diff --git a/.gitignore b/.gitignore
index c497e28d7..aeec2c4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ docs/build/
 .phpunit.result.cache
 ###< phpunit/phpunit ###
 
+/.php-cs-fixer.cache
+/.idea/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 295eb3e0e..f76ec4b98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,87 @@
 ---
-image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
 
 # Select what we should cache between builds
 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
-  - php -d memory_limit=2G tests/app/bin/console doctrine:fixtures:load -n
-  - echo "before_script finished"
+    paths:
+        - tests/app/vendor/
+        - .cache
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ee/ci/services/README.html for examples.
 services:
-  - name: postgis/postgis:12-3.1-alpine
-    alias: db
-  - name: redis
-    alias: redis
+    - name: postgis/postgis:12-3.1-alpine
+      alias: db
+    - name: redis
+      alias: redis
 
 # Set any variables we need
 variables:
-  # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
-  POSTGRES_USER: postgres
-  POSTGRES_PASSWORD: postgres
-  # fetch the chill-app using git submodules
-  GIT_SUBMODULE_STRATEGY: recursive
-  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
+    GIT_DEPTH: 1
+    # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
+    POSTGRES_USER: postgres
+    POSTGRES_PASSWORD: postgres
+    # fetch the chill-app using git submodules
+    GIT_SUBMODULE_STRATEGY: recursive
+    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
 
+stages:
+    - Composer install
+    - Tests
 
-# Run our tests
-test:
-  script:
-    - php -d memory_limit=3G bin/phpunit --colors=never
+build:
+    stage: Composer install
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    before_script:
+        - curl -sS https://getcomposer.org/installer | php
+        - php -d memory_limit=2G composer.phar config -g cache-dir "$(pwd)/.cache"
+    script:
+        - php -d memory_limit=2G composer.phar install --optimize-autoloader --no-ansi --no-interaction --no-progress
+    cache:
+        paths:
+            - .cache/
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+code_style:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - bin/grumphp run --tasks=phpcsfixer
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+sa_tests:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - bin/grumphp run --tasks=phpstan
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+unit_tests:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - php tests/app/bin/console doctrine:migrations:migrate -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
+        - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
+        - php -d memory_limit=3G bin/phpunit --colors=never
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
diff --git a/.gitlab/merge_request_templates/Default merge request.md b/.gitlab/merge_request_templates/Default merge request.md
new file mode 100644
index 000000000..5d62f91eb
--- /dev/null
+++ b/.gitlab/merge_request_templates/Default merge request.md	
@@ -0,0 +1,24 @@
+
+# Description of changes
+
+<!--
+  describe here the change of your MR. It can be either a text, or a bullet list
+  for changes
+-->
+
+
+# Issues related
+
+<!--
+  list the issues related to this MR.
+
+  It may be client issues, or dev issues
+-->
+
+* ...
+* ...
+
+# Tests
+
+<!-- Describe tests if any, or why no tests -->
+
diff --git a/.php_cs.dist.php b/.php_cs.dist.php
new file mode 100644
index 000000000..4ad5af914
--- /dev/null
+++ b/.php_cs.dist.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
+$config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
+
+$config
+    ->getFinder()
+    ->ignoreDotFiles(false)
+    ->notPath('tests/app')
+    ->name(['.php_cs.dist.php']);
+
+$rules = $config->getRules();
+
+$riskyRules = [
+    'ternary_to_elvis_operator' => false,
+    'php_unit_mock_short_will_return' => false,
+    'php_unit_set_up_tear_down_visibility' => false,
+    'php_unit_construct' => false,
+    'php_unit_dedicate_assert' => false,
+    'php_unit_expectation' => false,
+    'php_unit_mock' => false,
+    'php_unit_namespaced' => false,
+    'php_unit_no_expectation_annotation' => false,
+    'php_unit_test_case_static_method_calls' => false,
+    'php_unit_test_annotation' => false,
+    //    'final_internal_class' => false,
+    //    'strict_param' => false,
+    //    'declare_strict_types' => false,
+    //    'strict_comparison' => false,
+    //    'no_unreachable_default_argument_value' => false,
+    //    'ereg_to_preg' => false,
+    //    'ordered_interfaces' => false,
+    //    'error_suppression' => false,
+    //    'non_printable_character' => false,
+    //    'ordered_traits' => false,
+    //    'no_useless_sprintf' => false,
+    //    'dir_constant' => false,
+    //    'no_alias_functions' => false,
+    //    'implode_call' => false,
+    //    'combine_nested_dirname' => false,
+    //    'pow_to_exponentiation' => false,
+    //    'comment_to_phpdoc' => false,
+    //    'no_unset_on_property' => false,
+    //    'native_constant_invocation' => false,
+    //    'function_to_constant' => false,
+    //    'is_null' => false,
+    //    'native_function_invocation' => false,
+    //    'no_trailing_whitespace_in_string' => false,
+    //    'array_push' => false,
+    //    'fopen_flag_order' => false,
+    //    'fopen_flags' => false,
+    //    'logical_operators' => false,
+    //    'modernize_types_casting' => false,
+    //    'no_homoglyph_names' => false,
+    //    'no_unneeded_final_method' => false,
+    //    'random_api_migration' => false,
+    //    'static_lambda' => false,
+    //    'set_type_to_cast' => false,
+    //    'string_line_ending' => false,
+    //    'psr_autoloading' => false,
+];
+
+$rules = array_merge(
+    $rules,
+    $riskyRules
+);
+
+$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
+
+return $config->setRules($rules);
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34047e541..209bf858e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,11 +11,162 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] change address format in case the country is France, in Address render box and address normalizer
+* [person] add validator for accompanying period with a test on social issues (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/76)
+* [activity] fix visibility for location
+* [origin] fix origin: use correctly the translatable strings
 
+    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');`
+* [person] redirect bug fixed.
+* [action] add an unrelated issue within action creation.
+* [origin] fix origin: use correctly the translatable strings
+    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');`
+* [main] change order of civilities in civility fixtures (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] set min attr in the minimum of children field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add marital status date in person view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show number of children + allow set number of children to null (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show acceptSMS option (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add death information in person render box in twig and vue render boxes (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
+
+## Test releases
+
+### test release 2021-12-06
+
+* [main] address: use search API end points for getting postal code and reference address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
+* [main] address: in edit mode, select the encoded values in multiselect for address reference and city (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
+* [person search] fix bug when using birthdate after and birthdate before
+* [person search] increase pertinence when lastname begins with search pattern
+* [activity/actions] Améliore la cohérence du design entre
+  * la page résumé d'un parcours (liste d'actions récentes et liste d'activités récentes)
+  * la page liste des actions
+  * la page liste des activités (contexte personne / contexte parcours)
+* [household] field to edit wheter person is titulaire of household or not removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/322)
+* [activity] create work if a work with same social action is not associated to the activity
+* [visgraph] improve and fix bugs on vis-network relationship graph
+* [bugfix] posting of birth- and deathdate through api fixed.
+* [suggestions] improve suggestions lists
+* [badge-entity] design coherency between badge-person and 3 kinds of badge-thirdparty
+* [AddPersons] suggestions row are clickable, not only checkbox
+* [activity] improve show/new/edit templates, fix SEE and SEE_DETAILS acl
+* [activity][calendar] concerned groups items are clickable with on-the-fly modal, create specific badge for TMS column
+
+### Test release 2021-11-19 - bis
+
+* [household] do not allow to create two addresses on the same date
+* [activity] handle case when there is no social action associated to social issue
+* [activity] layout for issues / actions
+* [activity][bugfix] in edit mode, the form will now load the social action list
+
+
+### Test release 2021-11-29
+
+* [person] suggest entities (person | thirdparty) when creating/editing the accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/119)
+* [activity] add custom validation on the Activity class, based on what is required from the ActivityType (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/188)
+* [main] translate multiselect messages when selecting/creating address
+* [main] set the coordinates of the city when creating a new address OR choosing "pas d'adresse complète"
+* Use the user.label in accompanying course banner, instead of username;
+* fix: show validation message when closing accompanying course;
+* [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
+* [assets] new asset to style suggestions lists (with add/remove item link) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/258)
+* [accompanyingCourseWorkEdit] improves hyphenation and line breaks for long badges
+* [acompanyingCourse] improve Resume page
+  * complete all needed informations,
+  * actions and activities are clickables,
+  * better placement with js masonry blocks on top of content area,
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/101
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/295
+* [activity/calendar] on show page, concerned groups of persons table adapt itself to isVisibles options
+* [activity] remove the "plus" button in activity list
+* [activity] check ACL on activity list in person context
+* [list for accompanying course in person] filter list using ACL
+* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
+* [period] only the user can enable confidentiality
+* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
+* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
 
 
 ## Test releases
 
+### Test release 2021-11-22
+
+* [activity] delete admin_user_show in twig template because this route is not defined and should be defined
+* [activity] suggest requestor, user and ressources for adding persons|user|3rdparty
+* [calendar] suggest persons, professionals and invites for adding persons|3rdparty|user
+* [activity] take into account the restrictions on person|thirdparties|users visibilities defined in ActivityType
+* [main] Add currentLocation to the User entity + add a page for selecting this location + add in the user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133)
+* [activity] add user current location as default location for a new activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133)
+* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
+* remove "search by phone configuration option": search by phone is now executed by default
+* remplacer le classement par ordre alphabétique par un classement par ordre de pertinence, qui tient compte:
+    * de la présence d'une string avec le nom de la ville;
+    * de la similarité;
+    * du fait que la recherche commence par une partie du mot recherché
+* ajouter la recherche par numéro de téléphone directement dans la barre de recherche et dans le formulaire recherche avancée;
+* ajouter la recherche par date de naissance directement dans la barre de recherche;
+* ajouter la recherche par ville dans la recherche avancée
+* ajouter un lien vers le ménage dans les résultats de recherche
+* ajouter l'id du parcours dans les résultats de recherche
+* ajouter le demandeur dans les résultats de recherche
+* ajout d'un bouton "recherche avancée" sur la page d'accueil
+* [person] create an accompanying course: add client-side validation if no origin (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/210)
+* [person] fix bounds for computing current person address: the new address appears immediatly
+* [docgen] create a normalizer and serializer for normalization on doc format
+* [person normalization] the key center is now "centers" and is an array. Empty array if no center
+* [accompanyingCourse] Ability to close accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/296)
+* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
+* [list result] show all courses, except ones with period closed
+* [accompanyingCourse] improve banner with small carousel to display slide social-issues or slide associated persons (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/69)
+
+### Test release 2021-11-15
+
+* [main] fix adding multiple AddresseDeRelais (combine PickAddressType with ChillCollection)
+* [person]: do not suggest the current household of the person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/51)
+* [person]: display other phone numbers in view + add message in case no others phone numbers (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/184)
+* 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.
+* [household]: improve relationship graph
+    * add form to create/edit/delete relationship link,
+    * improve graph refresh mechanism
+    * add feature to export canvas as image (png)
+* [person suggest] In widget "add person", improve the pertinence of persons when one of the names starts with the pattern;
+* [person] do not ask for center any more on person creation
+* [3party] do not ask for center any more on 3party creation
+
+## 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
+* [activity] Bugfix: documents can now be added to an activity.
+* [tasks] improve tasks with filter order
+* [tasks] refactor singleControllerTasks: limit the number of conditions from the context
+* [validations] validation of accompanying period added: no duplicate participations or resources (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/60).
+* [renderbox] If gender of person is not defined, no icon is displayed instead of neuter-icon (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/129).
+* [confidential information] module added to blur confidential information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/248).
+* refactor `AuthorizationHelper` and `UserACLAwareRepository` to fix constructor, and separate logic for parent role helper into `ParentRoleHelper`
+* [main]: filter location and locationType in backend: exclude NULL names, only active and availableToUsers
+* [activity]: perform client-side validation & show/hide fields in the "new location" modal
+* [person]: normalize person with CenterResolverDispatcher and handle case where center is null or multiple in PersonRenderBox
+* [docstore] voter for PersonDocument and AccompanyingCourseDocument on the 2.0 way (using VoterHelperFactory)
+* [docstore] add authorization check inside controller and menu
+* [activity]: fix inheritance for role `ACTIVITY FULL` and add missing acl in menu
+* [person] show current address in search results
+* [person] show alt names in search results
+* [admin]: links to activity admin section added again.
+* [household]: endDate field deleted from household edit form.
+* [household]: View accompanying periods of current and old household members.
+* [tasks]: different layout for task list / my tasks, and fix link to tasks in alert or in warning
+* [admin]: links to activity admin section added again.
+* [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
+
 ### Test release 2021-10-27
 
 * [person]: delete double actions buttons on search person page
@@ -33,7 +184,10 @@ and this project adheres to
 * [3party]: fix address creation
 * [household members editor] finalisation of editor
 * [AccompanyingCourse banner]: replace translation referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/70)
-* [Location]: add location system in activity and RV (calendar). User can choose in location list or create a new location. 
+* [Location]: add location system in activity and RV (calendar). User can choose in location list or create a new location.
+* [household]: add relationship page with dynamic data visualisation graph
+
+## Test releases
 
 ### Test release 2021-10-11
 
@@ -49,7 +203,7 @@ and this project adheres to
     * fast creation buttons
     * add ordering for types
 
-* [AccompanyingCourse Resume page] badge-title for AccompanyingCourseWork and for Activities;
+* [AccompanyingCourse Resume page] dashboard for AccompanyingCourseWork and for Activities;
 * Improve badges behaviour with small screens;
 
 * [ThirdParty]:
@@ -100,7 +254,7 @@ and this project adheres to
 
 ## Test released
 
-<!-- 
+<!--
 
 Coming soon...
 
@@ -113,4 +267,4 @@ DO NOT ADD unreleased items here. Add them under "Unreleased" title
 ## Stable releases
 
 No stable releases for v2+
- 
+
diff --git a/CONVENTIONS.md b/CONVENTIONS.md
index 4dcdb08ea..717249a83 100644
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -56,28 +56,28 @@ Arborescence:
 Comment s'échaffaudent les styles dans Chill ?
 
 
-1. l'entrypoint **mod_bootstrap** (module bootstrap) est le premier niveau. Toutes les parties(modules) de bootstrap sont convoquées dans le fichier ```bootstrap.js``` situé dans ```ChillMainBundle/Resources/public/module/bootstrap```. 
-    * Au début, ce fichier importe le fichier ```variables.scss``` qui détermine la plupart des réglages bootstrap tels qu'on les a personnalisés. Ce fichier surcharge l'original, et de nombreuses variables y sont adaptées pour Chill. 
+1. l'entrypoint **mod_bootstrap** (module bootstrap) est le premier niveau. Toutes les parties(modules) de bootstrap sont convoquées dans le fichier ```bootstrap.js``` situé dans ```ChillMainBundle/Resources/public/module/bootstrap```.
+    * Au début, ce fichier importe le fichier ```variables.scss``` qui détermine la plupart des réglages bootstrap tels qu'on les a personnalisés. Ce fichier surcharge l'original, et de nombreuses variables y sont adaptées pour Chill.
         * On veillera à ce qu'on puisse toujours comparer ce fichier à l'original de bootstrap. En cas de mise à jour de bootstrap, il faudra générer un diff, et adapter ce diff sur le fichier variable de la nouvelle version.
-    * A la fin on importe le fichier ```custom.scss```, qui comprends des adaptations de bootstrap pour le préparer à notre thème Chill. 
+    * A la fin on importe le fichier ```custom.scss```, qui comprends des adaptations de bootstrap pour le préparer à notre thème Chill.
         * ce ```custom.scss``` peut être splitté en plus petits fichiers avec des ```@import 'custom/...'```
     * L'idée est que cette première couche bootstrap règle un partie importante des styles de l'application, en particulier ce qui touche aux position du layout, aux points de bascules responsive, aux marges et écarts appliqués par défauts aux éléments qu'on manipule.
 
 2. l'entrypoint **chill** est le second niveau. Il contient le thème Chill qui est reconnaissable à l'application.
     * Chaque bundle a un dossier ```Resources/public/chill``` dans lequel on peut trouver une feuille sass principale, qui est éventuellement splittée avec des ```@imports```. Toutes ces feuilles sont compilées dans un unique entrypoint Chill, c'est le thème de l'application. Celui-ci surcharge bootstrap.
-    * La feuille chillmain.scss devrait contenir les cascades de styles les plus générales, celles qui sont appliquées à de nombreux endroits de l'application. 
+    * La feuille chillmain.scss devrait contenir les cascades de styles les plus générales, celles qui sont appliquées à de nombreux endroits de l'application.
     * La feuille chillperson.scss va aussi retrouver des styles propres aux différents contextes des personnes: person, household et accompanyingcourse.
     * Certains bundles plus secondaires ne contiennent que des styles spécifiques à leur fonctionnement.
 
 3. les entrypoints **vue_** sont utilisés pour des composants vue. Les fichiers vue peuvent contenir un bloc de styles scss. Ce sont des styles qui ne concernent que le composant et son héritage, le tag ```scoped``` précise justement sa portée (voir la doc).
 
-4. les entrypoints **page_** sont utilisés pour ajouter des assets spécifiques à certaines pages, le plus souvent des scripts et des styles. 
+4. les entrypoints **page_** sont utilisés pour ajouter des assets spécifiques à certaines pages, le plus souvent des scripts et des styles.
 
 
 ## Taguer du code html et construire la cascade de styles
 
 L'exemple suivant montre comment taguer sans excès un élément de code. On remarque que:
-* il n'est pas nécessaire de taguer toutes les classes intérieures, 
+* il n'est pas nécessaire de taguer toutes les classes intérieures,
 * il ne faut pas répéter la classe parent dans toutes les classes enfants. La cascade sass va permettre de saisir le html avec souplesse sans alourdir la structure des balises.
 * souvent la première classe sera déclinée par plusieurs classes qui commencent de la même manière: ```bloc-dark``` ajoute juste la version sombre de ```bloc```, on ne met pas ```bloc dark```, car on ne souhaite pas que la classe ```dark``` de ```bloc``` interagisse avec la même classe ```dark``` de ```table```. On aura donc un élément ```bloc bloc-dark``` et un élément ```table table-dark```.
 
@@ -94,11 +94,11 @@ L'exemple suivant montre comment taguer sans excès un élément de code. On rem
 </div>
 ```
 
-Finalement, il importe ici de définir ce qu'est un bloc, ce qu'est une zone d'actions et ce qu'est un bouton. Ces 3 éléments existent de manière autonome, ce sont les seuls qu'on tagge. 
+Finalement, il importe ici de définir ce qu'est un bloc, ce qu'est une zone d'actions et ce qu'est un bouton. Ces 3 éléments existent de manière autonome, ce sont les seuls qu'on tagge.
 
 Par exemple pour mettre un style au titre on précise juste h3 dans la cascade bloc.
 
-```sass
+```scss
 div.bloc {
    // un bloc générique, utilisé à plusieurs endroits
    &.bloc-dark {
@@ -113,12 +113,12 @@ div.bloc {
    }
 }
 div.mon-bloc {
-   // des exceptions spécifiques à mon-bloc, 
+   // des exceptions spécifiques à mon-bloc,
    // qui sont des adaptations de bloc
 }
 
 ul.record_actions {
-   // va uniformiser tous les record_actions de l'application  
+   // va uniformiser tous les record_actions de l'application
    li {
      //...
    }
@@ -260,7 +260,7 @@ Exemple:
 address|chill_entity_render_box
 ```
 
-Justification: 
+Justification:
 
 * des éléments sont parfois personnalisés par installation (par exemple, le nom de chaque utilisateur sera suivi par le nom du service)
 * pour rationaliser et rendre semblable les affichages
@@ -270,13 +270,13 @@ A prevoir:
 
 * toujours trois positions:
     * inline
-    * block 
+    * block
     * item (dans un tableau, une ligne)
 
 > block et item sont en fait la même option passée au render_box: render: bloc. Il y a aussi ‘raw’ pour le inline, et ‘label’ pour une titraille configurable avec des options.
 
-> quand on passe l’option render: bloc, on peut placer le render_box dans une boucle for plus large qui fonctionne avec la classe flex-table ou la classe flex-bloc, ce qui donnera un affichage en rangée (table) ou en blocs. [name=Mathieu] 
-  
+> quand on passe l’option render: bloc, on peut placer le render_box dans une boucle for plus large qui fonctionne avec la classe flex-table ou la classe flex-bloc, ce qui donnera un affichage en rangée (table) ou en blocs. [name=Mathieu]
+
 
 
 #### En vue
@@ -292,13 +292,13 @@ A chaque fois qu'on indique le nom d'une personne, un parcours, un ménage, il y
 
 Ces éléments sont toujours proposé par des `render_box` par défaut. Des options permettent de les désactiver dans des cas particuliers
 
-> à discuter, quelques réflexion: 
-> quelle est la logique qui domine pour les boutons ? on a symbolisé les 4 actions du crud par des couleurs: bleu(show) orange(edit) vert(create) et rouge(delete). 
-> Est-ce que c'est ça qui prime, et comment ça s'articule avec la logique des pictos ? 
+> à discuter, quelques réflexion:
+> quelle est la logique qui domine pour les boutons ? on a symbolisé les 4 actions du crud par des couleurs: bleu(show) orange(edit) vert(create) et rouge(delete).
+> Est-ce que c'est ça qui prime, et comment ça s'articule avec la logique des pictos ?
 > Par exemple, il pourrait être logique d'utiliser l'oeil bleu pour voir l'objet, qu'il s'agisse d'une personne ou d'un parcours, ce serait plutôt le contexte, et l'infobulle (title) qui préciserait le contexte.
 > Je pense que les pictos de boutons doivent faire référence à l'action, mais pas à l'objet. Autrement dit je n'utiliserais jamais l'icone du ménage ou du parcours dans les boutons.
 > Pour représenter les ménages et les parcours, je pense qu'il faudrait trouver autre chose que forkawesome. Si c'est des pictos, trouver un motif différents et de tailles différente. Réfléchir à un couplage picto-couleur-forme différent, qui exprime le contexte et qui se distingue bien des boutons.
-> Idem pour les badges, il faut une palette de badge qui couvre tous les besoins: socialIssue, socialActions, socialReason, members, etc. [name=Mathieu] 
+> Idem pour les badges, il faut une palette de badge qui couvre tous les besoins: socialIssue, socialActions, socialReason, members, etc. [name=Mathieu]
 
 ### Formulaires
 
@@ -350,7 +350,7 @@ A chaque fois qu'un élément est créé par un formulaire, un message flash doi
 
 > "L'élément a été créé"
 
-Le nom de l'élément peut être remplacé par quelque chose de plus pertinent: 
+Le nom de l'élément peut être remplacé par quelque chose de plus pertinent:
 
 > * L'activité a été créée
 > * Le rendez-vous a été créé
@@ -362,7 +362,7 @@ Le nom de l'élément peut être remplacé par quelque chose de plus pertinent:
 A chaque fois qu'un élément est enregistré, un message flash doit apparaitre:
 
 > * Les données ont été modifiées
-> 
+>
 
 #### Erreur sur un formulaire (erreur de validation)
 
@@ -377,7 +377,36 @@ Les erreurs doivent apparaitre attachée au champ qui les concerne. Toutefois, i
 A chaque fois qu'un lien est indiqué, vérifier si on ne doit pas utiliser la fonction `chill_return_path`, `chill_forward_return_path` ou `chill_return_path_or`.
 
 * depuis la page liste, vers l'ouverture d'un élément, ou le bouton création => utiliser `chill_path_add_return_path`
-* dans ces pages d'éditions, 
+* dans ces pages d'éditions,
     * utiliser `chill_return_path_or` dans le bouton "Cancel";
     * pour les boutons "enregistrer et voir" et "Enregistrer et fermer" => ?
 
+### Assets pour les listes de suggestion
+
+Créer une liste de suggestions à ajouter (tout l'item est cliquable)
+```html
+<ul class="list-suggest add-items">
+   <li>
+      <span>item</span>
+   </li>
+</ul>
+```
+Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'ancre a est vide)
+```html
+<ul class="list-suggest remove-items">
+    <li>
+        <span>
+            item
+            <a></a>
+        </span>
+    </li>
+</ul>
+```
+Créer un titre enlevable (avec une croix rouge cliquable, l'ancre a est vide)
+```html
+<div class="item-title">
+    title
+    <a></a>
+</div>
+```
+Les classes `cols` ou `inline` peuvent être ajoutées à côté de `list-suggest` pour modifier la disposition de la liste.
diff --git a/LICENSE b/LICENSE
index 1cf094aab..be3f7b28e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -629,12 +629,12 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    chill-bundles
-    Copyright (C) 2021  Chill Project
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     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
+    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,
diff --git a/composer.json b/composer.json
index 0d134cbf8..6e18ea69a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,7 @@
         "phpoffice/phpspreadsheet": "^1.16",
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
+        "spomky-labs/base64url": "^2.0",
         "symfony/asset": "4.*",
         "symfony/browser-kit": "^5.2",
         "symfony/css-selector": "^5.2",
@@ -52,8 +53,10 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "drupol/php-conventions": "^5",
         "fakerphp/faker": "^1.13",
         "nelmio/alice": "^3.8",
+        "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^7.0",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^5.1",
@@ -88,7 +91,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "tests/app/src/"
+            "App\\": "tests/app/src/",
+            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
         }
     },
     "minimum-stability": "dev",
diff --git a/docs/source/_static/code/exports/BirthdateFilter.php b/docs/source/_static/code/exports/BirthdateFilter.php
index 91a5dc0f6..2c3cd765f 100644
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -1,123 +1,126 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraints;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
-class BirthdateFilter implements FilterInterface, ExportElementValidatedInterface
+class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    // add specific role for this filter    
+    // add specific role for this filter
     public function addRole()
     {
         // we do not need any new role for this filter, so we return null
         return null;
     }
 
+    // here, we alter the query created by Export
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        // we create the clause here
+        $clause = $qb->expr()->between(
+            'person.birthdate',
+            ':date_from',
+            ':date_to'
+        );
+
+        // we have to take care **not to** remove previous clauses...
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        // we add parameters from $data. $data contains the parameters from the form
+        $qb->setParameter('date_from', $data['date_from']);
+        $qb->setParameter('date_to', $data['date_to']);
+    }
+
     // we give information on which type of export this filter applies
     public function applyOn()
     {
         return 'person';
     }
 
-    public function getTitle()
-    {
-        return 'Filter by person\'s birthdate';
-    }
-
     // we build a form to collect some parameters from the users
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, array(
-            'label' => "Born after this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
+        $builder->add('date_from', DateType::class, [
+            'label' => 'Born after this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->add('date_to', DateType::class, array(
-            'label' => "Born before this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
+        ]);
+
+        $builder->add('date_to', DateType::class, [
+            'label' => 'Born before this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
-        ));
-        
-    }
-   
-    // the form created above must be validated. The process of validation
-    // is executed here. This function is added by the interface 
-    // `ExportElementValidatedInterface`, and can be ignore if there is 
-    // no need for a validation
-    public function validateForm($data, ExecutionContextInterface $context)
-    { 
-        $date_from = $data['date_from'];
-        $date_to   = $data['date_to'];
-        
-        if ($date_from === null) {
-            $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
-                ->addViolation();
-        }
-        
-        if ($date_to === null) {
-            $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
-                ->addViolation();
-        }
-        
-        if (
-            ($date_from !== null && $date_to !== null)
-            &&
-            $date_from >= $date_to
-        ) {
-            $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
-                ->addViolation();
-        }
-    }
-
-
-    // here, we alter the query created by Export
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-        // we create the clause here
-        $clause = $qb->expr()->between('person.birthdate', ':date_from', 
-            ':date_to');
-
-        // we have to take care **not to** remove previous clauses...
-        if ($where instanceof Expr\Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-        
-        $qb->add('where', $where);
-        // we add parameters from $data. $data contains the parameters from the form
-        $qb->setParameter('date_from', $data['date_from']);
-        $qb->setParameter('date_to', $data['date_to']);
+        ]);
     }
 
     // here, we create a simple string which will describe the action of
     // the filter in the Response
     public function describeAction($data, $format = 'string')
     {
-        return array('Filtered by person\'s birtdate: '
-            . 'between %date_from% and %date_to%', array(
+        return ['Filtered by person\'s birtdate: '
+            . 'between %date_from% and %date_to%', [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ));
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ], ];
     }
 
+    public function getTitle()
+    {
+        return 'Filter by person\'s birthdate';
+    }
 
+    // the form created above must be validated. The process of validation
+    // is executed here. This function is added by the interface
+    // `ExportElementValidatedInterface`, and can be ignore if there is
+    // no need for a validation
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        $date_from = $data['date_from'];
+        $date_to = $data['date_to'];
+
+        if (null === $date_from) {
+            $context->buildViolation('The "date from" should not be empty')
+                //->atPath('date_from')
+                ->addViolation();
+        }
+
+        if (null === $date_to) {
+            $context->buildViolation('The "date to" should not be empty')
+                //->atPath('date_to')
+                ->addViolation();
+        }
+
+        if (
+            (null !== $date_from && null !== $date_to)
+            && $date_from >= $date_to
+        ) {
+            $context->buildViolation('The date "date to" should be after the '
+                . 'date given in "date from" field')
+                ->addViolation();
+        }
+    }
 }
diff --git a/docs/source/_static/code/exports/CountPerson.php b/docs/source/_static/code/exports/CountPerson.php
index bc76f96d6..98c4fcd00 100644
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -1,118 +1,117 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\Query;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Export\Declarations;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CountPerson implements ExportInterface
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $entityManager;
-    
+
     public function __construct(
-            EntityManagerInterface $em
-            )
-    {
+        EntityManagerInterface $em
+    ) {
         $this->entityManager = $em;
     }
-    
-    public function getType()
+
+    public function buildForm(FormBuilderInterface $builder)
     {
-        return Declarations::PERSON_TYPE;
+        // this export does not add any form
     }
-    
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
     public function getDescription()
     {
-        return "Count peoples by various parameters.";
+        return 'Count peoples by various parameters.';
     }
-    
-    public function getTitle()
+
+    public function getLabels($key, array $values, $data)
     {
-        return "Count peoples";
+        // the Closure which will be executed by the formatter.
+        return function ($value) {
+            switch ($value) {
+                case '_header':
+                    // we have to process specifically the '_header' string,
+                    // which will be used by the formatter to show a column title
+                    return $this->getTitle();
+
+                default:
+                    // for all value, we do not process them and return them
+                    // immediatly
+                    return $value;
+            }
+        };
     }
-    
-    public function requiredRole()
-    {
-        return new Role(PersonVoter::STATS);
-    }
-    
-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
-    {
-        // we gather all center the user choose.
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
-        
-        $qb = $this->entityManager->createQueryBuilder();
-        
-        $qb->select('COUNT(person.id) AS export_result')
-                ->from('ChillPersonBundle:Person', 'person')
-                ->join('person.center', 'center')
-                ->andWhere('center IN (:authorized_centers)')
-                ->setParameter('authorized_centers', $centers);
-                ;
-        
-        
-        return $qb;
-    }
-    
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-    
+
     public function getQueryKeys($data)
     {
         // this array match the result keys in the query. We have only
         // one column.
-        return array('export_result');
+        return ['export_result'];
     }
-    
-    public function getLabels($key, array $values, $data)
+
+    public function getResult($qb, $data)
     {
-        
-        // the Closure which will be executed by the formatter. 
-        return function($value) {
-            switch($value) {
-                case '_header':
-                  // we have to process specifically the '_header' string, 
-                  // which will be used by the formatter to show a column title
-                  return $this->getTitle();
-                default:
-                  // for all value, we do not process them and return them
-                  // immediatly
-                  return $value;
-        };
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
-    
-    public function getAllowedFormattersTypes()
+
+    public function getTitle()
     {
-        return array(FormatterInterface::TYPE_TABULAR);
+        return 'Count peoples';
     }
-    
-    public function buildForm(FormBuilderInterface $builder) {
-        // this export does not add any form
+
+    public function getType()
+    {
+        return Declarations::PERSON_TYPE;
     }
-    
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        // we gather all center the user choose.
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb->select('COUNT(person.id) AS export_result')
+            ->from('ChillPersonBundle:Person', 'person')
+            ->join('person.center', 'center')
+            ->andWhere('center IN (:authorized_centers)')
+            ->setParameter('authorized_centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole()
+    {
+        return new Role(PersonVoter::STATS);
+    }
+
     public function supportsModifiers()
     {
         // explain the export manager which formatters and filters are allowed
-        return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
+        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
     }
-    
 }
diff --git a/docs/source/development/access_control_model.rst b/docs/source/development/access_control_model.rst
index 58fe44319..e159f7fb6 100644
--- a/docs/source/development/access_control_model.rst
+++ b/docs/source/development/access_control_model.rst
@@ -23,15 +23,196 @@ Every time an entity is created, viewed or updated, the software check if the us
 
 The user must be granted access to the action on this particular entity, with this scope and center.
 
+TL;DR
+=====
+
+Resolve scope and center
+------------------------
+
+In a service, resolve the center and scope of an entity
+
+.. code-block:: php
+
+   use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+   use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+
+
+   class MyService {
+      private ScopeResolverDispatcher $scopeResolverDispatcher;
+      private CenterResolverDispatcher $centerResolverDispatcher;
+
+      public function myFunction($entity) {
+         /** @var null|Center[]|Center $center */
+         $center = $this->centerResolverDispatcher->resolveCenter($entity);
+         // $center may be null, an array of center, or an instance of Center
+
+         if ($this->scopeResolverDispatcher->isConcerned($entity) {
+            /** @var null|Scope[]|Scope */
+            $scope = $this-scopeResolverDispatcher->resolveScope($entity);
+            // $scope may be null, an array of Scope, or an instance of Scope
+         }
+
+      }
+
+   }
+
+In twig template, resolve the center:
+
+.. code-block:: twig
+
+   {# resolve a center #}
+
+   {% if person|chill_resolve_center is not null%}
+
+      {% if person|chill_resolve_center is iterable %}
+         {% set centers = person|chill_resolve_center %}
+      {% else %}
+         {% set centers = [ person|chill_resolve_center ] %}
+      {% endif %}
+
+      <span class="open_sansbold">
+         {{ 'Center'|trans|upper}} :
+      </span>
+      {% for c in centers %}
+         {{  c.name|upper }}
+         {% if not loop.last %}, {% endif %}
+      {% endfor %}
+   {%- endif -%}
+
+In twig template, resolve the scope:
+
+.. code-block:: twig
+
+   {% if entity|chill_is_scope_concerned %}
+
+      {% if entity|chill_resolve_scope is iterable %}
+         {% set scopes = entity|chill_resolve_scope %}
+      {% else %}
+         {% set scopes = [ entity|chill_resolve_scope ] %}
+      {% endif %}
+
+      <span>Scopes&nbsp;:</span>
+      {% for s in scopes %}
+         {{  c.name|localize_translatable_string }}
+         {% if not loop.last %}, {% endif %}
+      {% endfor %}
+   {%- endif -%}
+
+Build a ``Voter``
+-----------------
+
+.. code-block:: php
+
+   <?php
+
+   namespace Chill\DocStoreBundle\Security\Authorization;
+
+   use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+   use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+   use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+   use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+   use Chill\DocStoreBundle\Entity\PersonDocument;
+   use Chill\PersonBundle\Entity\Person;
+   use Chill\MainBundle\Entity\User;
+   use Chill\PersonBundle\Security\Authorization\PersonVoter;
+   use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+   use Psr\Log\LoggerInterface;
+   use Symfony\Component\Security\Core\Security;
+
+   class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
+   {
+       // roles should be stored into constants:
+
+       const CREATE = 'CHILL_PERSON_DOCUMENT_CREATE';
+       const SEE    = 'CHILL_PERSON_DOCUMENT_SEE';
+       const SEE_DETAILS = 'CHILL_PERSON_DOCUMENT_SEE_DETAILS';
+       const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
+       const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
+
+       protected Security $security;
+       protected VoterHelperInterface $voterHelper;
+
+       public function __construct(
+           Security $security,
+           VoterHelperFactoryInterface $voterHelperFactory
+       ) {
+           $this->security = $security;
+
+           // we build here a voter helper. This will ease the operations below.
+           // when the authorization model is changed, it will be easy to make a different implementation
+           // of the helper, instead of writing all Voters
+
+           $this->voterHelper = $voterHelperFactory
+               // create a builder with some context
+               ->generate(self::class)
+               // add the support of given roles for given class:
+               ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+               ->addCheckFor(PersonDocument::class, $this->getRoles())
+               ->build();
+       }
+
+
+       protected function supports($attribute, $subject)
+       {
+           return $this->voterHelper->supports($attribute, $subject);
+       }
+
+       protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+       {
+           // basic check
+           if (!$token->getUser() instanceof User) {
+               return false;
+           }
+
+           // we first check the acl for associated elements.
+           // here, we must be able to see the person associated to the document:
+           if ($subject instanceof PersonDocument
+               && !$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
+
+               // not possible to see the associated person ? Then, not possible to see the document!
+               return false;
+           }
+
+           // the voter helper will implements the logic:
+           return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
+       }
+
+       // all the method below are used to register roles into the admin part
+       public function getRoles()
+       {
+           return [
+               self::CREATE,
+               self::SEE,
+               self::SEE_DETAILS,
+               self::UPDATE,
+               self::DELETE
+           ];
+       }
+
+       public function getRolesWithoutScope()
+       {
+           return array();
+       }
+
+
+       public function getRolesWithHierarchy()
+       {
+           return ['PersonDocument' => $this->getRoles() ];
+       }
+   }
+
+
+
+
 From an user point of view
---------------------------
+==========================
 
 The software is design to allow fine tuned access rights for complicated installation and team structure. The administrators may also decide that every user has the right to see all resources, where team have a more simple structure. 
 
 Here is an overview of the model.
 
 Chill can be multi-center
-^^^^^^^^^^^^^^^^^^^^^^^^^
+-------------------------
 
 Chill is designed to be installed once for social center who work with multiple teams separated, or for social services's federation who would like to share the same installation of the software for all their members. 
 
@@ -42,7 +223,7 @@ Otherwise, it is not required to create multiple center: Chill can also work for
 Obviously, users working in the different centers are not allowed to see the entities (_persons_, _reports_, _activities_) of other centers. But users may be attached to multiple centers: consequently they will be able to see the entities of the multiple centers they are attached to.
 
 Inside center, scope divide team
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+--------------------------------
 
 Users are attached to one or more center and, inside to those center, there may exists differents scopes. The aim of those _scopes_ is to divide the whole team of social worker amongst different departement, for instance: the social team, the psychologist team, the nurse team, the administrative team, ... Each team is granted of different rights amongst scope. For instance, the social team may not see the _activities_ of the psychologist team. The administrative team may see the date & time's activities, but is not allowed to see the detail of those entities (the personal notes, ...).
 
@@ -52,8 +233,38 @@ As entities have only one scopes, if some entities must be shared across two dif
 
 Example: if some activities must be seen and updated between nurses and psychologists, the administrator will create a scope "nurse and psy" and add the ability for both team "nurse" and "psychologist" to "create", "see", and "update" the activities belonging to scope "nurse and psy".
 
+
+Where does the ``scope`` and ``center`` comes from ?
+====================================================
+
+Most often, scope and center comes from user's input:
+
+* when person is created, Chill asks the associated center to the user. Then, every entity associated to the user (Activity, ...) is associated to this center;
+* when an entity is created, Chill asks the associated scope.
+
+The UI check the model before adding those input into form. If the user hae access to only one center or scope, this scope or center is filled automatically, and the UI does not ask the user. Most of the times, the user does not see "Pick a scope" and "Pick a center" inputs.
+
+Scope and Center are associated to entities through ``ManyToOne`` properties, which are then mapped to ``FOREIGN KEY`` in tables, ...
+
+But sometimes, this implementation does not fits the needs:
+
+* persons are associated to center *geographically*: the address of each person contains lat/lon coordinates, and the center is resolved from this coordinated;
+* some would like to associated persons to multiple center, or one center;
+* entities are associated to scope through the job reached by "creator" (an user);
+* some would like not to use scope at all;
+* … 
+
+For this reasons, associated center and scopes must be resolved programmatically. The default implementation rely on the model association, as described above. But it becomes possible to change the behaviour on different implementations.
+
+Is my entity "concerned" by scopes ?
+------------------------------------
+
+Some entities are concerned by scope, some not.
+
+This is also programmatically resolved.
+
 The concepts translated into code
------------------------------------
+===================================
 
 .. figure:: /_static/access_control_model.png
    
@@ -81,7 +292,7 @@ At each step of his lifetime (creation, view of the entity and eventually of his
 All those action are executed through symfony voters and helpers. 
 
 How to check authorization ?
-----------------------------
+============================
 
 Just use the symfony way-of-doing, but do not forget to associate the entity you want to check access. For instance, in controller :  
 
@@ -100,34 +311,23 @@ Just use the symfony way-of-doing, but do not forget to associate the entity you
 
 And in template :
 
-.. code-block:: html+jinja
+.. code-block:: twig
 
    {{ if is_granted('CHILL_ENTITY_SEE', entity) %}print something{% endif %}
 
-Retrieving reachable scopes and centers
-----------------------------------------
+Retrieving reachable scopes and centers for a user
+--------------------------------------------------
 
-The class :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelper` helps you to get centers and scope reachable by a user.
+The class :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelperInterface` helps you to get centers and scope reachable by a user.
 
 Those methods are intentionnaly build to give information about user rights: 
 
 - getReachableCenters: to get reachable centers for a user
 - getReachableScopes : to get reachable scopes for a user
 
-.. note::
-
-   The service is reachable through the Depedency injection with the key `chill.main.security.authorization.helper`. Example :
-
-   .. code-block:: php
-
-      $helper = $container->get('chill.main.security.authorization.helper');
-
-.. todo::
-
-   Waiting for a link between our api and this doc, we invite you to read the method signatures `here <https://github.com/Chill-project/Main/blob/add_acl/Security/Authorization/AuthorizationHelper.php>`_
 
 Adding your own roles
-=====================
+---------------------
 
 Extending Chill will requires you to define your own roles and rules for your entities. You will have to define your own voter to do so.
 
@@ -152,7 +352,7 @@ To create your own roles, you should:
 
 
 Declare your role
-------------------
+^^^^^^^^^^^^^^^^^^
 
 To declare new role, implement the class :class:`Chill\\MainBundle\\Security\\ProvideRoleInterface`. 
 
@@ -212,69 +412,8 @@ Example of an implementation of :class:`Chill\\MainBundle\\Security\\ProvideRole
 
    }
 
-Implement your voter
---------------------
-
-Inside this class, you might use the :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelper` to check permission (do not re-invent the wheel). This is a real-world example:
-
-.. code-block:: php
-
-   namespace Chill\ReportBundle\Security\Authorization;
-   use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-   use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-
-
-   class ReportVoter extends AbstractChillVoter
-   {
-       const CREATE = 'CHILL_REPORT_CREATE';
-       const SEE    = 'CHILL_REPORT_SEE';
-       const UPDATE = 'CHILL_REPORT_UPDATE';
-       
-       /**
-        *
-        * @var AuthorizationHelper
-        */
-       protected $helper;
-       
-       public function __construct(AuthorizationHelper $helper)
-       {
-           $this->helper = $helper;
-       }
-       
-       protected function getSupportedAttributes()
-       {
-           return array(self::CREATE, self::SEE, self::UPDATE);
-       }
-       protected function getSupportedClasses()
-       {
-           return array('Chill\ReportBundle\Entity\Report');
-       }
-       protected function isGranted($attribute, $report, $user = null)
-       {
-           if (! $user instanceof \Chill\MainBundle\Entity\User){
-               
-               return false;
-           }
-           
-           return $this->helper->userHasAccess($user, $report, $attribute);
-       }
-   }
-
-Then, you will have to declare the service and tag it as a voter :
-
-.. code-block:: yaml
-
-   services:
-       chill.report.security.authorization.report_voter:
-           class: Chill\ReportBundle\Security\Authorization\ReportVoter
-           arguments:
-               - "@chill.main.security.authorization.helper"
-           tags:
-            - { name: security.voter }
-
-
 Adding role hierarchy
----------------------
+^^^^^^^^^^^^^^^^^^^^^
 
 You should prepend Symfony's security component directly from your code. 
 
@@ -312,3 +451,484 @@ You should prepend Symfony's security component directly from your code.
    }
 
 
+
+Implement your voter
+^^^^^^^^^^^^^^^^^^^^
+
+Most of the time, Voter will check that:
+
+1. The given role is reachable (= ``$attribute``)
+2. for the given center,
+3. and, if any, for the given role
+4. if the entity is associated to another entity, this entity should be, at least, viewable by the user.
+
+Thats what we call the "autorization logic". But this logic may be replace by a new one, and developers should take care of it.
+
+
+Then voter implementation should take care of:
+
+* check the access to associated entities. For instance, if an ``Activity`` is associated to a ``Person``, the voter should first check that the user can show the associated ``Person``;
+* as far as possible, delegates the check for associated center, scopes, and check for authorization using the authorization logic. VoterHelper will ease the most common operation of this logic.
+
+This is an example of implementation:
+
+
+.. code-block:: php
+
+   <?php
+
+   namespace Chill\DocStoreBundle\Security\Authorization;
+
+   use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+   use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+   use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+   use Chill\DocStoreBundle\Entity\PersonDocument;
+   use Chill\PersonBundle\Entity\Person;
+   use Chill\MainBundle\Entity\User;
+   use Chill\PersonBundle\Security\Authorization\PersonVoter;
+   use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+   use Symfony\Component\Security\Core\Security;
+
+   class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
+   {
+       protected Security $security;
+       protected VoterHelperInterface $voterHelper;
+
+       public function __construct(
+           Security $security,
+           VoterHelperFactoryInterface $voterHelperFactory
+       ) {
+           $this->security = $security;
+
+           // we build here a voter helper. This will ease the operations below.
+           // when the authorization model is changed, it will be easy to make a different implementation
+           // of the helper, instead of writing all Voters
+
+           $this->voterHelper = $voterHelperFactory
+               // create a builder with some context
+               ->generate(self::class)
+               // add the support of given roles for given class:
+               ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+               ->addCheckFor(PersonDocument::class, $this->getRoles())
+               ->build();
+       }
+
+
+       protected function supports($attribute, $subject)
+       {
+           return $this->voterHelper->supports($attribute, $subject);
+       }
+
+       protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+       {
+           // basic check
+           if (!$token->getUser() instanceof User) {
+               return false;
+           }
+
+           // we first check the acl for associated elements.
+           // here, we must be able to see the person associated to the document:
+           if ($subject instanceof PersonDocument
+               && !$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
+
+               // not possible to see the associated person ? Then, not possible to see the document!
+               return false;
+           }
+
+           // the voter helper will implements the logic of checking:
+           // 1. that the center is reachable
+           // 2. for this given entity
+           // 3. for this given scope
+           // 4. and for the given role
+           return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
+       }
+
+       public function getRoles()
+       {
+           // ...
+       }
+
+       public function getRolesWithoutScope()
+       {
+           // ...
+       }
+
+
+       public function getRolesWithHierarchy()
+       {
+           // ...
+       }
+   }
+
+Then, you will have to declare the service and tag it as a voter :
+
+.. code-block:: yaml
+
+   services:
+       chill.report.security.authorization.report_voter:
+           class: Chill\ReportBundle\Security\Authorization\ReportVoter
+           arguments:
+               - "@chill.main.security.authorization.helper"
+           tags:
+            - { name: security.voter }
+
+
+How to resolve scope and center programmatically ?
+==================================================
+
+In a service, resolve the center and scope of an entity
+
+.. code-block:: php
+
+   use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+   use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+
+
+   class MyService {
+      private ScopeResolverDispatcher $scopeResolverDispatcher;
+      private CenterResolverDispatcher $centerResolverDispatcher;
+
+      public function myFunction($entity) {
+         /** @var null|Center[]|Center $center */
+         $center = $this->centerResolverDispatcher->resolveCenter($entity);
+         // $center may be null, an array of center, or an instance of Center
+
+         if ($this->scopeResolverDispatcher->isConcerned($entity) {
+            /** @var null|Scope[]|Scope */
+            $scope = $this-scopeResolverDispatcher->resolveScope($entity);
+            // $scope may be null, an array of Scope, or an instance of Scope
+         }
+
+      }
+
+   }
+
+In twig template, resolve the center:
+
+.. code-block:: twig
+
+   {# resolve a center #}
+
+   {% if person|chill_resolve_center is not null%}
+
+      {% if person|chill_resolve_center is iterable %}
+         {% set centers = person|chill_resolve_center %}
+      {% else %}
+         {% set centers = [ person|chill_resolve_center ] %}
+      {% endif %}
+
+      <span class="open_sansbold">
+         {{ 'Center'|trans|upper}} :
+      </span>
+      {% for c in centers %}
+         {{  c.name|upper }}
+         {% if not loop.last %}, {% endif %}
+      {% endfor %}
+   {%- endif -%}
+
+In twig template, resolve the scope:
+
+.. code-block:: twig
+
+   {% if entity|chill_is_scope_concerned %}
+
+      {% if entity|chill_resolve_scope is iterable %}
+         {% set scopes = entity|chill_resolve_scope %}
+      {% else %}
+         {% set scopes = [ entity|chill_resolve_scope ] %}
+      {% endif %}
+
+      <span>Scopes&nbsp;:</span>
+      {% for s in scopes %}
+         {{  c.name|localize_translatable_string }}
+         {% if not loop.last %}, {% endif %}
+      {% endfor %}
+   {%- endif -%}
+
+What is the default implementation of Scope and Center resolver ?
+-----------------------------------------------------------------
+
+By default, the implementation rely on association into entities.
+
+* implements ``Chill\MainBundle\Entity\HasCenterInterface`` on entities which have one or any center;
+* implements ``Chill\MainBundle\Entity\HasCentersInterface`` on entities which have one, multiple or any centers;
+* implements ``Chill\MainBundle\Entity\HasScopeInterface`` on entities which have one or any scope;
+* implements ``Chill\MainBundle\Entity\HasScopesInterface`` on entities which have one or any scopes;
+
+Then, the default implementation will resolve the center and scope based on the implementation in your model.
+
+How to change the default behaviour ?
+-------------------------------------
+
+Implements those interface into services:
+
+* ``Chill\MainBundle\Security\Resolver\CenterResolverInterface``;
+* ``Chill\MainBundle\Security\Resolver\ScopeResolverInterface``;
+
+Authorization into lists and index pages
+========================================
+
+Due to the fact that authorization model may be overriden, "list" and "index" pages should not rely on center and scope from controller. This must be delegated to dedicated service, which will be aware of the authorization model. We call them ``ACLAwareRepository``. This service must implements an interface, in order to allow to change the implementation.
+
+The controller **must not** performs any DQL or SQL query.
+
+Example in a controller:
+
+.. code-block:: php
+
+   namespace Chill\TaskBundle\Controller;
+
+   use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+   use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
+
+
+   final class SingleTaskController extends AbstractController
+   {
+
+       private SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository;
+
+       /**
+        *
+        * @Route(
+        *  "/{_locale}/task/single-task/list",
+        *  name="chill_task_singletask_list"
+        * )
+        */
+       public function listAction(
+           Request $request
+       ) {
+           $this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
+
+           $nb = $this->singleTaskAclAwareRepository->countByAllViewable(
+               '', // search pattern
+               [] // search flags
+           );
+           $paginator = $this->paginatorFactory->create($nb);
+
+           if (0 < $nb) {
+               $tasks = $this->singleTaskAclAwareRepository->findByAllViewable(
+                  '', // search pattern
+                  [] // search flags
+                   $paginator->getCurrentPageFirstItemNumber(),
+                   $paginator->getItemsPerPage(),
+                   // ordering:
+                   [
+                       'startDate' => 'DESC',
+                       'endDate' => 'DESC',
+                   ]
+               );
+           } else {
+               $tasks = [];
+           }
+
+           return $this->render('@ChillTask/SingleTask/List/index.html.twig', [
+                   'tasks' => $tasks,
+                   'paginator' => $paginator,
+                   'filter_order' => $filterOrder
+               ]);
+       }
+   }
+
+Writing ``ACLAwareRepository``
+------------------------------
+
+The ACLAwareRepository should rely on interfaces
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+As described above, the ACLAwareRepository will perform the query for listing entities, and take care of authorization.
+
+Those "ACLAwareRepositories" must be described into ``interfaces``.
+
+The service must rely on this interface, and not on the default implementation.
+
+Example: at first, we design an interface for listing ``SingleTask`` entities: 
+
+
+.. code-block:: php
+
+   <?php
+
+   namespace Chill\TaskBundle\Repository;
+
+   use Chill\PersonBundle\Entity\AccompanyingPeriod;
+   use Chill\PersonBundle\Entity\Person;
+
+   interface SingleTaskAclAwareRepositoryInterface
+   {
+
+       /**
+        * @return SingleTask[]|array
+        */
+       public function findByCurrentUsersTasks(?string $pattern = null, ?array $flags = [], ?int $start = 0, ?int $limit = 50, ?array $orderBy = []): array;
+
+       public function countByCurrentUsersTasks(?string $pattern = null, ?array $flags = []): int;
+
+       public function countByAllViewable(
+           ?string $pattern = null,
+           ?array $flags = []
+       ): int;
+
+       /**
+        * @return SingleTask[]|array
+        */
+       public function findByAllViewable(
+           ?string $pattern = null,
+           ?array $flags = [],
+           ?int $start = 0,
+           ?int $limit = 50,
+           ?array $orderBy = []
+       ): array;
+   }
+
+Implements this interface and register the interface as an alias for the implementation.
+
+.. code-block:: yaml
+
+   services:
+       Chill\TaskBundle\Repository\SingleTaskAclAwareRepository:
+           autowire: true
+           autoconfigure: true
+
+       Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface: '@Chill\TaskBundle\Repository\SingleTaskAclAwareRepository'
+
+Write the basic implementation for re-use: separate authorization logic and search logic
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The logic of such repository may be separated into two logic:
+
+* the authorization logic (show only entities that the user is allowed to see);
+* the search logic (filter entities on some criterias).
+
+This logic should be separated into your implementation.
+
+Considering this simple interface:
+
+.. code-block:: php
+
+   interface MyEntityACLAwareRepositoryInterface {
+
+       public function countByAuthorized(array $criterias): int;
+       
+       public function findByAuthorized(array $criteria, int $start, int $limit, array $orderBy): array;
+
+   }
+
+The base implementation should separate the logic to allow an easy reuse. Here, the method ``buildQuery`` build a basic query without authorization logic, which can be re-used. The authorization logic is dedicated to a private method. For ease of user, the logic of adding ordering criterias and pagination parameters (``$start`` and ``$limit``) are also delegated to a public method.
+
+
+.. code-block:: php
+
+   namespace Chill\MyBundle\Repository;
+
+   use Doctrine\ORM\EntityManagerInterface;
+   use Doctrine\ORM\QueryBuilder;
+
+
+   final class MyEntityACLAwareRepository implements MyEntityACLAwareRepositoryInterface {
+
+       private EntityManagerInterface $em;
+
+       // constructor omitted
+
+       public function countByAuthorized(array $criterias): int
+       {
+           $qb = $this->buildQuery($criterias);
+
+           return $this->addAuthorizations($qb)->select("COUNT(e)")->getQuery()->getResult()->getSingleScalarResult();
+       }
+       
+       public function findByAuthorized(array $criteria, int $start, int $limit, array $orderBy): array
+       {
+           $qb = $this->buildQuery($criterias);
+
+           return $this->getResult($this->addAuthorizations($qb), $start, $limit, $orderBy);
+       }
+
+       public function getResult(QueryBuilder $qb, int $start, int $limit, array $orderBy): array
+       {
+           $qb
+               ->setFirstResult($start)
+               ->setMaxResults($limit)
+               ;
+
+            // add order by logic
+
+            return $qb->getQuery()->getResult();
+       }
+
+       public function buildQuery(array $criterias): QueryBuilder
+       {
+           $qb = $this->em->createQueryBuilder();
+
+           // implement you logic with search criteria here
+
+           return $qb;
+       }
+
+       private function addAuthorizations(QueryBuilder $qb): QueryBuilder
+       {
+           // add authorization logic here
+           return $qb;
+       }
+
+   }
+
+Once this logic is executed, it becomes easy to make a new implementation of the repository:
+
+.. code-block:: php
+
+   namespace Chill\MyOtherBundle\Repository;
+
+   use Doctrine\ORM\EntityManagerInterface;
+   use Doctrine\ORM\QueryBuilder;
+   use Chill\MyBundle\Repository\MyEntityACLAwareRepository
+
+
+   final class AnotherEntityACLAwareRepository implements MyEntityACLAwareRepositoryInterface {
+
+       private EntityManagerInterface $em;
+       private \Chill\MyBundle\Repository\MyEntityACLAwareRepository $initial;
+
+       public function __construct(
+           EntityManagerInterface $em,
+           \Chill\MyBundle\Repository\MyEntityACLAwareRepository $initial
+       ) {
+           $this->em = $em;
+           $this->initial = $initial;
+       }
+
+       public function countByAuthorized(array $criterias): int
+       {
+           $qb = $this->initial->buildQuery($criterias);
+
+           return $this->addAuthorizations($qb)->select("COUNT(e)")->getQuery()->getResult()->getSingleScalarResult();
+       }
+       
+       public function findByAuthorized(array $criteria, int $start, int $limit, array $orderBy): array
+       {
+           $qb = $this->initial->buildQuery($criterias);
+
+           return $this->initial->getResult($this->addAuthorizations($qb), $start, $limit, $orderBy);
+       }
+
+       private function addAuthorizations(QueryBuilder $qb): QueryBuilder
+       {
+           // add a different authorization logic here
+           return $qb;
+       }
+
+   }
+
+Then, register this service and decorates the old one:
+
+.. code-block:: yaml
+
+   services:
+       Chill\MyOtherBundle\Repository\AnotherEntityACLAwareRepository:
+           autowire: true
+           autoconfigure: true
+           decorates: Chill\MyBundle\Repository\MyEntityACLAwareRepositoryInterface:
+
+
+
+
diff --git a/docs/source/development/pagination/example.php b/docs/source/development/pagination/example.php
index 6ed1e68ef..ed91d16a7 100644
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -1,42 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
 
-
-class ItemController extends Controller {
-
-    public function yourAction() 
+class example extends Controller
+{
+    public function yourAction()
     {
         $em = $this->getDoctrine()->getManager();
         // first, get the number of total item are available
         $total = $em
-             ->createQuery("SELECT COUNT (item.id) FROM ChillMyBundle:Item item")
-             ->getSingleScalarResult();
-       
+            ->createQuery('SELECT COUNT (item.id) FROM ChillMyBundle:Item item')
+            ->getSingleScalarResult();
+
         // get the PaginatorFactory
         $paginatorFactory = $this->get('chill_main.paginator_factory');
-        
-        // create a pagination instance. This instance is only valid for 
+
+        // create a pagination instance. This instance is only valid for
         // the current route and parameters
         $paginator = $paginatorFactory->create($total);
-        
+
         // launch your query on item. Limit the query to the results
         // for the current page using the paginator
-        $items = $em->createQuery("SELECT item FROM ChillMyBundle:Item item WHERE <your clause>")
+        $items = $em->createQuery('SELECT item FROM ChillMyBundle:Item item WHERE <your clause>')
             // use the paginator to get the first item number
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             // use the paginator to get the number of items to display
             ->setMaxResults($paginator->getItemsPerPage());
-            
-        return $this->render('ChillMyBundle:Item:list.html.twig', array(
+
+        return $this->render(
+            'ChillMyBundle:Item:list.html.twig',
+            [
                 'items' => $items,
-                'paginator' => $paginator
-                );
-            
+                'paginator' => $paginator,
+            ]
+        );
     }
-
 }
-
diff --git a/docs/source/development/useful-snippets/controller-secured-for-person.php b/docs/source/development/useful-snippets/controller-secured-for-person.php
index 501fb46c1..325b5da90 100644
--- a/docs/source/development/useful-snippets/controller-secured-for-person.php
+++ b/docs/source/development/useful-snippets/controller-secured-for-person.php
@@ -1,43 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\HealthBundle\Controller;
 
 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\Core\Role\Role;
 
 class ConsultationController extends Controller
 {
     /**
-     * 
      * @param int $id personId
-     * @return \Symfony\Component\HttpFoundation\Response
+     *
      * @throws type
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function listAction($id)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $this->get('chill.person.repository.person')
             ->find($id);
-        
-        if ($person === null) {
-            throw $this->createNotFoundException("The person is not found");
+
+        if (null === $person) {
+            throw $this->createNotFoundException('The person is not found');
         }
-        
+
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
-        
-        /* @var $authorizationHelper \Chill\MainBundle\Security\Authorization\AuthorizationHelper */
+
+        /** @var \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper */
         $authorizationHelper = $this->get('chill.main.security.'
             . 'authorization.helper');
-        
+
         $circles = $authorizationHelper->getReachableCircles(
-            $this->getUser(), 
-            new Role(ConsultationVoter::SEE), 
+            $this->getUser(),
+            new Role(ConsultationVoter::SEE),
             $person->getCenter()
-            );
-        
-        // create a query which take circles into account        
+        );
+
+        // create a query which take circles into account
         $consultations = $this->getDoctrine()->getManager()
             ->createQuery('SELECT c FROM ChillHealthBundle:Consultation c '
                 . 'WHERE c.patient = :person AND c.circle IN(:circles) '
@@ -45,11 +55,10 @@ class ConsultationController extends Controller
             ->setParameter('person', $person)
             ->setParameter('circles', $circles)
             ->getResult();
-        
-        return $this->render('ChillHealthBundle:Consultation:list.html.twig', array(
-                'person' => $person,
-                'consultations' => $consultations
-            ));    
+
+        return $this->render('ChillHealthBundle:Consultation:list.html.twig', [
+            'person' => $person,
+            'consultations' => $consultations,
+        ]);
     }
 }
-
diff --git a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
index 2cc893cc3..2786b3376 100644
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -1,64 +1,63 @@
 <?php
-   # Chill\MainBundle\DependencyInjection\Configuration.php
-  
-   namespace Chill\MainBundle\DependencyInjection;
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\DependencyInjection;
+
+   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
    use Symfony\Component\Config\Definition\Builder\TreeBuilder;
    use Symfony\Component\Config\Definition\ConfigurationInterface;
-   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
    use Symfony\Component\DependencyInjection\ContainerBuilder;
 
    /**
-    * Configure the main bundle
+    * Configure the main bundle.
     */
-   class Configuration implements ConfigurationInterface
+   class ChillMainConfiguration implements ConfigurationInterface
    {
-       
        use AddWidgetConfigurationTrait;
-       
+
        /**
-	*
-	* @var ContainerBuilder
-	*/
+        * @var ContainerBuilder
+        */
        private $containerBuilder;
 
-       
-       public function __construct(array $widgetFactories = array(), 
-	       ContainerBuilder $containerBuilder)
-       {
+       public function __construct(
+           array $widgetFactories,
+           ContainerBuilder $containerBuilder
+       ) {
            // we register here widget factories (see below)
-	   $this->setWidgetFactories($widgetFactories);
+           $this->setWidgetFactories($widgetFactories);
            // we will need the container builder later...
-	   $this->containerBuilder = $containerBuilder;
+           $this->containerBuilder = $containerBuilder;
        }
-       
-       /**
-	* {@inheritDoc}
-	*/
+
        public function getConfigTreeBuilder()
        {
-	   $treeBuilder = new TreeBuilder();
-	   $rootNode = $treeBuilder->root('chill_main');
+           $treeBuilder = new TreeBuilder();
+           $rootNode = $treeBuilder->root('chill_main');
 
-	   $rootNode
-	       ->children()
+           $rootNode
+               ->children()
 
                    // ...
-
-		   ->arrayNode('widgets')
-		       ->canBeDisabled()
-		       ->children()
+               ->arrayNode('widgets')
+               ->canBeDisabled()
+               ->children()
                             // we declare here all configuration for homepage place
-			    ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
-		       ->end() // end of widgets/children
-		   ->end() // end of widgets
-		  ->end() // end of root/children
-	       ->end() // end of root
-	   ;
+               ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
+               ->end() // end of widgets/children
+               ->end() // end of widgets
+               ->end() // end of root/children
+               ->end() // end of root
+;
 
-	   
-	   return $treeBuilder;
+           return $treeBuilder;
        }
    }
-
-
diff --git a/docs/source/development/user-interface/widgets/ChillMainExtension.php b/docs/source/development/user-interface/widgets/ChillMainExtension.php
index 4370f33f2..e054ebca1 100644
--- a/docs/source/development/user-interface/widgets/ChillMainExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillMainExtension.php
@@ -1,16 +1,19 @@
 <?php
 
-#Chill\MainBundle\DependencyInjection\ChillMainExtension.php
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
-use Chill\MainBundle\DependencyInjection\Configuration;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This class load config for chillMainExtension.
@@ -18,42 +21,42 @@ use Chill\MainBundle\DependencyInjection\Configuration;
 class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesExtensionInterface
 {
     /**
-     * widget factory
-     * 
+     * widget factory.
+     *
      * @var WidgetFactoryInterface[]
      */
-    protected $widgetFactories = array();
-    
+    protected $widgetFactories = [];
+
     public function addWidgetFactory(WidgetFactoryInterface $factory)
     {
         $this->widgetFactories[] = $factory;
     }
-    
+
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->widgetFactories, $container);
+    }
+
     /**
-     * 
      * @return WidgetFactoryInterface[]
      */
     public function getWidgetFactories()
     {
         return $this->widgetFactories;
     }
-    
+
     public function load(array $configs, ContainerBuilder $container)
     {
         // configuration for main bundle
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
-        
-        // add the key 'widget' without the key 'enable'
-        $container->setParameter('chill_main.widgets', 
-            array('homepage' => $config['widgets']['homepage']));
 
-        // ... 
+        // add the key 'widget' without the key 'enable'
+        $container->setParameter(
+            'chill_main.widgets',
+            ['homepage' => $config['widgets']['homepage']]
+        );
+
+        // ...
     }
-    
-    public function getConfiguration(array $config, ContainerBuilder $container)
-    {
-        return new Configuration($this->widgetFactories, $container);
-    }
-    
 }
diff --git a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
index e5bd236c9..31121c253 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
@@ -1,69 +1,73 @@
 <?php
 
-# Chill/PersonBundle/Widget/PersonListWidgetFactory
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * add configuration for the person_list widget.
  */
-class PersonListWidgetFactory extends AbstractWidgetFactory
+class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
 {
-   /*
-    * append the option to the configuration
-    * see http://symfony.com/doc/current/components/config/definition.html
-    *
-    */
+    /*
+     * append the option to the configuration
+     * see http://symfony.com/doc/current/components/config/definition.html
+     *
+     */
     public function configureOptions($place, NodeBuilder $node)
     {
         $node->booleanNode('only_active')
-                ->defaultTrue()
-                ->end();
+            ->defaultTrue()
+            ->end();
         $node->integerNode('number_of_items')
             ->defaultValue(50)
             ->end();
         $node->scalarNode('filtering_class')
-                ->defaultNull()
-                ->end();
-            
+            ->defaultNull()
+            ->end();
     }
-     
-   /*
-    * return an array with the allowed places where the widget can be rendered
-    *
-    * @return string[]
-    */   
+
+    /**
+     * return an array with the allowed places where the widget can be rendered.
+     *
+     * @return string[]
+     */
     public function getAllowedPlaces()
     {
-        return array('homepage');
+        return ['homepage'];
     }
-    
-   /* 
-    * return the widget alias
-    *
-    * @return string
-    */
-    public function getWidgetAlias()
-    {
-        return 'person_list';
-    }
-    
+
     /*
      * return the service id for the service which will render the widget.
      *
      * this service must implements `Chill\MainBundle\Templating\Widget\WidgetInterface`
-     * 
-     * the service must exists in the container, and it is not required that the service 
+     *
+     * the service must exists in the container, and it is not required that the service
      * has the `chill_main` tag.
      */
     public function getServiceId(ContainerBuilder $containerBuilder, $place, $order, array $config)
     {
         return 'chill_person.widget.person_list';
     }
-    
-}
 
+    /**
+     * return the widget alias.
+     *
+     * @return string
+     */
+    public function getWidgetAlias()
+    {
+        return 'person_list';
+    }
+}
diff --git a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
index 876848d23..266682e3b 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -1,66 +1,73 @@
 <?php
-# Chill/PersonBundle/Widget/PersonListWidget.php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\PersonBundle\Widget;
 
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTime;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\DBAL\Types\Type;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\EntityManager;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Twig_Environment;
 
 /**
- * add a widget with person list. 
- * 
+ * add a widget with person list.
+ *
  * The configuration is defined by `PersonListWidgetFactory`
  */
-class PersonListWidget implements WidgetInterface
+class ChillPersonAddAPersonWidget implements WidgetInterface
 {
-    
     /**
-     * Repository for persons
-     * 
-     * @var EntityRepository
+     * the authorization helper.
+     *
+     * @var AuthorizationHelper;
      */
-    protected $personRepository;
-    
+    protected $authorizationHelper;
+
     /**
-     * The entity manager
+     * The entity manager.
      *
      * @var EntityManager
      */
     protected $entityManager;
-    
-    /**
-     * the authorization helper
-     * 
-     * @var AuthorizationHelper;
-     */
-    protected $authorizationHelper;
-    
+
     /**
+     * Repository for persons.
      *
+     * @var EntityRepository
+     */
+    protected $personRepository;
+
+    /**
      * @var TokenStorage
      */
     protected $tokenStorage;
-    
+
     /**
-     *
      * @var UserInterface
      */
     protected $user;
-    
+
     public function __construct(
-            EntityRepository $personRepostory,
-            EntityManager $em,
-            AuthorizationHelper $authorizationHelper,
-            TokenStorage $tokenStorage
-            ) {
+        EntityRepository $personRepostory,
+        EntityManager $em,
+        AuthorizationHelper $authorizationHelper,
+        TokenStorage $tokenStorage
+    ) {
         $this->personRepository = $personRepostory;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
@@ -68,27 +75,24 @@ class PersonListWidget implements WidgetInterface
     }
 
     /**
-     * 
      * @param type $place
-     * @param array $context
-     * @param array $config
+     *
      * @return string
      */
-    public function render(\Twig_Environment $env, $place, array $context, array $config)
-    { 
+    public function render(Twig_Environment $env, $place, array $context, array $config)
+    {
         $qb = $this->personRepository
-                ->createQueryBuilder('person');
-        
+            ->createQueryBuilder('person');
+
         // show only the person from the authorized centers
         $and = $qb->expr()->andX();
         $centers = $this->authorizationHelper
-                ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
+            ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
-        
 
         // add the "only active" where clause
-        if ($config['only_active'] === true) {
+        if (true === $config['only_active']) {
             $qb->join('person.accompanyingPeriods', 'ap');
             $or = new Expr\Orx();
             // add the case where closingDate IS NULL
@@ -98,32 +102,30 @@ class PersonListWidget implements WidgetInterface
             $or->add($andWhenClosingDateIsNull);
             // add the case when now is between opening date and closing date
             $or->add(
-                    (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
-                );
+                (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
+            );
             $and->add($or);
-            $qb->setParameter('now', new \DateTime(), Type::DATE);
+            $qb->setParameter('now', new DateTime(), Type::DATE);
         }
-        
+
         // adding the where clause to the query
         $qb->where($and);
-        
+
         $qb->setFirstResult(0)->setMaxResults($config['number_of_items']);
-        
+
         $persons = $qb->getQuery()->getResult();
-        
+
         return $env->render(
             'ChillPersonBundle:Widget:homepage_person_list.html.twig',
-            array('persons' => $persons)
-            );
+            ['persons' => $persons]
+        );
     }
-    
+
     /**
-     * 
      * @return UserInterface
      */
     private function getUser()
     {
         // return a user
     }
-
 }
diff --git a/docs/source/development/user-interface/widgets/ChillPersonExtension.php b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
index 869931184..66b01792a 100644
--- a/docs/source/development/user-interface/widgets/ChillPersonExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
@@ -1,51 +1,48 @@
 <?php
 
-# Chill/PersonBundle/DependencyInjection/ChillPersonExtension.php
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Chill\MainBundle\DependencyInjection\MissingBundleException;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
-      // ...
+        // ...
     }
-    
-    
+
     /**
-     * 
-     * Add a widget "add a person" on the homepage, automatically
-     * 
+     * Add a widget "add a person" on the homepage, automatically.
+     *
      * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
      */
-    public function prepend(ContainerBuilder $container) 
+    public function prepend(ContainerBuilder $container)
     {
-        $container->prependExtensionConfig('chill_main', array(
-            'widgets' => array(
-                'homepage' => array(
-                    array(
+        $container->prependExtensionConfig('chill_main', [
+            'widgets' => [
+                'homepage' => [
+                    [
                         'widget_alias' => 'add_person',
-                        'order' => 2
-                    )
-                )
-            )
-        ));
+                        'order' => 2,
+                    ],
+                ],
+            ],
+        ]);
     }
 }
-
diff --git a/grumphp.yml b/grumphp.yml
new file mode 100644
index 000000000..d25cc01ba
--- /dev/null
+++ b/grumphp.yml
@@ -0,0 +1,14 @@
+imports:
+    - {
+          resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml,
+      }
+
+parameters:
+    tasks.phpcsfixer.config: .php_cs.dist.php
+    tasks.license.name: AGPL-3.0
+    tasks.license.holder: Champs-Libres
+    tasks.license.date_from: 2001
+
+    tasks.phpcsfixer.allow_risky: true
+    tasks.phpcsfixer.diff: true
+    tasks.phpstan.level: 1
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 000000000..d996ff3b8
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,101 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Variable property access on \\$this\\(Chill\\\\ActivityBundle\\\\Entity\\\\ActivityType\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+
+		-
+			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Variable \\$participation might not be defined\\.$#"
+			count: 3
+			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+
+		-
+			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Variable method call on object\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^Cannot unset offset '_token' on array\\{formatter\\: mixed, export\\: mixed, centers\\: mixed, alias\\: string\\}\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Foreach overwrites \\$line with its value variable\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+
+		-
+			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Foreach overwrites \\$key with its value variable\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Variable \\$message on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
+
+		-
+			message: "#^Variable \\$sqls on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
+		-
+			message: "#^Class Chill\\\\PersonBundle\\\\Entity\\\\Person constructor invoked with 1 parameter, 0 required\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Variable \\$street1Value might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Variable method call on mixed\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+
+		-
+			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+		-
+			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+
+		-
+			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+
+		-
+			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
diff --git a/phpstan-critical.neon b/phpstan-critical.neon
new file mode 100644
index 000000000..b214654bf
--- /dev/null
+++ b/phpstan-critical.neon
@@ -0,0 +1,126 @@
+parameters:
+    ignoreErrors:
+        -
+            message: "#^Implicit array creation is not allowed \\- variable \\$centers might not exist\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
+            count: 3
+            path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+
+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$work\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+        -
+            message: "#^Undefined variable\\: \\$person$#"
+            count: 1
+            path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+
+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Household\\\\MembersEditorFactory\\:\\:\\$validator\\.$#"
+            count: 2
+            path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
+
+        -
+            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:countBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$action$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$limit$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$offset$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$orderBy$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Variable variables are not allowed\\.$#"
+            count: 4
+            path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+
+        -
+            message: "#^Function Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\·\\\\is_array not found\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+        -
+            message: "#^Undefined variable\\: \\$choiceSlug$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+        -
+            message: "#^Undefined variable\\: \\$choiceSlug$#"
+            count: 1
+            path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+        -
+            message: "#^Undefined variable\\: \\$type$#"
+            count: 1
+            path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
+
+        -
+            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:getRoleFor\\(\\)\\.$#"
+            count: 1
+            path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+
+        -
+            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Controller\\\\UserController\\:\\:createEditForm\\(\\)\\.$#"
+            count: 1
+            path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+        -
+            message: "#^Undefined variable\\: \\$current$#"
+            count: 1
+            path: src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
+
+        -
+            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AbstractChillVoter\\:\\:getSupportedAttributes\\(\\)\\.$#"
+            count: 1
+            path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+
+        -
+            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AbstractChillVoter\\:\\:getSupportedClasses\\(\\)\\.$#"
+            count: 1
+            path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+
+        -
+            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AbstractChillVoter\\:\\:isGranted\\(\\)\\.$#"
+            count: 1
+            path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+
+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:\\$security\\.$#"
+            count: 3
+            path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+        -
+            message: "#^Call to an undefined method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyTypeCategoryType\\:\\:transform\\(\\)\\.$#"
+            count: 1
+            path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
diff --git a/phpstan-deprecations.neon b/phpstan-deprecations.neon
new file mode 100644
index 000000000..05442b25a
--- /dev/null
+++ b/phpstan-deprecations.neon
@@ -0,0 +1,1592 @@
+parameters:
+	ignoreErrors:
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Call to deprecated method setType\\(\\) of class Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityReasonAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityTypeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ActivityUserAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\CountActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityReasonFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityTypeFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AsideActivityBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
+					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
+					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\CalendarBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bridge\\\\Twig\\\\TwigEngine\\:
+					since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Used function LogicException not found\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
+					since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$twigEngine of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bridge\\\\Twig\\\\TwigEngine\\:
+					since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
+					since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
+					since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$templating of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:__construct\\(\\) has typehint with deprecated class Symfony\\\\Bundle\\\\TwigBundle\\\\TwigEngine\\:
+					since version 4\\.3, to be removed in 5\\.0; use Twig instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldsGroupType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 3
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\DocStoreBundle\\\\Controller\\\\DocumentPersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 6
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Controller\\\\EventController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/EventType.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickEventType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickRoleType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickStatusType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Controller\\\\FamilyMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$role of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getReachableCenters\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getTranslator\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getLanguageBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Languages\\} or \\{@see Scripts\\} instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getRegionBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Countries\\} instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\PasswordController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$role of anonymous function has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getLanguageBundle\\(\\) of class Symfony\\\\Component\\\\Intl\\\\Intl\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use \\{@see Languages\\} or \\{@see Scripts\\} instead\\.$#
+				"""
+			count: 2
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\MainBundle\\\\Entity\\\\User implements deprecated interface Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\AdvancedUserInterface\\:
+					since Symfony 4\\.1$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/User.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\Entity\\\\User\\:\\:getRoles\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/User.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ExportInterface\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportInterface.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadsheetListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\Export\\\\ModifierInterface\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ModifierInterface.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\MainBundle\\\\Form\\\\Event\\\\CustomizeFormEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\PostalCodeType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/UserType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Notification\\\\Mailer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Notification/Mailer.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuBuilder\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuComposer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$attribute of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccess\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCircles\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelperFactory\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelperGenerator\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+
+		-
+			message: "#^Call to deprecated method setTimeout\\(\\) of class Redis\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcher implements deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\MainBundle\\\\Templating\\\\Events\\\\DelegatedBlockRenderingEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\RoleScopeScopePresence\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\PersonBundle\\\\Actions\\\\ActionEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
+					since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
+					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$trans of method Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseWorkController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
+					since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
+					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\AgeAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\CountPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method execute\\(\\) of class Doctrine\\\\DBAL\\\\Statement\\:
+					Statement\\:\\:execute\\(\\) is deprecated, use Statement\\:\\:executeQuery\\(\\) or executeStatement\\(\\) instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodClosingFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingPeriodOpeningFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\BirthdateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\NationalityFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Form\\\\Type\\\\PickPersonType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\PersonBundle\\\\Privacy\\\\AccompanyingPeriodPrivacyEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\PersonBundle\\\\Privacy\\\\PrivacyEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriodACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 3
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:requiredRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportListProvider\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
+
+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\ReportBundle\\\\Export\\\\Filter\\\\ReportDateFilter\\:\\:addRole\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Form/ReportType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$role of method Chill\\\\ReportBundle\\\\Form\\\\ReportType\\:\\:appendScopeChoices\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Form/ReportType.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 2
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$role of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:setCreateForm\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Controller\\\\TaskController\\:\\:applyTransitionAction\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\TaskBundle\\\\Event\\\\TaskEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Event/TaskEvent.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\TaskBundle\\\\Event\\\\UI\\\\UIEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 4
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Form\\\\SingleTaskType\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskAclAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+					Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\AuthorizationEvent extends deprecated class Symfony\\\\Component\\\\EventDispatcher\\\\Event\\:
+					since Symfony 4\\.3, use "Symfony\\\\Contracts\\\\EventDispatcher\\\\Event" instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 3
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
+
diff --git a/phpstan-types.neon b/phpstan-types.neon
new file mode 100644
index 000000000..98d17b666
--- /dev/null
+++ b/phpstan-types.neon
@@ -0,0 +1,497 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getTitle\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
+			count: 3
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 3
+			path: src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 4
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:offsetGet\\(\\) should return mixed but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Entity/Participation.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\EventBundle\\\\Form\\\\EventTypeType\\:\\:setDefaultOptions\\(\\) has invalid type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/EventTypeType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\EventBundle\\\\Form\\\\RoleType\\:\\:setDefaultOptions\\(\\) has invalid type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/RoleType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\EventBundle\\\\Form\\\\StatusType\\:\\:setDefaultOptions\\(\\) has invalid type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/StatusType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Search\\\\EventSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
+
+		-
+			message: "#^Casting to string something that's already string\\.$#"
+			count: 5
+			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\$scope of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getReachableCenters\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\Scope\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Resolver\\\\Resolver\\:\\:getConfigValue\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillUserSendRenewPasswordCodeCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadAndUpdateLanguagesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadCountriesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadPostalCodesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\SetPasswordCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Address.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/User.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/Type/AddressType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/Type/AddressType.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:getTemplateData\\(\\) should return array but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Command\\\\ChillPersonMoveCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 6
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Security\\\\Authorization\\\\ReportVoter\\:\\:supports\\(\\) should return bool but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+
+		-
+			message: "#^Casting to string something that's already string\\.$#"
+			count: 3
+			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 5
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+
+		-
+			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+
+		-
+			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 000000000..edec00554
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,26 @@
+parameters:
+    level: 1
+    paths:
+        - src/
+    excludePaths:
+        - docs/
+        - src/Bundle/*/Tests/*
+        - 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
+    - phpstan-critical.neon
+    - phpstan-deprecations.neon
+    - phpstan-types.neon
+
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 3faa756b3..80367c691 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -37,6 +37,9 @@
         <testsuite name="CalendarBundle">
             <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
         </testsuite>
+        <testsuite name="DocGeneratorBundle">
+            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
+        </testsuite>
     </testsuites>
 
     <listeners>
diff --git a/resource/header.txt b/resource/header.txt
new file mode 100644
index 000000000..4f6730dc9
--- /dev/null
+++ b/resource/header.txt
@@ -0,0 +1,5 @@
+Chill is a software for social workers
+
+For the full copyright and license information, please view
+the LICENSE file that was distributed with this source code.
+
diff --git a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
index 36c396474..21245504f 100644
--- a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
+++ b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 9529d40c0..863190a9f 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -1,85 +1,252 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
-use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Repository\LocationRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Form;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Form\ActivityType;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Serializer\SerializerInterface;
+use function array_key_exists;
 
-/**
- * Class ActivityController
- *
- * @package Chill\ActivityBundle\Controller
- */
-class ActivityController extends AbstractController
+final class ActivityController extends AbstractController
 {
-    protected EventDispatcherInterface $eventDispatcher;
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
 
-    protected AuthorizationHelper $authorizationHelper;
+    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
 
-    protected LoggerInterface $logger;
+    private ActivityRepository $activityRepository;
 
-    protected SerializerInterface $serializer;
+    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
 
-    protected ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+    private ActivityTypeRepository $activityTypeRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private EventDispatcherInterface $eventDispatcher;
+
+    private LocationRepository $locationRepository;
+
+    private LoggerInterface $logger;
+
+    private PersonRepository $personRepository;
+
+    private SerializerInterface $serializer;
+
+    private ThirdPartyRepository $thirdPartyRepository;
 
     public function __construct(
         ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
+        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeCategoryRepository $activityTypeCategoryRepository,
+        PersonRepository $personRepository,
+        ThirdPartyRepository $thirdPartyRepository,
+        LocationRepository $locationRepository,
+        ActivityRepository $activityRepository,
+        AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        EntityManagerInterface $entityManager,
         EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
         SerializerInterface $serializer
     ) {
         $this->activityACLAwareRepository = $activityACLAwareRepository;
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->activityTypeCategoryRepository = $activityTypeCategoryRepository;
+        $this->personRepository = $personRepository;
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->locationRepository = $locationRepository;
+        $this->activityRepository = $activityRepository;
+        $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
+        $this->entityManager = $entityManager;
         $this->eventDispatcher = $eventDispatcher;
-        $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
         $this->serializer = $serializer;
     }
 
+    /**
+     * Deletes a Activity entity.
+     *
+     * @param mixed $id
+     */
+    public function deleteAction(Request $request, $id)
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        $activity = $this->activityRepository->find($id);
+
+        if (!$activity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $activity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        }
+
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
+
+        $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->logger->notice('An activity has been removed', [
+                    'by_user' => $this->getUser()->getUsername(),
+                    'activity_id' => $activity->getId(),
+                    'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
+                    'comment' => $activity->getComment()->getComment(),
+                    'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
+                    'reasons_ids' => $activity->getReasons()
+                        ->map(
+                            static fn (ActivityReason $ar): int => $ar->getId()
+                        )
+                        ->toArray(),
+                    'type_id' => $activity->getActivityType()->getId(),
+                    'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
+                    'date' => $activity->getDate()->format('Y-m-d'),
+                    'attendee' => $activity->getAttendee(),
+                ]);
+
+                $this->entityManager->remove($activity);
+                $this->entityManager->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                    ->trans('The activity has been successfully removed.'));
+
+                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+                return $this->redirectToRoute('chill_activity_activity_list', $params);
+            }
+        }
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+            'activity' => $activity,
+            'delete_form' => $form->createView(),
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+        ]);
+    }
+
+    /**
+     * Displays a form to edit an existing Activity entity.
+     */
+    public function editAction(int $id, Request $request): Response
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        $entity = $this->activityRepository->find($id);
+
+        if (null === $entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+        }
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
+
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
+            'activityType' => $entity->getActivityType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->entityManager->persist($entity);
+            $this->entityManager->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            $params['id'] = $entity->getId();
+
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
+        }
+
+        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
+
+        /*
+         * TODO
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'element_id' => $entity->getId(),
+            'action' => 'edit'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+         */
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+
+        return $this->render($view, [
+            'entity' => $entity,
+            'edit_form' => $form->createView(),
+            'delete_form' => $deleteForm->createView(),
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'activity_json' => $activity_array,
+        ]);
+    }
+
     /**
      * Lists all Activity entities.
      */
     public function listAction(Request $request): Response
     {
-        $em = $this->getDoctrine()->getManager();
         $view = null;
+        $activities = [];
         // TODO: add pagination
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
@@ -89,10 +256,10 @@ class ActivityController extends AbstractController
             $activities = $this->activityACLAwareRepository
                 ->findByPerson($person, ActivityVoter::SEE, 0, null);
 
-            $event = new PrivacyEvent($person, array(
+            $event = new PrivacyEvent($person, [
                 'element_class' => Activity::class,
-                'action' => 'list'
-            ));
+                'action' => 'list',
+            ]);
             $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
             $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
@@ -105,62 +272,19 @@ class ActivityController extends AbstractController
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
 
-        return $this->render($view, array(
-            'activities' => $activities,
-            'person'   => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-        ));
-    }
-
-    public function selectTypeAction(Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $view = null;
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
-        }
-
-        $data = [];
-
-        $activityTypeCategories = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityTypeCategory::class)
-            ->findBy(['active' => true], ['ordering' => 'ASC']);
-
-        foreach ($activityTypeCategories as $activityTypeCategory) {
-            $activityTypes = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
-                ->findBy(['active' => true, 'category' => $activityTypeCategory], ['ordering' => 'ASC']);
-
-            $data[] = [
-                'activityTypeCategory' => $activityTypeCategory,
-                'activityTypes' => $activityTypes,
-            ];
-        }
-
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-        } else {
-            $activityData = [];
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'data' => $data,
-            'activityData' => $activityData
-        ]);
+        return $this->render(
+            $view,
+            [
+                'activities' => $activities,
+                'person' => $person,
+                'accompanyingCourse' => $accompanyingPeriod,
+            ]
+        );
     }
 
     public function newAction(Request $request): Response
     {
-        $em = $this->getDoctrine()->getManager();
+        $view = null;
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
@@ -171,26 +295,26 @@ class ActivityController extends AbstractController
         }
 
         $activityType_id = $request->get('activityType_id', 0);
-        $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
-            ->find($activityType_id);
+        $activityType = $this->activityTypeRepository->find($activityType_id);
 
         if (isset($activityType) && !$activityType->isActive()) {
-            throw new \InvalidArgumentException('Activity type must be active');
+            throw new InvalidArgumentException('Activity type must be active');
         }
 
         $activityData = null;
+
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
         }
 
-        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
-            !$activityType->isActive()) {
-
+        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType
+            || !$activityType->isActive()) {
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
 
             if (null !== $activityData) {
                 $params['activityData'] = $activityData;
             }
+
             return $this->redirectToRoute('chill_activity_activity_select_type', $params);
         }
 
@@ -205,8 +329,8 @@ class ActivityController extends AbstractController
             $entity->setAccompanyingPeriod($accompanyingPeriod);
         }
 
-        $entity->setType($activityType);
-        $entity->setDate(new \DateTime('now'));
+        $entity->setActivityType($activityType);
+        $entity->setDate(new DateTime('now'));
 
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
@@ -215,61 +339,61 @@ class ActivityController extends AbstractController
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);
                 $minutes = $durationTimeInMinutes % 60;
-                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
+                $duration = DateTime::createFromFormat('H:i', $hours . ':' . $minutes);
+
                 if ($duration) {
                     $entity->setDurationTime($duration);
                 }
             }
 
             if (array_key_exists('date', $activityData)) {
-                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+                $date = DateTime::createFromFormat('Y-m-d', $activityData['date']);
+
                 if ($date) {
                     $entity->setDate($date);
                 }
             }
 
             if (array_key_exists('personsId', $activityData)) {
-                foreach($activityData['personsId'] as $personId){
-                    $concernedPerson = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
+                foreach ($activityData['personsId'] as $personId) {
+                    $concernedPerson = $this->personRepository->find($personId);
                     $entity->addPerson($concernedPerson);
                 }
             }
 
             if (array_key_exists('professionalsId', $activityData)) {
-                foreach($activityData['professionalsId'] as $professionalsId){
-                    $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
+                foreach ($activityData['professionalsId'] as $professionalsId) {
+                    $professional = $this->thirdPartyRepository->find($professionalsId);
                     $entity->addThirdParty($professional);
                 }
             }
 
             if (array_key_exists('location', $activityData)) {
-                $location = $em->getRepository(\Chill\MainBundle\Entity\Location::class)->find($activityData['location']);
+                $location = $this->locationRepository->find($activityData['location']);
                 $entity->setLocation($location);
             }
-            
+
             if (array_key_exists('comment', $activityData)) {
                 $comment = new CommentEmbeddable();
                 $comment->setComment($activityData['comment']);
                 $comment->setUserId($this->getUser()->getid());
-                $comment->setDate(new \DateTime('now'));
+                $comment->setDate(new DateTime('now'));
                 $entity->setComment($comment);
             }
-
         }
 
-        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
+        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
             'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_ACTIVITY_CREATE'),
-            'activityType' => $entity->getType(),
+            'role' => new Role('CHILL_ACTIVITY_CREATE'),
+            'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
         ])->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $em->persist($entity);
-            $em->flush();
+            $this->entityManager->persist($entity);
+            $this->entityManager->flush();
 
             $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
@@ -280,24 +404,71 @@ class ActivityController extends AbstractController
             return $this->redirectToRoute('chill_activity_activity_show', $params);
         }
 
-        if ($view === null) {
+        if (null === $view) {
             throw $this->createNotFoundException('Template not found');
         }
 
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
+        $defaultLocation = $this->getUser()->getCurrentLocation();
+
         return $this->render($view, [
-            'person'   => $person,
+            'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'entity' => $entity,
             'form' => $form->createView(),
-            'activity_json' => $activity_array
+            'activity_json' => $activity_array,
+            'default_location' => $defaultLocation,
         ]);
     }
 
-    public function showAction(Request $request, $id): Response
+    public function selectTypeAction(Request $request): Response
     {
-        $em = $this->getDoctrine()->getManager();
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
+        }
+
+        $data = [];
+
+        $activityTypeCategories = $this
+            ->activityTypeCategoryRepository
+            ->findBy(['active' => true], ['ordering' => 'ASC']);
+
+        foreach ($activityTypeCategories as $activityTypeCategory) {
+            $activityTypes = $this
+                ->activityTypeRepository
+                ->findBy(
+                    ['active' => true, 'category' => $activityTypeCategory],
+                    ['ordering' => 'ASC']
+                );
+
+            $data[] = [
+                'activityTypeCategory' => $activityTypeCategory,
+                'activityTypes' => $activityTypes,
+            ];
+        }
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'data' => $data,
+            'activityData' => $request->query->get('activityData', []),
+        ]);
+    }
+
+    public function showAction(Request $request, int $id): Response
+    {
+        $view = null;
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
@@ -307,21 +478,22 @@ class ActivityController extends AbstractController
             $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
         }
 
-        $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
+        $entity = $this->activityRepository->find($id);
 
-        if (!$entity) {
+        if (null === $entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
         if (null !== $accompanyingPeriod) {
-           $entity->personsAssociated = $entity->getPersonsAssociated();
-           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
+            // @TODO: Properties created dynamically.
+            $entity->personsAssociated = $entity->getPersonsAssociated();
+            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
         }
 
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
 
-        $deleteForm = $this->createDeleteForm($id, $person, $accompanyingPeriod);
+        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
 
         // TODO
         /*
@@ -331,166 +503,39 @@ class ActivityController extends AbstractController
             'action' => 'show'
         ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        */
+         */
 
-        if ($view === null) {
+        if (null === $view) {
             throw $this->createNotFoundException('Template not found');
         }
 
-        return $this->render($view, array(
-            'person'      => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'entity'      => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-     * Displays a form to edit an existing Activity entity.
-     *
-     */
-    public function editAction($id, Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
-        }
-
-        $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        // TODO
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
-
-        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_ACTIVITY_UPDATE'),
-            'activityType' => $entity->getType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em->persist($entity);
-            $em->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            $params['id'] = $id;
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
-        }
-
-        $deleteForm = $this->createDeleteForm($id, $person, $accompanyingPeriod);
-
-        /*
-         * TODO
-        $event = new PrivacyEvent($person, array(
-            'element_class' => Activity::class,
-            'element_id' => $entity->getId(),
-            'action' => 'edit'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        */
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-
-        return $this->render($view, array(
-            'entity'      => $entity,
-            'edit_form'   => $form->createView(),
-            'delete_form' => $deleteForm->createView(),
+        return $this->render($view, [
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
-            'activity_json' => $activity_array
-        ));
+            'entity' => $entity,
+            'delete_form' => $deleteForm->createView(),
+        ]);
     }
 
-    /**
-     * Deletes a Activity entity.
-     *
-     */
-    public function deleteAction(Request $request, $id)
+    private function buildParamsToUrl(?Person $person, ?AccompanyingPeriod $accompanyingPeriod): array
     {
-        $em = $this->getDoctrine()->getManager();
+        $params = [];
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        if (null !== $person) {
+            $params['person_id'] = $person->getId();
         }
 
-        /* @var $activity Activity */
-        $activity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
-
-        if (!$activity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
+        if (null !== $accompanyingPeriod) {
+            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
         }
 
-        // TODO
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
-
-        $form = $this->createDeleteForm($id, $person, $accompanyingPeriod);
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-
-                $this->logger->notice("An activity has been removed", array(
-                   'by_user' => $this->getUser()->getUsername(),
-                   'activity_id' => $activity->getId(),
-                   'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
-                   'comment' => $activity->getComment()->getComment(),
-                   'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
-                   'reasons_ids' => $activity->getReasons()
-                      ->map(function ($ar) { return $ar->getId(); })
-                      ->toArray(),
-                   'type_id' => $activity->getType()->getId(),
-                   'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
-                   'date' => $activity->getDate()->format('Y-m-d'),
-                   'attendee' => $activity->getAttendee()
-                ));
-
-                $em->remove($activity);
-                $em->flush();
-
-                $this->addFlash('success', $this->get('translator')
-                      ->trans("The activity has been successfully removed."));
-
-                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-                return $this->redirectToRoute('chill_activity_activity_list', $params);
-            }
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, array(
-           'activity' => $activity,
-           'delete_form' => $form->createView(),
-           'person' => $person,
-           'accompanyingCourse' => $accompanyingPeriod,
-        ));
+        return $params;
     }
 
     /**
      * Creates a form to delete a Activity entity by id.
      */
-    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form
+    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): FormInterface
     {
         $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
         $params['id'] = $id;
@@ -498,58 +543,40 @@ class ActivityController extends AbstractController
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_activity_activity_delete', $params))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
     }
 
     private function getEntity(Request $request): array
     {
-        $em = $this->getDoctrine()->getManager();
-        $person = $accompanyingPeriod  = null;
+        $person = $accompanyingPeriod = null;
 
         if ($request->query->has('person_id')) {
             $person_id = $request->get('person_id');
-            $person = $em->getRepository(Person::class)->find($person_id);
+            $person = $this->personRepository->find($person_id);
 
-            if ($person === null) {
+            if (null === $person) {
                 throw $this->createNotFoundException('Person not found');
             }
 
             $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } elseif ($request->query->has('accompanying_period_id')) {
             $accompanying_period_id = $request->get('accompanying_period_id');
-            $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
+            $accompanyingPeriod = $this->accompanyingPeriodRepository->find($accompanying_period_id);
 
-            if ($accompanyingPeriod === null) {
+            if (null === $accompanyingPeriod) {
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
             // TODO Add permission
             // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
-            throw $this->createNotFoundException("Person or Accompanying Period not found");
+            throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
 
         return [
-            $person, $accompanyingPeriod
+            $person,
+            $accompanyingPeriod,
         ];
     }
-
-    private function buildParamsToUrl(
-        ?Person $person,
-        ?AccompanyingPeriod $accompanyingPeriod
-    ): array {
-        $params = [];
-
-        if ($person) {
-            $params['person_id'] = $person->getId();
-        }
-
-        if ($accompanyingPeriod) {
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
-        }
-
-        return $params;
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
index 793c9c695..7da49a823 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -1,38 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Chill\ActivityBundle\Form\ActivityReasonCategoryType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * ActivityReasonCategory controller.
- *
  */
 class ActivityReasonCategoryController extends AbstractController
 {
-
-    /**
-     * Lists all ActivityReasonCategory entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new ActivityReasonCategory entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -45,71 +37,19 @@ class ActivityReasonCategoryController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityReasonCategory entity.
-     *
-     * @param ActivityReasonCategory $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReasonCategory $entity)
-    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new ActivityReasonCategory entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReasonCategory();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a ActivityReasonCategory entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', array(
-            'entity'      => $entity,
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
      *
+     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -123,33 +63,64 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-    * Creates a form to edit a ActivityReasonCategory entity.
-    *
-    * @param ActivityReasonCategory $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(ActivityReasonCategory $entity)
+     * Lists all ActivityReasonCategory entities.
+     */
+    public function indexAction()
     {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
+        $em = $this->getDoctrine()->getManager();
 
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
 
-        return $form;
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
+            'entities' => $entities,
+        ]);
     }
+
+    /**
+     * Displays a form to create a new ActivityReasonCategory entity.
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReasonCategory();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a ActivityReasonCategory entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
+            'entity' => $entity,
+        ]);
+    }
+
     /**
      * Edits an existing ActivityReasonCategory entity.
      *
+     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -167,12 +138,50 @@ class ActivityReasonCategoryController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a ActivityReasonCategory entity.
+     *
+     * @param ActivityReasonCategory $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReasonCategory $entity)
+    {
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a ActivityReasonCategory entity.
+     *
+     * @param ActivityReasonCategory $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(ActivityReasonCategory $entity)
+    {
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
index 6afeceac7..c656fe7a7 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -1,38 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Form\ActivityReasonType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * ActivityReason controller.
- *
  */
 class ActivityReasonController extends AbstractController
 {
-
-    /**
-     * Lists all ActivityReason entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new ActivityReason entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -45,71 +37,19 @@ class ActivityReasonController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityReason entity.
-     *
-     * @param ActivityReason $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReason $entity)
-    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreason_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new ActivityReason entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReason();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a ActivityReason entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', array(
-            'entity'      => $entity,
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing ActivityReason entity.
      *
+     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -123,33 +63,64 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView()
-        ));
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-    * Creates a form to edit a ActivityReason entity.
-    *
-    * @param ActivityReason $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(ActivityReason $entity)
+     * Lists all ActivityReason entities.
+     */
+    public function indexAction()
     {
-        $form = $this->createForm(ActivityReasonType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreason_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
+        $em = $this->getDoctrine()->getManager();
 
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
 
-        return $form;
+        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
+            'entities' => $entities,
+        ]);
     }
+
+    /**
+     * Displays a form to create a new ActivityReason entity.
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReason();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a ActivityReason entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
+            'entity' => $entity,
+        ]);
+    }
+
     /**
      * Edits an existing ActivityReason entity.
      *
+     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -167,12 +138,50 @@ class ActivityReasonController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $id)));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView()
-        ));
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a ActivityReason entity.
+     *
+     * @param ActivityReason $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReason $entity)
+    {
+        $form = $this->createForm(ActivityReasonType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreason_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a ActivityReason entity.
+     *
+     * @param ActivityReason $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(ActivityReason $entity)
+    {
+        $form = $this->createForm(ActivityReasonType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
index a100c3f5d..790f59be4 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -9,10 +18,8 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityPresenceController extends CRUDController
 {
     /**
-     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
index 1aef0c183..48d91aedf 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -9,10 +18,8 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityTypeCategoryController extends CRUDController
 {
     /**
-     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
index 8bf5da13d..f8b19ec9f 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -9,15 +18,14 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityTypeController extends CRUDController
 {
     /**
-     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC');
+        return $query->orderBy('e.ordering', 'ASC')
+            ->addOrderBy('e.id', 'ASC');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminController.php b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
index 0150b44d0..5a658c165 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -1,33 +1,20 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * Controller for activity configuration
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Controller for activity configuration.
  */
 class AdminController extends AbstractController
 {
@@ -35,7 +22,7 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillActivityBundle:Admin:layout_activity.html.twig');
     }
-    
+
     public function redirectToAdminIndexAction()
     {
         return $this->redirectToRoute('chill_main_admin_central');
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
index a23b2d73f..72a88a72d 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -1,55 +1,41 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory as FakerFactory;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityReason;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityType;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
-/**
- * Load reports into DB
- *
- * @author Champs-Libres Coop
- */
-class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
+    private EntityManagerInterface $em;
+
     /**
      * @var \Faker\Generator
      */
     private $faker;
 
-    public function __construct()
+    public function __construct(EntityManagerInterface $em)
     {
         $this->faker = FakerFactory::create('fr_FR');
+        $this->em = $em;
     }
 
     public function getOrder()
@@ -57,57 +43,27 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
         return 16400;
     }
 
-    /**
-     * Return a random scope
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getRandomScope()
+    public function load(ObjectManager $manager)
     {
-        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
-        return $this->getReference($scopeRef);
-    }
+        $persons = $this->em
+            ->getRepository(Person::class)
+            ->findAll();
 
-    /**
-     * Return a random activityType
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    private function getRandomActivityType()
-    {
-        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
-        return $this->getReference($typeRef);
-    }
+        foreach ($persons as $person) {
+            $activityNbr = mt_rand(0, 3);
 
-    /**
-     * Return a random activityReason
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityReason
-     */
-    private function getRandomActivityReason(array $excludingIds)
-    {
-        $reasonRef = LoadActivityReason::$references[array_rand(LoadActivityReason::$references)];
+            for ($i = 0; $i < $activityNbr; ++$i) {
+                $activity = $this->newRandomActivity($person);
 
-        if (in_array($this->getReference($reasonRef)->getId(), $excludingIds)) {
-            // we have a reason which should be excluded. Find another...
-            return $this->getRandomActivityReason($excludingIds);
+                if (null !== $activity) {
+                    $manager->persist($activity);
+                }
+            }
         }
-
-        return $this->getReference($reasonRef);
+        $manager->flush();
     }
 
-    /**
-     * Return a random user
-     *
-     * @return \Chill\MainBundle\Entity\User
-     */
-    private function getRandomUser()
-    {
-        $userRef = array_rand(LoadUsers::$refs);
-        return $this->getReference($userRef);
-    }
-
-    public function newRandomActivity($person)
+    public function newRandomActivity($person): ?Activity
     {
         $activity = (new Activity())
             ->setUser($this->getRandomUser())
@@ -115,38 +71,68 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
             ->setDate($this->faker->dateTimeThisYear())
             ->setDurationTime($this->faker->dateTime(36000))
             ->setType($this->getRandomActivityType())
-            ->setScope($this->getRandomScope())
-            ;
+            ->setScope($this->getRandomScope());
 
         //      ->setAttendee($this->faker->boolean())
 
-        $usedId = array();
-        for ($i = 0; $i < rand(0, 4); $i++) {
-            $reason = $this->getRandomActivityReason($usedId);
-            $usedId[] = $reason->getId();
-            $activity->addReason($reason);
+        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
+            $reason = $this->getRandomActivityReason();
+
+            if (null !== $reason) {
+                $activity->addReason($reason);
+            } else {
+                return null;
+            }
         }
 
         return $activity;
     }
 
-    public function load(ObjectManager $manager)
+    /**
+     * Return a random activityReason.
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityReason
+     */
+    private function getRandomActivityReason()
     {
-        $persons = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillPersonBundle:Person')
-            ->findAll();
+        $reasonRef = LoadActivityReason::$references[array_rand(LoadActivityReason::$references)];
 
-        foreach($persons as $person) {
-            $activityNbr = rand(0,3);
-            $ref = 'activity_'.$person->getFullnameCanonical();
+        return $this->getReference($reasonRef);
+    }
 
-            for($i = 0; $i < $activityNbr; $i ++) {
-                $activity = $this->newRandomActivity($person);
-                $manager->persist($activity);
-            }
+    /**
+     * Return a random activityType.
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    private function getRandomActivityType()
+    {
+        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
 
-            $this->setReference($ref, $activity);
-        }
-        $manager->flush();
+        return $this->getReference($typeRef);
+    }
+
+    /**
+     * Return a random scope.
+     *
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getRandomScope()
+    {
+        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
+
+        return $this->getReference($scopeRef);
+    }
+
+    /**
+     * Return a random user.
+     *
+     * @return \Chill\MainBundle\Entity\User
+     */
+    private function getRandomUser()
+    {
+        $userRef = array_rand(LoadUsers::$refs);
+
+        return $this->getReference($userRef);
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
index 9ef67a7ac..63eeb965c 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
@@ -1,15 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivity;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 
 /**
- * Load notififications into database
+ * Load notififications into database.
  */
 class LoadActivityNotifications extends AbstractFixture implements DependentFixtureInterface
 {
@@ -25,9 +33,9 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
                 'center a_social',
                 'center a_administrative',
                 'center a_direction',
-                'multi_center'
+                'multi_center',
             ],
-        ]
+        ],
     ];
 
     public function getDependencies()
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
index 3915fc3af..1904bbcb4 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -1,81 +1,68 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
+use Chill\ActivityBundle\Entity\ActivityReason;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityReason;
 
 /**
- * Description of LoadActivityReason
- *
- * @author Champs-Libres Coop
+ * Description of LoadActivityReason.
  */
 class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $references = [];
+
     public function getOrder()
     {
         return 16300;
     }
-    
-    public static $references = array();
-    
+
     public function load(ObjectManager $manager)
     {
         $reasons = [
             [
                 'name' => ['fr' => 'Recherche logement', 'en' => 'Housing research', 'nl' => 'Woning zoektoch'],
-                'category' => 'cat_Housing'],
+                'category' => 'cat_Housing', ],
             [
                 'name' => ['fr' => 'Problème avec propriétaire', 'en' => 'Landlord problems', 'nl' => 'Huisbaas problemen'],
-                'category' => 'cat_Housing'],
+                'category' => 'cat_Housing', ],
             [
                 'name' => ['fr' => 'Retard de payement', 'en' => 'Payement problems', 'nl' => 'Betalings vertragingen'],
-                'category' => 'cat_Housing'],
+                'category' => 'cat_Housing', ],
             [
                 'name' => ['fr' => 'Explication législation', 'en' => 'Legislation explanation', 'nl' => 'Legislative uitleg'],
-                'category' => 'cat_Unemployment procedure'],
+                'category' => 'cat_Unemployment procedure', ],
             [
                 'name' => ['fr' => 'Coaching entretien d\'activation', 'en' => 'Interview coaching', 'nl' => 'Interview coaching'],
-                'category' => 'cat_Unemployment procedure'],
+                'category' => 'cat_Unemployment procedure', ],
             [
                 'name' => ['fr' => 'Récupération des allocations', 'en' => 'Allowance recovery', 'nl' => 'Terugwinning van de uitkeringen'],
-                'category' => 'cat_Unemployment procedure']
+                'category' => 'cat_Unemployment procedure', ],
         ];
-        
+
         foreach ($reasons as $r) {
-            print "Creating activity reason : " . $r['name']['en'] . "\n";
+            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
             $activityReason = (new ActivityReason())
                 ->setName(($r['name']))
                 ->setActive(true)
                 ->setCategory($this->getReference($r['category']));
             $manager->persist($activityReason);
-            $reference = 'activity_reason_'.$r['name']['en'];
+            $reference = 'activity_reason_' . $r['name']['en'];
             $this->addReference($reference, $activityReason);
             static::$references[] = $reference;
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
index d6b802776..e62080aea 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -1,35 +1,23 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityReasonCategory;
+
 /**
- * Description of LoadActivityReasonCategory
- *
- * @author Champs-Libres Coop
+ * Description of LoadActivityReasonCategory.
  */
 class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -37,27 +25,26 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
     {
         return 16200;
     }
-    
+
     public function load(ObjectManager $manager)
     {
         $categs = [
-            ['name' =>
-                ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
-            ['name' =>
-                ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
+            ['name' => ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
+            ['name' => ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
         ];
-            
+
         foreach ($categs as $c) {
-            print "Creating activity reason category : " . $c['name']['en'] . "\n";
+            echo 'Creating activity reason category : ' . $c['name']['en'] . "\n";
             $activityReasonCategory = (new ActivityReasonCategory())
                 ->setName(($c['name']))
                 ->setActive(true);
             $manager->persist($activityReasonCategory);
             $this->addReference(
-              'cat_'.$c['name']['en'],
-              $activityReasonCategory);
+                'cat_' . $c['name']['en'],
+                $activityReasonCategory
+            );
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
index de3c1d4de..c6031b95d 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -1,86 +1,67 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
+use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityType;
 
 /**
- * Description of LoadActivityType
- *
- * @author Champs-Libres Coop
+ * Description of LoadActivityType.
  */
 class LoadActivityType extends Fixture implements OrderedFixtureInterface
 {
+    public static $references = [];
+
     public function getOrder()
     {
         return 16100;
     }
 
-    public static $references = array();
-
     public function load(ObjectManager $manager)
     {
         $types = [
-            # Exange
+            // Exange
             [
-                'name' =>
-                    ['fr' => 'Entretien physique avec l\'usager'],
-                'category' => 'exchange' ],
+                'name' => ['fr' => 'Entretien physique avec l\'usager'],
+                'category' => 'exchange', ],
             [
-                'name' =>
-                    ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
-                'category' => 'exchange' ],
+                'name' => ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
+                'category' => 'exchange', ],
             [
-                'name' =>
-                    ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
-                'category' => 'exchange' ],
-            # Meeting
+                'name' => ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
+                'category' => 'exchange', ],
+            // Meeting
             [
-                'name' =>
-                    ['fr' => 'Point technique encadrant'],
-                'category' => 'meeting' ],
+                'name' => ['fr' => 'Point technique encadrant'],
+                'category' => 'meeting', ],
             [
-                'name' =>
-                    ['fr' => 'Réunion avec des partenaires'],
-                'category' => 'meeting' ],
+                'name' => ['fr' => 'Réunion avec des partenaires'],
+                'category' => 'meeting', ],
             [
-                'name' =>
-                    ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
-                'category' => 'meeting' ],
+                'name' => ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
+                'category' => 'meeting', ],
         ];
 
         foreach ($types as $t) {
-            print "Creating activity type : " . $t['name']['fr'] . " (cat:". $t['category']  . " \n";
+            echo 'Creating activity type : ' . $t['name']['fr'] . ' (cat:' . $t['category'] . " \n";
             $activityType = (new ActivityType())
                 ->setName(($t['name']))
-                ->setCategory($this->getReference('activity_type_cat_'.$t['category']))
+                ->setCategory($this->getReference('activity_type_cat_' . $t['category']))
                 ->setSocialIssuesVisible(1)
                 ->setSocialActionsVisible(1);
             $manager->persist($activityType);
-            $reference = 'activity_type_'.$t['name']['fr'];
+            $reference = 'activity_type_' . $t['name']['fr'];
             $this->addReference($reference, $activityType);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
index 40e45fcf4..20035b557 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -1,40 +1,27 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 
 /**
- * Fixtures for ActivityTypeCategory
- *
- * @author Champs-Libres Coop
+ * Fixtures for ActivityTypeCategory.
  */
 class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterface
 {
-    public static $references = array();
+    public static $references = [];
 
     public function getOrder()
     {
@@ -55,13 +42,13 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
         ];
 
         foreach ($categories as $cat) {
-            print "Creating activity type category : " . $cat['ref'] . "\n";
+            echo 'Creating activity type category : ' . $cat['ref'] . "\n";
 
             $newCat = (new ActivityTypeCategory())
                 ->setName(($cat['name']));
 
             $manager->persist($newCat);
-            $reference = 'activity_type_cat_'.$cat['ref'];
+            $reference = 'activity_type_cat_' . $cat['ref'];
 
             $this->addReference($reference, $newCat);
             static::$references[] = $reference;
diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
index 331db2305..cb2d46d49 100644
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -1,37 +1,29 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use function in_array;
 
 /**
  * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
- * and a role CHILL_ACTIVITY_SEE for administrative
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * and a role CHILL_ACTIVITY_SEE for administrative.
  */
 class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -40,12 +32,12 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
         return 16000;
     }
 
-    
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
-            foreach (LoadScopes::$references as $scopeRef){
+
+            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 //create permission group
                 switch ($permissionsGroup->getName()) {
@@ -53,47 +45,52 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                         if ($scope->getName()['en'] === 'administrative') {
                             break 2; // we do not want any power on administrative
                         }
+
                         break;
+
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
-                        }  
+                        }
+
                         break;
                 }
-                
-                printf("Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s "
-                        . "permission group, scope '%s' \n", 
-                        $permissionsGroup->getName(), $scope->getName()['en']);
+
+                printf(
+                    'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
+                        . "permission group, scope '%s' \n",
+                    $permissionsGroup->getName(),
+                    $scope->getName()['en']
+                );
                 $roleScopeUpdate = (new RoleScope())
-                            ->setRole('CHILL_ACTIVITY_UPDATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_ACTIVITY_UPDATE')
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
                 $roleScopeCreate = (new RoleScope())
-                            ->setRole('CHILL_ACTIVITY_CREATE')
-                            ->setScope($scope);
+                    ->setRole(ActivityVoter::CREATE_ACCOMPANYING_COURSE)
+                    ->setScope($scope);
+                $roleScopeCreate = (new RoleScope())
+                    ->setRole(ActivityVoter::CREATE_PERSON)
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeCreate);
                 $roleScopeDelete = (new RoleScope())
-                            ->setRole('CHILL_ACTIVITY_DELETE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_ACTIVITY_DELETE')
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeDelete);
                 $roleScopeList = (new RoleScope())
-                            ->setRole(ActivityStatsVoter::LISTS)
-                            ;
+                    ->setRole(ActivityStatsVoter::LISTS);
                 $permissionsGroup->addRoleScope($roleScopeList);
                 $roleScopeStat = (new RoleScope())
-                            ->setRole(ActivityStatsVoter::STATS)
-                            ;
+                    ->setRole(ActivityStatsVoter::STATS);
                 $permissionsGroup->addRoleScope($roleScopeStat);
-                
+
                 $manager->persist($roleScopeUpdate);
                 $manager->persist($roleScopeCreate);
                 $manager->persist($roleScopeDelete);
             }
-            
         }
-        
+
         $manager->flush();
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
index a6f1d6a8a..39c7eab36 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -1,45 +1,30 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillActivityExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
@@ -47,7 +32,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
 
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
@@ -56,6 +41,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');
         $loader->load('services/accompanyingPeriodConsistency.yaml');
+        $loader->load('services/doctrine.entitylistener.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
@@ -65,31 +51,38 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $this->prependCruds($container);
     }
 
-    /* (non-PHPdoc)
+    public function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                ActivityVoter::UPDATE => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::CREATE_PERSON => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::CREATE_ACCOMPANYING_COURSE => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
+                ActivityVoter::FULL => [
+                    ActivityVoter::CREATE_PERSON,
+                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
+                    ActivityVoter::DELETE,
+                    ActivityVoter::UPDATE,
+                ],
+            ],
+        ]);
+    }
+
+    /** (non-PHPdoc).
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)
     {
         //add routes for custom bundle
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillActivityBundle/config/routes.yaml'
-              )
-           )
-        ));
-    }
-
-    public function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-              ActivityVoter::UPDATE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::CREATE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::DELETE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::SEE_DETAILS => array(ActivityVoter::SEE)
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillActivityBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
     }
 
     protected function prependCruds(ContainerBuilder $container)
@@ -105,17 +98,17 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                     'actions' => [
                         'index' => [
                             'template' => '@ChillActivity/ActivityType/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityType/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityType/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\ActivityBundle\Entity\ActivityTypeCategory::class,
@@ -126,17 +119,17 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                     'actions' => [
                         'index' => [
                             'template' => '@ChillActivity/ActivityTypeCategory/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityTypeCategory/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityTypeCategory/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\ActivityBundle\Entity\ActivityPresence::class,
@@ -147,19 +140,19 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                     'actions' => [
                         'index' => [
                             'template' => '@ChillActivity/ActivityPresence/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityPresence/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityPresence/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
-            ]
+            ],
         ]);
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
index 601424ea7..f4b9d177c 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -1,71 +1,76 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use function is_int;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_activity');
         $rootNode = $treeBuilder->getRootNode('chill_activity');
-        
+
         $rootNode
-                ->children()
-                    ->arrayNode('form')
-                        ->canBeEnabled()
-                        ->children()
-                            ->arrayNode('time_duration')
-                            ->isRequired()
-                            ->requiresAtLeastOneElement()
-                            ->defaultValue(
-                                    array(
-                                        [ 'label' => '5 minutes',  'seconds' => 300], 
-                                        [ 'label' => '10 minutes', 'seconds' => 600],
-                                        [ 'label' => '15 minutes', 'seconds' => 900],
-                                        [ 'label' => '20 minutes', 'seconds' => 1200],
-                                        [ 'label' => '25 minutes', 'seconds' => 1500],
-                                        [ 'label' => '30 minutes', 'seconds' => 1800],
-                                        [ 'label' => '45 minutes', 'seconds' => 2700],
-                                        [ 'label' => '1 hour',     'seconds' => 3600],
-                                        [ 'label' => '1 hour 15',  'seconds' => 4500],
-                                        [ 'label' => '1 hour 30',  'seconds' => 5400],
-                                        [ 'label' => '1 hour 45',  'seconds' => 6300],
-                                        [ 'label' => '2 hours',    'seconds' => 7200],
-                                        )
-                                    )
-                            ->info('The intervals of time to show in activity form')
-
-                            ->prototype('array')
-                                ->children()
-                                    ->scalarNode('seconds')
-                                        ->info("The number of seconds of this duration. Must be an integer.")
-                                        ->cannotBeEmpty()
-                                        ->validate()
-                                            ->ifTrue(function($data) {
-                                                return !is_int($data);
-                                            })->thenInvalid("The value %s is not a valid integer")
-                                        ->end()
-                                    ->end()
-                                    ->scalarNode('label')
-                                        ->cannotBeEmpty()
-                                        ->info("The label to show into fields")
-                                    ->end()
-                                ->end()
-
-                            ->end()
+            ->children()
+            ->arrayNode('form')
+            ->canBeEnabled()
+            ->children()
+            ->arrayNode('time_duration')
+            ->isRequired()
+            ->requiresAtLeastOneElement()
+            ->defaultValue(
+                [
+                    ['label' => '5 minutes',  'seconds' => 300],
+                    ['label' => '10 minutes', 'seconds' => 600],
+                    ['label' => '15 minutes', 'seconds' => 900],
+                    ['label' => '20 minutes', 'seconds' => 1200],
+                    ['label' => '25 minutes', 'seconds' => 1500],
+                    ['label' => '30 minutes', 'seconds' => 1800],
+                    ['label' => '45 minutes', 'seconds' => 2700],
+                    ['label' => '1 hour',     'seconds' => 3600],
+                    ['label' => '1 hour 15',  'seconds' => 4500],
+                    ['label' => '1 hour 30',  'seconds' => 5400],
+                    ['label' => '1 hour 45',  'seconds' => 6300],
+                    ['label' => '2 hours',    'seconds' => 7200],
+                ]
+            )
+            ->info('The intervals of time to show in activity form')
+            ->prototype('array')
+            ->children()
+            ->scalarNode('seconds')
+            ->info('The number of seconds of this duration. Must be an integer.')
+            ->cannotBeEmpty()
+            ->validate()
+            ->ifTrue(static function ($data) {
+                return !is_int($data);
+            })->thenInvalid('The value %s is not a valid integer')
+            ->end()
+            ->end()
+            ->scalarNode('label')
+            ->cannotBeEmpty()
+            ->info('The label to show into fields')
+            ->end()
+            ->end()
+            ->end()
 //                            ->validate()
-//                            
+//
 //                                ->ifTrue(function ($data) {
 //                                    // test this is an array
 //                                    if (!is_array($data)) {
@@ -84,11 +89,10 @@ class Configuration implements ConfigurationInterface
 //                                    })
 //                                    ->thenInvalid("The data are invalid. The keys must be a string and the value integers")
 //                            ->end()
-                            ->end()
-                        ->end()
-                
-                    ->end()
-                ->end();
+            ->end()
+            ->end()
+            ->end()
+            ->end();
 
         return $treeBuilder;
     }
diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index ae310f775..77f650ce4 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -1,71 +1,107 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
+use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\Document;
-use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
-use Doctrine\Common\Collections\Collection;
+use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
-use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
-use Symfony\Component\Serializer\Annotation\Groups;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\SerializedName;
 
 /**
- * Class Activity
+ * Class Activity.
  *
- * @package Chill\ActivityBundle\Entity
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
  * @ORM\Table(name="activity")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  * @DiscriminatorMap(typeProperty="type", mapping={
- *  "activity"=Activity::class
- *  })
+ *     "activity": Activity::class
+ * })
+ * @ActivityValidator\ActivityValidity
+ *
+ * TODO see if necessary
+ * UserCircleConsistency(
+ *     "CHILL_ACTIVITY_SEE_DETAILS",
+ *     getUserFunction="getUser",
+ * path="scope")
  */
-
-/*
- * TODO : revoir
- * @UserCircleConsistency(
- *      "CHILL_ACTIVITY_SEE_DETAILS",
- *      getUserFunction="getUser",
- *      path="scope")
- */
-
-class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
 {
-    const SENTRECEIVED_SENT = 'sent';
-    const SENTRECEIVED_RECEIVED = 'received';
+    public const SENTRECEIVED_RECEIVED = 'received';
+
+    public const SENTRECEIVED_SENT = 'sent';
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     * @Groups({"read"})
+     */
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
+     * @Groups({"read"})
+     * @SerializedName("activityType")
+     * @ORM\JoinColumn(name="type_id")
+     */
+    private ActivityType $activityType;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     */
+    private ?ActivityPresence $attendee = null;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    private DateTime $date;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
+     */
+    private Collection $documents;
+
+    /**
+     * @ORM\Column(type="time", nullable=true)
+     */
+    private ?DateTime $durationTime = null;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     */
+    private bool $emergency = false;
 
     /**
      * @ORM\Id
@@ -76,29 +112,21 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     private ?int $id = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @groups({"read"})
      */
-    private User $user;
+    private ?Location $location = null;
 
     /**
-     * @ORM\Column(type="datetime")
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private \DateTime $date;
+    private ?Person $person = null;
 
     /**
-     * @ORM\Column(type="time", nullable=true)
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @Groups({"read"})
      */
-    private ?\DateTime $durationTime = null;
-
-    /**
-     * @ORM\Column(type="time", nullable=true)
-     */
-    private ?\DateTime $travelTime = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     */
-    private ?ActivityPresence $attendee = null;
+    private ?Collection $persons = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
@@ -106,11 +134,14 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     private Collection $reasons;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     * @Groups({"read"})
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private Collection $socialIssues;
+    private ?Scope $scope = null;
+
+    /**
+     * @ORM\Column(type="string", options={"default": ""})
+     */
+    private string $sentReceived = '';
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
@@ -120,36 +151,11 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     private Collection $socialActions;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
-     */
-    private ActivityType $type;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     */
-    private ?Scope $scope = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
-     */
-    private ?Person $person = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
      * @Groups({"read"})
      */
-    private ?AccompanyingPeriod $accompanyingPeriod = null;
-
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     */
-    private CommentEmbeddable $comment;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     * @Groups({"read"})
-     */
-    private ?Collection $persons = null;
+    private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
@@ -158,9 +164,14 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     private ?Collection $thirdParties = null;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject")
+     * @ORM\Column(type="time", nullable=true)
      */
-    private Collection $documents;
+    private ?DateTime $travelTime = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     */
+    private User $user;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
@@ -168,23 +179,6 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
      */
     private ?Collection $users = null;
 
-    /**
-     * @ORM\Column(type="boolean", options={"default"=false})
-     */
-    private bool $emergency = false;
-
-    /**
-     * @ORM\Column(type="string", options={"default"=""})
-     */
-    private string $sentReceived = '';
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     * @groups({"read"})
-     */
-    private ?Location $location = null;
-
-
     public function __construct()
     {
         $this->reasons = new ArrayCollection();
@@ -197,71 +191,27 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         $this->socialActions = new ArrayCollection();
     }
 
-    public function getId(): ?int
+    public function addDocument(Document $document): self
     {
-        return $this->id;
-    }
-
-    public function setUser(User $user): self
-    {
-        $this->user = $user;
+        $this->documents[] = $document;
 
         return $this;
     }
 
-    public function getUser(): User
+    /**
+     * Add a person to the person list.
+     */
+    public function addPerson(?Person $person): self
     {
-        return $this->user;
-    }
-
-    public function setDate(\DateTime $date): self
-    {
-        $this->date = $date;
+        if (null !== $person) {
+            if (!$this->persons->contains($person)) {
+                $this->persons[] = $person;
+            }
+        }
 
         return $this;
     }
 
-    public function getDate(): \DateTime
-    {
-        return $this->date;
-    }
-
-    public function setDurationTime(?\DateTime $durationTime): self
-    {
-        $this->durationTime = $durationTime;
-
-        return $this;
-    }
-
-    public function getDurationTime(): ?\DateTime
-    {
-        return $this->durationTime;
-    }
-
-    public function setTravelTime(\DateTime $travelTime): self
-    {
-        $this->travelTime = $travelTime;
-
-        return $this;
-    }
-
-    public function getTravelTime(): ?\DateTime
-    {
-        return $this->travelTime;
-    }
-
-    public function setAttendee(ActivityPresence $attendee): self
-    {
-        $this->attendee = $attendee;
-
-        return $this;
-    }
-
-    public function getAttendee(): ?ActivityPresence
-    {
-        return $this->attendee;
-    }
-
     public function addReason(ActivityReason $reason): self
     {
         $this->reasons->add($reason);
@@ -269,49 +219,6 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this;
     }
 
-    public function removeReason(ActivityReason $reason): void
-    {
-        $this->reasons->removeElement($reason);
-    }
-
-    public function getReasons(): Collection
-    {
-        return $this->reasons;
-    }
-
-    public function setReasons(?ArrayCollection $reasons): self
-    {
-        $this->reasons = $reasons;
-
-        return $this;
-    }
-
-    public function getSocialIssues(): Collection
-    {
-        return $this->socialIssues;
-    }
-
-    public function addSocialIssue(SocialIssue $socialIssue): self
-    {
-        if (!$this->socialIssues->contains($socialIssue)) {
-            $this->socialIssues[] = $socialIssue;
-        }
-
-        return $this;
-    }
-
-    public function removeSocialIssue(SocialIssue $socialIssue): self
-    {
-        $this->socialIssues->removeElement($socialIssue);
-
-        return $this;
-    }
-
-    public function getSocialActions(): Collection
-    {
-        return $this->socialActions;
-    }
-
     public function addSocialAction(SocialAction $socialAction): self
     {
         if (!$this->socialActions->contains($socialAction)) {
@@ -321,67 +228,55 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this;
     }
 
-    public function removeSocialAction(SocialAction $socialAction): self
+    public function addSocialIssue(SocialIssue $socialIssue): self
     {
-        $this->socialActions->removeElement($socialAction);
+        if (!$this->socialIssues->contains($socialIssue)) {
+            $this->socialIssues[] = $socialIssue;
+        }
 
         return $this;
     }
 
-
-
-
-    public function setType(ActivityType $type): self
+    public function addThirdParty(?ThirdParty $thirdParty): self
     {
-        $this->type = $type;
+        if (null !== $thirdParty) {
+            if (!$this->thirdParties->contains($thirdParty)) {
+                $this->thirdParties[] = $thirdParty;
+            }
+        }
 
         return $this;
     }
 
-    public function getType(): ActivityType
+    public function addUser(?User $user): self
     {
-        return $this->type;
-    }
-
-    public function setScope(Scope $scope): self
-    {
-        $this->scope = $scope;
+        if (null !== $user) {
+            if (!$this->users->contains($user)) {
+                $this->users[] = $user;
+            }
+        }
 
         return $this;
     }
 
-    public function getScope(): ?Scope
-    {
-        return $this->scope;
-    }
-
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
         return $this->accompanyingPeriod;
     }
 
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    public function getActivityType(): ActivityType
     {
-        $this->accompanyingPeriod = $accompanyingPeriod;
+        return $this->activityType;
+    }
 
-        return $this;
+    public function getAttendee(): ?ActivityPresence
+    {
+        return $this->attendee;
     }
 
     /**
      * get the center
-     * center is extracted from person
+     * center is extracted from person.
      */
     public function getCenter(): ?Center
     {
@@ -397,28 +292,39 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this->comment;
     }
 
-    public function setComment(CommentEmbeddable $comment): self
+    public function getDate(): DateTime
     {
-        $this->comment = $comment;
-
-        return $this;
+        return $this->date;
     }
 
-    /**
-     * Add a person to the person list
-     */
-    public function addPerson(?Person $person): self
+    public function getDocuments(): Collection
     {
-        if (null !== $person) {
-            $this->persons[] = $person;
-        }
-
-        return $this;
+        return $this->documents;
     }
 
-    public function removePerson(Person $person): void
+    public function getDurationTime(): ?DateTime
     {
-        $this->persons->removeElement($person);
+        return $this->durationTime;
+    }
+
+    public function getEmergency(): bool
+    {
+        return $this->emergency;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
     }
 
     public function getPersons(): Collection
@@ -430,13 +336,16 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     {
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
+
             foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
                 if ($this->persons->contains($participation->getPerson())) {
                     $personsAssociated[] = $participation->getPerson();
                 }
             }
+
             return $personsAssociated;
         }
+
         return [];
     }
 
@@ -444,28 +353,104 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     {
         if (null !== $this->accompanyingPeriod) {
             $personsNotAssociated = [];
+
+            // TODO better semantic with:  return $this->persons->filter(...);
             foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated())) {
-                     $personsNotAssociated[] = $person;
+                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
+                    $personsNotAssociated[] = $person;
                 }
             }
+
             return $personsNotAssociated;
         }
+
         return [];
     }
 
-    public function setPersons(?Collection $persons): self
+    public function getReasons(): Collection
     {
-        $this->persons = $persons;
+        return $this->reasons;
+    }
+
+    public function getScope(): ?Scope
+    {
+        return $this->scope;
+    }
+
+    public function getSentReceived(): string
+    {
+        return $this->sentReceived;
+    }
+
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
+    public function getSocialIssues(): Collection
+    {
+        return $this->socialIssues;
+    }
+
+    public function getThirdParties(): Collection
+    {
+        return $this->thirdParties;
+    }
+
+    public function getTravelTime(): ?DateTime
+    {
+        return $this->travelTime;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function getType(): ActivityType
+    {
+        return $this->activityType;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function getUsers(): Collection
+    {
+        return $this->users;
+    }
+
+    public function isEmergency(): bool
+    {
+        return $this->getEmergency();
+    }
+
+    public function removeDocument(Document $document): void
+    {
+        $this->documents->removeElement($document);
+    }
+
+    public function removePerson(Person $person): void
+    {
+        $this->persons->removeElement($person);
+    }
+
+    public function removeReason(ActivityReason $reason): void
+    {
+        $this->reasons->removeElement($reason);
+    }
+
+    public function removeSocialAction(SocialAction $socialAction): self
+    {
+        $this->socialActions->removeElement($socialAction);
 
         return $this;
     }
 
-    public function addThirdParty(?ThirdParty $thirdParty): self
+    public function removeSocialIssue(SocialIssue $socialIssue): self
     {
-        if (null !== $thirdParty) {
-           $this->thirdParties[] = $thirdParty;
-        }
+        $this->socialIssues->removeElement($socialIssue);
+
         return $this;
     }
 
@@ -474,33 +459,44 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         $this->thirdParties->removeElement($thirdParty);
     }
 
-    public function getThirdParties(): Collection
+    public function removeUser(User $user): void
     {
-        return $this->thirdParties;
+        $this->users->removeElement($user);
     }
 
-    public function setThirdParties(?Collection $thirdParties): self
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
     {
-        $this->thirdParties = $thirdParties;
+        $this->accompanyingPeriod = $accompanyingPeriod;
 
         return $this;
     }
 
-    public function addDocument(Document $document): self
+    public function setActivityType(ActivityType $activityType): self
     {
-        $this->documents[] = $document;
+        $this->activityType = $activityType;
 
         return $this;
     }
 
-    public function removeDocument(Document $document): void
+    public function setAttendee(ActivityPresence $attendee): self
     {
-        $this->documents->removeElement($document);
+        $this->attendee = $attendee;
+
+        return $this;
     }
 
-    public function getDocuments(): Collection
+    public function setComment(CommentEmbeddable $comment): self
     {
-        return $this->documents;
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setDate(DateTime $date): self
+    {
+        $this->date = $date;
+
+        return $this;
     }
 
     public function setDocuments(Collection $documents): self
@@ -510,41 +506,13 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this;
     }
 
-    public function addUser(?User $user): self
+    public function setDurationTime(?DateTime $durationTime): self
     {
-        if (null !== $user) {
-            $this->users[] = $user;
-        }
-        return $this;
-    }
-
-    public function removeUser(User $user): void
-    {
-        $this->users->removeElement($user);
-    }
-
-    public function getUsers(): Collection
-    {
-        return $this->users;
-    }
-
-    public function setUsers(?Collection $users): self
-    {
-        $this->users = $users;
+        $this->durationTime = $durationTime;
 
         return $this;
     }
 
-    public function isEmergency(): bool
-    {
-        return $this->getEmergency();
-    }
-
-    public function getEmergency(): bool
-    {
-        return $this->emergency;
-    }
-
     public function setEmergency(bool $emergency): self
     {
         $this->emergency = $emergency;
@@ -552,9 +520,39 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this;
     }
 
-    public function getSentReceived(): string
+    public function setLocation(?Location $location): Activity
     {
-        return $this->sentReceived;
+        $this->location = $location;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setPersons(?Collection $persons): self
+    {
+        $this->persons = $persons;
+
+        return $this;
+    }
+
+    public function setReasons(?ArrayCollection $reasons): self
+    {
+        $this->reasons = $reasons;
+
+        return $this;
+    }
+
+    public function setScope(Scope $scope): self
+    {
+        $this->scope = $scope;
+
+        return $this;
     }
 
     public function setSentReceived(?string $sentReceived): self
@@ -564,21 +562,41 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this;
     }
 
-    /**
-     * @return Location|null
-     */
-    public function getLocation(): ?Location
+    public function setThirdParties(?Collection $thirdParties): self
     {
-        return $this->location;
+        $this->thirdParties = $thirdParties;
+
+        return $this;
+    }
+
+    public function setTravelTime(DateTime $travelTime): self
+    {
+        $this->travelTime = $travelTime;
+
+        return $this;
     }
 
     /**
-     * @param Location|null $location
-     * @return Activity
+     * @deprecated
      */
-    public function setLocation(?Location $location): Activity
+    public function setType(ActivityType $activityType): self
     {
-        $this->location = $location;
+        $this->activityType = $activityType;
+
+        return $this;
+    }
+
+    public function setUser(UserInterface $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function setUsers(?Collection $users): self
+    {
+        $this->users = $users;
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
index ed9757549..725b1eb8e 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -1,37 +1,32 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class ActivityPresence
+ * Class ActivityPresence.
  *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="activitytpresence")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class ActivityPresence
 {
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
     /**
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -44,28 +39,6 @@ class ActivityPresence
      */
     private array $name = [];
 
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $active = true;
-
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getName(): array
-    {
-        return $this->name;
-    }
-
     /**
      * Get active
      * return true if the category type is active.
@@ -75,9 +48,19 @@ class ActivityPresence
         return $this->active;
     }
 
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
     /**
      * Is active
-     * return true if the category type is active
+     * return true if the category type is active.
      */
     public function isActive(): bool
     {
@@ -86,7 +69,7 @@ class ActivityPresence
 
     /**
      * Set active
-     * set to true if the category type is active
+     * set to true if the category type is active.
      */
     public function setActive(bool $active): self
     {
@@ -94,4 +77,11 @@ class ActivityPresence
 
         return $this;
     }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
index 6116815dc..aed079aca 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -1,40 +1,43 @@
 <?php
 
-/*
- * 
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 
 /**
- * Class ActivityReason
+ * Class ActivityReason.
  *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="activityreason")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class ActivityReason
 {
     /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * @var ActivityReasonCategory
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
+     * inversedBy="reasons")
+     */
+    private $category;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -44,91 +47,22 @@ class ActivityReason
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
     /**
-     * @var ActivityReasonCategory
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
-     *     inversedBy="reasons")
-     */
-    private $category;
-
-    /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-
-    /**
-     * Get id
+     * Get active.
      *
-     * @return integer
+     * @return bool
      */
-    public function getId()
+    public function getActive()
     {
-        return $this->id;
+        return $this->active;
     }
 
     /**
-     * Set name
-     *
-     * @param array $name
-     * @return ActivityReason
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     *
-     * @return array | string
-     */
-    public function getName($locale = null)
-    {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            } else {
-                foreach ($this->name as $name) {
-                    if (!empty($name)) {
-                        return $name;
-                    }
-                }
-            }
-            return '';
-        } else {
-            return $this->name;
-        }
-    }
-    
-    /**
-     * Set category of the reason. If you set to the reason an inactive
-     * category, the reason will become inactive
-     *
-     * @param ActivityReasonCategory $category
-     * @return ActivityReason
-     */
-    public function setCategory(ActivityReasonCategory $category)
-    {
-        if($this->category !== $category && ! $category->getActive()) {
-            $this->setActive(False);
-        }
-        
-        $this->category = $category;
-
-        return $this;
-    }
-
-    /**
-     * Get category
+     * Get category.
      *
      * @return ActivityReasonCategory
      */
@@ -138,9 +72,46 @@ class ActivityReason
     }
 
     /**
-     * Set active
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get name.
+     *
+     * @param mixed|null $locale
+     *
+     * @return array | string
+     */
+    public function getName($locale = null)
+    {
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            }
+
+            foreach ($this->name as $name) {
+                if (!empty($name)) {
+                    return $name;
+                }
+            }
+
+            return '';
+        }
+
+        return $this->name;
+    }
+
+    /**
+     * Set active.
+     *
+     * @param bool $active
      *
-     * @param boolean $active
      * @return ActivityReason
      */
     public function setActive($active)
@@ -151,13 +122,33 @@ class ActivityReason
     }
 
     /**
-     * Get active
+     * Set category of the reason. If you set to the reason an inactive
+     * category, the reason will become inactive.
      *
-     * @return boolean
+     * @return ActivityReason
      */
-    public function getActive()
+    public function setCategory(ActivityReasonCategory $category)
     {
-        return $this->active;
+        if ($this->category !== $category && !$category->getActive()) {
+            $this->setActive(false);
+        }
+
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * Set name.
+     *
+     * @param array $name
+     *
+     * @return ActivityReason
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
     }
 }
-
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
index dc5d5f9ba..f6d35b520 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -1,39 +1,36 @@
 <?php
 
-/*
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class ActivityReasonCategory
+ * Class ActivityReasonCategory.
  *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="activityreasoncategory")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class ActivityReasonCategory
 {
     /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -43,25 +40,20 @@ class ActivityReasonCategory
 
     /**
      * @var string
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
     /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-    
-    /**
-     * Array of ActivityReason
+     * Array of ActivityReason.
+     *
      * @var ArrayCollection
      * @ORM\OneToMany(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
-     *     mappedBy="category")
+     * mappedBy="category")
      */
     private $reasons;
-    
+
     /**
      * ActivityReasonCategory constructor.
      */
@@ -69,19 +61,29 @@ class ActivityReasonCategory
     {
         $this->reasons = new ArrayCollection();
     }
-    
+
     /**
      * @return string
      */
     public function __toString()
     {
-        return 'ActivityReasonCategory('.$this->getName('x').')';
+        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
     }
 
     /**
-     * Get id
+     * Get active.
      *
-     * @return integer
+     * @return bool
+     */
+    public function getActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
      */
     public function getId()
     {
@@ -89,20 +91,9 @@ class ActivityReasonCategory
     }
 
     /**
-     * Set name
+     * Get name.
      *
-     * @param array $name
-     * @return ActivityReasonCategory
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
+     * @param mixed|null $locale
      *
      * @return array
      */
@@ -111,48 +102,53 @@ class ActivityReasonCategory
         if ($locale) {
             if (isset($this->name[$locale])) {
                 return $this->name[$locale];
-            } else {
-                foreach ($this->name as $name) {
-                    if (!empty($name)) {
-                        return $name;
-                    }
+            }
+
+            foreach ($this->name as $name) {
+                if (!empty($name)) {
+                    return $name;
                 }
             }
+
             return '';
-        } else {
-            return $this->name;
         }
+
+        return $this->name;
     }
 
     /**
      * Declare a category as active (or not). When a category is set
      * as unactive, all the reason have this entity as category is also
-     * set as unactive
+     * set as unactive.
+     *
+     * @param bool $active
      *
-     * @param boolean $active
      * @return ActivityReasonCategory
      */
     public function setActive($active)
     {
-        if($this->active !== $active && !$active) {
+        if ($this->active !== $active && !$active) {
             foreach ($this->reasons as $reason) {
                 $reason->setActive($active);
             }
         }
-        
+
         $this->active = $active;
-        
+
         return $this;
     }
 
     /**
-     * Get active
+     * Set name.
      *
-     * @return boolean
+     * @param array $name
+     *
+     * @return ActivityReasonCategory
      */
-    public function getActive()
+    public function setName($name)
     {
-        return $this->active;
+        $this->name = $name;
+
+        return $this;
     }
 }
-
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index 14ede1335..5ad692bf4 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -1,40 +1,118 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use InvalidArgumentException;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * Class ActivityType
+ * Class ActivityType.
  *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="activitytype")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class ActivityType
 {
-    const FIELD_INVISIBLE = 0;
-    const FIELD_OPTIONAL = 1;
-    const FIELD_REQUIRED = 2;
+    public const FIELD_INVISIBLE = 0;
+
+    public const FIELD_OPTIONAL = 1;
+
+    public const FIELD_REQUIRED = 2;
+
+    /**
+     * @deprecated not in use
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $accompanyingPeriodLabel = '';
+
+    /**
+     * @deprecated not in use
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="boolean")
+     * @Groups({"read"})
+     */
+    private bool $active = true;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $attendeeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $attendeeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityTypeCategory")
+     */
+    private ?ActivityTypeCategory $category = null;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $commentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $commentVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $dateLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 2})
+     */
+    private int $dateVisible = self::FIELD_REQUIRED;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $documentsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $documentsVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $durationTimeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $durationTimeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $emergencyLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $emergencyVisible = self::FIELD_INVISIBLE;
 
     /**
      * @ORM\Id
@@ -44,250 +122,143 @@ class ActivityType
     private ?int $id;
 
     /**
-     * @ORM\Column(type="json_array")
-     */
-    private array $name = [];
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $active = true;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityTypeCategory")
-     */
-    private ?ActivityTypeCategory $category = null;
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
-     */
-    private int $personVisible = self::FIELD_REQUIRED;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $personLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
-     */
-    private int $userVisible = self::FIELD_REQUIRED;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $userLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
-     */
-    private int $dateVisible = self::FIELD_REQUIRED;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $dateLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $placeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $placeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $personsVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $personsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $thirdPartiesLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $durationTimeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $durationTimeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $travelTimeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $travelTimeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $attendeeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $attendeeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $reasonsVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $reasonsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $commentVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $commentLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $sentReceivedVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $sentReceivedLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $documentsVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $documentsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $usersVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $usersLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $emergencyVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $emergencyLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $accompanyingPeriodLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $socialDataVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $socialDataLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $socialIssuesVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $socialIssuesLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $socialActionsVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $socialActionsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $locationVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
     private string $locationLabel = '';
 
     /**
-     * @ORM\Column(type="float", options={"default"="0.0"})
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $locationVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="json")
+     * @Groups({"read"})
+     */
+    private array $name = [];
+
+    /**
+     * @ORM\Column(type="float", options={"default": "0.0"})
      */
     private float $ordering = 0.0;
 
     /**
-     * Get id
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
-    public function getId(): int
-    {
-        return $this->id;
-    }
+    private string $personLabel = '';
 
     /**
-     * Set name
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
+    private string $personsLabel = '';
 
     /**
-     * Get name
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Groups({"read"})
      */
-    public function getName(): array
-    {
-        return $this->name;
-    }
+    private int $personsVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 2})
+     */
+    private int $personVisible = self::FIELD_REQUIRED;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $reasonsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $reasonsVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $sentReceivedLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $sentReceivedVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $socialActionsLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter")
+     */
+    private int $socialActionsVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     *
+     * @deprecated not in use
+     */
+    private string $socialDataLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     *
+     * @deprecated not in use
+     */
+    private int $socialDataVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $socialIssuesLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $socialIssuesVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $thirdPartiesLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Groups({"read"})
+     */
+    private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $travelTimeLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $travelTimeVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $userLabel = '';
+
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $usersLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Groups({"read"})
+     */
+    private int $usersVisible = self::FIELD_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 2})
+     */
+    private int $userVisible = self::FIELD_REQUIRED;
 
     /**
      * Get active
@@ -298,228 +269,9 @@ class ActivityType
         return $this->active;
     }
 
-    /**
-     * Is active
-     * return true if the type is active
-     */
-    public function isActive(): bool
+    public function getAttendeeLabel(): string
     {
-        return $this->getActive();
-    }
-
-    /**
-     * Set active
-     * set to true if the type is active
-     */
-    public function setActive(bool $active): self
-    {
-        $this->active = $active;
-
-        return $this;
-    }
-
-    public function getCategory(): ?ActivityTypeCategory
-    {
-        return $this->category;
-    }
-
-    public function setCategory(?ActivityTypeCategory $category): self
-    {
-        $this->category = $category;
-
-        return $this;
-    }
-
-    public function getPersonVisible(): int
-    {
-        return $this->personVisible;
-    }
-
-    public function setPersonVisible(int $personVisible): self
-    {
-        $this->personVisible = $personVisible;
-
-        return $this;
-    }
-
-    public function getPersonLabel(): string
-    {
-        return $this->personLabel;
-    }
-
-    public function setPersonLabel(string $personLabel): self
-    {
-        $this->personLabel = $personLabel;
-
-        return $this;
-    }
-
-    public function getUserVisible(): int
-    {
-        return $this->userVisible;
-    }
-
-    public function setUserVisible(int $userVisible): self
-    {
-        $this->userVisible = $userVisible;
-
-        return $this;
-    }
-
-    public function getUserLabel(): string
-    {
-        return $this->userLabel;
-    }
-
-    public function setUserLabel(string $userLabel): self
-    {
-        $this->userLabel = $userLabel;
-
-        return $this;
-    }
-
-    public function getDateVisible(): int
-    {
-        return $this->dateVisible;
-    }
-
-    public function setDateVisible(int $dateVisible): self
-    {
-        $this->dateVisible = $dateVisible;
-
-        return $this;
-    }
-
-    public function getDateLabel(): string
-    {
-        return $this->dateLabel;
-    }
-
-    public function setDateLabel(string $dateLabel): self
-    {
-        $this->dateLabel = $dateLabel;
-
-        return $this;
-    }
-
-    public function getPlaceVisible(): int
-    {
-        return $this->placeVisible;
-    }
-
-    public function setPlaceVisible(int $placeVisible): self
-    {
-        $this->placeVisible = $placeVisible;
-
-        return $this;
-    }
-
-    public function getPlaceLabel(): string
-    {
-        return $this->placeLabel;
-    }
-
-    public function setPlaceLabel(string $placeLabel): self
-    {
-        $this->placeLabel = $placeLabel;
-
-        return $this;
-    }
-
-    public function getPersonsVisible(): int
-    {
-        return $this->personsVisible;
-    }
-
-    public function setPersonsVisible(int $personsVisible): self
-    {
-        $this->personsVisible = $personsVisible;
-
-        return $this;
-    }
-
-    public function getPersonsLabel(): string
-    {
-        return $this->personsLabel;
-    }
-
-    public function setPersonsLabel(string $personsLabel): self
-    {
-        $this->personsLabel = $personsLabel;
-
-        return $this;
-    }
-
-    public function getThirdPartiesVisible(): int
-    {
-        return $this->thirdPartiesVisible;
-    }
-
-    public function setThirdPartiesVisible(int $thirdPartiesVisible): self
-    {
-        $this->thirdPartiesVisible = $thirdPartiesVisible;
-
-        return $this;
-    }
-
-    public function getThirdPartiesLabel(): string
-    {
-        return $this->thirdPartiesLabel;
-    }
-
-    public function setThirdPartiesLabel(string $thirdPartiesLabel): self
-    {
-        $this->thirdPartiesLabel = $thirdPartiesLabel;
-
-        return $this;
-    }
-
-    public function getDurationTimeVisible(): int
-    {
-        return $this->durationTimeVisible;
-    }
-
-    public function setDurationTimeVisible(int $durationTimeVisible): self
-    {
-        $this->durationTimeVisible = $durationTimeVisible;
-
-        return $this;
-    }
-
-    public function getDurationTimeLabel(): string
-    {
-        return $this->durationTimeLabel;
-    }
-
-    public function setDurationTimeLabel(string $durationTimeLabel): self
-    {
-        $this->durationTimeLabel = $durationTimeLabel;
-
-        return $this;
-    }
-
-    public function getTravelTimeVisible(): int
-    {
-        return $this->travelTimeVisible;
-    }
-
-    public function setTravelTimeVisible(int $TravelTimeVisible): self
-    {
-        $this->travelTimeVisible = $TravelTimeVisible;
-
-        return $this;
-    }
-
-    public function getTravelTimeLabel(): string
-    {
-        return $this->travelTimeLabel;
-    }
-
-    public function setTravelTimeLabel(string $TravelTimeLabel): self
-    {
-        $this->travelTimeLabel = $TravelTimeLabel;
-
-        return $this;
+        return $this->attendeeLabel;
     }
 
     public function getAttendeeVisible(): int
@@ -527,16 +279,243 @@ class ActivityType
         return $this->attendeeVisible;
     }
 
-    public function setAttendeeVisible(int $attendeeVisible): self
+    public function getCategory(): ?ActivityTypeCategory
     {
-        $this->attendeeVisible = $attendeeVisible;
-
-        return $this;
+        return $this->category;
     }
 
-    public function getAttendeeLabel(): string
+    public function getCommentLabel(): string
     {
-        return $this->attendeeLabel;
+        return $this->commentLabel;
+    }
+
+    public function getCommentVisible(): int
+    {
+        return $this->commentVisible;
+    }
+
+    public function getDateLabel(): string
+    {
+        return $this->dateLabel;
+    }
+
+    public function getDateVisible(): int
+    {
+        return $this->dateVisible;
+    }
+
+    public function getDocumentsLabel(): string
+    {
+        return $this->documentsLabel;
+    }
+
+    public function getDocumentsVisible(): int
+    {
+        return $this->documentsVisible;
+    }
+
+    public function getDurationTimeLabel(): string
+    {
+        return $this->durationTimeLabel;
+    }
+
+    public function getDurationTimeVisible(): int
+    {
+        return $this->durationTimeVisible;
+    }
+
+    public function getEmergencyLabel(): string
+    {
+        return $this->emergencyLabel;
+    }
+
+    public function getEmergencyVisible(): int
+    {
+        return $this->emergencyVisible;
+    }
+
+    /**
+     * Get id.
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getLabel(string $field): ?string
+    {
+        $property = $field . 'Label';
+
+        if (!property_exists($this, $property)) {
+            throw new InvalidArgumentException('Field "' . $field . '" not found');
+        }
+
+        return $this->{$property};
+    }
+
+    public function getLocationLabel(): ?string
+    {
+        return $this->locationLabel;
+    }
+
+    public function getLocationVisible(): ?int
+    {
+        return $this->locationVisible;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
+    public function getPersonLabel(): string
+    {
+        return $this->personLabel;
+    }
+
+    public function getPersonsLabel(): string
+    {
+        return $this->personsLabel;
+    }
+
+    public function getPersonsVisible(): int
+    {
+        return $this->personsVisible;
+    }
+
+    public function getPersonVisible(): int
+    {
+        return $this->personVisible;
+    }
+
+    public function getReasonsLabel(): string
+    {
+        return $this->reasonsLabel;
+    }
+
+    public function getReasonsVisible(): int
+    {
+        return $this->reasonsVisible;
+    }
+
+    public function getSentReceivedLabel(): string
+    {
+        return $this->sentReceivedLabel;
+    }
+
+    public function getSentReceivedVisible(): int
+    {
+        return $this->sentReceivedVisible;
+    }
+
+    public function getSocialActionsLabel(): ?string
+    {
+        return $this->socialActionsLabel;
+    }
+
+    public function getSocialActionsVisible(): ?int
+    {
+        return $this->socialActionsVisible;
+    }
+
+    public function getSocialIssuesLabel(): ?string
+    {
+        return $this->socialIssuesLabel;
+    }
+
+    public function getSocialIssuesVisible(): ?int
+    {
+        return $this->socialIssuesVisible;
+    }
+
+    public function getThirdPartiesLabel(): string
+    {
+        return $this->thirdPartiesLabel;
+    }
+
+    public function getThirdPartiesVisible(): int
+    {
+        return $this->thirdPartiesVisible;
+    }
+
+    public function getTravelTimeLabel(): string
+    {
+        return $this->travelTimeLabel;
+    }
+
+    public function getTravelTimeVisible(): int
+    {
+        return $this->travelTimeVisible;
+    }
+
+    public function getUserLabel(): string
+    {
+        return $this->userLabel;
+    }
+
+    public function getUsersLabel(): string
+    {
+        return $this->usersLabel;
+    }
+
+    public function getUsersVisible(): int
+    {
+        return $this->usersVisible;
+    }
+
+    public function getUserVisible(): int
+    {
+        return $this->userVisible;
+    }
+
+    /**
+     * Is active
+     * return true if the type is active.
+     */
+    public function isActive(): bool
+    {
+        return $this->getActive();
+    }
+
+    public function isRequired(string $field): bool
+    {
+        $property = $field . 'Visible';
+
+        if (!property_exists($this, $property)) {
+            throw new InvalidArgumentException('Field "' . $field . '" not found');
+        }
+
+        return self::FIELD_REQUIRED === $this->{$property};
+    }
+
+    public function isVisible(string $field): bool
+    {
+        $property = $field . 'Visible';
+
+        if (!property_exists($this, $property)) {
+            throw new InvalidArgumentException('Field "' . $field . '" not found');
+        }
+
+        return self::FIELD_INVISIBLE !== $this->{$property};
+    }
+
+    /**
+     * Set active
+     * set to true if the type is active.
+     */
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
     }
 
     public function setAttendeeLabel(string $attendeeLabel): self
@@ -546,47 +525,20 @@ class ActivityType
         return $this;
     }
 
-    public function getReasonsVisible(): int
+    public function setAttendeeVisible(int $attendeeVisible): self
     {
-        return $this->reasonsVisible;
-    }
-
-    public function setReasonsVisible(int $reasonsVisible): self
-    {
-        $this->reasonsVisible = $reasonsVisible;
+        $this->attendeeVisible = $attendeeVisible;
 
         return $this;
     }
 
-    public function getReasonsLabel(): string
+    public function setCategory(?ActivityTypeCategory $category): self
     {
-        return $this->reasonsLabel;
-    }
-
-    public function setReasonsLabel(string $reasonsLabel): self
-    {
-        $this->reasonsLabel = $reasonsLabel;
+        $this->category = $category;
 
         return $this;
     }
 
-    public function getCommentVisible(): int
-    {
-        return $this->commentVisible;
-    }
-
-    public function setCommentVisible(int $commentVisible): self
-    {
-        $this->commentVisible = $commentVisible;
-
-        return $this;
-    }
-
-    public function getCommentLabel(): string
-    {
-        return $this->commentLabel;
-    }
-
     public function setCommentLabel(string $commentLabel): self
     {
         $this->commentLabel = $commentLabel;
@@ -594,47 +546,27 @@ class ActivityType
         return $this;
     }
 
-    public function getSentReceivedVisible(): int
+    public function setCommentVisible(int $commentVisible): self
     {
-        return $this->sentReceivedVisible;
-    }
-
-    public function setSentReceivedVisible(int $sentReceivedVisible): self
-    {
-        $this->sentReceivedVisible = $sentReceivedVisible;
+        $this->commentVisible = $commentVisible;
 
         return $this;
     }
 
-    public function getSentReceivedLabel(): string
+    public function setDateLabel(string $dateLabel): self
     {
-        return $this->sentReceivedLabel;
-    }
-
-    public function setSentReceivedLabel(string $sentReceivedLabel): self
-    {
-        $this->sentReceivedLabel = $sentReceivedLabel;
+        $this->dateLabel = $dateLabel;
 
         return $this;
     }
 
-    public function getDocumentsVisible(): int
+    public function setDateVisible(int $dateVisible): self
     {
-        return $this->documentsVisible;
-    }
-
-    public function setDocumentsVisible(int $documentsVisible): self
-    {
-        $this->documentsVisible = $documentsVisible;
+        $this->dateVisible = $dateVisible;
 
         return $this;
     }
 
-    public function getDocumentsLabel(): string
-    {
-        return $this->documentsLabel;
-    }
-
     public function setDocumentsLabel(string $documentsLabel): self
     {
         $this->documentsLabel = $documentsLabel;
@@ -642,47 +574,27 @@ class ActivityType
         return $this;
     }
 
-    public function getUsersVisible(): int
+    public function setDocumentsVisible(int $documentsVisible): self
     {
-        return $this->usersVisible;
-    }
-
-    public function setUsersVisible(int $usersVisible): self
-    {
-        $this->usersVisible = $usersVisible;
+        $this->documentsVisible = $documentsVisible;
 
         return $this;
     }
 
-    public function getUsersLabel(): string
+    public function setDurationTimeLabel(string $durationTimeLabel): self
     {
-        return $this->usersLabel;
-    }
-
-    public function setUsersLabel(string $usersLabel): self
-    {
-        $this->usersLabel = $usersLabel;
+        $this->durationTimeLabel = $durationTimeLabel;
 
         return $this;
     }
 
-    public function getEmergencyVisible(): int
+    public function setDurationTimeVisible(int $durationTimeVisible): self
     {
-        return $this->emergencyVisible;
-    }
-
-    public function setEmergencyVisible(int $emergencyVisible): self
-    {
-        $this->emergencyVisible = $emergencyVisible;
+        $this->durationTimeVisible = $durationTimeVisible;
 
         return $this;
     }
 
-    public function getEmergencyLabel(): string
-    {
-        return $this->emergencyLabel;
-    }
-
     public function setEmergencyLabel(string $emergencyLabel): self
     {
         $this->emergencyLabel = $emergencyLabel;
@@ -690,164 +602,13 @@ class ActivityType
         return $this;
     }
 
-    public function getAccompanyingPeriodVisible(): int
+    public function setEmergencyVisible(int $emergencyVisible): self
     {
-        return $this->accompanyingPeriodVisible;
-    }
-
-    public function setAccompanyingPeriodVisible(int $accompanyingPeriodVisible): self
-    {
-        $this->accompanyingPeriodVisible = $accompanyingPeriodVisible;
+        $this->emergencyVisible = $emergencyVisible;
 
         return $this;
     }
 
-    public function getAccompanyingPeriodLabel(): string
-    {
-        return $this->accompanyingPeriodLabel;
-    }
-
-    public function setAccompanyingPeriodLabel(string $accompanyingPeriodLabel): self
-    {
-        $this->accompanyingPeriodLabel = $accompanyingPeriodLabel;
-
-        return $this;
-    }
-
-    public function getSocialDataVisible(): int
-    {
-        return $this->socialDataVisible;
-    }
-
-    public function setSocialDataVisible(int $socialDataVisible): self
-    {
-        $this->socialDataVisible = $socialDataVisible;
-
-        return $this;
-    }
-
-    public function getSocialDataLabel(): string
-    {
-        return $this->socialDataLabel;
-    }
-
-    public function setSocialDataLabel(string $socialDataLabel): self
-    {
-        $this->socialDataLabel = $socialDataLabel;
-
-        return $this;
-    }
-
-    public function isVisible(string $field): bool
-    {
-        $property = $field.'Visible';
-
-        if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
-        }
-
-        return self::FIELD_INVISIBLE !== $this->$property;
-    }
-
-    public function isRequired(string $field): bool
-    {
-        $property = $field.'Visible';
-
-        if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
-        }
-
-        return self::FIELD_REQUIRED === $this->$property;
-    }
-
-    public function getLabel(string $field): ?string
-    {
-        $property = $field.'Label';
-
-        if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
-        }
-
-        return $this->$property;
-    }
-
-    public function getOrdering(): float
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(float $ordering): self
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
-
-    public function getSocialIssuesVisible(): ?int
-    {
-        return $this->socialIssuesVisible;
-    }
-
-    public function setSocialIssuesVisible(int $socialIssuesVisible): self
-    {
-        $this->socialIssuesVisible = $socialIssuesVisible;
-
-        return $this;
-    }
-
-    public function getSocialIssuesLabel(): ?string
-    {
-        return $this->socialIssuesLabel;
-    }
-
-    public function setSocialIssuesLabel(string $socialIssuesLabel): self
-    {
-        $this->socialIssuesLabel = $socialIssuesLabel;
-
-        return $this;
-    }
-
-    public function getSocialActionsVisible(): ?int
-    {
-        return $this->socialActionsVisible;
-    }
-
-    public function setSocialActionsVisible(int $socialActionsVisible): self
-    {
-        $this->socialActionsVisible = $socialActionsVisible;
-
-        return $this;
-    }
-
-    public function getSocialActionsLabel(): ?string
-    {
-        return $this->socialActionsLabel;
-    }
-
-    public function setSocialActionsLabel(string $socialActionsLabel): self
-    {
-        $this->socialActionsLabel = $socialActionsLabel;
-
-        return $this;
-    }
-
-    public function getLocationVisible(): ?int
-    {
-        return $this->locationVisible;
-    }
-
-    public function setLocationVisible(int $locationVisible): self
-    {
-        $this->locationVisible = $locationVisible;
-
-        return $this;
-    }
-
-    public function getLocationLabel(): ?string
-    {
-        return $this->locationLabel;
-    }
-
     public function setLocationLabel(string $locationLabel): self
     {
         $this->locationLabel = $locationLabel;
@@ -855,4 +616,167 @@ class ActivityType
         return $this;
     }
 
+    public function setLocationVisible(int $locationVisible): self
+    {
+        $this->locationVisible = $locationVisible;
+
+        return $this;
+    }
+
+    /**
+     * Set name.
+     */
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function setOrdering(float $ordering): self
+    {
+        $this->ordering = $ordering;
+
+        return $this;
+    }
+
+    public function setPersonLabel(string $personLabel): self
+    {
+        $this->personLabel = $personLabel;
+
+        return $this;
+    }
+
+    public function setPersonsLabel(string $personsLabel): self
+    {
+        $this->personsLabel = $personsLabel;
+
+        return $this;
+    }
+
+    public function setPersonsVisible(int $personsVisible): self
+    {
+        $this->personsVisible = $personsVisible;
+
+        return $this;
+    }
+
+    public function setPersonVisible(int $personVisible): self
+    {
+        $this->personVisible = $personVisible;
+
+        return $this;
+    }
+
+    public function setReasonsLabel(string $reasonsLabel): self
+    {
+        $this->reasonsLabel = $reasonsLabel;
+
+        return $this;
+    }
+
+    public function setReasonsVisible(int $reasonsVisible): self
+    {
+        $this->reasonsVisible = $reasonsVisible;
+
+        return $this;
+    }
+
+    public function setSentReceivedLabel(string $sentReceivedLabel): self
+    {
+        $this->sentReceivedLabel = $sentReceivedLabel;
+
+        return $this;
+    }
+
+    public function setSentReceivedVisible(int $sentReceivedVisible): self
+    {
+        $this->sentReceivedVisible = $sentReceivedVisible;
+
+        return $this;
+    }
+
+    public function setSocialActionsLabel(string $socialActionsLabel): self
+    {
+        $this->socialActionsLabel = $socialActionsLabel;
+
+        return $this;
+    }
+
+    public function setSocialActionsVisible(int $socialActionsVisible): self
+    {
+        $this->socialActionsVisible = $socialActionsVisible;
+
+        return $this;
+    }
+
+    public function setSocialIssuesLabel(string $socialIssuesLabel): self
+    {
+        $this->socialIssuesLabel = $socialIssuesLabel;
+
+        return $this;
+    }
+
+    public function setSocialIssuesVisible(int $socialIssuesVisible): self
+    {
+        $this->socialIssuesVisible = $socialIssuesVisible;
+
+        return $this;
+    }
+
+    public function setThirdPartiesLabel(string $thirdPartiesLabel): self
+    {
+        $this->thirdPartiesLabel = $thirdPartiesLabel;
+
+        return $this;
+    }
+
+    public function setThirdPartiesVisible(int $thirdPartiesVisible): self
+    {
+        $this->thirdPartiesVisible = $thirdPartiesVisible;
+
+        return $this;
+    }
+
+    public function setTravelTimeLabel(string $TravelTimeLabel): self
+    {
+        $this->travelTimeLabel = $TravelTimeLabel;
+
+        return $this;
+    }
+
+    public function setTravelTimeVisible(int $TravelTimeVisible): self
+    {
+        $this->travelTimeVisible = $TravelTimeVisible;
+
+        return $this;
+    }
+
+    public function setUserLabel(string $userLabel): self
+    {
+        $this->userLabel = $userLabel;
+
+        return $this;
+    }
+
+    public function setUsersLabel(string $usersLabel): self
+    {
+        $this->usersLabel = $usersLabel;
+
+        return $this;
+    }
+
+    public function setUsersVisible(int $usersVisible): self
+    {
+        $this->usersVisible = $usersVisible;
+
+        return $this;
+    }
+
+    public function setUserVisible(int $userVisible): self
+    {
+        $this->userVisible = $userVisible;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
index 2da799980..37b85ce61 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
@@ -1,85 +1,47 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class ActivityTypeCateogry
- *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="activitytypecategory")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class ActivityTypeCategory
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\Column(type="json_array")
-     */
-    private array $name = [];
-
     /**
      * @ORM\Column(type="boolean")
      */
     private bool $active = true;
 
     /**
-     * @ORM\Column(type="float", options={"default"="0.0"})
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $name = [];
+
+    /**
+     * @ORM\Column(type="float", options={"default": "0.0"})
      */
     private float $ordering = 0.0;
 
-    /**
-     * Get id
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set name
-     */
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     */
-    public function getName(): array
-    {
-        return $this->name;
-    }
-
     /**
      * Get active
      * return true if the category type is active.
@@ -89,9 +51,27 @@ class ActivityTypeCategory
         return $this->active;
     }
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
     /**
      * Is active
-     * return true if the category type is active
+     * return true if the category type is active.
      */
     public function isActive(): bool
     {
@@ -100,7 +80,7 @@ class ActivityTypeCategory
 
     /**
      * Set active
-     * set to true if the category type is active
+     * set to true if the category type is active.
      */
     public function setActive(bool $active): self
     {
@@ -109,9 +89,14 @@ class ActivityTypeCategory
         return $this;
     }
 
-    public function getOrdering(): float
+    /**
+     * Set name.
+     */
+    public function setName(array $name): self
     {
-        return $this->ordering;
+        $this->name = $name;
+
+        return $this;
     }
 
     public function setOrdering(float $ordering): self
diff --git a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
new file mode 100644
index 000000000..ab370e89e
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\EntityListener;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+
+use function in_array;
+
+class ActivityEntityListener
+{
+    private EntityManagerInterface $em;
+
+    private AccompanyingPeriodWorkRepository $workRepository;
+
+    public function __construct(EntityManagerInterface $em, AccompanyingPeriodWorkRepository $workRepository)
+    {
+        $this->em = $em;
+        $this->workRepository = $workRepository;
+    }
+
+    public function persistActionToCourse(Activity $activity)
+    {
+        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $period = $activity->getAccompanyingPeriod();
+
+            $accompanyingCourseWorks = $this->workRepository->findByAccompanyingPeriod($period);
+            $periodActions = [];
+            $now = new DateTimeImmutable();
+
+            foreach ($accompanyingCourseWorks as $key => $work) {
+                // take only the actions which are still opened
+                if ($work->getEndDate() === null || $work->getEndDate() > ($activity->getDate() ?? $now)) {
+                    $periodActions[$key] = spl_object_hash($work->getSocialAction());
+                }
+            }
+
+            $associatedPersons = $activity->getPersonsAssociated();
+            $associatedThirdparties = $activity->getThirdParties();
+
+            foreach ($activity->getSocialActions() as $action) {
+                if (in_array(spl_object_hash($action), $periodActions, true)) {
+                    continue;
+                }
+                $newAction = new AccompanyingPeriodWork();
+                $newAction->setSocialAction($action);
+                $period->addWork($newAction);
+
+                $date = DateTimeImmutable::createFromMutable($activity->getDate());
+                $newAction->setStartDate($date);
+
+                foreach ($associatedPersons as $person) {
+                    $newAction->addPerson($person);
+                }
+
+                foreach ($associatedThirdparties as $thirdparty) {
+                    $newAction->setHandlingThierparty($thirdparty);
+                }
+                $this->em->persist($newAction);
+                $this->em->flush();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
index 6614caace..56306d90a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
@@ -1,107 +1,92 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
+use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Join;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function count;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class ActivityReasonAggregator implements AggregatorInterface,
-    ExportElementValidatedInterface
+class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    /**
-     *
-     * @var EntityRepository
-     */
-    protected $categoryRepository;
+    protected ActivityReasonCategoryRepository $activityReasonCategoryRepository;
 
-    /**
-     *
-     * @var EntityRepository
-     */
-    protected $reasonRepository;
+    protected ActivityReasonRepository $activityReasonRepository;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $stringHelper;
+    protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-            EntityRepository $categoryRepository,
-            EntityRepository $reasonRepository,
-            TranslatableStringHelper $stringHelper
+        ActivityReasonCategoryRepository $activityReasonCategoryRepository,
+        ActivityReasonRepository $activityReasonRepository,
+        TranslatableStringHelper $translatableStringHelper
     ) {
-        $this->categoryRepository = $categoryRepository;
-        $this->reasonRepository   = $reasonRepository;
-        $this->stringHelper       = $stringHelper;
+        $this->activityReasonCategoryRepository = $activityReasonCategoryRepository;
+        $this->activityReasonRepository = $activityReasonRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
-        if ($data['level'] === 'reasons') {
+        if ('reasons' === $data['level']) {
             $elem = 'reasons.id';
             $alias = 'activity_reasons_id';
-        } elseif ($data['level'] === 'categories') {
+        } elseif ('categories' === $data['level']) {
             $elem = 'category.id';
             $alias = 'activity_categories_id';
         } else {
-            throw new \RuntimeException('the data provided are not recognized');
+            throw new RuntimeException('The data provided are not recognized.');
         }
 
-        $qb->addSelect($elem.' as '.$alias);
+        $qb->addSelect($elem . ' as ' . $alias);
 
         // make a jointure only if needed
         $join = $qb->getDQLPart('join');
+
         if (
-            (array_key_exists('activity', $join)
-            &&
-            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            (
+                array_key_exists('activity', $join)
+            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            OR
-            (! array_key_exists('activity', $join))
+            || (!array_key_exists('activity', $join))
         ) {
             $qb->add(
-                    'join',
-                    array('activity' =>
-                        new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')
-                        ),
-                    true);
+                'join',
+                [
+                    'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
+                ],
+                true
+            );
         }
 
         // join category if necessary
-        if ($alias === 'activity_categories_id') {
+        if ('activity_categories_id' === $alias) {
             // add join only if needed
             if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
                 $qb->join('reasons.category', 'category');
@@ -118,12 +103,104 @@ class ActivityReasonAggregator implements AggregatorInterface,
         }
     }
 
+    public function applyOn()
+    {
+        return 'activity';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add(
+            'level',
+            ChoiceType::class,
+            [
+                'choices' => [
+                    'By reason' => 'reasons',
+                    'By category of reason' => 'categories',
+                ],
+                'multiple' => false,
+                'expanded' => true,
+                'label' => "Reason's level",
+            ]
+        );
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // for performance reason, we load data from db only once
+        switch ($data['level']) {
+            case 'reasons':
+                $this->activityReasonRepository->findBy(['id' => $values]);
+
+                break;
+
+            case 'categories':
+                $this->activityReasonCategoryRepository->findBy(['id' => $values]);
+
+                break;
+
+            default:
+                throw new RuntimeException(sprintf("The level data '%s' is invalid.", $data['level']));
+        }
+
+        return function ($value) use ($data) {
+            if ('_header' === $value) {
+                return 'reasons' === $data['level'] ? 'Group by reasons' : 'Group by categories of reason';
+            }
+
+            switch ($data['level']) {
+                case 'reasons':
+                    $r = $this->activityReasonRepository->find($value);
+
+                    return sprintf(
+                        '%s > %s',
+                        $this->translatableStringHelper->localize($r->getCategory()->getName()),
+                        $this->translatableStringHelper->localize($r->getName())
+                    );
+
+                case 'categories':
+                    $c = $this->activityReasonCategoryRepository->find($value);
+
+                    return $this->translatableStringHelper->localize($c->getName());
+            }
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        // add select element
+        if ('reasons' === $data['level']) {
+            return ['activity_reasons_id'];
+        }
+
+        if ('categories' === $data['level']) {
+            return ['activity_categories_id'];
+        }
+
+        throw new RuntimeException('The data provided are not recognised.');
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by activity reason';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['level']) {
+            $context
+                ->buildViolation("The reasons's level should not be empty.")
+                ->addViolation();
+        }
+    }
+
     /**
-     * Check if a join between Activity and another alias
+     * Check if a join between Activity and another alias.
      *
      * @param Join[] $joins
      * @param string $alias the alias to search for
-     * @return boolean
+     *
+     * @return bool
      */
     private function checkJoinAlreadyDefined(array $joins, $alias)
     {
@@ -135,99 +212,4 @@ class ActivityReasonAggregator implements AggregatorInterface,
 
         return false;
     }
-
-    public function applyOn()
-    {
-        return 'activity';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('level', ChoiceType::class, array(
-            'choices' => array(
-                'By reason'             => 'reasons',
-                'By category of reason' => 'categories'
-            ),
-            'multiple' => false,
-            'expanded' => true,
-            'label' => 'Reason\'s level'
-        ));
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['level'] === null) {
-            $context->buildViolation("The reasons's level should not be empty")
-                ->addViolation();
-        }
-    }
-
-        public function getTitle()
-    {
-        return "Aggregate by activity reason";
-    }
-
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        // for performance reason, we load data from db only once
-        switch ($data['level']) {
-            case 'reasons':
-                $this->reasonRepository->findBy(array('id' => $values));
-                break;
-            case 'categories':
-                $this->categoryRepository->findBy(array('id' => $values));
-                break;
-            default:
-                throw new \RuntimeException(sprintf("the level data '%s' is invalid",
-                            $data['level']));
-        }
-
-        return function($value) use ($data) {
-            if ($value === '_header') {
-                return $data['level'] === 'reasons' ?
-                        'Group by reasons'
-                        :
-                        'Group by categories of reason'
-                        ;
-            }
-
-            switch ($data['level']) {
-                case 'reasons':
-                    /* @var $r \Chill\ActivityBundle\Entity\ActivityReason */
-                    $r = $this->reasonRepository->find($value);
-
-                    return $this->stringHelper->localize($r->getCategory()->getName())
-                            ." > "
-                            . $this->stringHelper->localize($r->getName());
-                        ;
-                    break;
-                case 'categories':
-                    $c = $this->categoryRepository->find($value);
-
-                    return $this->stringHelper->localize($c->getName());
-                    break;
-                // no need for a default : the default was already set above
-            }
-        };
-
-    }
-
-    public function getQueryKeys($data)
-    {
-        // add select element
-        if ($data['level'] === 'reasons') {
-            return array('activity_reasons_id');
-        } elseif ($data['level'] === 'categories') {
-            return array ('activity_categories_id');
-        } else {
-            throw new \RuntimeException('the data provided are not recognised');
-        }
-
-    }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
index 3dec544ba..83b5f71e2 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -1,88 +1,54 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Closure;
 use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ActivityTypeAggregator implements AggregatorInterface
 {
-    
-    /**
-     *
-     * @var EntityRepository
-     */
-    protected $typeRepository;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $stringHelper;
-    
-    const KEY = 'activity_type_aggregator';
-    
+    public const KEY = 'activity_type_aggregator';
+
+    protected ActivityTypeRepository $activityTypeRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-            EntityRepository $typeRepository,
-            TranslatableStringHelper $stringHelper
+        ActivityTypeRepository $activityTypeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
     ) {
-        $this->typeRepository     = $typeRepository;
-        $this->stringHelper       = $stringHelper;
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
     }
-    
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        // add select element    
+        // add select element
         $qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));
-        
+
         // add the "group by" part
-        $groupBy = $qb->addGroupBy(self::KEY);
-    }
-    
-    /**
-     * Check if a join between Activity and another alias
-     * 
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     * @return boolean
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-        
-        return false;
+        $qb->addGroupBy(self::KEY);
     }
 
     public function applyOn()
@@ -95,37 +61,48 @@ class ActivityTypeAggregator implements AggregatorInterface
         // no form required for this aggregator
     }
 
-    public function getTitle()
-    {
-        return "Aggregate by activity type";
-    }
-    
-    public function addRole()
-    {
-        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) {
-            if ($value === '_header') {
+        $this->activityTypeRepository->findBy(['id' => $values]);
+
+        return function ($value): string {
+            if ('_header' === $value) {
                 return 'Activity type';
             }
 
-            /* @var $r \Chill\ActivityBundle\Entity\ActivityType */
-            $t = $this->typeRepository->find($value);
+            $t = $this->activityTypeRepository->find($value);
 
-            return $this->stringHelper->localize($t->getName());
+            return $this->translatableStringHelper->localize($t->getName());
         };
-        
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return array(self::KEY);
+        return [self::KEY];
     }
 
+    public function getTitle()
+    {
+        return 'Aggregate by activity type';
+    }
+
+    /**
+     * Check if a join between Activity and another alias.
+     *
+     * @param Join[] $joins
+     * @param string $alias the alias to search for
+     *
+     * @return bool
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
index ca01e0ae5..312456104 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -1,51 +1,36 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <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\ActivityBundle\Export\Aggregator;
-
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Query\Expr\Join;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\MainBundle\Entity\User;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepository;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+
 class ActivityUserAggregator implements AggregatorInterface
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    const KEY = 'activity_user_id';
-    
-    function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
+    public const KEY = 'activity_user_id';
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        UserRepository $userRepository
+    ) {
+        $this->userRepository = $userRepository;
     }
-    
+
     public function addRole()
     {
         return new Role(ActivityStatsVoter::STATS);
@@ -53,9 +38,9 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        // add select element    
+        // add select element
         $qb->addSelect(sprintf('IDENTITY(activity.user) AS %s', self::KEY));
-        
+
         // add the "group by" part
         $qb->addGroupBy(self::KEY);
     }
@@ -70,30 +55,27 @@ class ActivityUserAggregator implements AggregatorInterface
         // nothing to add
     }
 
-    public function getLabels($key, $values, $data): \Closure
+    public function getLabels($key, $values, $data): Closure
     {
         // preload users at once
-        $this->em->getRepository(User::class)
-            ->findBy(['id' => $values]);
-        
-        return function($value) {
-            switch ($value) {
-                case '_header':
-                    return 'activity user';
-                default:
-                    return $this->em->getRepository(User::class)->find($value)
-                        ->getUsername();
+        $this->userRepository->findBy(['id' => $values]);
+
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'activity user';
             }
+
+            return $this->userRepository->find($value)->getUsername();
         };
     }
 
     public function getQueryKeys($data)
     {
-        return [ self::KEY ];
+        return [self::KEY];
     }
 
     public function getTitle(): string
     {
-        return "Aggregate by activity user";
+        return 'Aggregate by activity user';
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
index 3498d7a13..3824b059f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
@@ -1,121 +1,61 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export;
 
-use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Query;
+use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CountActivity implements ExportInterface
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $entityManager;
-    
+    protected ActivityRepository $activityRepository;
+
     public function __construct(
-            EntityManagerInterface $em
-            )
-    {
-        $this->entityManager = $em;
-    }
-    
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
-    {
-        
+        ActivityRepository $activityRepository
+    ) {
+        $this->activityRepository = $activityRepository;
     }
 
-    public function getDescription()
+    public function buildForm(FormBuilderInterface $builder)
     {
-        return "Count activities by various parameters.";
-    }
-
-    public function getTitle()
-    {
-        return "Count activities";
-    }
-
-    public function getType()
-    {
-        return 'activity';
-    }
-
-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
-    {
-        $qb = $this->entityManager->createQueryBuilder();
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
-        
-        $qb->select('COUNT(activity.id) as export_count_activity')
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.person', 'person')
-                ;
-        
-        $qb->where($qb->expr()->in('person.center', ':centers'))
-            ->setParameter('centers', $centers)
-            ;
-        
-        return $qb;
-    }
-    
-    public function supportsModifiers()
-    {
-        return array('person', 'activity');
-    }
-    
-    public function requiredRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function getAllowedFormattersTypes()
     {
-        return array(\Chill\MainBundle\Export\FormatterInterface::TYPE_TABULAR);
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription()
+    {
+        return 'Count activities by various parameters.';
     }
 
     public function getLabels($key, array $values, $data)
     {
-        if ($key !== 'export_count_activity') {
-            throw new \LogicException("the key $key is not used by this export");
+        if ('export_count_activity' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
         }
-        
-        return function($value) {
-            return $value === '_header' ? 
-                    'Number of activities'
-                    :
-                    $value
-                    ;
-        };
+
+        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
     }
 
     public function getQueryKeys($data)
     {
-        return array('export_count_activity');
+        return ['export_count_activity'];
     }
 
     public function getResult($qb, $data)
@@ -123,4 +63,40 @@ class CountActivity implements ExportInterface
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle()
+    {
+        return 'Count activities';
+    }
+
+    public function getType()
+    {
+        return 'activity';
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
+        $qb = $this
+            ->activityRepository
+            ->createQueryBuilder('activity')
+            ->select('COUNT(activity.id) as export_count_activity')
+            ->join('activity.person', 'person');
+
+        $qb
+            ->where($qb->expr()->in('person.center', ':centers'))
+            ->setParameter('centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
+    public function supportsModifiers()
+    {
+        return ['person', 'activity'];
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
index 6e5d7b0b8..8fcb6ec6f 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
@@ -1,69 +1,41 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export;
 
-use Chill\MainBundle\Export\ListInterface;
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Scope;
-use Chill\ActivityBundle\Entity\ActivityType;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Symfony\Component\Form\FormBuilderInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use DateTime;
+use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
-use Doctrine\ORM\Query;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function count;
+use function in_array;
 
-/**
- * Create a list for all activities
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ListActivity implements ListInterface
 {
+    protected EntityManagerInterface $entityManager;
 
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $entityManager;
-
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    protected $fields = array(
+    protected array $fields = [
         'id',
         'date',
         'durationTime',
@@ -74,115 +46,121 @@ class ListActivity implements ListInterface
         'type_name',
         'person_firstname',
         'person_lastname',
-        'person_id'
-    );
+        'person_id',
+    ];
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
+    private ActivityRepository $activityRepository;
 
     public function __construct(
-            EntityManagerInterface $em,
-            TranslatorInterface $translator,
-            TranslatableStringHelper $translatableStringHelper
-            )
-    {
+        EntityManagerInterface $em,
+        TranslatorInterface $translator,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ActivityRepository $activityRepository
+    ) {
         $this->entityManager = $em;
         $this->translator = $translator;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->activityRepository = $activityRepository;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param FormBuilderInterface $builder
-     */
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('fields', ChoiceType::class, array(
+        $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
             'expanded' => true,
             'choices' => array_combine($this->fields, $this->fields),
-            'label'    => 'Fields to include in export',
-            'constraints' => [new Callback(array(
-                'callback' => function($selected, ExecutionContextInterface $context) {
+            'label' => 'Fields to include in export',
+            'constraints' => [new Callback([
+                'callback' => static function ($selected, ExecutionContextInterface $context) {
                     if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
-                }
-            ))]
-        ));
-
+                },
+            ])],
+        ]);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return type
-     */
     public function getAllowedFormattersTypes()
     {
-        return array(FormatterInterface::TYPE_LIST);
+        return [FormatterInterface::TYPE_LIST];
     }
 
     public function getDescription()
     {
-        return "List activities";
+        return 'List activities';
     }
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key)
-        {
-            case 'date' :
-                return function($value) {
-                    if ($value === '_header') return 'date';
+        switch ($key) {
+            case 'date':
+                return static function ($value) {
+                    if ('_header' === $value) {
+                        return 'date';
+                    }
 
-                    $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                    $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
 
                     return $date->format('d-m-Y');
                 };
+
             case 'attendee':
-                return function($value) {
-                    if ($value === '_header') return 'attendee';
+                return static function ($value) {
+                    if ('_header' === $value) {
+                        return 'attendee';
+                    }
 
                     return $value ? 1 : 0;
                 };
-            case 'list_reasons' :
-                /* @var $activityReasonsRepository EntityRepository */
-                $activityRepository = $this->entityManager
-                    ->getRepository('ChillActivityBundle:Activity');
 
-                return function($value) use ($activityRepository) {
-                    if ($value === '_header') return 'activity reasons';
+            case 'list_reasons':
+                $activityRepository = $this->activityRepository;
 
-                    $activity = $activityRepository
-                            ->find($value);
+                return function ($value) use ($activityRepository): string {
+                    if ('_header' === $value) {
+                        return 'activity reasons';
+                    }
 
-                    return implode(", ", array_map(function(ActivityReason $r) {
+                    $activity = $activityRepository->find($value);
 
-                        return '"'.
+                    return implode(', ', array_map(function (ActivityReason $r) {
+                        return '"' .
                                 $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                .' > '.
+                                . ' > ' .
                                 $this->translatableStringHelper->localize($r->getName())
-                                .'"';
+                                . '"';
                     }, $activity->getReasons()->toArray()));
                 };
-            case 'circle_name' :
-                return function($value) {
-                    if ($value === '_header') return 'circle';
 
-                    return $this->translatableStringHelper
-                            ->localize(json_decode($value, true));
-                };
-            case 'type_name' :
-                return function($value) {
-                    if ($value === '_header') return 'activity type';
+            case 'circle_name':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'circle';
+                    }
 
-                    return $this->translatableStringHelper
-                            ->localize(json_decode($value, true));
+                    return $this->translatableStringHelper->localize(json_decode($value, true));
                 };
+
+            case 'type_name':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'activity type';
+                    }
+
+                    return $this->translatableStringHelper->localize(json_decode($value, true));
+                };
+
             default:
-                return function($value) use ($key) {
-                    if ($value === '_header') return $key;
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return $key;
+                    }
 
                     return $value;
                 };
@@ -209,68 +187,80 @@ class ListActivity implements ListInterface
         return 'activity';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = array())
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
 
         // throw an error if any fields are present
-        if (!\array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException("any fields "
-                . "have been checked");
+        if (!array_key_exists('fields', $data)) {
+            throw new InvalidArgumentException('Any fields have been checked.');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.person', 'person')
-                ->join('person.center', 'center')
-                ->andWhere('center IN (:authorized_centers)')
-                ->setParameter('authorized_centers', $centers);
-                ;
+            ->from('ChillActivityBundle:Activity', 'activity')
+            ->join('activity.person', 'person')
+            ->join('person.center', 'center')
+            ->andWhere('center IN (:authorized_centers)')
+            ->setParameter('authorized_centers', $centers);
 
         foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'])) {
+            if (in_array($f, $data['fields'], true)) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');
+
                         break;
+
                     case 'person_firstname':
                         $qb->addSelect('person.firstName AS person_firstname');
+
                         break;
+
                     case 'person_lastname':
                         $qb->addSelect('person.lastName AS person_lastname');
+
                         break;
+
                     case 'person_id':
                         $qb->addSelect('person.id AS person_id');
+
                         break;
+
                     case 'user_username':
                         $qb->join('activity.user', 'user');
                         $qb->addSelect('user.username AS user_username');
+
                         break;
+
                     case 'circle_name':
                         $qb->join('activity.scope', 'circle');
                         $qb->addSelect('circle.name AS circle_name');
+
                         break;
+
                     case 'type_name':
                         $qb->join('activity.type', 'type');
                         $qb->addSelect('type.name AS type_name');
+
                         break;
+
                     case 'list_reasons':
                         // this is a trick... The reasons is filled with the
                         // activity id which will be used to load reasons
                         $qb->addSelect('activity.id AS list_reasons');
+
                         break;
+
                     default:
                         $qb->addSelect(sprintf('activity.%s as %s', $f, $f));
+
                         break;
                 }
-
             }
         }
 
-
-
         return $qb;
     }
 
@@ -281,7 +271,6 @@ class ListActivity implements ListInterface
 
     public function supportsModifiers()
     {
-        return array('activity', 'person');
+        return ['activity', 'person'];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
index 8fd4ec00b..3e6122621 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
@@ -1,154 +1,82 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export;
 
-use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Query;
+use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * This export allow to compute stats on activity duration.
- * 
+ *
  * The desired stat must be given in constructor.
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class StatActivityDuration implements ExportInterface
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $entityManager;
-    
-    const SUM = 'sum';
-    
+    public const SUM = 'sum';
+
     /**
      * The action for this report.
-     *
-     * @var string
      */
-    protected $action;
-    
+    protected string $action;
+
+    private ActivityRepository $activityRepository;
+
     /**
-     * constructor
-     * 
-     * @param EntityManagerInterface $em
      * @param string $action the stat to perform
      */
     public function __construct(
-            EntityManagerInterface $em,
-            $action = 'sum'
-            )
-    {
-        $this->entityManager = $em;
+        ActivityRepository $activityRepository,
+        string $action = 'sum'
+    ) {
         $this->action = $action;
-    }
-    
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
-    {
-        
+        $this->activityRepository = $activityRepository;
     }
 
-    public function getDescription()
+    public function buildForm(FormBuilderInterface $builder)
     {
-        if ($this->action === self::SUM) {
-            return "Sum activities duration by various parameters.";
-        }
-    }
-
-    public function getTitle()
-    {
-        if ($this->action === self::SUM) {
-            return "Sum activity duration";
-        }
-        
-    }
-
-    public function getType()
-    {
-        return 'activity';
-    }
-
-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
-    {
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
-        $qb = $this->entityManager->createQueryBuilder();
-        
-        if ($this->action === self::SUM) {
-            $select = "SUM(activity.durationTime) AS export_stat_activity";
-        }
-        
-        $qb->select($select)
-                ->from('ChillActivityBundle:Activity', 'activity')
-                ->join('activity.person',  'person')
-                ->join('person.center', 'center')
-                ->where($qb->expr()->in('center', ':centers'))
-                ->setParameter(':centers', $centers)
-                ;
-        
-        return $qb;
-    }
-    
-    public function supportsModifiers()
-    {
-        return array('person', 'activity');
-    }
-    
-    public function requiredRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function getAllowedFormattersTypes()
     {
-        return array(\Chill\MainBundle\Export\FormatterInterface::TYPE_TABULAR);
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription()
+    {
+        if (self::SUM === $this->action) {
+            return 'Sum activities duration by various parameters.';
+        }
     }
 
     public function getLabels($key, array $values, $data)
     {
-        if ($key !== 'export_stat_activity') {
-            throw new \LogicException("the key $key is not used by this export");
+        if ('export_stat_activity' !== $key) {
+            throw new LogicException(sprintf('The key %s is not used by this export', $key));
         }
-        
-        switch ($this->action) {
-            case self::SUM:
-                $header = "Sum of activities  duration";
-        }
-        
-        return function($value) use ($header) {
-            return $value === '_header' ? 
-                    $header
-                    :
-                    $value
-                    ;
-        };
+
+        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;
+
+        return static fn (string $value) => '_header' === $value ? $header : $value;
     }
 
     public function getQueryKeys($data)
     {
-        return array('export_stat_activity');
+        return ['export_stat_activity'];
     }
 
     public function getResult($qb, $data)
@@ -156,4 +84,47 @@ class StatActivityDuration implements ExportInterface
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle()
+    {
+        if (self::SUM === $this->action) {
+            return 'Sum activity duration';
+        }
+    }
+
+    public function getType()
+    {
+        return 'activity';
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(
+            static fn (array $el): string => $el['center'],
+            $acl
+        );
+
+        $qb = $this->activityRepository->createQueryBuilder('activity');
+
+        $select = null;
+
+        if (self::SUM === $this->action) {
+            $select = 'SUM(activity.durationTime) AS export_stat_activity';
+        }
+
+        return $qb->select($select)
+            ->join('activity.person', 'person')
+            ->join('person.center', 'center')
+            ->where($qb->expr()->in('center', ':centers'))
+            ->setParameter(':centers', $centers);
+    }
+
+    public function requiredRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
+    public function supportsModifiers()
+    {
+        return ['person', 'activity'];
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
index dca4cec30..00a9ac382 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -1,69 +1,57 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Translation\TranslatorInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ActivityDateFilter implements FilterInterface
 {
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    function __construct(TranslatorInterface $translator)
+    protected TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
 
-    
     public function addRole()
     {
         return null;
     }
 
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between('activity.date', ':date_from', 
-            ':date_to');
+        $clause = $qb->expr()->between(
+            'activity.date',
+            ':date_from',
+            ':date_to'
+        );
 
         if ($where instanceof Expr\Andx) {
             $where->add($clause);
         } else {
             $where = $qb->expr()->andX($clause);
         }
-        
+
         $qb->add('where', $where);
         $qb->setParameter('date_from', $data['date_from']);
         $qb->setParameter('date_to', $data['date_to']);
@@ -74,57 +62,68 @@ class ActivityDateFilter implements FilterInterface
         return 'activity';
     }
 
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, array(
-            'label' => "Activities after this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->add('date_to', DateType::class, array(
-            'label' => "Activities before this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            /* @var $filterForm \Symfony\Component\Form\FormInterface */
+        $builder->add(
+            'date_from',
+            DateType::class,
+            [
+                'label' => 'Activities after this date',
+                'data' => new DateTime(),
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
+                'format' => 'dd-MM-yyyy',
+            ]
+        );
+
+        $builder->add(
+            'date_to',
+            DateType::class,
+            [
+                'label' => 'Activities before this date',
+                'data' => new DateTime(),
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
+                'format' => 'dd-MM-yyyy',
+            ]
+        );
+
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            /** @var \Symfony\Component\Form\FormInterface $filterForm */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
-            
-            if ($enabled === true) {
+
+            if (true === $enabled) {
                 // if the filter is enabled, add some validation
-                $form      = $event->getForm();
+                $form = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
-                $date_to   = $form->get('date_to')->getData();
-                
+                $date_to = $form->get('date_to')->getData();
+
                 // check that fields are not empty
-                if ($date_from === null) {
+                if (null === $date_from) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')));
+                        . 'should not be empty')
+                    ));
                 }
-                if ($date_to   === null) {
+
+                if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')));
-                } 
-                
+                        . 'should not be empty')
+                    ));
+                }
+
                 // check that date_from is before date_to
                 if (
-                    ($date_from !== null && $date_to !== null)
-                    &&
-                    $date_from >= $date_to
+                    (null !== $date_from && null !== $date_to)
+                    && $date_from >= $date_to
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date should be after '
                             . 'the date given in "Implied in an activity after '
-                            . 'this date" field')));
+                            . 'this date" field')
+                    ));
                 }
             }
         });
@@ -132,17 +131,17 @@ class ActivityDateFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string')
     {
-        return array(
-            "Filtered by date of activity: only between %date_from% and %date_to%",
-            array(
-                "%date_from%" => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ));
+        return [
+            'Filtered by date of activity: only between %date_from% and %date_to%',
+            [
+                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ],
+        ];
     }
 
     public function getTitle()
     {
-        return "Filtered by date activity";
+        return 'Filtered by date activity';
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
index 37157af60..ff0767116 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
@@ -1,88 +1,71 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr\Join;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function count;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class ActivityReasonFilter implements FilterInterface,
-   ExportElementValidatedInterface
+class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     * The repository for activity reasons
-     *
-     * @var EntityRepository
-     */
-    protected $reasonRepository;
-    
+    protected ActivityReasonRepository $activityReasonRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-            TranslatableStringHelper $helper,
-            EntityRepository $reasonRepository
+        TranslatableStringHelper $helper,
+        ActivityReasonRepository $activityReasonRepository
     ) {
         $this->translatableStringHelper = $helper;
-        $this->reasonRepository         = $reasonRepository;
+        $this->activityReasonRepository = $activityReasonRepository;
     }
-    
-    
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $join  = $qb->getDQLPart('join');
+        $join = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
         //dump($join);
         // add a join to reasons only if needed
         if (
-            (array_key_exists('activity', $join)
-            &&
-            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            (
+                array_key_exists('activity', $join)
+            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            OR
-            (! array_key_exists('activity', $join))
+            || (!array_key_exists('activity', $join))
         ) {
             $qb->add(
-                    'join', 
-                    array('activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')), 
-                    true
-                    );
+                'join',
+                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
+                true
+            );
         }
 
         if ($where instanceof Expr\Andx) {
@@ -90,27 +73,10 @@ class ActivityReasonFilter implements FilterInterface,
         } else {
             $where = $qb->expr()->andX($clause);
         }
-        
+
         $qb->add('where', $where);
         $qb->setParameter('selected_activity_reasons', $data['reasons']);
     }
-    
-    /**
-     * Check if a join between Activity and Reason is already defined
-     * 
-     * @param Join[] $joins
-     * @return boolean
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
 
     public function applyOn()
     {
@@ -119,51 +85,59 @@ class ActivityReasonFilter implements FilterInterface,
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        //create a local copy of translatableStringHelper
-        $helper = $this->translatableStringHelper;
-        
-        $builder->add('reasons', EntityType::class, array(
-            'class' => 'ChillActivityBundle:ActivityReason',
-            'choice_label' => function (ActivityReason $reason) use ($helper) {
-                return $helper->localize($reason->getName());
-            },
-            'group_by' => function(ActivityReason $reason) use ($helper) {
-                return $helper->localize($reason->getCategory()->getName());
-            },
+        $builder->add('reasons', EntityType::class, [
+            'class' => ActivityReason::class,
+            'choice_label' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
+            'group_by' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
             'multiple' => true,
-            'expanded' => false
-        ));
-    }
-    
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['reasons'] === null || count($data['reasons']) === 0) {
-            $context->buildViolation("At least one reason must be choosen")
-                ->addViolation();
-        }
+            'expanded' => false,
+        ]);
     }
 
-        public function getTitle()
-    {
-        return 'Filter by reason';
-    }
-    
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-    
     public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-                function(ActivityReason $r) {
-                    return "\"".$this->translatableStringHelper->localize($r->getName())."\"";
-                },
-                $this->reasonRepository->findBy(array('id' => $data['reasons']->toArray()))
-                );
-        
-        return array("Filtered by reasons: only %list%", 
-            ["%list%" => implode(", ", $reasonsNames)]);
+            fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+            $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
+        );
+
+        return [
+            'Filtered by reasons: only %list%',
+            [
+                '%list%' => implode(', ', $reasonsNames),
+            ],
+        ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by reason';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+            $context
+                ->buildViolation('At least one reason must be chosen')
+                ->addViolation();
+        }
+    }
+
+    /**
+     * Check if a join between Activity and Reason is already defined.
+     *
+     * @param Join[] $joins
+     * @param mixed $alias
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias): bool
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index b3616da10..0b283632a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -1,67 +1,50 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr\Join;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function count;
 
-/**
- * 
- *
- */
-class ActivityTypeFilter implements FilterInterface,
-   ExportElementValidatedInterface
+class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     * The repository for activity reasons
-     *
-     * @var EntityRepository
-     */
-    protected $typeRepository;
-    
+    protected ActivityTypeRepository $activityTypeRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-            TranslatableStringHelper $helper,
-            EntityRepository $typeRepository
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ActivityTypeRepository $activityTypeRepository
     ) {
-        $this->translatableStringHelper = $helper;
-        $this->typeRepository = $typeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->activityTypeRepository = $activityTypeRepository;
     }
-    
-    
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
@@ -72,27 +55,10 @@ class ActivityTypeFilter implements FilterInterface,
         } else {
             $where = $qb->expr()->andX($clause);
         }
-        
+
         $qb->add('where', $where);
         $qb->setParameter('selected_activity_types', $data['types']);
     }
-    
-    /**
-     * Check if a join between Activity and Reason is already defined
-     * 
-     * @param Join[] $joins
-     * @return boolean
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
 
     public function applyOn()
     {
@@ -101,48 +67,64 @@ class ActivityTypeFilter implements FilterInterface,
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        //create a local copy of translatableStringHelper
-        $helper = $this->translatableStringHelper;
-        
-        $builder->add('types', EntityType::class, array(
-            'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $type) use ($helper) {
-                return $helper->localize($type->getName());
-            },
-            'multiple' => true,
-            'expanded' => false
-        ));
-    }
-    
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['types'] === null || count($data['types']) === 0) {
-            $context->buildViolation("At least one type must be choosen")
-                ->addViolation();
-        }
+        $builder->add(
+            'types',
+            EntityType::class,
+            [
+                'class' => ActivityType::class,
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
+                'multiple' => true,
+                'expanded' => false,
+            ]
+        );
     }
 
-        public function getTitle()
-    {
-        return 'Filter by activity type';
-    }
-    
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-    
     public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-                function(ActivityType $t) {
-                    return "\"".$this->translatableStringHelper->localize($t->getName())."\"";
-                },
-                $this->typeRepository->findBy(array('id' => $data['types']->toArray()))
-                );
-        
-        return array("Filtered by activity type: only %list%", 
-            ["%list%" => implode(", ", $reasonsNames)]);
+            fn (ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
+            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
+        );
+
+        return [
+            'Filtered by activity type: only %list%',
+            [
+                '%list%' => implode(', ', $reasonsNames),
+            ],
+        ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by activity type';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['types'] || count($data['types']) === 0) {
+            $context
+                ->buildViolation('At least one type must be chosen')
+                ->addViolation();
+        }
+    }
+
+    /**
+     * Check if a join between Activity and Reason is already defined.
+     *
+     * @param Join[] $joins
+     * @param mixed $alias
+     *
+     * @return bool
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
index cf444bd0a..55b1337bf 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
@@ -1,106 +1,85 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Filter;
 
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Repository\ActivityReasonRepository;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\EntityManager;
-use Chill\PersonBundle\Export\Declarations;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use function count;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class PersonHavingActivityBetweenDateFilter implements FilterInterface, 
-    ExportElementValidatedInterface
+class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
-     * @var EntityRepository
-     */
-    protected $activityReasonRepository;
-    
-    /**
-     *
-     * @var TranslatorInterface 
-     */
-    protected $translator;
-    
+    protected ActivityReasonRepository $activityReasonRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
     public function __construct(
-            TranslatableStringHelper $translatableStringHelper,
-            EntityRepository $activityReasonRepository,
-            TranslatorInterface $translator
+        TranslatableStringHelper $translatableStringHelper,
+        ActivityReasonRepository $activityReasonRepository,
+        TranslatorInterface $translator
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->activityReasonRepository = $activityReasonRepository;
-        $this->translator               = $translator;
+        $this->translator = $translator;
     }
 
-
     public function addRole()
     {
         return null;
     }
 
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data)
     {
         // create a query for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
-        $sqb->select("person_person_having_activity.id")
-                ->from("ChillActivityBundle:Activity", "activity_person_having_activity")
-                ->join("activity_person_having_activity.person", "person_person_having_activity")
-                ;
+        $sqb->select('person_person_having_activity.id')
+            ->from('ChillActivityBundle:Activity', 'activity_person_having_activity')
+            ->join('activity_person_having_activity.person', 'person_person_having_activity');
+
         // add clause between date
-        $sqb->where("activity_person_having_activity.date BETWEEN "
-                . ":person_having_activity_between_date_from"
-                . " AND "
-                . ":person_having_activity_between_date_to");
+        $sqb->where('activity_person_having_activity.date BETWEEN '
+            . ':person_having_activity_between_date_from'
+            . ' AND '
+            . ':person_having_activity_between_date_to');
+
         // add clause activity reason
-        $sqb->join('activity_person_having_activity.reasons', 
-                'reasons_person_having_activity');
+        $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');
+
         $sqb->andWhere(
-                $sqb->expr()->in(
-                    'reasons_person_having_activity',
-                    ":person_having_activity_reasons")
-                );
-        
+            $sqb->expr()->in(
+                'reasons_person_having_activity',
+                ':person_having_activity_reasons'
+            )
+        );
+
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('person.id', $sqb->getDQL());
 
@@ -109,12 +88,16 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface,
         } else {
             $where = $qb->expr()->andX($clause);
         }
-        
+
         $qb->add('where', $where);
-        $qb->setParameter('person_having_activity_between_date_from', 
-                $data['date_from']);
-        $qb->setParameter('person_having_activity_between_date_to', 
-                $data['date_to']);
+        $qb->setParameter(
+            'person_having_activity_between_date_from',
+            $data['date_from']
+        );
+        $qb->setParameter(
+            'person_having_activity_between_date_to',
+            $data['date_to']
+        );
         $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
@@ -123,106 +106,104 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface,
         return Declarations::PERSON_IMPLIED_IN;
     }
 
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, array(
-            'label' => "Implied in an activity after this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
+        $builder->add('date_from', DateType::class, [
+            'label' => 'Implied in an activity after this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->add('date_to', DateType::class, array(
-            'label' => "Implied in an activity before this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
+        ]);
+
+        $builder->add('date_to', DateType::class, [
+            'label' => 'Implied in an activity before this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->add('reasons', EntityType::class, array(
-            'class' => 'ChillActivityBundle:ActivityReason',
-            'choice_label' => function (ActivityReason $reason) {
-                return $this->translatableStringHelper
-                        ->localize($reason->getName());
-            },
-            'group_by' => function(ActivityReason $reason) {
-                return $this->translatableStringHelper
-                        ->localize($reason->getCategory()->getName());
-            },
+        ]);
+
+        $builder->add('reasons', EntityType::class, [
+            'class' => ActivityReason::class,
+            'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
+            'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
             'data' => $this->activityReasonRepository->findAll(),
             'multiple' => true,
             'expanded' => false,
-            'label'    => "Activity reasons for those activities"
-        ));
-        
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            /* @var $filterForm \Symfony\Component\Form\FormInterface */
+            'label' => 'Activity reasons for those activities',
+        ]);
+
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            /** @var FormInterface $filterForm */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
-            
-            if ($enabled === true) {
+
+            if (true === $enabled) {
                 // if the filter is enabled, add some validation
-                $form      = $event->getForm();
+                $form = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
-                $date_to   = $form->get('date_to')->getData();
-                
+                $date_to = $form->get('date_to')->getData();
+
                 // check that fields are not empty
-                if ($date_from === null) {
+                if (null === $date_from) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')));
+                        . 'should not be empty')
+                    ));
                 }
-                if ($date_to   === null) {
+
+                if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')));
-                } 
-                
+                        . 'should not be empty')
+                    ));
+                }
+
                 // check that date_from is before date_to
                 if (
-                    ($date_from !== null && $date_to !== null)
-                    &&
-                    $date_from >= $date_to
+                    (null !== $date_from && null !== $date_to)
+                    && $date_from >= $date_to
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date '
                         . 'should be after the date given in "Implied in an '
-                        . 'activity after this date" field')));
+                        . 'activity after this date" field')
+                    ));
                 }
             }
         });
     }
-    
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['reasons'] === null || count($data['reasons']) === 0) {
-            $context->buildViolation("At least one reason must be choosen")
-                ->addViolation();
-        }
-    }
 
     public function describeAction($data, $format = 'string')
     {
-        return array(
-            "Filtered by person having an activity between %date_from% and "
-            . "%date_to% with reasons %reasons_name%",
-            array(
-                "%date_from%" => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y'),
-                "%reasons_name%"  => implode(", ", array_map(
-                        function (ActivityReason $r) {
-                            return '"'.$this->translatableStringHelper->
-                                    localize($r->getName()).'"';
-                        },
-                        $data['reasons']))
-            ));
+        return [
+            'Filtered by person having an activity between %date_from% and '
+            . '%date_to% with reasons %reasons_name%',
+            [
+                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+                '%reasons_name%' => implode(
+                    ', ',
+                    array_map(
+                        fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+                        $data['reasons']
+                    )
+                ),
+            ],
+        ];
     }
 
     public function getTitle()
     {
-        return "Filtered by person having an activity in a period";
+        return 'Filtered by person having an activity in a period';
     }
 
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+            $context->buildViolation('At least one reason must be chosen')
+                ->addViolation();
+        }
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
index 42894cc25..5c467a575 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
@@ -1,13 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityPresenceType extends AbstractType
 {
@@ -15,19 +24,19 @@ class ActivityPresenceType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
+            ->add('active', ChoiceType::class, [
+                'choices' => [
                     'Yes' => true,
-                    'No'  => false
-                ),
-                'expanded' => true
-            ));
+                    'No' => false,
+                ],
+                'expanded' => true,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
-            'data_class' => ActivityPresence::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => ActivityPresence::class,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
index 5f566393f..09cd5ad6e 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -1,25 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityReasonCategoryType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, array('required' => false))
-        ;
+            ->add('active', CheckboxType::class, ['required' => false]);
     }
 
     /**
@@ -27,9 +31,9 @@ class ActivityReasonCategoryType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
index f46930faa..01543d18c 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
@@ -1,37 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
 
 class ActivityReasonType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, array('required' => false))
-            ->add('category', TranslatableActivityReasonCategory::class)
-        ;
+            ->add('active', CheckboxType::class, ['required' => false])
+            ->add('category', TranslatableActivityReasonCategory::class);
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason',
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 19d53c262..d19f4ce19 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -7,54 +16,57 @@ use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\DocStoreBundle\Form\StoredObjectType;
 use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\UserPickerType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateInterval;
+use DateTime;
+use DateTimeZone;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectManager;
+use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Entity\User;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\CallbackTransformer;
-use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use function in_array;
 
 class ActivityType extends AbstractType
 {
-    protected User $user;
-
     protected AuthorizationHelper $authorizationHelper;
 
     protected ObjectManager $om;
 
-    protected TranslatableStringHelper $translatableStringHelper;
+    protected SocialActionRender $socialActionRender;
 
     protected SocialIssueRender $socialIssueRender;
 
-    protected SocialActionRender $socialActionRender;
-
     protected array $timeChoices;
 
-    public function __construct (
+    protected TranslatableStringHelper $translatableStringHelper;
+
+    protected User $user;
+
+    public function __construct(
         TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
         ObjectManager $om,
@@ -64,7 +76,7 @@ class ActivityType extends AbstractType
         SocialActionRender $socialActionRender
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
-            throw new \RuntimeException("you should have a valid user");
+            throw new RuntimeException('you should have a valid user');
         }
 
         $this->user = $tokenStorage->getToken()->getUser();
@@ -100,12 +112,13 @@ class ActivityType extends AbstractType
                 'center' => $options['center'],
                 'role' => $options['role'],
                 // TODO make required again once scope and rights are fixed
-                'required' => false
+                'required' => false,
             ]);
         }
 
         /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
-        $accompanyingPeriod = NULL;
+        $accompanyingPeriod = null;
+
         if ($options['accompanyingPeriod']) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
@@ -113,49 +126,53 @@ class ActivityType extends AbstractType
         if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
             $builder->add('socialIssues', HiddenType::class);
             $builder->get('socialIssues')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $socialIssuesAsIterable): string {
-                       $socialIssueIds = [];
-                       foreach ($socialIssuesAsIterable as $value) {
-                          $socialIssueIds[] = $value->getId();
-                       }
-                       return implode(',', $socialIssueIds);
-                   },
-                   function (?string $socialIssuesAsString): array {
-                       if (null === $socialIssuesAsString) {
-                          return [];
-                       }
-                       return array_map(
-                          fn(string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
-                          explode(',', $socialIssuesAsString)
-                       );
-                   }
-               ))
-            ;
+                ->addModelTransformer(new CallbackTransformer(
+                    static function (iterable $socialIssuesAsIterable): string {
+                        $socialIssueIds = [];
+
+                        foreach ($socialIssuesAsIterable as $value) {
+                            $socialIssueIds[] = $value->getId();
+                        }
+
+                        return implode(',', $socialIssueIds);
+                    },
+                    function (?string $socialIssuesAsString): array {
+                        if (null === $socialIssuesAsString) {
+                            return [];
+                        }
+
+                        return array_map(
+                            fn (string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
+                            explode(',', $socialIssuesAsString)
+                        );
+                    }
+                ));
         }
 
         if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
             $builder->add('socialActions', HiddenType::class);
             $builder->get('socialActions')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $socialActionsAsIterable): string {
-                       $socialActionIds = [];
-                       foreach ($socialActionsAsIterable as $value) {
-                          $socialActionIds[] = $value->getId();
-                       }
-                       return implode(',', $socialActionIds);
-                   },
-                   function (?string $socialActionsAsString): array {
-                       if (null === $socialActionsAsString) {
-                          return [];
-                       }
-                       return array_map(
-                          fn(string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
-                          explode(',', $socialActionsAsString)
-                       );
-                   }
-               ))
-            ;
+                ->addModelTransformer(new CallbackTransformer(
+                    static function (iterable $socialActionsAsIterable): string {
+                        $socialActionIds = [];
+
+                        foreach ($socialActionsAsIterable as $value) {
+                            $socialActionIds[] = $value->getId();
+                        }
+
+                        return implode(',', $socialActionIds);
+                    },
+                    function (?string $socialActionsAsString): array {
+                        if (null === $socialActionsAsString) {
+                            return [];
+                        }
+
+                        return array_map(
+                            fn (string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
+                            explode(',', $socialActionsAsString)
+                        );
+                    }
+                ));
         }
 
         if ($activityType->isVisible('date')) {
@@ -188,7 +205,7 @@ class ActivityType extends AbstractType
                 'choice_label' => function (ActivityPresence $activityPresence) {
                     return $this->translatableStringHelper->localize($activityPresence->getName());
                 },
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('a')
                         ->where('a.active = true');
                 },
@@ -200,7 +217,7 @@ class ActivityType extends AbstractType
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
                 'center' => $options['center'],
-                'role'   => $options['role']
+                'role' => $options['role'],
             ]);
         }
 
@@ -213,8 +230,8 @@ class ActivityType extends AbstractType
                 'choice_label' => function (ActivityReason $activityReason) {
                     return $this->translatableStringHelper->localize($activityReason->getName());
                 },
-                'attr' => array('class' => 'select2 '),
-                'query_builder' => function (EntityRepository $er) {
+                'attr' => ['class' => 'select2 '],
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('a')
                         ->where('a.active = true');
                 },
@@ -232,43 +249,53 @@ class ActivityType extends AbstractType
         if ($activityType->isVisible('persons')) {
             $builder->add('persons', HiddenType::class);
             $builder->get('persons')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $personsAsIterable): string {
-                       $personIds = [];
-                       foreach ($personsAsIterable as $value) {
-                          $personIds[] = $value->getId();
-                       }
-                       return implode(',', $personIds);
-                   },
-                   function (?string $personsAsString): array {
-                       return array_map(
-                          fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
-                          explode(',', $personsAsString)
-                       );
-                   }
-               ))
-           ;
+                ->addModelTransformer(new CallbackTransformer(
+                    static function (iterable $personsAsIterable): string {
+                        $personIds = [];
+
+                        foreach ($personsAsIterable as $value) {
+                            $personIds[] = $value->getId();
+                        }
+
+                        return implode(',', $personIds);
+                    },
+                    function (?string $personsAsString): array {
+                        if (null === $personsAsString) {
+                            return [];
+                        }
+
+                        return array_map(
+                            fn (string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
+                            explode(',', $personsAsString)
+                        );
+                    }
+                ));
         }
 
         if ($activityType->isVisible('thirdParties')) {
             $builder->add('thirdParties', HiddenType::class);
             $builder->get('thirdParties')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $thirdpartyAsIterable): string {
-                       $thirdpartyIds = [];
-                       foreach ($thirdpartyAsIterable as $value) {
-                          $thirdpartyIds[] = $value->getId();
-                       }
-                       return implode(',', $thirdpartyIds);
-                   },
-                   function (?string $thirdpartyAsString): array {
-                       return array_map(
-                           fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
-                           explode(',', $thirdpartyAsString)
-                       );
-                   }
-               ))
-           ;
+                ->addModelTransformer(new CallbackTransformer(
+                    static function (iterable $thirdpartyAsIterable): string {
+                        $thirdpartyIds = [];
+
+                        foreach ($thirdpartyAsIterable as $value) {
+                            $thirdpartyIds[] = $value->getId();
+                        }
+
+                        return implode(',', $thirdpartyIds);
+                    },
+                    function (?string $thirdpartyAsString): array {
+                        if (null === $thirdpartyAsString) {
+                            return [];
+                        }
+
+                        return array_map(
+                            fn (string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
+                            explode(',', $thirdpartyAsString)
+                        );
+                    }
+                ));
         }
 
         if ($activityType->isVisible('documents')) {
@@ -278,46 +305,51 @@ class ActivityType extends AbstractType
                 'required' => $activityType->isRequired('documents'),
                 'allow_add' => true,
                 'button_add_label' => 'activity.Insert a document',
-                'button_remove_label' => 'activity.Remove a document'
+                'button_remove_label' => 'activity.Remove a document',
             ]);
         }
 
         if ($activityType->isVisible('users')) {
             $builder->add('users', HiddenType::class);
             $builder->get('users')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $usersAsIterable): string {
-                       $userIds = [];
-                       foreach ($usersAsIterable as $value) {
-                           $userIds[] = $value->getId();
-                       }
-                       return implode(',', $userIds);
-                   },
-                   function (?string $usersAsString): array {
-                       return array_map(
-                           fn(string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
-                           explode(',', $usersAsString)
-                       );
-                   }
-               ))
-           ;
+                ->addModelTransformer(new CallbackTransformer(
+                    static function (iterable $usersAsIterable): string {
+                        $userIds = [];
+
+                        foreach ($usersAsIterable as $value) {
+                            $userIds[] = $value->getId();
+                        }
+
+                        return implode(',', $userIds);
+                    },
+                    function (?string $usersAsString): array {
+                        if (null === $usersAsString) {
+                            return [];
+                        }
+
+                        return array_map(
+                            fn (string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
+                            explode(',', $usersAsString)
+                        );
+                    }
+                ));
         }
 
         if ($activityType->isVisible('location')) {
             $builder->add('location', HiddenType::class)
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
-                    function (?Location $location): string {
+                    static function (?Location $location): string {
                         if (null === $location) {
                             return '';
                         }
-                        return $location->getId();
+
+                        return (string) $location->getId();
                     },
-                    function (?string $id): Location {
+                    function (?string $id): ?Location {
                         return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                     }
-                ))
-            ;
+                ));
         }
 
         if ($activityType->isVisible('emergency')) {
@@ -347,7 +379,7 @@ class ActivityType extends AbstractType
                 ->addModelTransformer($durationTimeTransformer);
 
             $builder->get($fieldName)
-                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
+                ->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $formEvent) use (
                     $timeChoices,
                     $builder,
                     $durationTimeTransformer,
@@ -356,24 +388,25 @@ class ActivityType extends AbstractType
                 ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new \DateTimeZone('GMT');
-                    /* @var $data \DateTime */
-                    $data = $formEvent->getData() === NULL ?
-                        \DateTime::createFromFormat('U', 300) :
+                    $timezoneUTC = new DateTimeZone('GMT');
+                    /** @var DateTime $data */
+                    $data = $formEvent->getData() === null ?
+                        DateTime::createFromFormat('U', '300') :
                         $formEvent->getData();
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
-                    $data->add(new \DateInterval('PT'.$seconds.'S'));
+                    $data->add(new DateInterval('PT' . $seconds . 'S'));
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
+                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, array_merge(
-                            $durationTimeOptions, [
+                            $durationTimeOptions,
+                            [
                                 'choices' => $timeChoices,
-                                'auto_initialize' => false
+                                'auto_initialize' => false,
                             ]
                         ));
                         $form->addModelTransformer($durationTimeTransformer);
@@ -383,12 +416,10 @@ class ActivityType extends AbstractType
         }
     }
 
-
-
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => Activity::class
+            'data_class' => Activity::class,
         ]);
 
         $resolver
@@ -396,8 +427,7 @@ class ActivityType extends AbstractType
             ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
             ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
-        ;
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
     }
 
     public function getBlockPrefix(): string
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
index 0c592f519..510d27913 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
@@ -1,14 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeCategoryType extends AbstractType
 {
@@ -16,24 +25,23 @@ class ActivityTypeCategoryType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
+            ->add('active', ChoiceType::class, [
+                'choices' => [
                     'Yes' => true,
-                    'No'  => false
-                ),
-                'expanded' => true
-            ))
+                    'No' => false,
+                ],
+                'expanded' => true,
+            ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
-                'scale' => 5
-            ])
-        ;
+                'scale' => 5,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults(array(
-            'data_class' => ActivityTypeCategory::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => ActivityTypeCategory::class,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index d1a46b109..28947d72b 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -1,18 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Chill\ActivityBundle\Form\Type\ActivityFieldPresence;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeType extends AbstractType
 {
@@ -30,9 +39,9 @@ class ActivityTypeType extends AbstractType
             ->add('active', ChoiceType::class, [
                 'choices' => [
                     'Yes' => true,
-                    'No'  => false
+                    'No' => false,
                 ],
-                'expanded' => true
+                'expanded' => true,
             ])
             ->add('category', EntityType::class, [
                 'class' => ActivityTypeCategory::class,
@@ -42,20 +51,20 @@ class ActivityTypeType extends AbstractType
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
-                'scale' => 5
-            ])
-        ;
+                'scale' => 5,
+            ]);
 
         $fields = [
-            'persons', 'user', 'date', 'place', 'persons',
+            'persons', 'user', 'date', 'location', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
             'reasons', 'comment', 'sentReceived', 'documents',
-            'emergency', 'accompanyingPeriod', 'socialData', 'users'
+            'emergency', 'socialIssues', 'socialActions', 'users',
         ];
+
         foreach ($fields as $field) {
             $builder
-                ->add($field.'Visible', ActivityFieldPresence::class)
-                ->add($field.'Label', TextType::class, [
+                ->add($field . 'Visible', ActivityFieldPresence::class)
+                ->add($field . 'Label', TextType::class, [
                     'required' => false,
                     'empty_data' => '',
                 ]);
@@ -64,8 +73,8 @@ class ActivityTypeType extends AbstractType
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
index 8de67b546..5e0bd4561 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;
@@ -9,21 +18,21 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ActivityFieldPresence extends AbstractType
 {
-    public function getParent()
-    {
-        return ChoiceType::class;
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
-            array(
+            [
                 'choices' => [
                     'Invisible' => ActivityType::FIELD_INVISIBLE,
                     'Optional' => ActivityType::FIELD_OPTIONAL,
                     'Required' => ActivityType::FIELD_REQUIRED,
                 ],
-            )
+            ]
         );
     }
+
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
index 4bf4aa9da..70b7e9b91 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
@@ -1,54 +1,39 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2020, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * FormType to choose amongst activity reasons
- * 
+ * FormType to choose amongst activity reasons.
  */
 class TranslatableActivityReason extends AbstractType
 {
-
     /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
      * @var ActivityReasonRender
      */
     protected $reasonRender;
 
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
         ActivityReasonRender $reasonRender
@@ -57,6 +42,30 @@ class TranslatableActivityReason extends AbstractType
         $this->reasonRender = $reasonRender;
     }
 
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'class' => 'ChillActivityBundle:ActivityReason',
+                'choice_label' => function (ActivityReason $choice) {
+                    return $this->reasonRender->renderString($choice, []);
+                },
+                'group_by' => function (ActivityReason $choice): ?string {
+                    if (null !== $category = $choice->getCategory()) {
+                        return $this->translatableStringHelper->localize($category->getName());
+                    }
+
+                    return null;
+                },
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('r')
+                        ->where('r.active = true');
+                },
+                'attr' => ['class' => ' select2 '],
+            ]
+        );
+    }
+
     public function getBlockPrefix()
     {
         return 'translatable_activity_reason';
@@ -66,28 +75,4 @@ class TranslatableActivityReason extends AbstractType
     {
         return EntityType::class;
     }
-    
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            array(
-                'class' => 'ChillActivityBundle:ActivityReason',
-                'choice_label' => function(ActivityReason $choice)  {
-                    return $this->reasonRender->renderString($choice, []);
-                },
-                'group_by' => function(ActivityReason $choice): ?string {
-                    if (null !== $category = $choice->getCategory()) {
-                        return $this->translatableStringHelper->localize($category->getName());
-                    }
-
-                    return null;
-                },
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('r')
-                        ->where('r.active = true');
-                },
-                'attr' => [ 'class' => ' select2 ']
-            )
-        );
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
index 6dd04023c..2b501864f 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
@@ -1,40 +1,25 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Description of TranslatableActivityReasonCategory
- *
- * @author Champs-Libres Coop
+ * Description of TranslatableActivityReasonCategory.
  */
-
-
 class TranslatableActivityReasonCategory extends AbstractType
 {
     /**
@@ -47,6 +32,21 @@ class TranslatableActivityReasonCategory extends AbstractType
         $this->requestStack = $requestStack;
     }
 
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $locale = $this->requestStack->getCurrentRequest()->getLocale();
+        $resolver->setDefaults(
+            [
+                'class' => 'ChillActivityBundle:ActivityReasonCategory',
+                'choice_label' => 'name[' . $locale . ']',
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.active = true');
+                },
+            ]
+        );
+    }
+
     public function getBlockPrefix()
     {
         return 'translatable_activity_reason_category';
@@ -56,19 +56,4 @@ class TranslatableActivityReasonCategory extends AbstractType
     {
         return EntityType::class;
     }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
-        $resolver->setDefaults(
-            array(
-                'class' => 'ChillActivityBundle:ActivityReasonCategory',
-                'choice_label' => 'name['.$locale.']',
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.active = true');
-                }
-            )
-        );
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
index f21184a30..dc6328709 100644
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -1,60 +1,66 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
 use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- * Description of TranslatableActivityType
- *
- * @author Champs-Libres Coop
- */
 class TranslatableActivityType extends AbstractType
 {
+    protected ActivityTypeRepository $activityTypeRepository;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    protected $activityTypeRepository;
+    protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-            TranslatableStringHelper $helper,
-            EntityRepository $activityTypeRepository
-            )
-    {
+        TranslatableStringHelperInterface $helper,
+        ActivityTypeRepository $activityTypeRepository
+    ) {
         $this->translatableStringHelper = $helper;
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        /** @var QueryBuilder $qb */
+        $qb = $options['query_builder'];
+
+        if (true === $options['active_only']) {
+            $qb->where($qb->expr()->eq('at.active', ':active'));
+            $qb->setParameter('active', true, Types::BOOLEAN);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'class' => ActivityType::class,
+                'active_only' => true,
+                'query_builder' => $this->activityTypeRepository
+                    ->createQueryBuilder('at'),
+                'choice_label' => function (ActivityType $type) {
+                    return $this->translatableStringHelper->localize($type->getName());
+                },
+            ]
+        );
+    }
+
     public function getBlockPrefix()
     {
         return 'translatable_activity_type';
@@ -64,30 +70,4 @@ class TranslatableActivityType extends AbstractType
     {
         return EntityType::class;
     }
-
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, array $options) {
-        /* @var $qb \Doctrine\ORM\QueryBuilder */
-        $qb = $options['query_builder'];
-
-        if ($options['active_only'] === true) {
-            $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Type::BOOLEAN);
-        }
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-
-        $resolver->setDefaults(
-            array(
-                'class' => 'ChillActivityBundle:ActivityType',
-                'active_only' => true,
-                'query_builder' => $this->activityTypeRepository
-                    ->createQueryBuilder('at'),
-                'choice_label' => function (ActivityType $type) {
-                    return $this->translatableStringHelper->localize($type->getName());
-                }
-            )
-        );
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
index 7d5ba520d..b0e91a3a5 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,47 +1,54 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Menu;
 
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected TokenStorageInterface $tokenStorage;
-
-    protected AuthorizationHelper $authorizationHelper;
+    protected Security $security;
 
     protected TranslatorInterface $translator;
 
     public function __construct(
-        TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
+        Security $security,
         TranslatorInterface $translator
     ) {
+        $this->security = $security;
         $this->translator = $translator;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->tokenStorage = $tokenStorage;
-    }
-    public static function getMenuIds(): array
-    {
-        return ['accompanyingCourse'];
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $period = $parameters['accompanyingCourse'];
 
-        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
+        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
+            && $this->security->isGranted(ActivityVoter::SEE, $period)) {
             $menu->addChild($this->translator->trans('Activity'), [
                 'route' => 'chill_activity_activity_list',
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),
-                ]])
+                ], ])
                 ->setExtras(['order' => 40]);
         }
     }
+
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..58b0825dc
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+use function in_array;
+
+final class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->security->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
+            $menu->addChild('Activities', [
+                'route' => 'chill_admin_activity_index',
+            ])
+                ->setExtras([
+                    'order' => 2000,
+                    'explain' => 'Activity configuration',
+                ]);
+        } else {
+            $menu
+                ->addChild('Activities', [
+                    'route' => 'chill_admin_activity_index',
+                ])
+                ->setExtras([
+                    'order' => '60',
+                ]);
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'admin_activity'];
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
index e44a0f561..34b18f078 100644
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -1,68 +1,56 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-namespace Chill\ActivityBundle\Menu; 
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator)
-    {
+        TranslatorInterface $translator
+    ) {
         $this->translator = $translator;
         $this->authorizationChecker = $authorizationChecker;
     }
 
-    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $parameters['person'];
-        
+
         if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
             $menu->addChild(
-                $this->translator->trans('Activity list'), [
+                $this->translator->trans('Activity list'),
+                [
                     'route' => 'chill_activity_activity_list',
-                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ])
-                ->setExtra('order', 201)
-                ;
+                    'routeParameters' => ['person_id' => $person->getId()],
+                ]
+            )
+                ->setExtra('order', 201);
         }
     }
 
diff --git a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
index 1836f599b..f7f19e3f1 100644
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
@@ -1,17 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Notification;
 
-use Chill\MainBundle\Entity\Notification;
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\Notification;
 
 final class ActivityNotificationRenderer
 {
-    public function supports(Notification $notification, array $options = []): bool
-    {
-        return $notification->getRelatedEntityClass() == Activity::class;
-    }
-
     public function getTemplate()
     {
         return '@ChillActivity/Activity/showInNotification.html.twig';
@@ -21,4 +25,9 @@ final class ActivityNotificationRenderer
     {
         return ['notification' => $notification];
     }
+
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() === Activity::class;
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
index b498a6090..e80dc5522 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -1,60 +1,47 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Scope;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr\Orx;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
-
+use function count;
+use function in_array;
 
 final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
     private AuthorizationHelper $authorizationHelper;
 
-    private TokenStorageInterface $tokenStorage;
-
-    private ActivityRepository $repository;
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
 
     private EntityManagerInterface $em;
 
+    private ActivityRepository $repository;
+
     private Security $security;
 
-    private CenterResolverDispatcher $centerResolverDispatcher;
+    private TokenStorageInterface $tokenStorage;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcher $centerResolverDispatcher,
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
         TokenStorageInterface $tokenStorage,
         ActivityRepository $repository,
         EntityManagerInterface $em,
@@ -68,34 +55,11 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $this->security = $security;
     }
 
-    /**
-     * @param Person $person
-     * @param string $role
-     * @param int|null $start
-     * @param int|null $limit
-     * @param array $orderBy
-     * @return array|Activity[]
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
-    {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
-        }
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
-
-        return $this->em->getRepository(Activity::class)
-            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
-        ;
-    }
-
     public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
     {
         $user = $this->security->getUser();
         $center = $this->centerResolverDispatcher->resolveCenter($period);
+
         if (0 === count($orderBy)) {
             $orderBy = ['date' => 'DESC'];
         }
@@ -107,6 +71,27 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
+    /**
+     * @param array $orderBy
+     *
+     * @return Activity[]|array
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+    }
+
     public function queryTimelineIndexer(string $context, array $args = []): array
     {
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
@@ -115,15 +100,15 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         [$where, $parameters] = $this->getWhereClause($context, $args);
 
         return [
-           'id' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('id'),
-           'type' => 'activity',
-           'date' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('date'),
-           'FROM' => $from,
-           'WHERE' => $where,
-           'parameters' => $parameters
-       ];
+            'id' => $metadataActivity->getTableName()
+                 . '.' . $metadataActivity->getColumnName('id'),
+            'type' => 'activity',
+            'date' => $metadataActivity->getTableName()
+                 . '.' . $metadataActivity->getColumnName('date'),
+            'FROM' => $from,
+            'WHERE' => $where,
+            'parameters' => $parameters,
+        ];
     }
 
     private function getFromClauseCenter(array $args): string
@@ -132,13 +117,12 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
 
-        return $metadataActivity->getTableName().' JOIN '
-            .$metadataPerson->getTableName().' ON '
-            .$metadataPerson->getTableName().'.'.
+        return $metadataActivity->getTableName() . ' JOIN '
+            . $metadataPerson->getTableName() . ' ON '
+            . $metadataPerson->getTableName() . '.' .
                 $associationMapping['joinColumns'][0]['referencedColumnName']
-            .' = '
-            .$associationMapping['joinColumns'][0]['name']
-            ;
+            . ' = '
+            . $associationMapping['joinColumns'][0]['name'];
     }
 
     private function getWhereClause(string $context, array $args): array
@@ -149,21 +133,22 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $activityToScope  = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
+        $activityToScope = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
         $personToCenter = $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'];
 
-
         // acls:
         $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
-                $role);
+        $reachableCenters = $this->authorizationHelper->getReachableCenters(
+            $this->tokenStorage->getToken()->getUser(),
+            $role
+        );
 
         if (count($reachableCenters) === 0) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
 
-        if ($context === 'person') {
+        if ('person' === $context) {
             // we start with activities having the person_id linked to person
             $where .= sprintf('%s = ? AND ', $activityToPerson);
             $parameters[] = $person->getId();
@@ -172,21 +157,22 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         // we add acl (reachable center and scopes)
         $where .= '('; // first loop for the for centers
         $centersI = 0; // like centers#i
+
         foreach ($reachableCenters as $center) {
             // we pass if not in centers
-            if (!\in_array($center, $args['centers'])) {
+            if (!in_array($center, $args['centers'], true)) {
                 continue;
             }
             // we get all the reachable scopes for this center
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); },
+                static function (Scope $scope) { return $scope->getId(); },
                 $reachableScopes
             );
 
             // if not the first center
-            if ($centersI > 0) {
+            if (0 < $centersI) {
                 $where .= ') OR (';
             }
 
@@ -199,21 +185,20 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             $scopesI = 0; //like scope#i
 
             foreach ($reachablesScopesId as $scopeId) {
-                if ($scopesI > 0) {
+                if (0 < $scopesI) {
                     $where .= ' OR ';
                 }
                 $where .= sprintf(' %s.%s = ? ', $metadataActivity->getTableName(), $activityToScope);
                 $parameters[] = $scopeId;
-                $scopesI ++;
+                ++$scopesI;
             }
             // close loop for scopes
             $where .= ') ';
-            $centersI++;
+            ++$centersI;
         }
         // close loop for centers
         $where .= ')';
 
         return [$where, $parameters];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
index 0b646f7c5..56fb112f9 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -8,12 +17,12 @@ use Chill\PersonBundle\Entity\Person;
 interface ActivityACLAwareRepositoryInterface
 {
     /**
-     * @return array|Activity[]
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
-
-    /**
-     * @return array|Activity[]
+     * @return Activity[]|array
      */
     public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+
+    /**
+     * @return Activity[]|array
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
new file mode 100644
index 000000000..085846074
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ActivityReasonCategory|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ActivityReasonCategory|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ActivityReasonCategory[]    findAll()
+ * @method ActivityReasonCategory[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ActivityReasonCategoryRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ActivityReasonCategory::class);
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
new file mode 100644
index 000000000..52bc47205
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ActivityReason|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ActivityReason|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ActivityReason[]    findAll()
+ * @method ActivityReason[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ActivityReasonRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ActivityReason::class);
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 90b3875f6..312d601ad 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -29,10 +18,10 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method AccompanyingPeriodParticipation|null find($id, $lockMode = null, $lockVersion = null)
- * @method AccompanyingPeriodParticipation|null findOneBy(array $criteria, array $orderBy = null)
- * @method AccompanyingPeriodParticipation[]    findAll()
- * @method AccompanyingPeriodParticipation[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method Activity|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Activity|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Activity[]    findAll()
+ * @method Activity[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
 class ActivityRepository extends ServiceEntityRepository
 {
@@ -42,14 +31,49 @@ class ActivityRepository extends ServiceEntityRepository
     }
 
     /**
-     * @param $person
-     * @param array $scopes
-     * @param string[] $orderBy
-     * @param int $limit
-     * @param int $offset
-     * @return array|Activity[]
+     * @deprecated use @see{ActivityACLAwareRepositoryInterface::findByAccompanyingPeriod}
+     *
+     * @return Activity[]
      */
-    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        if (!$allowNullScope) {
+            $qb
+                ->where($qb->expr()->in('a.scope', ':scopes'))
+                ->setParameter('scopes', $scopes);
+        } else {
+            $qb
+                ->where(
+                    $qb->expr()->orX(
+                        $qb->expr()->in('a.scope', ':scopes'),
+                        $qb->expr()->isNull('a.scope')
+                    )
+                )
+                ->setParameter('scopes', $scopes);
+        }
+
+        $qb
+            ->andWhere(
+                $qb->expr()->eq('a.accompanyingPeriod', ':period')
+            )
+            ->setParameter('period', $period);
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.' . $k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    /**
+     * @return Activity[]
+     */
+    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = ['date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
     {
         $qb = $this->createQueryBuilder('a');
         $qb->select('a');
@@ -63,63 +87,14 @@ class ActivityRepository extends ServiceEntityRepository
                     ':person MEMBER OF a.persons'
                 )
             )
-            ->setParameter('person', $person)
-            ;
+            ->setParameter('person', $person);
 
         foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
+            $qb->addOrderBy('a.' . $k, $dir);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);
 
-        return $qb->getQuery()
-            ->getResult();
-    }
-
-    /**
-     * @param AccompanyingPeriod $period
-     * @param array $scopes
-     * @param int|null $limit
-     * @param int|null $offset
-     * @param array|string[] $orderBy
-     * @return array|Activity[]
-     */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
-    {
-        $qb = $this->createQueryBuilder('a');
-        $qb->select('a');
-
-        if (!$allowNullScope) {
-            $qb
-                ->where($qb->expr()->in('a.scope', ':scopes'))
-                ->setParameter('scopes', $scopes)
-            ;
-        } else {
-            $qb
-                ->where(
-                    $qb->expr()->orX(
-                        $qb->expr()->in('a.scope', ':scopes'),
-                        $qb->expr()->isNull('a.scope')
-                    )
-                )
-                ->setParameter('scopes', $scopes)
-            ;
-        }
-
-        $qb
-            ->andWhere(
-                $qb->expr()->eq('a.accompanyingPeriod', ':period')
-            )
-            ->setParameter('period', $period)
-        ;
-
-        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
-        }
-
-        $qb->setMaxResults($limit)->setFirstResult($offset);
-
-        return $qb->getQuery()
-            ->getResult();
+        return $qb->getQuery()->getResult();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
new file mode 100644
index 000000000..1714d14e3
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ActivityTypeCategory|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ActivityTypeCategory|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ActivityTypeCategory[]    findAll()
+ * @method ActivityTypeCategory[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ActivityTypeCategoryRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ActivityTypeCategory::class);
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
new file mode 100644
index 000000000..735b70054
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\ActivityType;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ActivityType|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ActivityType|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ActivityType[]    findAll()
+ * @method ActivityType[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ActivityTypeRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ActivityType::class);
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
index 28c02e23e..275f67950 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -24,14 +24,16 @@ div.new-activity-select-type {
 }
 
 //// ACTIVITY LIST PAGE
-// precise badge-title specific details
+// precise dashboard specific details
 
+p.date-label {
+    display: inline-block;
+    margin: 0 0.5em 0 0;
+    font-weight: 700;
+    font-size: 18pt;
+}
+div.dashboard,
 h2.badge-title {
-    div.duration {
-        font-size: smaller;
-        padding-left: 1em;
-        margin-top: 1em;
-    }
     ul.list-content {
         font-size: 70%;
         list-style-type: none;
@@ -39,16 +41,13 @@ h2.badge-title {
         margin: 0;
         li {
             margin-bottom: 0.2em;
-            // exception: change bg color for action badges above badge-title
+            // exception: change bg color for action badges above dashboard
             .bg-light {
                 background-color: $chill-light-gray !important;
             }
         }
     }
 }
-div.main {
-    padding: 1em;
-}
 
 //// ACTIVITY SHOW AND FORM PAGES
 // Exceptions for flex-bloc in concerned-groups
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
index 52454c2f7..2fb9d022d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -1,7 +1,7 @@
 <template>
-   <concerned-groups></concerned-groups>
-   <social-issues-acc></social-issues-acc>
-   <location></location>
+   <concerned-groups v-if="hasPerson"></concerned-groups>
+   <social-issues-acc v-if="hasSocialIssues"></social-issues-acc>
+   <location v-if="hasLocation"></location>
 </template>
 
 <script>
@@ -11,6 +11,7 @@ import Location from './components/Location.vue';
 
 export default {
    name: "App",
+    props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
    components: {
       ConcernedGroups,
       SocialIssuesAcc,
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js
index 9dab14ef1..8d4bcac3b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js
@@ -1,4 +1,5 @@
 import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
 
 /*
 *  Load socialActions by socialIssue (id)
@@ -12,33 +13,20 @@ const getSocialActionByIssue = (id) => {
       });
 };
 
-/*
-*   Load Locations
- */
-const getLocations = () => {
-    const url = `/api/1.0/main/location.json`;
-    return fetch(url)
-        .then(response => {
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
-};
+const getLocations = () => fetchResults('/api/1.0/main/location.json');
+
+const getLocationTypes = () => fetchResults('/api/1.0/main/location-type.json');
 
 /*
-*   Load Location Types
+*   Load Location Type by defaultFor
+*   @param {string} entity - can be "person" or "thirdparty"
  */
-const getLocationTypes = () => {
-    const url = `/api/1.0/main/location-type.json`;
-    return fetch(url)
-        .then(response => {
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
+const getLocationTypeByDefaultFor = (entity) => {
+    return getLocationTypes().then(results =>
+        results.filter(t => t.defaultFor === entity)[0]
+    );
 };
 
-/*
-*   Post a Location
- */
 const postLocation = (body) => {
     const url = `/api/1.0/main/location.json`;
     return fetch(url, {
@@ -59,5 +47,6 @@ export {
    getSocialActionByIssue,
    getLocations,
    getLocationTypes,
+   getLocationTypeByDefaultFor,
    postLocation
 };
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
index 108e1e493..49b53c8cb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -1,33 +1,33 @@
 <template>
-   <teleport to="#add-persons">
+    <teleport to="#add-persons" v-if="isComponentVisible">
 
-      <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc
-            v-for="bloc in contextPersonsBlocs"
-            v-bind:key="bloc.key"
-            v-bind:bloc="bloc"
-            v-bind:setPersonsInBloc="setPersonsInBloc">
-         </persons-bloc>
-      </div>
+        <div class="flex-bloc concerned-groups" :class="getContext">
+            <persons-bloc
+                v-for="bloc in contextPersonsBlocs"
+                v-bind:key="bloc.key"
+                v-bind:bloc="bloc"
+                v-bind:blocWidth="getBlocWidth"
+                v-bind:setPersonsInBloc="setPersonsInBloc">
+            </persons-bloc>
+        </div>
+        <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
+            <ul class="list-suggest add-items inline">
+                <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
+                    <span>{{ p.text }}</span>
+                </li>
+            </ul>
+        </div>
 
-     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
-        <ul>
-          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
-             {{ p.text }}
-          </li>
-        </ul>
-     </div>
+        <add-persons
+            buttonTitle="activity.add_persons"
+            modalTitle="activity.add_persons"
+            v-bind:key="addPersons.key"
+            v-bind:options="addPersonsOptions"
+            @addNewPersons="addNewPersons"
+            ref="addPersons">
+        </add-persons>
 
-      <add-persons
-         buttonTitle="activity.add_persons"
-         modalTitle="activity.add_persons"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
-
-  </teleport>
+    </teleport>
 </template>
 
 <script>
@@ -52,38 +52,35 @@ export default {
             {  key: 'personsAssociated',
                title: 'activity.bloc_persons_associated',
                persons: [],
-               included: false
+               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
             },
             {  key: 'personsNotAssociated',
                title: 'activity.bloc_persons_not_associated',
                persons: [],
-               included: false
+               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
             },
             {  key: 'thirdparty',
                title: 'activity.bloc_thirdparty',
                persons: [],
-               included: true
+               included: window.activity ? window.activity.activityType.thirdPartiesVisible !== 0 : true
             },
             {  key: 'users',
                title: 'activity.bloc_users',
                persons: [],
-               included: true
+               included: window.activity ? window.activity.activityType.usersVisible !== 0 : true
             },
          ],
          addPersons: {
-            key: 'activity',
-            options: {
-               type: ['person', 'thirdparty', 'user'],
-               priority: null,
-               uniq: false,
-               button: {
-                   size: 'btn-sm'
-               }
-            }
+            key: 'activity'
          }
       }
    },
    computed: {
+      isComponentVisible() {
+         return window.activity
+             ? (window.activity.activityType.personsVisible !== 0 || window.activity.activityType.thirdPartiesVisible !== 0 || window.activity.activityType.usersVisible !== 0)
+             : true
+      },
       ...mapState({
          persons: state => state.activity.persons,
          thirdParties: state => state.activity.thirdParties,
@@ -91,14 +88,41 @@ export default {
          accompanyingCourse: state => state.activity.accompanyingPeriod
       }),
       ...mapGetters([
-          'filterSuggestedPersons'
+          'suggestedEntities'
       ]),
       getContext() {
          return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
       },
       contextPersonsBlocs() {
          return this.personsBlocs.filter(bloc => bloc.included !== false);
-      }
+      },
+      addPersonsOptions() {
+         let optionsType = [];
+         if (window.activity) {
+            if (window.activity.activityType.personsVisible !== 0) {
+               optionsType.push('person')
+            }
+            if (window.activity.activityType.thirdPartiesVisible !== 0) {
+               optionsType.push('thirdparty')
+            }
+            if (window.activity.activityType.usersVisible !== 0) {
+               optionsType.push('user')
+            }
+         } else {
+            optionsType = ['person', 'thirdparty', 'user'];
+         }
+         return {
+            type: optionsType,
+            priority: null,
+            uniq: false,
+            button: {
+                  size: 'btn-sm'
+            }
+         }
+      },
+       getBlocWidth() {
+           return Math.round(100/(this.contextPersonsBlocs.length)) + '%';
+       }
    },
    mounted() {
       this.setPersonsInBloc();
@@ -168,7 +192,7 @@ export default {
       },
       addNewPersons({ selected, modal }) {
          console.log('@@@ CLICK button addNewPersons', selected);
-         selected.forEach(function(item) {
+         selected.forEach((item) => {
                this.$store.dispatch('addPersonsInvolved', item);
             }, this
          );
@@ -176,7 +200,7 @@ export default {
          modal.showModal = false;
          this.setPersonsInBloc();
       },
-      addNewPerson(person) {
+      addSuggestedEntity(person) {
         this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
         this.setPersonsInBloc();
       },
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
index bef11159c..a13e672c2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,12 +1,8 @@
 <template>
    <li>
-      <span class="badge bg-primary" :title="person.text">
-         <span class="chill_denomination">
-            {{ textCutted }}
-         </span>
-         <a class="fa fa-fw fa-times"
-            @click.prevent="$emit('remove', person)">
-         </a>
+      <span :title="person.text">
+         <span class="chill_denomination">{{ textCutted }}</span>
+         <a @click.prevent="$emit('remove', person)"></a>
       </span>
    </li>
 </template>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
index f95e2add7..13ad54027 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
@@ -1,11 +1,11 @@
 <template>
-   <div class="item-bloc">
+   <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
       <div class="item-row">
          <div class="item-col">
             <h4>{{ $t(bloc.title) }}</h4>
          </div>
          <div class="item-col">
-            <ul class="list-content">
+            <ul class="list-suggest remove-items">
                <person-badge
                   v-for="person in bloc.persons"
                   v-bind:key="person.id"
@@ -25,7 +25,7 @@ export default {
    components: {
       PersonBadge
    },
-   props: ['bloc', 'setPersonsInBloc'],
+   props: ['bloc', 'setPersonsInBloc', 'blocWidth'],
    methods: {
       removePerson(item) {
          console.log('@@ CLICK remove person: item', item);
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 0dbf2652a..9a4b78334 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -2,10 +2,9 @@
     <teleport to="#location">
         <div class="mb-3 row">
             <label class="col-form-label col-sm-4">
-                {{ $t('activity.location') }}
+                {{ $t("activity.location") }}
             </label>
             <div class="col-sm-8">
-
                 <VueMultiselect
                     name="selectLocation"
                     id="selectLocation"
@@ -17,81 +16,159 @@
                     :placeholder="$t('activity.choose_location')"
                     :custom-label="customLabel"
                     :options="locations"
-                    v-model="location">
+                    group-values="locations"
+                    group-label="locationGroup"
+                    v-model="location"
+                >
                 </VueMultiselect>
 
-                <new-location @saveNewLocation="saveNewLocation"></new-location>
+                <new-location v-bind:locations="locations"></new-location>
             </div>
         </div>
     </teleport>
 </template>
 
 <script>
-import { mapState } from "vuex";
-import VueMultiselect from 'vue-multiselect';
-import NewLocation from './Location/NewLocation.vue';
-import { getLocations, postLocation } from '../api.js';
+import { mapState, mapGetters } from "vuex";
+import VueMultiselect from "vue-multiselect";
+import NewLocation from "./Location/NewLocation.vue";
+import { getLocations, getLocationTypeByDefaultFor } from "../api.js";
 
 export default {
     name: "Location",
     components: {
         NewLocation,
-        VueMultiselect
+        VueMultiselect,
     },
     data() {
         return {
-            locations: []
-        }
+            locations: [],
+        };
     },
     computed: {
-        ...mapState(['activity']),
+        ...mapState(["activity"]),
+        ...mapGetters(["suggestedEntities"]),
         location: {
             get() {
                 return this.activity.location;
             },
             set(value) {
-                this.$store.dispatch('updateLocation', value);
-            }
-        }
+                this.$store.dispatch("updateLocation", value);
+            },
+        },
     },
     mounted() {
-        this.getLocationsList();
+        getLocations().then(
+            (results) => {
+                getLocationTypeByDefaultFor('person').then(
+                    (personLocationType) => {
+                        if (personLocationType) {
+                            const personLocation = this.makeAccompanyingPeriodLocation(personLocationType);
+                            const concernedPersonsLocation =
+                                this.makeConcernedPersonsLocation(personLocationType);
+                            getLocationTypeByDefaultFor('thirdparty').then(
+                                thirdpartyLocationType => {
+                                    const concernedThirdPartiesLocation =
+                                        this.makeConcernedThirdPartiesLocation(thirdpartyLocationType);
+                                    this.locations = [
+                                        {
+                                            locationGroup: 'Localisation du parcours',
+                                            locations: [personLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Parties concernées',
+                                            locations: [...concernedPersonsLocation, ...concernedThirdPartiesLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Autres localisations',
+                                            locations: results
+                                        }
+                                    ];
+                                }
+                            )
+                        } else {
+                            this.locations = [
+                                {
+                                    locationGroup: 'Localisations',
+                                    locations: response.results
+                                }
+                            ];
+                        }
+                        if (window.default_location_id) {
+                            let location = this.locations.filter(
+                                (l) => l.id === window.default_location_id
+                            );
+                            this.$store.dispatch("updateLocation", location);
+                        }
+                    }
+                )
+            })
     },
     methods: {
-        getLocationsList() {
-            getLocations().then(response => new Promise(resolve => {
-                console.log('getLocations', response);
-                this.locations = response.results;
-                resolve();
-            }))
+        labelAccompanyingCourseLocation(value) {
+            return `${value.address.text} (${value.locationType.title.fr})`
         },
         customLabel(value) {
-            return `${value.locationType.title.fr} ${value.name}`;
+            return value.locationType
+                ? value.name
+                    ? value.name === '__AccompanyingCourseLocation__'
+                        ? this.labelAccompanyingCourseLocation(value)
+                        : `${value.name} (${value.locationType.title.fr})`
+                    : value.locationType.title.fr
+                : '';
         },
-        saveNewLocation(selected) {
-            console.log('saveNewLocation', selected);
-            let body = {
+        makeConcernedPersonsLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'person' && e.current_household_address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: {
+                                id: e.current_household_address.address_id,
+                            },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeConcernedThirdPartiesLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'thirdparty' && e.address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: { id: e.address.address_id },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeAccompanyingPeriodLocation(locationType) {
+            const accPeriodLocation = this.activity.accompanyingPeriod.location;
+            return {
                 type: 'location',
-                name: selected.name,
+                id: -1,
+                onthefly: true,
+                name: '__AccompanyingCourseLocation__',
                 address: {
-                    id: selected.addressId
+                    id: accPeriodLocation.address_id,
+                    text: `${accPeriodLocation.text} - ${accPeriodLocation.postcode.code} ${accPeriodLocation.postcode.name}`
                 },
-                locationType: {
-                    id: selected.type,
-                    type: 'location-type'
-                },
-                phonenumber1: selected.phonenumber1,
-                phonenumber2: selected.phonenumber2,
-                email: selected.email,
+                locationType: locationType
             }
-            postLocation(body).then(location => new Promise(resolve => {
-                console.log('postLocation', location);
-                this.locations.push(location);
-                this.$store.dispatch('updateLocation', location);
-                resolve();
-            }));
         }
-    }
-}
-
+    },
+};
 </script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 3ffb2a33f..35bf9a065 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -1,75 +1,87 @@
 <template>
+    <div>
+        <ul class="record_actions">
+            <li>
+                <a class="btn btn-sm btn-create" @click="openModal">
+                    {{ $t('activity.create_new_location') }}
+                </a>
+            </li>
+        </ul>
 
-    <ul class="record_actions">
-        <li>
-            <a class="btn btn-sm btn-create" @click="openModal">
-                {{ $t('activity.create_new_location') }}
-            </a>
-        </li>
-    </ul>
+        <teleport to="body">
+            <modal v-if="modal.showModal"
+                :modalDialogClass="modal.modalDialogClass"
+                @close="modal.showModal = false">
 
-    <teleport to="body">
-        <modal v-if="modal.showModal"
-               :modalDialogClass="modal.modalDialogClass"
-               @close="modal.showModal = false">
+                <template v-slot:header>
+                    <h3 class="modal-title">{{ $t('activity.create_new_location') }}</h3>
+                </template>
+                <template v-slot:body>
+                    <form>
+                        <div class="form-floating mb-3">
+                            <p v-if="errors.length">
+                                <b>{{ $t('activity.errors') }}</b>
+                                <ul>
+                                    <li v-for="error in errors" :key="error">{{ error }}</li>
+                                </ul>
+                            </p>
+                        </div>
 
-            <template v-slot:header>
-                <h3 class="modal-title">{{ $t('activity.create_new_location') }}</h3>
-            </template>
-            <template v-slot:body>
+                        <div class="form-floating mb-3">
+                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
+                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
+                                <option v-for="t in locationTypes" :value="t" :key="t.id">
+                                    {{ t.title.fr }}
+                                </option>
+                            </select>
+                            <label>{{ $t('activity.location_fields.type') }}</label>
+                        </div>
 
-                <add-address
-                    :context="addAddress.context"
-                    :options="addAddress.options"
-                    :addressChangedCallback="submitNewAddress"
-                    ref="addAddress">
-                </add-address>
+                        <div class="form-floating mb-3">
+                            <input class="form-control form-control-lg" id="name" v-model="inputName" placeholder />
+                            <label for="name">{{ $t('activity.location_fields.name') }}</label>
+                        </div>
 
-                <div class="form-floating mb-3">
-                    <input class="form-control form-control-lg" id="name" v-model="inputName" placeholder />
-                    <label for="name">{{ $t('activity.location_fields.name') }}</label>
-                </div>
+                        <add-address
+                            :context="addAddress.context"
+                            :options="addAddress.options"
+                            :addressChangedCallback="submitNewAddress"
+                            v-if="showAddAddress"
+                            ref="addAddress">
+                        </add-address>
 
-                <div class="form-floating mb-3">
-                    <select class="form-select form-select-lg" id="type" v-model="selectType">
-                        <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
-                        <option v-for="t in locationTypes" :value="t.id">
-                            {{ t.title.fr }}
-                        </option>
-                    </select>
-                    <label>{{ $t('activity.location_fields.type') }}</label>
-                </div>
+                        <div class="form-floating mb-3" v-if="showContactData">
+                            <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
+                            <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
+                            <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
+                            <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="showContactData">
+                            <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
+                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
+                        </div>
+                    </form>
+                </template>
+                <template v-slot:footer>
+                    <button class="btn btn-save"
+                        @click.prevent="saveNewLocation"
+                    >
+                        {{ $t('action.save') }}
+                    </button>
+                </template>
 
-                <div class="form-floating mb-3">
-                    <input class="form-control form-control-lg" id="phonenumber1" v-model="inputPhonenumber1" placeholder />
-                    <label for="phonenumber1">{{ $t('activity.location_fields.phonenumber1') }}</label>
-                </div>
-                <div class="form-floating mb-3" v-if="hasPhonenumber1">
-                    <input class="form-control form-control-lg" id="phonenumber2" v-model="inputPhonenumber2" placeholder />
-                    <label for="phonenumber2">{{ $t('activity.location_fields.phonenumber2') }}</label>
-                </div>
-                <div class="form-floating mb-3">
-                    <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
-                    <label for="email">{{ $t('activity.location_fields.email') }}</label>
-                </div>
-
-            </template>
-            <template v-slot:footer>
-                <button class="btn btn-save"
-                    @click.prevent="$emit('saveNewLocation', selected); modal.showModal = false;">
-                    {{ $t('action.save') }}
-                </button>
-            </template>
-
-        </modal>
-    </teleport>
+            </modal>
+        </teleport>
+    </div>
 </template>
 
 <script>
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { mapState } from "vuex";
-import { getLocationTypes } from "../../api";
+import { getLocationTypes, postLocation } from "../../api";
 
 export default {
     name: "NewLocation",
@@ -77,11 +89,12 @@ export default {
         Modal,
         AddAddress,
     },
-    emits: ['saveNewLocation'],
+    props: ['locations'],
     data() {
         return {
+            errors: [],
             selected: {
-                type: {},
+                type: null,
                 name: null,
                 addressId: null,
                 phonenumber1: null,
@@ -117,7 +130,7 @@ export default {
                 return this.selected.type;
             },
             set(value) {
-                this.selected.type = value
+                this.selected.type = value;
             }
         },
         inputName: {
@@ -154,22 +167,96 @@ export default {
         },
         hasPhonenumber1() {
             return this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== "";
-        }
+        },
+        showAddAddress() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.addressRequired !== 'never') {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
+        showContactData() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.contactData !== 'never') {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
     },
     mounted() {
         this.getLocationTypesList();
     },
     methods: {
+        checkForm() {
+            let cond = true;
+            this.errors = [];
+            if (!this.selected.type) {
+                this.errors.push('Type de localisation requis');
+                cond = false;
+            } else {
+                if (this.selected.type.addressRequired === 'required' && !this.selected.addressId) {
+                    this.errors.push('Adresse requise');
+                    cond = false;
+                }
+                if (this.selected.type.contactData === 'required' && !this.selected.phonenumber1) {
+                    this.errors.push('Numéro de téléphone requis');
+                    cond = false;
+                }
+                if (this.selected.type.contactData === 'required' && !this.selected.email) {
+                    this.errors.push('Adresse email requise');
+                    cond = false;
+                }
+            }
+            return cond;
+        },
         getLocationTypesList() {
-            getLocationTypes().then(response => new Promise(resolve => {
-                console.log('getLocationTypes', response);
-                this.locationTypes = response.results.filter(t => t.availableForUsers === true);
-                resolve();
-            }))
+            getLocationTypes().then(results => {
+                this.locationTypes = results.filter(t => t.availableForUsers === true);
+            })
         },
         openModal() {
             this.modal.showModal = true;
         },
+        saveNewLocation() {
+            if (this.checkForm()) {
+                console.log('saveNewLocation', this.selected);
+                let body = {
+                    type: 'location',
+                    name: this.selected.name,
+                    locationType: {
+                        id: this.selected.type.id,
+                        type: 'location-type'
+                    },
+                    phonenumber1: this.selected.phonenumber1,
+                    phonenumber2: this.selected.phonenumber2,
+                    email: this.selected.email,
+                };
+                if (this.selected.addressId) {
+                    body = Object.assign(body, {
+                        address: {
+                            id: this.selected.addressId
+                        }
+                    });
+                }
+                postLocation(body)
+                    .then(
+                        location => new Promise(resolve => {
+                            this.locations.push(location);
+                            this.$store.dispatch('updateLocation', location);
+                            resolve();
+                            this.modal.showModal = false;
+                        })
+                    ).catch(
+                        err => {
+                            this.errors.push(err.message);
+                        }
+                    );
+            };
+        },
         submitNewAddress(payload) {
             console.log('submitNewAddress', payload);
             this.selected.addressId = payload.addressId;
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index 06e0b197c..92aa7be0e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -50,19 +50,26 @@
                <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
             </div>
 
-            <check-social-action
-               v-if="socialIssuesSelected.length || socialActionsSelected.length"
-               v-for="action in socialActionsList"
-               v-bind:key="action.id"
-               v-bind:action="action"
-               v-bind:selection="socialActionsSelected"
-               @updateSelected="updateActionsSelected">
-            </check-social-action>
-
-            <span v-else class="inline-choice chill-no-data-statement mt-3">
+            <span v-else-if="socialIssuesSelected.length === 0" class="inline-choice chill-no-data-statement mt-3">
                {{ $t('activity.select_first_a_social_issue') }}
             </span>
 
+             <template v-else-if="socialActionsList.length > 0">
+                 <check-social-action
+                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
+                     v-for="action in socialActionsList"
+                     v-bind:key="action.id"
+                     v-bind:action="action"
+                     v-bind:selection="socialActionsSelected"
+                     @updateSelected="updateActionsSelected">
+                 </check-social-action>
+             </template>
+
+            <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
+                {{ $t('activity.social_action_list_empty') }}
+            </span>
+
+
          </div>
       </div>
 
@@ -85,7 +92,8 @@ export default {
    data() {
       return {
          issueIsLoading: false,
-         actionIsLoading: false
+         actionIsLoading: false,
+         actionAreLoaded: false,
       }
    },
    computed: {
@@ -109,6 +117,7 @@ export default {
       /* Load others issues in multiselect
       */
       this.issueIsLoading = true;
+      this.actionAreLoaded = false;
       getSocialIssues().then(response => new Promise((resolve, reject) => {
          this.$store.commit('updateIssuesOther', response.results);
 
@@ -141,6 +150,8 @@ export default {
          this.$store.commit('filterList', 'actions');
 
          this.issueIsLoading = false;
+         this.actionAreLoaded = true;
+         this.updateActionsList();
          resolve();
       }));
    },
@@ -173,7 +184,6 @@ export default {
          to get social actions concerned
       */
       updateActionsList() {
-         //console.log('updateActionsList');
          this.resetActionsList();
          this.socialIssuesSelected.forEach(item => {
 
@@ -188,6 +198,7 @@ export default {
                   this.$store.commit('filterList', 'actions');
 
                   this.actionIsLoading = false;
+                  this.actionAreLoaded = true;
                   resolve();
             }));
          }, this);
@@ -196,6 +207,7 @@ export default {
       */
       resetActionsList() {
          this.$store.commit('resetActionsList');
+         this.actionAreLoaded = false;
          this.socialActionsSelected.forEach(item => {
             this.$store.commit('addActionInList', item);
          }, this);
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
index e3727ad43..ac209ac71 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -1,18 +1,18 @@
 <template>
    <span class="inline-choice">
       <div class="form-check">
-   
+
          <input class="form-check-input"
-            type="checkbox" 
+            type="checkbox"
             v-model="selected"
             name="action"
-            v-bind:id="action.id" 
+            v-bind:id="action.id"
             v-bind:value="action"
             />
          <label class="form-check-label" v-bind:for="action.id">
-            {{ action.text }}
+            <span class="badge bg-light text-dark">{{ action.text }}</span>
          </label>
-         
+
       </div>
    </span>
 </template>
@@ -34,3 +34,15 @@ export default {
    }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-action-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
index d88a7c97f..8d902818f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -1,18 +1,18 @@
 <template>
    <span class="inline-choice">
       <div class="form-check">
-      
+
          <input class="form-check-input"
-            type="checkbox" 
+            type="checkbox"
             v-model="selected"
             name="issue"
-            v-bind:id="issue.id" 
+            v-bind:id="issue.id"
             v-bind:value="issue"
             />
          <label class="form-check-label" v-bind:for="issue.id">
-            {{ issue.text }}
+            <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
          </label>
-         
+
       </div>
    </span>
 </template>
@@ -34,3 +34,15 @@ export default {
    }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-issue-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
index c5ee23cec..fa7da3203 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -4,10 +4,12 @@ const activityMessages = {
    fr: {
       activity: {
          //
+         errors: "Le formulaire contient des erreurs",
          social_issues: "Problématiques sociales",
          choose_other_social_issue: "Ajouter une autre problématique sociale...",
          social_actions: "Actions d'accompagnement",
          select_first_a_social_issue: "Sélectionnez d'abord une problématique sociale",
+         social_action_list_empty: "Aucune action sociale disponible",
 
          //
          add_persons: "Ajouter des personnes concernées",
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
index 1408afd37..66657df47 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
@@ -7,8 +7,19 @@ import App from './App.vue';
 
 const i18n = _createI18n(activityMessages);
 
+const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
+const hasLocation = document.querySelector('#location') !== null;
+const hasPerson = document.querySelector('#add-persons') !== null;
+
 const app = createApp({
-   template: `<app></app>`,
+   template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
+    data() {
+       return {
+           hasSocialIssues,
+           hasLocation,
+           hasPerson,
+       };
+    }
 })
 .use(store)
 .use(i18n)
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
index 415c5a359..1ca9f9cc2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -1,190 +1,338 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from './api';
 
 const debug = process.env.NODE_ENV !== 'production';
 //console.log('window.activity', window.activity);
 
 const addIdToValue = (string, id) => {
-  let array = string ? string.split(',') : [];
-  array.push(id.toString());
-  let str = array.join();
-  return str;
+    let array = string ? string.split(',') : [];
+    array.push(id.toString());
+    let str = array.join();
+    return str;
 };
 
 const removeIdFromValue = (string, id) => {
-  let array = string.split(',');
-  array = array.filter(el => el !== id.toString());
-  let str = array.join();
-  return str;
+    let array = string.split(',');
+    array = array.filter(el => el !== id.toString());
+    let str = array.join();
+    return str;
 };
 
 const store = createStore({
-  strict: debug,
-  state: {
-    activity: window.activity,
-    socialIssuesOther: [],
-    socialActionsList: [],
-  },
-  getters: {
-    filterSuggestedPersons(state) {
-      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
-        return [];
-      }
-      let existingPersonIds = state.activity.persons.map(p => p.id);
-      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
-        .map(p => p.person)
-        .filter(p => !existingPersonIds.includes(p.id))
-    }
-  },
-  mutations: {
-    // SocialIssueAcc
-    addIssueInList(state, issue) {
-      //console.log('add issue list', issue.id);
-      state.activity.accompanyingPeriod.socialIssues.push(issue);
-    },
-    addIssueSelected(state, issue) {
-      //console.log('add issue selected', issue.id);
-      state.activity.socialIssues.push(issue);
-    },
-    updateIssuesSelected(state, issues) {
-      //console.log('update issues selected', issues);
-      state.activity.socialIssues = issues;
-    },
-    updateIssuesOther(state, payload) {
-      //console.log('update issues other');
-      state.socialIssuesOther = payload;
-    },
-    removeIssueInOther(state, issue) {
-      //console.log('remove issue other', issue.id);
-      state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
-    },
-    resetActionsList(state) {
-      //console.log('reset list actions');
-      state.socialActionsList = [];
-    },
-    addActionInList(state, action) {
-      //console.log('add action list', action.id);
-      state.socialActionsList.push(action);
-    },
-    updateActionsSelected(state, actions) {
-      //console.log('update actions selected', actions);
-      state.activity.socialActions = actions;
-    },
-    filterList(state, list) {
-      const filterList = (list) => {
-        // remove duplicates entries
-        list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
-        // alpha sort
-        list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
-        return list;
-      };
-      if (list === 'issues') {
-        state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
-      }
-      if (list === 'actions') {
-        state.socialActionsList = filterList(state.socialActionsList);
-      }
+    strict: debug,
+    state: {
+        activity: window.activity,
+        socialIssuesOther: [],
+        socialActionsList: [],
     },
+    getters: {
+        suggestedEntities(state) {
+            if (typeof state.activity.accompanyingPeriod === "undefined") {
+                return [];
+            }
+            const allEntities = [
+                ...store.getters.suggestedPersons,
+                ...store.getters.suggestedRequestor,
+                ...store.getters.suggestedUser,
+                ...store.getters.suggestedResources,
+            ];
+            const uniqueIds = [
+                ...new Set(allEntities.map((i) => `${i.type}-${i.id}`)),
+            ];
+            return Array.from(
+                uniqueIds,
+                (id) => allEntities.filter((r) => `${r.type}-${r.id}` === id)[0]
+            );
+        },
+        suggestedPersons(state) {
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            return state.activity.activityType.personsVisible === 0
+                ? []
+                : state.activity.accompanyingPeriod.participations
+                    .filter((p) => p.endDate === null)
+                    .map((p) => p.person)
+                    .filter((p) => !existingPersonIds.includes(p.id));
+        },
+        suggestedRequestor(state) {
+            if (state.activity.accompanyingPeriod.requestor === null) {
+                return [];
+            }
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            const existingThirdPartyIds = state.activity.thirdParties.map(
+                (p) => p.id
+            );
 
-    // ConcernedGroups
-    addPersonsInvolved(state, payload) {
-      //console.log('### mutation addPersonsInvolved', payload.result.type);
-      switch (payload.result.type) {
-        case 'person':
-          state.activity.persons.push(payload.result);
-          break;
-        case 'thirdparty':
-          state.activity.thirdParties.push(payload.result);
-          break;
-        case 'user':
-          state.activity.users.push(payload.result);
-          break;
-      };
+            return [state.activity.accompanyingPeriod.requestor].filter(
+                (r) =>
+                    (r.type === "person" &&
+                        !existingPersonIds.includes(r.id) &&
+                        state.activity.activityType.personsVisible !== 0) ||
+                    (r.type === "thirdparty" &&
+                        !existingThirdPartyIds.includes(r.id) &&
+                        state.activity.activityType.thirdPartiesVisible !== 0)
+            );
+        },
+        suggestedUser(state) {
+            const existingUserIds = state.activity.users.map((p) => p.id);
+            return state.activity.activityType.usersVisible === 0
+                ? []
+                : [state.activity.accompanyingPeriod.user].filter(
+                    (u) => u !== null && !existingUserIds.includes(u.id)
+                );
+        },
+        suggestedResources(state) {
+            const resources = state.activity.accompanyingPeriod.resources;
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            const existingThirdPartyIds = state.activity.thirdParties.map(
+                (p) => p.id
+            );
+            return state.activity.accompanyingPeriod.resources
+                .map((r) => r.resource)
+                .filter(
+                    (r) =>
+                        (r.type === "person" &&
+                            !existingPersonIds.includes(r.id) &&
+                            state.activity.activityType.personsVisible !== 0) ||
+                        (r.type === "thirdparty" &&
+                            !existingThirdPartyIds.includes(r.id) &&
+                            state.activity.activityType.thirdPartiesVisible !== 0)
+                );
+        },
     },
-    removePersonInvolved(state, payload) {
-      //console.log('### mutation removePersonInvolved', payload.type);
-      switch (payload.type) {
-        case 'person':
-          state.activity.persons = state.activity.persons.filter(person => person !== payload);
-          break;
-        case 'thirdparty':
-          state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
-          break;
-        case 'user':
-          state.activity.users = state.activity.users.filter(user => user !== payload);
-          break;
-      };
+    mutations: {
+        // SocialIssueAcc
+        addIssueInList(state, issue) {
+            //console.log('add issue list', issue.id);
+            state.activity.accompanyingPeriod.socialIssues.push(issue);
+        },
+        addIssueSelected(state, issue) {
+            //console.log('add issue selected', issue.id);
+            state.activity.socialIssues.push(issue);
+        },
+        updateIssuesSelected(state, issues) {
+            //console.log('update issues selected', issues);
+            state.activity.socialIssues = issues;
+        },
+        updateIssuesOther(state, payload) {
+            //console.log('update issues other');
+            state.socialIssuesOther = payload;
+        },
+        removeIssueInOther(state, issue) {
+            //console.log('remove issue other', issue.id);
+            state.socialIssuesOther = state.socialIssuesOther.filter(
+                (i) => i.id !== issue.id
+            );
+        },
+        resetActionsList(state) {
+            //console.log('reset list actions');
+            state.socialActionsList = [];
+        },
+        addActionInList(state, action) {
+            //console.log('add action list', action.id);
+            state.socialActionsList.push(action);
+        },
+        updateActionsSelected(state, actions) {
+            //console.log('update actions selected', actions);
+            state.activity.socialActions = actions;
+        },
+        filterList(state, list) {
+            const filterList = (list) => {
+                // remove duplicates entries
+                list = list.filter(
+                    (value, index) =>
+                        list.findIndex((array) => array.id === value.id) ===
+                        index
+                );
+                // alpha sort
+                list.sort((a, b) =>
+                    a.text > b.text ? 1 : b.text > a.text ? -1 : 0
+                );
+                return list;
+            };
+            if (list === "issues") {
+                state.activity.accompanyingPeriod.socialIssues = filterList(
+                    state.activity.accompanyingPeriod.socialIssues
+                );
+            }
+            if (list === "actions") {
+                state.socialActionsList = filterList(state.socialActionsList);
+            }
+        },
+
+        // ConcernedGroups
+        addPersonsInvolved(state, payload) {
+            console.log("### mutation addPersonsInvolved", payload);
+            switch (payload.result.type) {
+                case "person":
+                    state.activity.persons.push(payload.result);
+                    break;
+                case "thirdparty":
+                    state.activity.thirdParties.push(payload.result);
+                    break;
+                case "user":
+                    state.activity.users.push(payload.result);
+                    break;
+            }
+        },
+        removePersonInvolved(state, payload) {
+            //console.log('### mutation removePersonInvolved', payload.type);
+            switch (payload.type) {
+                case "person":
+                    state.activity.persons = state.activity.persons.filter(
+                        (person) => person !== payload
+                    );
+                    break;
+                case "thirdparty":
+                    state.activity.thirdParties =
+                        state.activity.thirdParties.filter(
+                            (thirdparty) => thirdparty !== payload
+                        );
+                    break;
+                case "user":
+                    state.activity.users = state.activity.users.filter(
+                        (user) => user !== payload
+                    );
+                    break;
+            }
+        },
+        updateLocation(state, value) {
+            console.log("### mutation: updateLocation", value);
+            state.activity.location = value;
+        },
     },
-    updateLocation(state, value) {
-        console.log('### mutation: updateLocation', value);
-        state.activity.location = value;
-    }
-  },
-  actions: {
-    addIssueSelected({ commit }, issue) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
-      commit('addIssueSelected', issue);
+    actions: {
+        addIssueSelected({ commit }, issue) {
+            let aSocialIssues = document.getElementById(
+                "chill_activitybundle_activity_socialIssues"
+            );
+            aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
+            commit("addIssueSelected", issue);
+        },
+        updateIssuesSelected({ commit }, payload) {
+            let aSocialIssues = document.getElementById(
+                "chill_activitybundle_activity_socialIssues"
+            );
+            aSocialIssues.value = "";
+            payload.forEach((item) => {
+                aSocialIssues.value = addIdToValue(
+                    aSocialIssues.value,
+                    item.id
+                );
+            });
+            commit("updateIssuesSelected", payload);
+        },
+        updateActionsSelected({ commit }, payload) {
+            let aSocialActions = document.getElementById(
+                "chill_activitybundle_activity_socialActions"
+            );
+            aSocialActions.value = "";
+            payload.forEach((item) => {
+                aSocialActions.value = addIdToValue(
+                    aSocialActions.value,
+                    item.id
+                );
+            });
+            commit("updateActionsSelected", payload);
+        },
+        addPersonsInvolved({ commit }, payload) {
+            //console.log('### action addPersonsInvolved', payload.result.type);
+            switch (payload.result.type) {
+                case "person":
+                    let aPersons = document.getElementById(
+                        "chill_activitybundle_activity_persons"
+                    );
+                    aPersons.value = addIdToValue(
+                        aPersons.value,
+                        payload.result.id
+                    );
+                    break;
+                case "thirdparty":
+                    let aThirdParties = document.getElementById(
+                        "chill_activitybundle_activity_thirdParties"
+                    );
+                    aThirdParties.value = addIdToValue(
+                        aThirdParties.value,
+                        payload.result.id
+                    );
+                    break;
+                case "user":
+                    let aUsers = document.getElementById(
+                        "chill_activitybundle_activity_users"
+                    );
+                    aUsers.value = addIdToValue(
+                        aUsers.value,
+                        payload.result.id
+                    );
+                    break;
+            }
+            commit("addPersonsInvolved", payload);
+        },
+        removePersonInvolved({ commit }, payload) {
+            //console.log('### action removePersonInvolved', payload);
+            switch (payload.type) {
+                case "person":
+                    let aPersons = document.getElementById(
+                        "chill_activitybundle_activity_persons"
+                    );
+                    aPersons.value = removeIdFromValue(
+                        aPersons.value,
+                        payload.id
+                    );
+                    break;
+                case "thirdparty":
+                    let aThirdParties = document.getElementById(
+                        "chill_activitybundle_activity_thirdParties"
+                    );
+                    aThirdParties.value = removeIdFromValue(
+                        aThirdParties.value,
+                        payload.id
+                    );
+                    break;
+                case "user":
+                    let aUsers = document.getElementById(
+                        "chill_activitybundle_activity_users"
+                    );
+                    aUsers.value = removeIdFromValue(aUsers.value, payload.id);
+                    break;
+            }
+            commit("removePersonInvolved", payload);
+        },
+        updateLocation({ commit }, value) {
+            console.log("### action: updateLocation", value);
+            let hiddenLocation = document.getElementById(
+                "chill_activitybundle_activity_location"
+            );
+            if (value.onthefly) {
+                const body = {
+                    "type": "location",
+                    "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                    "locationType": {
+                        "id": value.locationType.id,
+                        "type": "location-type"
+                    }
+                };
+                if (value.address.id) {
+                    Object.assign(body, {
+                        "address": {
+                            "id": value.address.id
+                        },
+                    })
+                }
+                postLocation(body)
+                    .then(
+                        location => hiddenLocation.value = location.id
+                    ).catch(
+                        err => {
+                            console.log(err.message);
+                        }
+                    );
+            } else {
+                hiddenLocation.value = value.id;
+            }
+            commit("updateLocation", value);
+        },
     },
-    updateIssuesSelected({ commit }, payload) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = '';
-      payload.forEach(item => {
-        aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
-      });
-      commit('updateIssuesSelected', payload);
-    },
-    updateActionsSelected({ commit }, payload) {
-      let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
-      aSocialActions.value = '';
-      payload.forEach(item => {
-        aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
-      });
-      commit('updateActionsSelected', payload);
-    },
-    addPersonsInvolved({ commit }, payload) {
-      //console.log('### action addPersonsInvolved', payload.result.type);
-      switch (payload.result.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = addIdToValue(aPersons.value, payload.result.id);
-          break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
-          break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = addIdToValue(aUsers.value, payload.result.id);
-          break;
-      };
-      commit('addPersonsInvolved', payload);
-    },
-    removePersonInvolved({ commit }, payload) {
-      //console.log('### action removePersonInvolved', payload);
-      switch (payload.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = removeIdFromValue(aPersons.value, payload.id);
-          break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
-          break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = removeIdFromValue(aUsers.value, payload.id);
-          break;
-      };
-      commit('removePersonInvolved', payload);
-    },
-    updateLocation({ commit }, value) {
-        console.log('### action: updateLocation', value);
-        let hiddenLocation = document.getElementById("chill_activitybundle_activity_location");
-        hiddenLocation.value = value.id;
-        commit('updateLocation', value);
-    }
-  }
 });
 
 export default store;
diff --git a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
index d639d79d5..3ea88daa4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -1,13 +1,38 @@
 <?php
 
-use Symfony\Component\HttpKernel\Kernel;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/logs';
+    }
+
     public function registerBundles()
     {
-        return array(
+        return [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -20,28 +45,12 @@ class AppKernel extends Kernel
             new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            #add here all the required bundle (some bundle are not required)
-        );
+            //add here all the required bundle (some bundle are not required)
+        ];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir().'/ActivityBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir().'/ActivityBundle/logs';
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
index 39dc0e2ba..ea351fb8a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -1,11 +1,20 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
-$loader = require __DIR__.'/../../../../../vendor/autoload.php';
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
index 285b8b1da..0e6debadf 100644
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
@@ -1,7 +1,16 @@
 <?php
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
@@ -17,7 +26,8 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 class appDevDebugProjectContainer extends Container
 {
     private $parameters;
-    private $targetDirs = array();
+
+    private $targetDirs = [];
 
     /**
      * Constructor.
@@ -28,10 +38,10 @@ class appDevDebugProjectContainer extends Container
 
         $this->services =
         $this->scopedServices =
-        $this->scopeStacks = array();
-        $this->scopes = array('request' => 'container');
-        $this->scopeChildren = array('request' => array());
-        $this->methodMap = array(
+        $this->scopeStacks = [];
+        $this->scopes = ['request' => 'container'];
+        $this->scopeChildren = ['request' => []];
+        $this->methodMap = [
             'annotation_reader' => 'getAnnotationReaderService',
             'assetic.asset_factory' => 'getAssetic_AssetFactoryService',
             'assetic.asset_manager' => 'getAssetic_AssetManagerService',
@@ -279,8 +289,8 @@ class appDevDebugProjectContainer extends Container
             'web_profiler.controller.exception' => 'getWebProfiler_Controller_ExceptionService',
             'web_profiler.controller.profiler' => 'getWebProfiler_Controller_ProfilerService',
             'web_profiler.controller.router' => 'getWebProfiler_Controller_RouterService',
-        );
-        $this->aliases = array(
+        ];
+        $this->aliases = [
             'console.command.sensiolabs_security_command_securitycheckercommand' => 'sensio_distribution.security_checker.command',
             'database_connection' => 'doctrine.dbal.default_connection',
             'doctrine.orm.default_metadata_cache' => 'doctrine_cache.providers.doctrine.orm.default_metadata_cache',
@@ -294,17 +304,46 @@ class appDevDebugProjectContainer extends Container
             'swiftmailer.mailer' => 'swiftmailer.mailer.default',
             'swiftmailer.plugin.messagelogger' => 'swiftmailer.mailer.default.plugin.messagelogger',
             'swiftmailer.transport' => 'swiftmailer.mailer.default.transport',
-        );
+        ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile()
     {
         throw new LogicException('You cannot compile a dumped frozen container.');
     }
 
+    public function getParameter($name)
+    {
+        $name = strtolower($name);
+
+        if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
+            throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+        }
+
+        return $this->parameters[$name];
+    }
+
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $this->parameterBag = new FrozenParameterBag($this->parameters);
+        }
+
+        return $this->parameterBag;
+    }
+
+    public function hasParameter($name)
+    {
+        $name = strtolower($name);
+
+        return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
+    }
+
+    public function setParameter($name, $value)
+    {
+        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
     /**
      * Gets the 'annotation_reader' service.
      *
@@ -318,6 +357,23 @@ class appDevDebugProjectContainer extends Container
         return $this->services['annotation_reader'] = new \Doctrine\Common\Annotations\FileCacheReader(new \Doctrine\Common\Annotations\AnnotationReader(), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/annotations', true);
     }
 
+    /**
+     * Gets the 'assetic.asset_factory' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Bundle\AsseticBundle\Factory\AssetFactory A Symfony\Bundle\AsseticBundle\Factory\AssetFactory instance.
+     */
+    protected function getAssetic_AssetFactoryService()
+    {
+        return $this->services['assetic.asset_factory'] = new \Symfony\Bundle\AsseticBundle\Factory\AssetFactory($this->get('kernel'), $this, $this->getParameterBag(), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/../web', true);
+    }
+
     /**
      * Gets the 'assetic.asset_manager' service.
      *
@@ -330,10 +386,10 @@ class appDevDebugProjectContainer extends Container
     {
         $a = $this->get('templating.loader');
 
-        $this->services['assetic.asset_manager'] = $instance = new \Assetic\Factory\LazyAssetManager($this->get('assetic.asset_factory'), array('twig' => new \Assetic\Factory\Loader\CachedFormulaLoader(new \Assetic\Extension\Twig\TwigFormulaLoader($this->get('twig'), $this->get('monolog.logger.assetic', ContainerInterface::NULL_ON_INVALID_REFERENCE)), new \Assetic\Cache\ConfigCache('/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/assetic/config'), true)));
+        $this->services['assetic.asset_manager'] = $instance = new \Assetic\Factory\LazyAssetManager($this->get('assetic.asset_factory'), ['twig' => new \Assetic\Factory\Loader\CachedFormulaLoader(new \Assetic\Extension\Twig\TwigFormulaLoader($this->get('twig'), $this->get('monolog.logger.assetic', ContainerInterface::NULL_ON_INVALID_REFERENCE)), new \Assetic\Cache\ConfigCache('/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/assetic/config'), true)]);
 
-        $instance->addResource(new \Symfony\Bundle\AsseticBundle\Factory\Resource\CoalescingDirectoryResource(array(0 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillPersonBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources/ChillPersonBundle/views', '/\\.[^.]+\\.twig$/'), 1 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillPersonBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/views', '/\\.[^.]+\\.twig$/'))), 'twig');
-        $instance->addResource(new \Symfony\Bundle\AsseticBundle\Factory\Resource\CoalescingDirectoryResource(array(0 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillMainBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources/ChillMainBundle/views', '/\\.[^.]+\\.twig$/'), 1 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillMainBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/views', '/\\.[^.]+\\.twig$/'))), 'twig');
+        $instance->addResource(new \Symfony\Bundle\AsseticBundle\Factory\Resource\CoalescingDirectoryResource([0 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillPersonBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources/ChillPersonBundle/views', '/\\.[^.]+\\.twig$/'), 1 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillPersonBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/views', '/\\.[^.]+\\.twig$/')]), 'twig');
+        $instance->addResource(new \Symfony\Bundle\AsseticBundle\Factory\Resource\CoalescingDirectoryResource([0 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillMainBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources/ChillMainBundle/views', '/\\.[^.]+\\.twig$/'), 1 => new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, 'ChillMainBundle', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/views', '/\\.[^.]+\\.twig$/')]), 'twig');
         $instance->addResource(new \Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource($a, '', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources/views', '/\\.[^.]+\\.twig$/'), 'twig');
 
         return $instance;
@@ -362,7 +418,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getAssetic_FilterManagerService()
     {
-        return $this->services['assetic.filter_manager'] = new \Symfony\Bundle\AsseticBundle\FilterManager($this, array('cssrewrite' => 'assetic.filter.cssrewrite'));
+        return $this->services['assetic.filter_manager'] = new \Symfony\Bundle\AsseticBundle\FilterManager($this, ['cssrewrite' => 'assetic.filter.cssrewrite']);
     }
 
     /**
@@ -388,7 +444,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getAssets_PackagesService()
     {
-        return $this->services['assets.packages'] = new \Symfony\Component\Asset\Packages(new \Symfony\Component\Asset\PathPackage('', new \Symfony\Component\Asset\VersionStrategy\EmptyVersionStrategy(), $this->get('assets.context')), array());
+        return $this->services['assets.packages'] = new \Symfony\Component\Asset\Packages(new \Symfony\Component\Asset\PathPackage('', new \Symfony\Component\Asset\VersionStrategy\EmptyVersionStrategy(), $this->get('assets.context')), []);
     }
 
     /**
@@ -401,7 +457,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getCacheClearerService()
     {
-        return $this->services['cache_clearer'] = new \Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer(array());
+        return $this->services['cache_clearer'] = new \Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer([]);
     }
 
     /**
@@ -414,7 +470,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getCacheWarmerService()
     {
-        return $this->services['cache_warmer'] = new \Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate(array(0 => new \Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplatePathsCacheWarmer(new \Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder($this->get('kernel'), $this->get('templating.filename_parser'), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources'), $this->get('templating.locator')), 1 => new \Symfony\Bundle\AsseticBundle\CacheWarmer\AssetManagerCacheWarmer($this), 2 => new \Symfony\Bundle\FrameworkBundle\CacheWarmer\TranslationsCacheWarmer($this->get('translator.default')), 3 => new \Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer($this->get('router')), 4 => new \Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer($this->get('doctrine'))));
+        return $this->services['cache_warmer'] = new \Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate([0 => new \Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplatePathsCacheWarmer(new \Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder($this->get('kernel'), $this->get('templating.filename_parser'), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/Resources'), $this->get('templating.locator')), 1 => new \Symfony\Bundle\AsseticBundle\CacheWarmer\AssetManagerCacheWarmer($this), 2 => new \Symfony\Bundle\FrameworkBundle\CacheWarmer\TranslationsCacheWarmer($this->get('translator.default')), 3 => new \Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer($this->get('router')), 4 => new \Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer($this->get('doctrine'))]);
     }
 
     /**
@@ -443,19 +499,6 @@ class appDevDebugProjectContainer extends Container
         return $this->services['chill.custom_field.custom_field_choice_type'] = new \Chill\CustomFieldsBundle\Form\CustomFieldType($this->get('chill.custom_field.provider'));
     }
 
-    /**
-     * Gets the 'chill.custom_field.custom_field_type' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Chill\CustomFieldsBundle\Form\Type\CustomFieldType A Chill\CustomFieldsBundle\Form\Type\CustomFieldType instance.
-     */
-    protected function getChill_CustomField_CustomFieldTypeService()
-    {
-        return $this->services['chill.custom_field.custom_field_type'] = new \Chill\CustomFieldsBundle\Form\Type\CustomFieldType($this->get('doctrine.orm.default_entity_manager'), $this->get('chill.custom_field.provider'));
-    }
-
     /**
      * Gets the 'chill.custom_field.custom_fields_group_linked_custom_fields' service.
      *
@@ -479,7 +522,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getChill_CustomField_CustomFieldsGroupTypeService()
     {
-        return $this->services['chill.custom_field.custom_fields_group_type'] = new \Chill\CustomFieldsBundle\Form\CustomFieldsGroupType(array(0 => array('class' => 'Chill\\PersonBundle\\Entity\\Person', 'name' => 'PersonEntity', 'options' => array())), $this->get('translator'));
+        return $this->services['chill.custom_field.custom_fields_group_type'] = new \Chill\CustomFieldsBundle\Form\CustomFieldsGroupType([0 => ['class' => 'Chill\\PersonBundle\\Entity\\Person', 'name' => 'PersonEntity', 'options' => []]], $this->get('translator'));
     }
 
     /**
@@ -495,6 +538,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['chill.custom_field.custom_fields_title_type'] = new \Chill\CustomFieldsBundle\Form\Type\CustomFieldsTitleType();
     }
 
+    /**
+     * Gets the 'chill.custom_field.custom_field_type' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Chill\CustomFieldsBundle\Form\Type\CustomFieldType A Chill\CustomFieldsBundle\Form\Type\CustomFieldType instance.
+     */
+    protected function getChill_CustomField_CustomFieldTypeService()
+    {
+        return $this->services['chill.custom_field.custom_field_type'] = new \Chill\CustomFieldsBundle\Form\Type\CustomFieldType($this->get('doctrine.orm.default_entity_manager'), $this->get('chill.custom_field.provider'));
+    }
+
     /**
      * Gets the 'chill.custom_field.helper' service.
      *
@@ -658,7 +714,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getChill_Main_Form_Type_Translatable_StringService()
     {
-        return $this->services['chill.main.form.type.translatable.string'] = new \Chill\MainBundle\Form\Type\TranslatableStringFormType(array(0 => 'fr'), $this->get('translator.default'));
+        return $this->services['chill.main.form.type.translatable.string'] = new \Chill\MainBundle\Form\Type\TranslatableStringFormType([0 => 'fr'], $this->get('translator.default'));
     }
 
     /**
@@ -701,7 +757,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getChill_Main_RoutesLoaderService()
     {
-        return $this->services['chill.main.routes_loader'] = new \Chill\MainBundle\Routing\Loader\ChillRoutesLoader(array(0 => '@ChillPersonBundle/Resources/config/routing.yml', 1 => '@ChillCustomFieldsBundle/Resources/config/routing.yml', 2 => '@ChillMainBundle/Resources/config/routing.yml'));
+        return $this->services['chill.main.routes_loader'] = new \Chill\MainBundle\Routing\Loader\ChillRoutesLoader([0 => '@ChillPersonBundle/Resources/config/routing.yml', 1 => '@ChillCustomFieldsBundle/Resources/config/routing.yml', 2 => '@ChillMainBundle/Resources/config/routing.yml']);
     }
 
     /**
@@ -806,9 +862,9 @@ class appDevDebugProjectContainer extends Container
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @return \Chill\PersonBundle\Form\Type\ClosingMotiveType A Chill\PersonBundle\Form\Type\ClosingMotiveType instance.
-     * 
      * @throws InactiveScopeException when the 'chill.person.accompanying_period_closing_motive' service is requested while the 'request' scope is not active
+     *
+     * @return \Chill\PersonBundle\Form\Type\ClosingMotiveType A Chill\PersonBundle\Form\Type\ClosingMotiveType instance.
      */
     protected function getChill_Person_AccompanyingPeriodClosingMotiveService()
     {
@@ -875,6 +931,23 @@ class appDevDebugProjectContainer extends Container
         return $this->services['chill.person.timeline.accompanying_period_opening'] = new \Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodOpening($this->get('doctrine.orm.default_entity_manager'));
     }
 
+    /**
+     * Gets the 'controller_name_converter' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser A Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser instance.
+     */
+    protected function getControllerNameConverterService()
+    {
+        return $this->services['controller_name_converter'] = new \Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser($this->get('kernel'));
+    }
+
     /**
      * Gets the 'data_collector.dump' service.
      *
@@ -885,20 +958,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getDataCollector_DumpService()
     {
-        return $this->services['data_collector.dump'] = new \Symfony\Component\HttpKernel\DataCollector\DumpDataCollector($this->get('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE), NULL, 'UTF-8', NULL, NULL);
-    }
-
-    /**
-     * Gets the 'data_collector.form' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\Form\Extension\DataCollector\FormDataCollector A Symfony\Component\Form\Extension\DataCollector\FormDataCollector instance.
-     */
-    protected function getDataCollector_FormService()
-    {
-        return $this->services['data_collector.form'] = new \Symfony\Component\Form\Extension\DataCollector\FormDataCollector($this->get('data_collector.form.extractor'));
+        return $this->services['data_collector.dump'] = new \Symfony\Component\HttpKernel\DataCollector\DumpDataCollector($this->get('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE), null, 'UTF-8', null, null);
     }
 
     /**
@@ -914,6 +974,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['data_collector.form.extractor'] = new \Symfony\Component\Form\Extension\DataCollector\FormDataExtractor();
     }
 
+    /**
+     * Gets the 'data_collector.form' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Component\Form\Extension\DataCollector\FormDataCollector A Symfony\Component\Form\Extension\DataCollector\FormDataCollector instance.
+     */
+    protected function getDataCollector_FormService()
+    {
+        return $this->services['data_collector.form'] = new \Symfony\Component\Form\Extension\DataCollector\FormDataCollector($this->get('data_collector.form.extractor'));
+    }
+
     /**
      * Gets the 'data_collector.request' service.
      *
@@ -976,7 +1049,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getDebug_DebugHandlersListenerService()
     {
-        return $this->services['debug.debug_handlers_listener'] = new \Symfony\Component\HttpKernel\EventListener\DebugHandlersListener('', $this->get('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), NULL, NULL, true, NULL);
+        return $this->services['debug.debug_handlers_listener'] = new \Symfony\Component\HttpKernel\EventListener\DebugHandlersListener('', $this->get('monolog.logger.php', ContainerInterface::NULL_ON_INVALID_REFERENCE), null, null, true, null);
     }
 
     /**
@@ -1004,7 +1077,7 @@ class appDevDebugProjectContainer extends Container
     {
         $this->services['debug.event_dispatcher'] = $instance = new \Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher(new \Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher($this), $this->get('debug.stopwatch'), $this->get('monolog.logger.event', ContainerInterface::NULL_ON_INVALID_REFERENCE));
 
-        $instance->addListenerService('kernel.controller', array(0 => 'data_collector.router', 1 => 'onKernelController'), 0);
+        $instance->addListenerService('kernel.controller', [0 => 'data_collector.router', 1 => 'onKernelController'], 0);
         $instance->addSubscriberService('response_listener', 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener');
         $instance->addSubscriberService('streamed_response_listener', 'Symfony\\Component\\HttpKernel\\EventListener\\StreamedResponseListener');
         $instance->addSubscriberService('locale_listener', 'Symfony\\Component\\HttpKernel\\EventListener\\LocaleListener');
@@ -1044,16 +1117,648 @@ class appDevDebugProjectContainer extends Container
     }
 
     /**
-     * Gets the 'doctrine' service.
+     * Gets the default parameters.
      *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Doctrine\Bundle\DoctrineBundle\Registry A Doctrine\Bundle\DoctrineBundle\Registry instance.
+     * @return array An array of the default parameters
      */
-    protected function getDoctrineService()
+    protected function getDefaultParameters()
     {
-        return $this->services['doctrine'] = new \Doctrine\Bundle\DoctrineBundle\Registry($this, array('default' => 'doctrine.dbal.default_connection'), array('default' => 'doctrine.orm.default_entity_manager'), 'default', 'default');
+        return [
+            'kernel.root_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app',
+            'kernel.environment' => 'dev',
+            'kernel.debug' => true,
+            'kernel.name' => 'app',
+            'kernel.cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev',
+            'kernel.logs_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/logs',
+            'kernel.bundles' => [
+                'FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle',
+                'SecurityBundle' => 'Symfony\\Bundle\\SecurityBundle\\SecurityBundle',
+                'TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle',
+                'MonologBundle' => 'Symfony\\Bundle\\MonologBundle\\MonologBundle',
+                'SwiftmailerBundle' => 'Symfony\\Bundle\\SwiftmailerBundle\\SwiftmailerBundle',
+                'AsseticBundle' => 'Symfony\\Bundle\\AsseticBundle\\AsseticBundle',
+                'DoctrineBundle' => 'Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle',
+                'SensioFrameworkExtraBundle' => 'Sensio\\Bundle\\FrameworkExtraBundle\\SensioFrameworkExtraBundle',
+                'ChillMainBundle' => 'Chill\\MainBundle\\ChillMainBundle',
+                'ChillCustomFieldsBundle' => 'Chill\\CustomFieldsBundle\\ChillCustomFieldsBundle',
+                'ChillPersonBundle' => 'Chill\\PersonBundle\\ChillPersonBundle',
+                'ChillActivityBundle' => 'Chill\\ActivityBundle\\ChillActivityBundle',
+                'DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle',
+                'WebProfilerBundle' => 'Symfony\\Bundle\\WebProfilerBundle\\WebProfilerBundle',
+                'SensioDistributionBundle' => 'Sensio\\Bundle\\DistributionBundle\\SensioDistributionBundle',
+                'SensioGeneratorBundle' => 'Sensio\\Bundle\\GeneratorBundle\\SensioGeneratorBundle',
+            ],
+            'kernel.charset' => 'UTF-8',
+            'kernel.container_class' => 'appDevDebugProjectContainer',
+            'database_host' => '127.0.0.1',
+            'database_port' => 5432,
+            'database_name' => 'chill_test',
+            'database_user' => 'chill',
+            'database_password' => 'chill',
+            'locale' => 'fr',
+            'controller_resolver.class' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
+            'controller_name_converter.class' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
+            'response_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
+            'streamed_response_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\StreamedResponseListener',
+            'locale_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\LocaleListener',
+            'event_dispatcher.class' => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
+            'http_kernel.class' => 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel',
+            'filesystem.class' => 'Symfony\\Component\\Filesystem\\Filesystem',
+            'cache_warmer.class' => 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerAggregate',
+            'cache_clearer.class' => 'Symfony\\Component\\HttpKernel\\CacheClearer\\ChainCacheClearer',
+            'file_locator.class' => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
+            'uri_signer.class' => 'Symfony\\Component\\HttpKernel\\UriSigner',
+            'request_stack.class' => 'Symfony\\Component\\HttpFoundation\\RequestStack',
+            'fragment.handler.class' => 'Symfony\\Component\\HttpKernel\\DependencyInjection\\LazyLoadingFragmentHandler',
+            'fragment.renderer.inline.class' => 'Symfony\\Component\\HttpKernel\\Fragment\\InlineFragmentRenderer',
+            'fragment.renderer.hinclude.class' => 'Symfony\\Component\\HttpKernel\\Fragment\\HIncludeFragmentRenderer',
+            'fragment.renderer.hinclude.global_template' => null,
+            'fragment.renderer.esi.class' => 'Symfony\\Component\\HttpKernel\\Fragment\\EsiFragmentRenderer',
+            'fragment.path' => '/_fragment',
+            'translator.class' => 'Symfony\\Bundle\\FrameworkBundle\\Translation\\Translator',
+            'translator.identity.class' => 'Symfony\\Component\\Translation\\IdentityTranslator',
+            'translator.selector.class' => 'Symfony\\Component\\Translation\\MessageSelector',
+            'translation.loader.php.class' => 'Symfony\\Component\\Translation\\Loader\\PhpFileLoader',
+            'translation.loader.yml.class' => 'Symfony\\Component\\Translation\\Loader\\YamlFileLoader',
+            'translation.loader.xliff.class' => 'Symfony\\Component\\Translation\\Loader\\XliffFileLoader',
+            'translation.loader.po.class' => 'Symfony\\Component\\Translation\\Loader\\PoFileLoader',
+            'translation.loader.mo.class' => 'Symfony\\Component\\Translation\\Loader\\MoFileLoader',
+            'translation.loader.qt.class' => 'Symfony\\Component\\Translation\\Loader\\QtFileLoader',
+            'translation.loader.csv.class' => 'Symfony\\Component\\Translation\\Loader\\CsvFileLoader',
+            'translation.loader.res.class' => 'Symfony\\Component\\Translation\\Loader\\IcuResFileLoader',
+            'translation.loader.dat.class' => 'Symfony\\Component\\Translation\\Loader\\IcuDatFileLoader',
+            'translation.loader.ini.class' => 'Symfony\\Component\\Translation\\Loader\\IniFileLoader',
+            'translation.loader.json.class' => 'Symfony\\Component\\Translation\\Loader\\JsonFileLoader',
+            'translation.dumper.php.class' => 'Symfony\\Component\\Translation\\Dumper\\PhpFileDumper',
+            'translation.dumper.xliff.class' => 'Symfony\\Component\\Translation\\Dumper\\XliffFileDumper',
+            'translation.dumper.po.class' => 'Symfony\\Component\\Translation\\Dumper\\PoFileDumper',
+            'translation.dumper.mo.class' => 'Symfony\\Component\\Translation\\Dumper\\MoFileDumper',
+            'translation.dumper.yml.class' => 'Symfony\\Component\\Translation\\Dumper\\YamlFileDumper',
+            'translation.dumper.qt.class' => 'Symfony\\Component\\Translation\\Dumper\\QtFileDumper',
+            'translation.dumper.csv.class' => 'Symfony\\Component\\Translation\\Dumper\\CsvFileDumper',
+            'translation.dumper.ini.class' => 'Symfony\\Component\\Translation\\Dumper\\IniFileDumper',
+            'translation.dumper.json.class' => 'Symfony\\Component\\Translation\\Dumper\\JsonFileDumper',
+            'translation.dumper.res.class' => 'Symfony\\Component\\Translation\\Dumper\\IcuResFileDumper',
+            'translation.extractor.php.class' => 'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor',
+            'translation.loader.class' => 'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader',
+            'translation.extractor.class' => 'Symfony\\Component\\Translation\\Extractor\\ChainExtractor',
+            'translation.writer.class' => 'Symfony\\Component\\Translation\\Writer\\TranslationWriter',
+            'property_accessor.class' => 'Symfony\\Component\\PropertyAccess\\PropertyAccessor',
+            'kernel.secret' => 'Not very secret',
+            'kernel.http_method_override' => true,
+            'kernel.trusted_hosts' => [
+            ],
+            'kernel.trusted_proxies' => [
+            ],
+            'kernel.default_locale' => 'fr',
+            'test.client.class' => 'Symfony\\Bundle\\FrameworkBundle\\Client',
+            'test.client.parameters' => [
+            ],
+            'test.client.history.class' => 'Symfony\\Component\\BrowserKit\\History',
+            'test.client.cookiejar.class' => 'Symfony\\Component\\BrowserKit\\CookieJar',
+            'test.session.listener.class' => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\TestSessionListener',
+            'session.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
+            'session.flashbag.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBag',
+            'session.attribute_bag.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBag',
+            'session.storage.metadata_bag.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag',
+            'session.metadata.storage_key' => '_sf2_meta',
+            'session.storage.native.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
+            'session.storage.php_bridge.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
+            'session.storage.mock_file.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage',
+            'session.handler.native_file.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
+            'session.handler.write_check.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler',
+            'session_listener.class' => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
+            'session.storage.options' => [
+                'gc_probability' => 1,
+            ],
+            'session.save_path' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/sessions',
+            'session.metadata.update_threshold' => '0',
+            'security.secure_random.class' => 'Symfony\\Component\\Security\\Core\\Util\\SecureRandom',
+            'form.resolved_type_factory.class' => 'Symfony\\Component\\Form\\ResolvedFormTypeFactory',
+            'form.registry.class' => 'Symfony\\Component\\Form\\FormRegistry',
+            'form.factory.class' => 'Symfony\\Component\\Form\\FormFactory',
+            'form.extension.class' => 'Symfony\\Component\\Form\\Extension\\DependencyInjection\\DependencyInjectionExtension',
+            'form.type_guesser.validator.class' => 'Symfony\\Component\\Form\\Extension\\Validator\\ValidatorTypeGuesser',
+            'form.type_extension.form.request_handler.class' => 'Symfony\\Component\\Form\\Extension\\HttpFoundation\\HttpFoundationRequestHandler',
+            'form.type_extension.csrf.enabled' => true,
+            'form.type_extension.csrf.field_name' => '_token',
+            'security.csrf.token_generator.class' => 'Symfony\\Component\\Security\\Csrf\\TokenGenerator\\UriSafeTokenGenerator',
+            'security.csrf.token_storage.class' => 'Symfony\\Component\\Security\\Csrf\\TokenStorage\\SessionTokenStorage',
+            'security.csrf.token_manager.class' => 'Symfony\\Component\\Security\\Csrf\\CsrfTokenManager',
+            'templating.engine.delegating.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\DelegatingEngine',
+            'templating.name_parser.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
+            'templating.filename_parser.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateFilenameParser',
+            'templating.cache_warmer.template_paths.class' => 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\TemplatePathsCacheWarmer',
+            'templating.locator.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
+            'templating.loader.filesystem.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
+            'templating.loader.cache.class' => 'Symfony\\Component\\Templating\\Loader\\CacheLoader',
+            'templating.loader.chain.class' => 'Symfony\\Component\\Templating\\Loader\\ChainLoader',
+            'templating.finder.class' => 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\TemplateFinder',
+            'templating.helper.assets.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\AssetsHelper',
+            'templating.helper.router.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\RouterHelper',
+            'templating.helper.code.file_link_format' => null,
+            'templating.loader.cache.path' => null,
+            'templating.engines' => [
+                0 => 'twig',
+            ],
+            'validator.class' => 'Symfony\\Component\\Validator\\Validator\\ValidatorInterface',
+            'validator.builder.class' => 'Symfony\\Component\\Validator\\ValidatorBuilderInterface',
+            'validator.builder.factory.class' => 'Symfony\\Component\\Validator\\Validation',
+            'validator.mapping.cache.apc.class' => 'Symfony\\Component\\Validator\\Mapping\\Cache\\ApcCache',
+            'validator.mapping.cache.prefix' => '',
+            'validator.validator_factory.class' => 'Symfony\\Bundle\\FrameworkBundle\\Validator\\ConstraintValidatorFactory',
+            'validator.expression.class' => 'Symfony\\Component\\Validator\\Constraints\\ExpressionValidator',
+            'validator.email.class' => 'Symfony\\Component\\Validator\\Constraints\\EmailValidator',
+            'validator.translation_domain' => 'validators',
+            'validator.api' => '2.5-bc',
+            'translator.logging' => true,
+            'profiler.class' => 'Symfony\\Component\\HttpKernel\\Profiler\\Profiler',
+            'profiler_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener',
+            'data_collector.config.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\ConfigDataCollector',
+            'data_collector.request.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector',
+            'data_collector.exception.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\ExceptionDataCollector',
+            'data_collector.events.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\EventDataCollector',
+            'data_collector.logger.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\LoggerDataCollector',
+            'data_collector.time.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector',
+            'data_collector.memory.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\MemoryDataCollector',
+            'data_collector.router.class' => 'Symfony\\Bundle\\FrameworkBundle\\DataCollector\\RouterDataCollector',
+            'form.resolved_type_factory.data_collector_proxy.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\Proxy\\ResolvedTypeFactoryDataCollectorProxy',
+            'form.type_extension.form.data_collector.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\Type\\DataCollectorTypeExtension',
+            'data_collector.form.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\FormDataCollector',
+            'data_collector.form.extractor.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\FormDataExtractor',
+            'profiler_listener.only_exceptions' => false,
+            'profiler_listener.only_master_requests' => false,
+            'profiler.storage.dsn' => 'file:/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/profiler',
+            'profiler.storage.username' => '',
+            'profiler.storage.password' => '',
+            'profiler.storage.lifetime' => 86400,
+            'router.class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
+            'router.request_context.class' => 'Symfony\\Component\\Routing\\RequestContext',
+            'routing.loader.class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\DelegatingLoader',
+            'routing.resolver.class' => 'Symfony\\Component\\Config\\Loader\\LoaderResolver',
+            'routing.loader.xml.class' => 'Symfony\\Component\\Routing\\Loader\\XmlFileLoader',
+            'routing.loader.yml.class' => 'Symfony\\Component\\Routing\\Loader\\YamlFileLoader',
+            'routing.loader.php.class' => 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader',
+            'router.options.generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+            'router.options.generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+            'router.options.generator_dumper_class' => 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper',
+            'router.options.matcher_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
+            'router.options.matcher_base_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
+            'router.options.matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper',
+            'router.cache_warmer.class' => 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\RouterCacheWarmer',
+            'router.options.matcher.cache_class' => 'appDevUrlMatcher',
+            'router.options.generator.cache_class' => 'appDevUrlGenerator',
+            'router_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
+            'router.request_context.host' => 'localhost',
+            'router.request_context.scheme' => 'http',
+            'router.request_context.base_url' => '',
+            'router.resource' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/config/routing.yml',
+            'router.cache_class_prefix' => 'appDev',
+            'request_listener.http_port' => 80,
+            'request_listener.https_port' => 443,
+            'annotations.reader.class' => 'Doctrine\\Common\\Annotations\\AnnotationReader',
+            'annotations.cached_reader.class' => 'Doctrine\\Common\\Annotations\\CachedReader',
+            'annotations.file_cache_reader.class' => 'Doctrine\\Common\\Annotations\\FileCacheReader',
+            'debug.debug_handlers_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\DebugHandlersListener',
+            'debug.stopwatch.class' => 'Symfony\\Component\\Stopwatch\\Stopwatch',
+            'debug.error_handler.throw_at' => -1,
+            'debug.event_dispatcher.class' => 'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher',
+            'debug.container.dump' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml',
+            'debug.controller_resolver.class' => 'Symfony\\Component\\HttpKernel\\Controller\\TraceableControllerResolver',
+            'security.context.class' => 'Symfony\\Component\\Security\\Core\\SecurityContext',
+            'security.user_checker.class' => 'Symfony\\Component\\Security\\Core\\User\\UserChecker',
+            'security.encoder_factory.generic.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactory',
+            'security.encoder.digest.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\MessageDigestPasswordEncoder',
+            'security.encoder.plain.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\PlaintextPasswordEncoder',
+            'security.encoder.pbkdf2.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\Pbkdf2PasswordEncoder',
+            'security.encoder.bcrypt.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\BCryptPasswordEncoder',
+            'security.user.provider.in_memory.class' => 'Symfony\\Component\\Security\\Core\\User\\InMemoryUserProvider',
+            'security.user.provider.in_memory.user.class' => 'Symfony\\Component\\Security\\Core\\User\\User',
+            'security.user.provider.chain.class' => 'Symfony\\Component\\Security\\Core\\User\\ChainUserProvider',
+            'security.authentication.trust_resolver.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolver',
+            'security.authentication.trust_resolver.anonymous_class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken',
+            'security.authentication.trust_resolver.rememberme_class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken',
+            'security.authentication.manager.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
+            'security.authentication.session_strategy.class' => 'Symfony\\Component\\Security\\Http\\Session\\SessionAuthenticationStrategy',
+            'security.access.decision_manager.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
+            'security.access.simple_role_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\RoleVoter',
+            'security.access.authenticated_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\AuthenticatedVoter',
+            'security.access.role_hierarchy_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\RoleHierarchyVoter',
+            'security.access.expression_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\ExpressionVoter',
+            'security.firewall.class' => 'Symfony\\Component\\Security\\Http\\Firewall',
+            'security.firewall.map.class' => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
+            'security.firewall.context.class' => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
+            'security.matcher.class' => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
+            'security.expression_matcher.class' => 'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher',
+            'security.role_hierarchy.class' => 'Symfony\\Component\\Security\\Core\\Role\\RoleHierarchy',
+            'security.http_utils.class' => 'Symfony\\Component\\Security\\Http\\HttpUtils',
+            'security.validator.user_password.class' => 'Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPasswordValidator',
+            'security.expression_language.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\ExpressionLanguage',
+            'security.authentication.retry_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\RetryAuthenticationEntryPoint',
+            'security.channel_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\ChannelListener',
+            'security.authentication.form_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\FormAuthenticationEntryPoint',
+            'security.authentication.listener.form.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\UsernamePasswordFormAuthenticationListener',
+            'security.authentication.listener.simple_form.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\SimpleFormAuthenticationListener',
+            'security.authentication.listener.simple_preauth.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\SimplePreAuthenticationListener',
+            'security.authentication.listener.basic.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\BasicAuthenticationListener',
+            'security.authentication.basic_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\BasicAuthenticationEntryPoint',
+            'security.authentication.listener.digest.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\DigestAuthenticationListener',
+            'security.authentication.digest_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\DigestAuthenticationEntryPoint',
+            'security.authentication.listener.x509.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\X509AuthenticationListener',
+            'security.authentication.listener.anonymous.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\AnonymousAuthenticationListener',
+            'security.authentication.switchuser_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\SwitchUserListener',
+            'security.logout_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\LogoutListener',
+            'security.logout.handler.session.class' => 'Symfony\\Component\\Security\\Http\\Logout\\SessionLogoutHandler',
+            'security.logout.handler.cookie_clearing.class' => 'Symfony\\Component\\Security\\Http\\Logout\\CookieClearingLogoutHandler',
+            'security.logout.success_handler.class' => 'Symfony\\Component\\Security\\Http\\Logout\\DefaultLogoutSuccessHandler',
+            'security.access_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\AccessListener',
+            'security.access_map.class' => 'Symfony\\Component\\Security\\Http\\AccessMap',
+            'security.exception_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\ExceptionListener',
+            'security.context_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\ContextListener',
+            'security.authentication.provider.dao.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\DaoAuthenticationProvider',
+            'security.authentication.provider.simple.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\SimpleAuthenticationProvider',
+            'security.authentication.provider.pre_authenticated.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\PreAuthenticatedAuthenticationProvider',
+            'security.authentication.provider.anonymous.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AnonymousAuthenticationProvider',
+            'security.authentication.success_handler.class' => 'Symfony\\Component\\Security\\Http\\Authentication\\DefaultAuthenticationSuccessHandler',
+            'security.authentication.failure_handler.class' => 'Symfony\\Component\\Security\\Http\\Authentication\\DefaultAuthenticationFailureHandler',
+            'security.authentication.simple_success_failure_handler.class' => 'Symfony\\Component\\Security\\Http\\Authentication\\SimpleAuthenticationHandler',
+            'security.authentication.provider.rememberme.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\RememberMeAuthenticationProvider',
+            'security.authentication.listener.rememberme.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\RememberMeListener',
+            'security.rememberme.token.provider.in_memory.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\RememberMe\\InMemoryTokenProvider',
+            'security.authentication.rememberme.services.persistent.class' => 'Symfony\\Component\\Security\\Http\\RememberMe\\PersistentTokenBasedRememberMeServices',
+            'security.authentication.rememberme.services.simplehash.class' => 'Symfony\\Component\\Security\\Http\\RememberMe\\TokenBasedRememberMeServices',
+            'security.rememberme.response_listener.class' => 'Symfony\\Component\\Security\\Http\\RememberMe\\ResponseListener',
+            'templating.helper.logout_url.class' => 'Symfony\\Bundle\\SecurityBundle\\Templating\\Helper\\LogoutUrlHelper',
+            'templating.helper.security.class' => 'Symfony\\Bundle\\SecurityBundle\\Templating\\Helper\\SecurityHelper',
+            'twig.extension.logout_url.class' => 'Symfony\\Bridge\\Twig\\Extension\\LogoutUrlExtension',
+            'twig.extension.security.class' => 'Symfony\\Bridge\\Twig\\Extension\\SecurityExtension',
+            'data_collector.security.class' => 'Symfony\\Bundle\\SecurityBundle\\DataCollector\\SecurityDataCollector',
+            'security.access.denied_url' => null,
+            'security.authentication.manager.erase_credentials' => true,
+            'security.authentication.session_strategy.strategy' => 'migrate',
+            'security.access.always_authenticate_before_granting' => false,
+            'security.authentication.hide_user_not_found' => true,
+            'security.role_hierarchy.roles' => [
+                'CHILL_PERSON_UPDATE' => [
+                    0 => 'CHILL_PERSON_SEE',
+                ],
+                'CHILL_PERSON_CREATE' => [
+                    0 => 'CHILL_PERSON_SEE',
+                ],
+            ],
+            'twig.class' => 'Twig_Environment',
+            'twig.loader.filesystem.class' => 'Symfony\\Bundle\\TwigBundle\\Loader\\FilesystemLoader',
+            'twig.loader.chain.class' => 'Twig_Loader_Chain',
+            'templating.engine.twig.class' => 'Symfony\\Bundle\\TwigBundle\\TwigEngine',
+            'twig.cache_warmer.class' => 'Symfony\\Bundle\\TwigBundle\\CacheWarmer\\TemplateCacheCacheWarmer',
+            'twig.extension.trans.class' => 'Symfony\\Bridge\\Twig\\Extension\\TranslationExtension',
+            'twig.extension.actions.class' => 'Symfony\\Bundle\\TwigBundle\\Extension\\ActionsExtension',
+            'twig.extension.code.class' => 'Symfony\\Bridge\\Twig\\Extension\\CodeExtension',
+            'twig.extension.routing.class' => 'Symfony\\Bridge\\Twig\\Extension\\RoutingExtension',
+            'twig.extension.yaml.class' => 'Symfony\\Bridge\\Twig\\Extension\\YamlExtension',
+            'twig.extension.form.class' => 'Symfony\\Bridge\\Twig\\Extension\\FormExtension',
+            'twig.extension.httpkernel.class' => 'Symfony\\Bridge\\Twig\\Extension\\HttpKernelExtension',
+            'twig.extension.debug.stopwatch.class' => 'Symfony\\Bridge\\Twig\\Extension\\StopwatchExtension',
+            'twig.extension.expression.class' => 'Symfony\\Bridge\\Twig\\Extension\\ExpressionExtension',
+            'twig.form.engine.class' => 'Symfony\\Bridge\\Twig\\Form\\TwigRendererEngine',
+            'twig.form.renderer.class' => 'Symfony\\Bridge\\Twig\\Form\\TwigRenderer',
+            'twig.translation.extractor.class' => 'Symfony\\Bridge\\Twig\\Translation\\TwigExtractor',
+            'twig.exception_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener',
+            'twig.controller.exception.class' => 'Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController',
+            'twig.controller.preview_error.class' => 'Symfony\\Bundle\\TwigBundle\\Controller\\PreviewErrorController',
+            'twig.exception_listener.controller' => 'twig.controller.exception:showAction',
+            'twig.form.resources' => [
+                0 => 'form_div_layout.html.twig',
+                1 => 'ChillCustomFieldsBundle:Form:fields.html.twig',
+                2 => 'ChillMainBundle:Form:fields.html.twig',
+            ],
+            'monolog.logger.class' => 'Symfony\\Bridge\\Monolog\\Logger',
+            'monolog.gelf.publisher.class' => 'Gelf\\MessagePublisher',
+            'monolog.gelfphp.publisher.class' => 'Gelf\\Publisher',
+            'monolog.handler.stream.class' => 'Monolog\\Handler\\StreamHandler',
+            'monolog.handler.console.class' => 'Symfony\\Bridge\\Monolog\\Handler\\ConsoleHandler',
+            'monolog.handler.group.class' => 'Monolog\\Handler\\GroupHandler',
+            'monolog.handler.buffer.class' => 'Monolog\\Handler\\BufferHandler',
+            'monolog.handler.rotating_file.class' => 'Monolog\\Handler\\RotatingFileHandler',
+            'monolog.handler.syslog.class' => 'Monolog\\Handler\\SyslogHandler',
+            'monolog.handler.syslogudp.class' => 'Monolog\\Handler\\SyslogUdpHandler',
+            'monolog.handler.null.class' => 'Monolog\\Handler\\NullHandler',
+            'monolog.handler.test.class' => 'Monolog\\Handler\\TestHandler',
+            'monolog.handler.gelf.class' => 'Monolog\\Handler\\GelfHandler',
+            'monolog.handler.rollbar.class' => 'Monolog\\Handler\\RollbarHandler',
+            'monolog.handler.flowdock.class' => 'Monolog\\Handler\\FlowdockHandler',
+            'monolog.handler.browser_console.class' => 'Monolog\\Handler\\BrowserConsoleHandler',
+            'monolog.handler.firephp.class' => 'Symfony\\Bridge\\Monolog\\Handler\\FirePHPHandler',
+            'monolog.handler.chromephp.class' => 'Symfony\\Bridge\\Monolog\\Handler\\ChromePhpHandler',
+            'monolog.handler.debug.class' => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
+            'monolog.handler.swift_mailer.class' => 'Symfony\\Bridge\\Monolog\\Handler\\SwiftMailerHandler',
+            'monolog.handler.native_mailer.class' => 'Monolog\\Handler\\NativeMailerHandler',
+            'monolog.handler.socket.class' => 'Monolog\\Handler\\SocketHandler',
+            'monolog.handler.pushover.class' => 'Monolog\\Handler\\PushoverHandler',
+            'monolog.handler.raven.class' => 'Monolog\\Handler\\RavenHandler',
+            'monolog.handler.newrelic.class' => 'Monolog\\Handler\\NewRelicHandler',
+            'monolog.handler.hipchat.class' => 'Monolog\\Handler\\HipChatHandler',
+            'monolog.handler.slack.class' => 'Monolog\\Handler\\SlackHandler',
+            'monolog.handler.cube.class' => 'Monolog\\Handler\\CubeHandler',
+            'monolog.handler.amqp.class' => 'Monolog\\Handler\\AmqpHandler',
+            'monolog.handler.error_log.class' => 'Monolog\\Handler\\ErrorLogHandler',
+            'monolog.handler.loggly.class' => 'Monolog\\Handler\\LogglyHandler',
+            'monolog.handler.logentries.class' => 'Monolog\\Handler\\LogEntriesHandler',
+            'monolog.handler.whatfailuregroup.class' => 'Monolog\\Handler\\WhatFailureGroupHandler',
+            'monolog.activation_strategy.not_found.class' => 'Symfony\\Bundle\\MonologBundle\\NotFoundActivationStrategy',
+            'monolog.handler.fingers_crossed.class' => 'Monolog\\Handler\\FingersCrossedHandler',
+            'monolog.handler.fingers_crossed.error_level_activation_strategy.class' => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
+            'monolog.handler.filter.class' => 'Monolog\\Handler\\FilterHandler',
+            'monolog.handler.mongo.class' => 'Monolog\\Handler\\MongoDBHandler',
+            'monolog.mongo.client.class' => 'MongoClient',
+            'monolog.handler.elasticsearch.class' => 'Monolog\\Handler\\ElasticSearchHandler',
+            'monolog.elastica.client.class' => 'Elastica\\Client',
+            'monolog.swift_mailer.handlers' => [
+            ],
+            'monolog.handlers_to_channels' => [
+            ],
+            'swiftmailer.class' => 'Swift_Mailer',
+            'swiftmailer.transport.sendmail.class' => 'Swift_Transport_SendmailTransport',
+            'swiftmailer.transport.mail.class' => 'Swift_Transport_MailTransport',
+            'swiftmailer.transport.failover.class' => 'Swift_Transport_FailoverTransport',
+            'swiftmailer.plugin.redirecting.class' => 'Swift_Plugins_RedirectingPlugin',
+            'swiftmailer.plugin.impersonate.class' => 'Swift_Plugins_ImpersonatePlugin',
+            'swiftmailer.plugin.messagelogger.class' => 'Swift_Plugins_MessageLogger',
+            'swiftmailer.plugin.antiflood.class' => 'Swift_Plugins_AntiFloodPlugin',
+            'swiftmailer.transport.smtp.class' => 'Swift_Transport_EsmtpTransport',
+            'swiftmailer.plugin.blackhole.class' => 'Swift_Plugins_BlackholePlugin',
+            'swiftmailer.spool.file.class' => 'Swift_FileSpool',
+            'swiftmailer.spool.memory.class' => 'Swift_MemorySpool',
+            'swiftmailer.email_sender.listener.class' => 'Symfony\\Bundle\\SwiftmailerBundle\\EventListener\\EmailSenderListener',
+            'swiftmailer.data_collector.class' => 'Symfony\\Bundle\\SwiftmailerBundle\\DataCollector\\MessageDataCollector',
+            'swiftmailer.mailer.default.transport.name' => 'smtp',
+            'swiftmailer.mailer.default.delivery.enabled' => true,
+            'swiftmailer.mailer.default.transport.smtp.encryption' => null,
+            'swiftmailer.mailer.default.transport.smtp.port' => 25,
+            'swiftmailer.mailer.default.transport.smtp.host' => 'localhost',
+            'swiftmailer.mailer.default.transport.smtp.username' => null,
+            'swiftmailer.mailer.default.transport.smtp.password' => null,
+            'swiftmailer.mailer.default.transport.smtp.auth_mode' => null,
+            'swiftmailer.mailer.default.transport.smtp.timeout' => 30,
+            'swiftmailer.mailer.default.transport.smtp.source_ip' => null,
+            'swiftmailer.mailer.default.spool.enabled' => false,
+            'swiftmailer.mailer.default.plugin.impersonate' => null,
+            'swiftmailer.mailer.default.single_address' => null,
+            'swiftmailer.spool.enabled' => false,
+            'swiftmailer.delivery.enabled' => true,
+            'swiftmailer.single_address' => null,
+            'swiftmailer.mailers' => [
+                'default' => 'swiftmailer.mailer.default',
+            ],
+            'swiftmailer.default_mailer' => 'default',
+            'assetic.asset_factory.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
+            'assetic.asset_manager.class' => 'Assetic\\Factory\\LazyAssetManager',
+            'assetic.asset_manager_cache_warmer.class' => 'Symfony\\Bundle\\AsseticBundle\\CacheWarmer\\AssetManagerCacheWarmer',
+            'assetic.cached_formula_loader.class' => 'Assetic\\Factory\\Loader\\CachedFormulaLoader',
+            'assetic.config_cache.class' => 'Assetic\\Cache\\ConfigCache',
+            'assetic.config_loader.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Loader\\ConfigurationLoader',
+            'assetic.config_resource.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Resource\\ConfigurationResource',
+            'assetic.coalescing_directory_resource.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Resource\\CoalescingDirectoryResource',
+            'assetic.directory_resource.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Resource\\DirectoryResource',
+            'assetic.filter_manager.class' => 'Symfony\\Bundle\\AsseticBundle\\FilterManager',
+            'assetic.worker.ensure_filter.class' => 'Assetic\\Factory\\Worker\\EnsureFilterWorker',
+            'assetic.worker.cache_busting.class' => 'Assetic\\Factory\\Worker\\CacheBustingWorker',
+            'assetic.value_supplier.class' => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
+            'assetic.node.paths' => [
+            ],
+            'assetic.cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/assetic',
+            'assetic.bundles' => [
+                0 => 'ChillPersonBundle',
+                1 => 'ChillMainBundle',
+            ],
+            'assetic.twig_extension.class' => 'Symfony\\Bundle\\AsseticBundle\\Twig\\AsseticExtension',
+            'assetic.twig_formula_loader.class' => 'Assetic\\Extension\\Twig\\TwigFormulaLoader',
+            'assetic.helper.dynamic.class' => 'Symfony\\Bundle\\AsseticBundle\\Templating\\DynamicAsseticHelper',
+            'assetic.helper.static.class' => 'Symfony\\Bundle\\AsseticBundle\\Templating\\StaticAsseticHelper',
+            'assetic.php_formula_loader.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Loader\\AsseticHelperFormulaLoader',
+            'assetic.debug' => true,
+            'assetic.use_controller' => false,
+            'assetic.enable_profiler' => false,
+            'assetic.read_from' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/../web',
+            'assetic.write_to' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/../web',
+            'assetic.variables' => [
+            ],
+            'assetic.java.bin' => '/usr/bin/java',
+            'assetic.node.bin' => '/usr/local/bin/node',
+            'assetic.ruby.bin' => '/usr/local/opt/ruby/bin/ruby',
+            'assetic.sass.bin' => '/usr/local/bin/sass',
+            'assetic.filter.cssrewrite.class' => 'Assetic\\Filter\\CssRewriteFilter',
+            'assetic.twig_extension.functions' => [
+            ],
+            'doctrine_cache.apc.class' => 'Doctrine\\Common\\Cache\\ApcCache',
+            'doctrine_cache.array.class' => 'Doctrine\\Common\\Cache\\ArrayCache',
+            'doctrine_cache.file_system.class' => 'Doctrine\\Common\\Cache\\FilesystemCache',
+            'doctrine_cache.php_file.class' => 'Doctrine\\Common\\Cache\\PhpFileCache',
+            'doctrine_cache.mongodb.class' => 'Doctrine\\Common\\Cache\\MongoDBCache',
+            'doctrine_cache.mongodb.collection.class' => 'MongoCollection',
+            'doctrine_cache.mongodb.connection.class' => 'MongoClient',
+            'doctrine_cache.mongodb.server' => 'localhost:27017',
+            'doctrine_cache.riak.class' => 'Doctrine\\Common\\Cache\\RiakCache',
+            'doctrine_cache.riak.bucket.class' => 'Riak\\Bucket',
+            'doctrine_cache.riak.connection.class' => 'Riak\\Connection',
+            'doctrine_cache.riak.bucket_property_list.class' => 'Riak\\BucketPropertyList',
+            'doctrine_cache.riak.host' => 'localhost',
+            'doctrine_cache.riak.port' => 8087,
+            'doctrine_cache.memcache.class' => 'Doctrine\\Common\\Cache\\MemcacheCache',
+            'doctrine_cache.memcache.connection.class' => 'Memcache',
+            'doctrine_cache.memcache.host' => 'localhost',
+            'doctrine_cache.memcache.port' => 11211,
+            'doctrine_cache.memcached.class' => 'Doctrine\\Common\\Cache\\MemcachedCache',
+            'doctrine_cache.memcached.connection.class' => 'Memcached',
+            'doctrine_cache.memcached.host' => 'localhost',
+            'doctrine_cache.memcached.port' => 11211,
+            'doctrine_cache.redis.class' => 'Doctrine\\Common\\Cache\\RedisCache',
+            'doctrine_cache.redis.connection.class' => 'Redis',
+            'doctrine_cache.redis.host' => 'localhost',
+            'doctrine_cache.redis.port' => 6379,
+            'doctrine_cache.couchbase.class' => 'Doctrine\\Common\\Cache\\CouchbaseCache',
+            'doctrine_cache.couchbase.connection.class' => 'Couchbase',
+            'doctrine_cache.couchbase.hostnames' => 'localhost:8091',
+            'doctrine_cache.wincache.class' => 'Doctrine\\Common\\Cache\\WinCacheCache',
+            'doctrine_cache.xcache.class' => 'Doctrine\\Common\\Cache\\XcacheCache',
+            'doctrine_cache.zenddata.class' => 'Doctrine\\Common\\Cache\\ZendDataCache',
+            'doctrine_cache.security.acl.cache.class' => 'Doctrine\\Bundle\\DoctrineCacheBundle\\Acl\\Model\\AclCache',
+            'doctrine.dbal.logger.chain.class' => 'Doctrine\\DBAL\\Logging\\LoggerChain',
+            'doctrine.dbal.logger.profiling.class' => 'Doctrine\\DBAL\\Logging\\DebugStack',
+            'doctrine.dbal.logger.class' => 'Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger',
+            'doctrine.dbal.configuration.class' => 'Doctrine\\DBAL\\Configuration',
+            'doctrine.data_collector.class' => 'Doctrine\\Bundle\\DoctrineBundle\\DataCollector\\DoctrineDataCollector',
+            'doctrine.dbal.connection.event_manager.class' => 'Symfony\\Bridge\\Doctrine\\ContainerAwareEventManager',
+            'doctrine.dbal.connection_factory.class' => 'Doctrine\\Bundle\\DoctrineBundle\\ConnectionFactory',
+            'doctrine.dbal.events.mysql_session_init.class' => 'Doctrine\\DBAL\\Event\\Listeners\\MysqlSessionInit',
+            'doctrine.dbal.events.oracle_session_init.class' => 'Doctrine\\DBAL\\Event\\Listeners\\OracleSessionInit',
+            'doctrine.class' => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
+            'doctrine.entity_managers' => [
+                'default' => 'doctrine.orm.default_entity_manager',
+            ],
+            'doctrine.default_entity_manager' => 'default',
+            'doctrine.dbal.connection_factory.types' => [
+            ],
+            'doctrine.connections' => [
+                'default' => 'doctrine.dbal.default_connection',
+            ],
+            'doctrine.default_connection' => 'default',
+            'doctrine.orm.configuration.class' => 'Doctrine\\ORM\\Configuration',
+            'doctrine.orm.entity_manager.class' => 'Doctrine\\ORM\\EntityManager',
+            'doctrine.orm.manager_configurator.class' => 'Doctrine\\Bundle\\DoctrineBundle\\ManagerConfigurator',
+            'doctrine.orm.cache.array.class' => 'Doctrine\\Common\\Cache\\ArrayCache',
+            'doctrine.orm.cache.apc.class' => 'Doctrine\\Common\\Cache\\ApcCache',
+            'doctrine.orm.cache.memcache.class' => 'Doctrine\\Common\\Cache\\MemcacheCache',
+            'doctrine.orm.cache.memcache_host' => 'localhost',
+            'doctrine.orm.cache.memcache_port' => 11211,
+            'doctrine.orm.cache.memcache_instance.class' => 'Memcache',
+            'doctrine.orm.cache.memcached.class' => 'Doctrine\\Common\\Cache\\MemcachedCache',
+            'doctrine.orm.cache.memcached_host' => 'localhost',
+            'doctrine.orm.cache.memcached_port' => 11211,
+            'doctrine.orm.cache.memcached_instance.class' => 'Memcached',
+            'doctrine.orm.cache.redis.class' => 'Doctrine\\Common\\Cache\\RedisCache',
+            'doctrine.orm.cache.redis_host' => 'localhost',
+            'doctrine.orm.cache.redis_port' => 6379,
+            'doctrine.orm.cache.redis_instance.class' => 'Redis',
+            'doctrine.orm.cache.xcache.class' => 'Doctrine\\Common\\Cache\\XcacheCache',
+            'doctrine.orm.cache.wincache.class' => 'Doctrine\\Common\\Cache\\WinCacheCache',
+            'doctrine.orm.cache.zenddata.class' => 'Doctrine\\Common\\Cache\\ZendDataCache',
+            'doctrine.orm.metadata.driver_chain.class' => 'Doctrine\\Common\\Persistence\\Mapping\\Driver\\MappingDriverChain',
+            'doctrine.orm.metadata.annotation.class' => 'Doctrine\\ORM\\Mapping\\Driver\\AnnotationDriver',
+            'doctrine.orm.metadata.xml.class' => 'Doctrine\\ORM\\Mapping\\Driver\\SimplifiedXmlDriver',
+            'doctrine.orm.metadata.yml.class' => 'Doctrine\\ORM\\Mapping\\Driver\\SimplifiedYamlDriver',
+            'doctrine.orm.metadata.php.class' => 'Doctrine\\ORM\\Mapping\\Driver\\PHPDriver',
+            'doctrine.orm.metadata.staticphp.class' => 'Doctrine\\ORM\\Mapping\\Driver\\StaticPHPDriver',
+            'doctrine.orm.proxy_cache_warmer.class' => 'Symfony\\Bridge\\Doctrine\\CacheWarmer\\ProxyCacheWarmer',
+            'form.type_guesser.doctrine.class' => 'Symfony\\Bridge\\Doctrine\\Form\\DoctrineOrmTypeGuesser',
+            'doctrine.orm.validator.unique.class' => 'Symfony\\Bridge\\Doctrine\\Validator\\Constraints\\UniqueEntityValidator',
+            'doctrine.orm.validator_initializer.class' => 'Symfony\\Bridge\\Doctrine\\Validator\\DoctrineInitializer',
+            'doctrine.orm.security.user.provider.class' => 'Symfony\\Bridge\\Doctrine\\Security\\User\\EntityUserProvider',
+            'doctrine.orm.listeners.resolve_target_entity.class' => 'Doctrine\\ORM\\Tools\\ResolveTargetEntityListener',
+            'doctrine.orm.listeners.attach_entity_listeners.class' => 'Doctrine\\ORM\\Tools\\AttachEntityListenersListener',
+            'doctrine.orm.naming_strategy.default.class' => 'Doctrine\\ORM\\Mapping\\DefaultNamingStrategy',
+            'doctrine.orm.naming_strategy.underscore.class' => 'Doctrine\\ORM\\Mapping\\UnderscoreNamingStrategy',
+            'doctrine.orm.quote_strategy.default.class' => 'Doctrine\\ORM\\Mapping\\DefaultQuoteStrategy',
+            'doctrine.orm.quote_strategy.ansi.class' => 'Doctrine\\ORM\\Mapping\\AnsiQuoteStrategy',
+            'doctrine.orm.entity_listener_resolver.class' => 'Doctrine\\ORM\\Mapping\\DefaultEntityListenerResolver',
+            'doctrine.orm.second_level_cache.default_cache_factory.class' => 'Doctrine\\ORM\\Cache\\DefaultCacheFactory',
+            'doctrine.orm.second_level_cache.default_region.class' => 'Doctrine\\ORM\\Cache\\Region\\DefaultRegion',
+            'doctrine.orm.second_level_cache.filelock_region.class' => 'Doctrine\\ORM\\Cache\\Region\\FileLockRegion',
+            'doctrine.orm.second_level_cache.logger_chain.class' => 'Doctrine\\ORM\\Cache\\Logging\\CacheLoggerChain',
+            'doctrine.orm.second_level_cache.logger_statistics.class' => 'Doctrine\\ORM\\Cache\\Logging\\StatisticsCacheLogger',
+            'doctrine.orm.second_level_cache.cache_configuration.class' => 'Doctrine\\ORM\\Cache\\CacheConfiguration',
+            'doctrine.orm.second_level_cache.regions_configuration.class' => 'Doctrine\\ORM\\Cache\\RegionsConfiguration',
+            'doctrine.orm.auto_generate_proxy_classes' => true,
+            'doctrine.orm.proxy_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/doctrine/orm/Proxies',
+            'doctrine.orm.proxy_namespace' => 'Proxies',
+            'sensio_framework_extra.view.guesser.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Templating\\TemplateGuesser',
+            'sensio_framework_extra.controller.listener.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
+            'sensio_framework_extra.routing.loader.annot_dir.class' => 'Symfony\\Component\\Routing\\Loader\\AnnotationDirectoryLoader',
+            'sensio_framework_extra.routing.loader.annot_file.class' => 'Symfony\\Component\\Routing\\Loader\\AnnotationFileLoader',
+            'sensio_framework_extra.routing.loader.annot_class.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Routing\\AnnotatedRouteControllerLoader',
+            'sensio_framework_extra.converter.listener.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
+            'sensio_framework_extra.converter.manager.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
+            'sensio_framework_extra.converter.doctrine.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
+            'sensio_framework_extra.converter.datetime.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
+            'sensio_framework_extra.view.listener.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
+            'chill_main.installation_name' => 'Chill',
+            'chill_main.available_languages' => [
+                0 => 'fr',
+            ],
+            'chill_main.routing.resources' => [
+                0 => '@ChillPersonBundle/Resources/config/routing.yml',
+                1 => '@ChillCustomFieldsBundle/Resources/config/routing.yml',
+                2 => '@ChillMainBundle/Resources/config/routing.yml',
+            ],
+            'chill_custom_fields.customizables_entities' => [
+                0 => [
+                    'class' => 'Chill\\PersonBundle\\Entity\\Person',
+                    'name' => 'PersonEntity',
+                    'options' => [
+                    ],
+                ],
+            ],
+            'cl_chill_person.search.use_double_metaphone' => false,
+            'web_profiler.controller.profiler.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Controller\\ProfilerController',
+            'web_profiler.controller.router.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Controller\\RouterController',
+            'web_profiler.controller.exception.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Controller\\ExceptionController',
+            'twig.extension.webprofiler.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Twig\\WebProfilerExtension',
+            'web_profiler.debug_toolbar.position' => 'bottom',
+            'sensio_distribution.webconfigurator.class' => 'Sensio\\Bundle\\DistributionBundle\\Configurator\\Configurator',
+            'sensio_distribution.webconfigurator.doctrine_step.class' => 'Sensio\\Bundle\\DistributionBundle\\Configurator\\Step\\DoctrineStep',
+            'sensio_distribution.webconfigurator.secret_step.class' => 'Sensio\\Bundle\\DistributionBundle\\Configurator\\Step\\SecretStep',
+            'sensio_distribution.security_checker.class' => 'SensioLabs\\Security\\SecurityChecker',
+            'sensio_distribution.security_checker.command.class' => 'SensioLabs\\Security\\Command\\SecurityCheckerCommand',
+            'data_collector.templates' => [
+                'data_collector.config' => [
+                    0 => 'config',
+                    1 => '@WebProfiler/Collector/config.html.twig',
+                ],
+                'data_collector.request' => [
+                    0 => 'request',
+                    1 => '@WebProfiler/Collector/request.html.twig',
+                ],
+                'data_collector.ajax' => [
+                    0 => 'ajax',
+                    1 => '@WebProfiler/Collector/ajax.html.twig',
+                ],
+                'data_collector.exception' => [
+                    0 => 'exception',
+                    1 => '@WebProfiler/Collector/exception.html.twig',
+                ],
+                'data_collector.events' => [
+                    0 => 'events',
+                    1 => '@WebProfiler/Collector/events.html.twig',
+                ],
+                'data_collector.logger' => [
+                    0 => 'logger',
+                    1 => '@WebProfiler/Collector/logger.html.twig',
+                ],
+                'data_collector.time' => [
+                    0 => 'time',
+                    1 => '@WebProfiler/Collector/time.html.twig',
+                ],
+                'data_collector.memory' => [
+                    0 => 'memory',
+                    1 => '@WebProfiler/Collector/memory.html.twig',
+                ],
+                'data_collector.router' => [
+                    0 => 'router',
+                    1 => '@WebProfiler/Collector/router.html.twig',
+                ],
+                'data_collector.form' => [
+                    0 => 'form',
+                    1 => '@WebProfiler/Collector/form.html.twig',
+                ],
+                'data_collector.translation' => [
+                    0 => 'translation',
+                    1 => '@WebProfiler/Collector/translation.html.twig',
+                ],
+                'data_collector.twig' => [
+                    0 => 'twig',
+                    1 => '@WebProfiler/Collector/twig.html.twig',
+                ],
+                'data_collector.security' => [
+                    0 => 'security',
+                    1 => '@Security/Collector/security.html.twig',
+                ],
+                'swiftmailer.data_collector' => [
+                    0 => 'swiftmailer',
+                    1 => '@Swiftmailer/Collector/swiftmailer.html.twig',
+                ],
+                'data_collector.doctrine' => [
+                    0 => 'db',
+                    1 => '@Doctrine/Collector/db.html.twig',
+                ],
+                'data_collector.dump' => [
+                    0 => 'dump',
+                    1 => '@Debug/Profiler/dump.html.twig',
+                ],
+            ],
+            'console.command.ids' => [
+                0 => 'sensio_distribution.security_checker.command',
+            ],
+        ];
     }
 
     /**
@@ -1066,7 +1771,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getDoctrine_Dbal_ConnectionFactoryService()
     {
-        return $this->services['doctrine.dbal.connection_factory'] = new \Doctrine\Bundle\DoctrineBundle\ConnectionFactory(array());
+        return $this->services['doctrine.dbal.connection_factory'] = new \Doctrine\Bundle\DoctrineBundle\ConnectionFactory([]);
     }
 
     /**
@@ -1087,9 +1792,26 @@ class appDevDebugProjectContainer extends Container
         $b->setSQLLogger($a);
 
         $c = new \Symfony\Bridge\Doctrine\ContainerAwareEventManager($this);
-        $c->addEventListener(array(0 => 'loadClassMetadata'), $this->get('doctrine.orm.default_listeners.attach_entity_listeners'));
+        $c->addEventListener([0 => 'loadClassMetadata'], $this->get('doctrine.orm.default_listeners.attach_entity_listeners'));
 
-        return $this->services['doctrine.dbal.default_connection'] = $this->get('doctrine.dbal.connection_factory')->createConnection(array('driver' => 'pdo_pgsql', 'host' => '127.0.0.1', 'port' => 5432, 'dbname' => 'chill_test', 'user' => 'chill', 'password' => 'chill', 'charset' => 'UTF8', 'driverOptions' => array()), $b, $c, array());
+        return $this->services['doctrine.dbal.default_connection'] = $this->get('doctrine.dbal.connection_factory')->createConnection(['driver' => 'pdo_pgsql', 'host' => '127.0.0.1', 'port' => 5432, 'dbname' => 'chill_test', 'user' => 'chill', 'password' => 'chill', 'charset' => 'UTF8', 'driverOptions' => []], $b, $c, []);
+    }
+
+    /**
+     * Gets the 'doctrine.dbal.logger.profiling.default' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Doctrine\DBAL\Logging\DebugStack A Doctrine\DBAL\Logging\DebugStack instance.
+     */
+    protected function getDoctrine_Dbal_Logger_Profiling_DefaultService()
+    {
+        return $this->services['doctrine.dbal.logger.profiling.default'] = new \Doctrine\DBAL\Logging\DebugStack();
     }
 
     /**
@@ -1115,7 +1837,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getDoctrine_Orm_DefaultEntityManagerService()
     {
-        $a = new \Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver(array('/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/config/doctrine' => 'Chill\\MainBundle\\Entity', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/custom-fields/Resources/config/doctrine' => 'Chill\\CustomFieldsBundle\\Entity', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/config/doctrine' => 'Chill\\PersonBundle\\Entity', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Resources/config/doctrine' => 'Chill\\ActivityBundle\\Entity'));
+        $a = new \Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver(['/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/config/doctrine' => 'Chill\\MainBundle\\Entity', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/custom-fields/Resources/config/doctrine' => 'Chill\\CustomFieldsBundle\\Entity', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/config/doctrine' => 'Chill\\PersonBundle\\Entity', '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Resources/config/doctrine' => 'Chill\\ActivityBundle\\Entity']);
         $a->setGlobalBasename('mapping');
 
         $b = new \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain();
@@ -1125,7 +1847,7 @@ class appDevDebugProjectContainer extends Container
         $b->addDriver($a, 'Chill\\ActivityBundle\\Entity');
 
         $c = new \Doctrine\ORM\Configuration();
-        $c->setEntityNamespaces(array('ChillMainBundle' => 'Chill\\MainBundle\\Entity', 'ChillCustomFieldsBundle' => 'Chill\\CustomFieldsBundle\\Entity', 'ChillPersonBundle' => 'Chill\\PersonBundle\\Entity', 'ChillActivityBundle' => 'Chill\\ActivityBundle\\Entity'));
+        $c->setEntityNamespaces(['ChillMainBundle' => 'Chill\\MainBundle\\Entity', 'ChillCustomFieldsBundle' => 'Chill\\CustomFieldsBundle\\Entity', 'ChillPersonBundle' => 'Chill\\PersonBundle\\Entity', 'ChillActivityBundle' => 'Chill\\ActivityBundle\\Entity']);
         $c->setMetadataCacheImpl($this->get('doctrine_cache.providers.doctrine.orm.default_metadata_cache'));
         $c->setQueryCacheImpl($this->get('doctrine_cache.providers.doctrine.orm.default_query_cache'));
         $c->setResultCacheImpl($this->get('doctrine_cache.providers.doctrine.orm.default_result_cache'));
@@ -1170,7 +1892,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getDoctrine_Orm_DefaultManagerConfiguratorService()
     {
-        return $this->services['doctrine.orm.default_manager_configurator'] = new \Doctrine\Bundle\DoctrineBundle\ManagerConfigurator(array(), array());
+        return $this->services['doctrine.orm.default_manager_configurator'] = new \Doctrine\Bundle\DoctrineBundle\ManagerConfigurator([], []);
     }
 
     /**
@@ -1250,6 +1972,19 @@ class appDevDebugProjectContainer extends Container
         return $instance;
     }
 
+    /**
+     * Gets the 'doctrine' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Doctrine\Bundle\DoctrineBundle\Registry A Doctrine\Bundle\DoctrineBundle\Registry instance.
+     */
+    protected function getDoctrineService()
+    {
+        return $this->services['doctrine'] = new \Doctrine\Bundle\DoctrineBundle\Registry($this, ['default' => 'doctrine.dbal.default_connection'], ['default' => 'doctrine.orm.default_entity_manager'], 'default', 'default');
+    }
+
     /**
      * Gets the 'file_locator' service.
      *
@@ -1312,7 +2047,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getForm_RegistryService()
     {
-        return $this->services['form.registry'] = new \Symfony\Component\Form\FormRegistry(array(0 => new \Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension($this, array('form' => 'form.type.form', 'birthday' => 'form.type.birthday', 'checkbox' => 'form.type.checkbox', 'choice' => 'form.type.choice', 'collection' => 'form.type.collection', 'country' => 'form.type.country', 'date' => 'form.type.date', 'datetime' => 'form.type.datetime', 'email' => 'form.type.email', 'file' => 'form.type.file', 'hidden' => 'form.type.hidden', 'integer' => 'form.type.integer', 'language' => 'form.type.language', 'locale' => 'form.type.locale', 'money' => 'form.type.money', 'number' => 'form.type.number', 'password' => 'form.type.password', 'percent' => 'form.type.percent', 'radio' => 'form.type.radio', 'repeated' => 'form.type.repeated', 'search' => 'form.type.search', 'textarea' => 'form.type.textarea', 'text' => 'form.type.text', 'time' => 'form.type.time', 'timezone' => 'form.type.timezone', 'url' => 'form.type.url', 'button' => 'form.type.button', 'submit' => 'form.type.submit', 'reset' => 'form.type.reset', 'currency' => 'form.type.currency', 'entity' => 'form.type.entity', 'translatable_string' => 'chill.main.form.type.translatable.string', 'select2_choice' => 'chill.main.form.type.select2choice', 'select2_entity' => 'chill.main.form.type.select2entity', 'select2_chill_country' => 'chill.main.form.type.select2country', 'select2_chill_language' => 'chill.main.form.type.select2language', 'center' => 'chill.main.form.type.center', 'custom_field_choice' => 'chill.custom_field.custom_field_choice_type', 'custom_fields_group' => 'chill.custom_field.custom_fields_group_type', 'custom_field' => 'chill.custom_field.custom_field_type', 'custom_fields_group_linked_custom_fields' => 'chill.custom_field.custom_fields_group_linked_custom_fields', 'custom_field_title' => 'chill.custom_field.custom_fields_title_type', 'closing_motive' => 'chill.person.accompanying_period_closing_motive'), array('form' => array(0 => 'form.type_extension.form.http_foundation', 1 => 'form.type_extension.form.validator', 2 => 'form.type_extension.csrf', 3 => 'form.type_extension.form.data_collector'), 'repeated' => array(0 => 'form.type_extension.repeated.validator'), 'submit' => array(0 => 'form.type_extension.submit.validator')), array(0 => 'form.type_guesser.validator', 1 => 'form.type_guesser.doctrine'))), $this->get('form.resolved_type_factory'));
+        return $this->services['form.registry'] = new \Symfony\Component\Form\FormRegistry([0 => new \Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension($this, ['form' => 'form.type.form', 'birthday' => 'form.type.birthday', 'checkbox' => 'form.type.checkbox', 'choice' => 'form.type.choice', 'collection' => 'form.type.collection', 'country' => 'form.type.country', 'date' => 'form.type.date', 'datetime' => 'form.type.datetime', 'email' => 'form.type.email', 'file' => 'form.type.file', 'hidden' => 'form.type.hidden', 'integer' => 'form.type.integer', 'language' => 'form.type.language', 'locale' => 'form.type.locale', 'money' => 'form.type.money', 'number' => 'form.type.number', 'password' => 'form.type.password', 'percent' => 'form.type.percent', 'radio' => 'form.type.radio', 'repeated' => 'form.type.repeated', 'search' => 'form.type.search', 'textarea' => 'form.type.textarea', 'text' => 'form.type.text', 'time' => 'form.type.time', 'timezone' => 'form.type.timezone', 'url' => 'form.type.url', 'button' => 'form.type.button', 'submit' => 'form.type.submit', 'reset' => 'form.type.reset', 'currency' => 'form.type.currency', 'entity' => 'form.type.entity', 'translatable_string' => 'chill.main.form.type.translatable.string', 'select2_choice' => 'chill.main.form.type.select2choice', 'select2_entity' => 'chill.main.form.type.select2entity', 'select2_chill_country' => 'chill.main.form.type.select2country', 'select2_chill_language' => 'chill.main.form.type.select2language', 'center' => 'chill.main.form.type.center', 'custom_field_choice' => 'chill.custom_field.custom_field_choice_type', 'custom_fields_group' => 'chill.custom_field.custom_fields_group_type', 'custom_field' => 'chill.custom_field.custom_field_type', 'custom_fields_group_linked_custom_fields' => 'chill.custom_field.custom_fields_group_linked_custom_fields', 'custom_field_title' => 'chill.custom_field.custom_fields_title_type', 'closing_motive' => 'chill.person.accompanying_period_closing_motive'], ['form' => [0 => 'form.type_extension.form.http_foundation', 1 => 'form.type_extension.form.validator', 2 => 'form.type_extension.csrf', 3 => 'form.type_extension.form.data_collector'], 'repeated' => [0 => 'form.type_extension.repeated.validator'], 'submit' => [0 => 'form.type_extension.submit.validator']], [0 => 'form.type_guesser.validator', 1 => 'form.type_guesser.doctrine'])], $this->get('form.resolved_type_factory'));
     }
 
     /**
@@ -1666,19 +2401,6 @@ class appDevDebugProjectContainer extends Container
         return $this->services['form.type.submit'] = new \Symfony\Component\Form\Extension\Core\Type\SubmitType();
     }
 
-    /**
-     * Gets the 'form.type.text' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\Form\Extension\Core\Type\TextType A Symfony\Component\Form\Extension\Core\Type\TextType instance.
-     */
-    protected function getForm_Type_TextService()
-    {
-        return $this->services['form.type.text'] = new \Symfony\Component\Form\Extension\Core\Type\TextType();
-    }
-
     /**
      * Gets the 'form.type.textarea' service.
      *
@@ -1692,6 +2414,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['form.type.textarea'] = new \Symfony\Component\Form\Extension\Core\Type\TextareaType();
     }
 
+    /**
+     * Gets the 'form.type.text' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Component\Form\Extension\Core\Type\TextType A Symfony\Component\Form\Extension\Core\Type\TextType instance.
+     */
+    protected function getForm_Type_TextService()
+    {
+        return $this->services['form.type.text'] = new \Symfony\Component\Form\Extension\Core\Type\TextType();
+    }
+
     /**
      * Gets the 'form.type.time' service.
      *
@@ -1866,7 +2601,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getFragment_Renderer_EsiService()
     {
-        $this->services['fragment.renderer.esi'] = $instance = new \Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer(NULL, $this->get('fragment.renderer.inline'), $this->get('uri_signer'));
+        $this->services['fragment.renderer.esi'] = $instance = new \Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer(null, $this->get('fragment.renderer.inline'), $this->get('uri_signer'));
 
         $instance->setFragmentPath('/_fragment');
 
@@ -1883,7 +2618,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getFragment_Renderer_HincludeService()
     {
-        $this->services['fragment.renderer.hinclude'] = $instance = new \Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer($this->get('twig'), $this->get('uri_signer'), NULL);
+        $this->services['fragment.renderer.hinclude'] = $instance = new \Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer($this->get('twig'), $this->get('uri_signer'), null);
 
         $instance->setFragmentPath('/_fragment');
 
@@ -1917,7 +2652,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getFragment_Renderer_SsiService()
     {
-        $this->services['fragment.renderer.ssi'] = $instance = new \Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer(NULL, $this->get('fragment.renderer.inline'), $this->get('uri_signer'));
+        $this->services['fragment.renderer.ssi'] = $instance = new \Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer(null, $this->get('fragment.renderer.inline'), $this->get('uri_signer'));
 
         $instance->setFragmentPath('/_fragment');
 
@@ -2163,6 +2898,19 @@ class appDevDebugProjectContainer extends Container
         return $instance;
     }
 
+    /**
+     * Gets the 'profiler_listener' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Component\HttpKernel\EventListener\ProfilerListener A Symfony\Component\HttpKernel\EventListener\ProfilerListener instance.
+     */
+    protected function getProfilerListenerService()
+    {
+        return $this->services['profiler_listener'] = new \Symfony\Component\HttpKernel\EventListener\ProfilerListener($this->get('profiler'), null, false, false, $this->get('request_stack'));
+    }
+
     /**
      * Gets the 'profiler' service.
      *
@@ -2177,6 +2925,7 @@ class appDevDebugProjectContainer extends Container
         $b = $this->get('kernel', ContainerInterface::NULL_ON_INVALID_REFERENCE);
 
         $c = new \Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector();
+
         if ($this->has('kernel')) {
             $c->setKernel($b);
         }
@@ -2206,19 +2955,6 @@ class appDevDebugProjectContainer extends Container
         return $instance;
     }
 
-    /**
-     * Gets the 'profiler_listener' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\HttpKernel\EventListener\ProfilerListener A Symfony\Component\HttpKernel\EventListener\ProfilerListener instance.
-     */
-    protected function getProfilerListenerService()
-    {
-        return $this->services['profiler_listener'] = new \Symfony\Component\HttpKernel\EventListener\ProfilerListener($this->get('profiler'), NULL, false, false, $this->get('request_stack'));
-    }
-
     /**
      * Gets the 'property_accessor' service.
      *
@@ -2277,16 +3013,20 @@ class appDevDebugProjectContainer extends Container
     }
 
     /**
-     * Gets the 'router' service.
+     * Gets the 'router.request_context' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @return \Symfony\Bundle\FrameworkBundle\Routing\Router A Symfony\Bundle\FrameworkBundle\Routing\Router instance.
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Routing\RequestContext A Symfony\Component\Routing\RequestContext instance.
      */
-    protected function getRouterService()
+    protected function getRouter_RequestContextService()
     {
-        return $this->services['router'] = new \Symfony\Bundle\FrameworkBundle\Routing\Router($this, '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/config/routing.yml', array('cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev', 'debug' => true, 'generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator', 'generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator', 'generator_dumper_class' => 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper', 'generator_cache_class' => 'appDevUrlGenerator', 'matcher_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher', 'matcher_base_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher', 'matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper', 'matcher_cache_class' => 'appDevUrlMatcher', 'strict_requirements' => true), $this->get('router.request_context', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('monolog.logger.router', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+        return $this->services['router.request_context'] = new \Symfony\Component\Routing\RequestContext('', 'GET', 'localhost', 'http', 80, 443);
     }
 
     /**
@@ -2302,6 +3042,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['router_listener'] = new \Symfony\Component\HttpKernel\EventListener\RouterListener($this->get('router'), $this->get('router.request_context', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('monolog.logger.request', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('request_stack'));
     }
 
+    /**
+     * Gets the 'router' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Bundle\FrameworkBundle\Routing\Router A Symfony\Bundle\FrameworkBundle\Routing\Router instance.
+     */
+    protected function getRouterService()
+    {
+        return $this->services['router'] = new \Symfony\Bundle\FrameworkBundle\Routing\Router($this, '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/config/routing.yml', ['cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev', 'debug' => true, 'generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator', 'generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator', 'generator_dumper_class' => 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper', 'generator_cache_class' => 'appDevUrlGenerator', 'matcher_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher', 'matcher_base_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher', 'matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper', 'matcher_cache_class' => 'appDevUrlMatcher', 'strict_requirements' => true], $this->get('router.request_context', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('monolog.logger.router', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+    }
+
     /**
      * Gets the 'routing.loader' service.
      *
@@ -2329,6 +3082,64 @@ class appDevDebugProjectContainer extends Container
         return $this->services['routing.loader'] = new \Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader($this->get('controller_name_converter'), $this->get('monolog.logger.router', ContainerInterface::NULL_ON_INVALID_REFERENCE), $d);
     }
 
+    /**
+     * Gets the 'security.access.decision_manager' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Core\Authorization\AccessDecisionManager A Symfony\Component\Security\Core\Authorization\AccessDecisionManager instance.
+     */
+    protected function getSecurity_Access_DecisionManagerService()
+    {
+        $a = $this->get('security.authentication.trust_resolver');
+        $b = $this->get('security.role_hierarchy');
+
+        return $this->services['security.access.decision_manager'] = new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager([0 => $this->get('chill.person.security.authorization.person'), 1 => new \Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter(new \Symfony\Component\Security\Core\Authorization\ExpressionLanguage(), $a, $b), 2 => new \Symfony\Component\Security\Core\Authorization\Voter\RoleHierarchyVoter($b), 3 => new \Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter($a)], 'affirmative', false, true);
+    }
+
+    /**
+     * Gets the 'security.authentication.manager' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager A Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager instance.
+     */
+    protected function getSecurity_Authentication_ManagerService()
+    {
+        $this->services['security.authentication.manager'] = $instance = new \Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager([0 => new \Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider($this->get('security.user.provider.concrete.chain_provider'), new \Symfony\Component\Security\Core\User\UserChecker(), 'default', $this->get('security.encoder_factory'), true), 1 => new \Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider('5593aedf3be85')], true);
+
+        $instance->setEventDispatcher($this->get('debug.event_dispatcher'));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'security.authentication.trust_resolver' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver A Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver instance.
+     */
+    protected function getSecurity_Authentication_TrustResolverService()
+    {
+        return $this->services['security.authentication.trust_resolver'] = new \Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver('Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken', 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken');
+    }
+
     /**
      * Gets the 'security.authentication_utils' service.
      *
@@ -2391,20 +3202,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getSecurity_EncoderFactoryService()
     {
-        return $this->services['security.encoder_factory'] = new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array('Chill\\MainBundle\\Entity\\User' => array('class' => 'Symfony\\Component\\Security\\Core\\Encoder\\BCryptPasswordEncoder', 'arguments' => array(0 => 13)), 'Symfony\\Component\\Security\\Core\\User\\User' => array('class' => 'Symfony\\Component\\Security\\Core\\Encoder\\PlaintextPasswordEncoder', 'arguments' => array(0 => false))));
-    }
-
-    /**
-     * Gets the 'security.firewall' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\Security\Http\Firewall A Symfony\Component\Security\Http\Firewall instance.
-     */
-    protected function getSecurity_FirewallService()
-    {
-        return $this->services['security.firewall'] = new \Symfony\Component\Security\Http\Firewall(new \Symfony\Bundle\SecurityBundle\Security\FirewallMap($this, array('security.firewall.map.context.dev' => new \Symfony\Component\HttpFoundation\RequestMatcher('^/(_(profiler|wdt)|css|images|js)/'), 'security.firewall.map.context.default' => NULL)), $this->get('debug.event_dispatcher'));
+        return $this->services['security.encoder_factory'] = new \Symfony\Component\Security\Core\Encoder\EncoderFactory(['Chill\\MainBundle\\Entity\\User' => ['class' => 'Symfony\\Component\\Security\\Core\\Encoder\\BCryptPasswordEncoder', 'arguments' => [0 => 13]], 'Symfony\\Component\\Security\\Core\\User\\User' => ['class' => 'Symfony\\Component\\Security\\Core\\Encoder\\PlaintextPasswordEncoder', 'arguments' => [0 => false]]]);
     }
 
     /**
@@ -2428,17 +3226,17 @@ class appDevDebugProjectContainer extends Container
 
         $h = new \Symfony\Component\Security\Http\HttpUtils($d, $d);
 
-        $i = new \Symfony\Component\Security\Http\Firewall\LogoutListener($b, $h, new \Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler($h, '/'), array('csrf_parameter' => '_csrf_token', 'intention' => 'logout', 'logout_path' => '/logout'));
+        $i = new \Symfony\Component\Security\Http\Firewall\LogoutListener($b, $h, new \Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler($h, '/'), ['csrf_parameter' => '_csrf_token', 'intention' => 'logout', 'logout_path' => '/logout']);
         $i->addHandler(new \Symfony\Component\Security\Http\Logout\SessionLogoutHandler());
 
-        $j = new \Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler($h, array());
-        $j->setOptions(array('always_use_default_target_path' => false, 'default_target_path' => '/', 'login_path' => '/login', 'target_path_parameter' => '_target_path', 'use_referer' => false));
+        $j = new \Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler($h, []);
+        $j->setOptions(['always_use_default_target_path' => false, 'default_target_path' => '/', 'login_path' => '/login', 'target_path_parameter' => '_target_path', 'use_referer' => false]);
         $j->setProviderKey('default');
 
-        $k = new \Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler($e, $h, array(), $a);
-        $k->setOptions(array('login_path' => '/login', 'failure_path' => NULL, 'failure_forward' => false, 'failure_path_parameter' => '_failure_path'));
+        $k = new \Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureHandler($e, $h, [], $a);
+        $k->setOptions(['login_path' => '/login', 'failure_path' => null, 'failure_forward' => false, 'failure_path_parameter' => '_failure_path']);
 
-        return $this->services['security.firewall.map.context.default'] = new \Symfony\Bundle\SecurityBundle\Security\FirewallContext(array(0 => new \Symfony\Component\Security\Http\Firewall\ChannelListener($g, new \Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint(80, 443), $a), 1 => new \Symfony\Component\Security\Http\Firewall\ContextListener($b, array(0 => $this->get('security.user.provider.concrete.chain_provider'), 1 => $this->get('security.user.provider.concrete.in_memory'), 2 => $this->get('security.user.provider.concrete.users')), 'default', $a, $c), 2 => $i, 3 => new \Symfony\Component\Security\Http\Firewall\UsernamePasswordFormAuthenticationListener($b, $f, new \Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy('migrate'), $h, 'default', $j, $k, array('csrf_parameter' => '_csrf_token', 'intention' => 'authenticate', 'check_path' => '/login_check', 'use_forward' => false, 'require_previous_session' => true, 'username_parameter' => '_username', 'password_parameter' => '_password', 'post_only' => true), $a, $c, $this->get('form.csrf_provider')), 4 => new \Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener($b, '5593aedf3be85', $a, $f), 5 => new \Symfony\Component\Security\Http\Firewall\AccessListener($b, $this->get('security.access.decision_manager'), $g, $f)), new \Symfony\Component\Security\Http\Firewall\ExceptionListener($b, $this->get('security.authentication.trust_resolver'), $h, 'default', new \Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint($e, $h, '/login', false), NULL, NULL, $a));
+        return $this->services['security.firewall.map.context.default'] = new \Symfony\Bundle\SecurityBundle\Security\FirewallContext([0 => new \Symfony\Component\Security\Http\Firewall\ChannelListener($g, new \Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint(80, 443), $a), 1 => new \Symfony\Component\Security\Http\Firewall\ContextListener($b, [0 => $this->get('security.user.provider.concrete.chain_provider'), 1 => $this->get('security.user.provider.concrete.in_memory'), 2 => $this->get('security.user.provider.concrete.users')], 'default', $a, $c), 2 => $i, 3 => new \Symfony\Component\Security\Http\Firewall\UsernamePasswordFormAuthenticationListener($b, $f, new \Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy('migrate'), $h, 'default', $j, $k, ['csrf_parameter' => '_csrf_token', 'intention' => 'authenticate', 'check_path' => '/login_check', 'use_forward' => false, 'require_previous_session' => true, 'username_parameter' => '_username', 'password_parameter' => '_password', 'post_only' => true], $a, $c, $this->get('form.csrf_provider')), 4 => new \Symfony\Component\Security\Http\Firewall\AnonymousAuthenticationListener($b, '5593aedf3be85', $a, $f), 5 => new \Symfony\Component\Security\Http\Firewall\AccessListener($b, $this->get('security.access.decision_manager'), $g, $f)], new \Symfony\Component\Security\Http\Firewall\ExceptionListener($b, $this->get('security.authentication.trust_resolver'), $h, 'default', new \Symfony\Component\Security\Http\EntryPoint\FormAuthenticationEntryPoint($e, $h, '/login', false), null, null, $a));
     }
 
     /**
@@ -2451,7 +3249,41 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getSecurity_Firewall_Map_Context_DevService()
     {
-        return $this->services['security.firewall.map.context.dev'] = new \Symfony\Bundle\SecurityBundle\Security\FirewallContext(array(), NULL);
+        return $this->services['security.firewall.map.context.dev'] = new \Symfony\Bundle\SecurityBundle\Security\FirewallContext([], null);
+    }
+
+    /**
+     * Gets the 'security.firewall' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Component\Security\Http\Firewall A Symfony\Component\Security\Http\Firewall instance.
+     */
+    protected function getSecurity_FirewallService()
+    {
+        return $this->services['security.firewall'] = new \Symfony\Component\Security\Http\Firewall(new \Symfony\Bundle\SecurityBundle\Security\FirewallMap($this, ['security.firewall.map.context.dev' => new \Symfony\Component\HttpFoundation\RequestMatcher('^/(_(profiler|wdt)|css|images|js)/'), 'security.firewall.map.context.default' => null]), $this->get('debug.event_dispatcher'));
+    }
+
+    /**
+     * Gets the 'security.logout_url_generator' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Http\Logout\LogoutUrlGenerator A Symfony\Component\Security\Http\Logout\LogoutUrlGenerator instance.
+     */
+    protected function getSecurity_LogoutUrlGeneratorService()
+    {
+        $this->services['security.logout_url_generator'] = $instance = new \Symfony\Component\Security\Http\Logout\LogoutUrlGenerator($this->get('request_stack', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('router', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.token_storage', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+
+        $instance->registerListener('default', '/logout', 'logout', '_csrf_token', null);
+
+        return $instance;
     }
 
     /**
@@ -2480,6 +3312,23 @@ class appDevDebugProjectContainer extends Container
         return $this->services['security.rememberme.response_listener'] = new \Symfony\Component\Security\Http\RememberMe\ResponseListener();
     }
 
+    /**
+     * Gets the 'security.role_hierarchy' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Core\Role\RoleHierarchy A Symfony\Component\Security\Core\Role\RoleHierarchy instance.
+     */
+    protected function getSecurity_RoleHierarchyService()
+    {
+        return $this->services['security.role_hierarchy'] = new \Symfony\Component\Security\Core\Role\RoleHierarchy(['CHILL_PERSON_UPDATE' => [0 => 'CHILL_PERSON_SEE'], 'CHILL_PERSON_CREATE' => [0 => 'CHILL_PERSON_SEE']]);
+    }
+
     /**
      * Gets the 'security.secure_random' service.
      *
@@ -2506,6 +3355,61 @@ class appDevDebugProjectContainer extends Container
         return $this->services['security.token_storage'] = new \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage();
     }
 
+    /**
+     * Gets the 'security.user.provider.concrete.chain_provider' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Core\User\ChainUserProvider A Symfony\Component\Security\Core\User\ChainUserProvider instance.
+     */
+    protected function getSecurity_User_Provider_Concrete_ChainProviderService()
+    {
+        return $this->services['security.user.provider.concrete.chain_provider'] = new \Symfony\Component\Security\Core\User\ChainUserProvider([0 => $this->get('security.user.provider.concrete.in_memory'), 1 => $this->get('security.user.provider.concrete.users')]);
+    }
+
+    /**
+     * Gets the 'security.user.provider.concrete.in_memory' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\Security\Core\User\InMemoryUserProvider A Symfony\Component\Security\Core\User\InMemoryUserProvider instance.
+     */
+    protected function getSecurity_User_Provider_Concrete_InMemoryService()
+    {
+        $this->services['security.user.provider.concrete.in_memory'] = $instance = new \Symfony\Component\Security\Core\User\InMemoryUserProvider();
+
+        $instance->createUser(new \Symfony\Component\Security\Core\User\User('admin', 'olala', [0 => 'ROLE_ADMIN']));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'security.user.provider.concrete.users' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Bridge\Doctrine\Security\User\EntityUserProvider A Symfony\Bridge\Doctrine\Security\User\EntityUserProvider instance.
+     */
+    protected function getSecurity_User_Provider_Concrete_UsersService()
+    {
+        return $this->services['security.user.provider.concrete.users'] = new \Symfony\Bridge\Doctrine\Security\User\EntityUserProvider($this->get('doctrine'), 'Chill\\MainBundle\\Entity\\User', 'username', null);
+    }
+
     /**
      * Gets the 'security.validator.user_password' service.
      *
@@ -2519,19 +3423,6 @@ class appDevDebugProjectContainer extends Container
         return $this->services['security.validator.user_password'] = new \Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator($this->get('security.token_storage'), $this->get('security.encoder_factory'));
     }
 
-    /**
-     * Gets the 'sensio_distribution.security_checker' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \SensioLabs\Security\SecurityChecker A SensioLabs\Security\SecurityChecker instance.
-     */
-    protected function getSensioDistribution_SecurityCheckerService()
-    {
-        return $this->services['sensio_distribution.security_checker'] = new \SensioLabs\Security\SecurityChecker();
-    }
-
     /**
      * Gets the 'sensio_distribution.security_checker.command' service.
      *
@@ -2545,6 +3436,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['sensio_distribution.security_checker.command'] = new \SensioLabs\Security\Command\SecurityCheckerCommand($this->get('sensio_distribution.security_checker'));
     }
 
+    /**
+     * Gets the 'sensio_distribution.security_checker' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \SensioLabs\Security\SecurityChecker A SensioLabs\Security\SecurityChecker instance.
+     */
+    protected function getSensioDistribution_SecurityCheckerService()
+    {
+        return $this->services['sensio_distribution.security_checker'] = new \SensioLabs\Security\SecurityChecker();
+    }
+
     /**
      * Gets the 'sensio_distribution.webconfigurator' service.
      *
@@ -2656,7 +3560,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getSensioFrameworkExtra_Security_ListenerService()
     {
-        return $this->services['sensio_framework_extra.security.listener'] = new \Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener(NULL, new \Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage(), $this->get('security.authentication.trust_resolver', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.role_hierarchy', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.token_storage', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.authorization_checker', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+        return $this->services['sensio_framework_extra.security.listener'] = new \Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener(null, new \Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage(), $this->get('security.authentication.trust_resolver', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.role_hierarchy', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.token_storage', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.authorization_checker', ContainerInterface::NULL_ON_INVALID_REFERENCE));
     }
 
     /**
@@ -2698,19 +3602,6 @@ class appDevDebugProjectContainer extends Container
         throw new RuntimeException('You have requested a synthetic service ("service_container"). The DIC does not know how to construct this service.');
     }
 
-    /**
-     * Gets the 'session' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\HttpFoundation\Session\Session A Symfony\Component\HttpFoundation\Session\Session instance.
-     */
-    protected function getSessionService()
-    {
-        return $this->services['session'] = new \Symfony\Component\HttpFoundation\Session\Session($this->get('session.storage.filesystem'), new \Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag(), new \Symfony\Component\HttpFoundation\Session\Flash\FlashBag());
-    }
-
     /**
      * Gets the 'session.handler' service.
      *
@@ -2750,6 +3641,23 @@ class appDevDebugProjectContainer extends Container
         return $this->services['session.storage.filesystem'] = new \Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage('/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/sessions', 'MOCKSESSID', $this->get('session.storage.metadata_bag'));
     }
 
+    /**
+     * Gets the 'session.storage.metadata_bag' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Component\HttpFoundation\Session\Storage\MetadataBag A Symfony\Component\HttpFoundation\Session\Storage\MetadataBag instance.
+     */
+    protected function getSession_Storage_MetadataBagService()
+    {
+        return $this->services['session.storage.metadata_bag'] = new \Symfony\Component\HttpFoundation\Session\Storage\MetadataBag('_sf2_meta', '0');
+    }
+
     /**
      * Gets the 'session.storage.native' service.
      *
@@ -2760,7 +3668,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getSession_Storage_NativeService()
     {
-        return $this->services['session.storage.native'] = new \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage(array('gc_probability' => 1), $this->get('session.handler'), $this->get('session.storage.metadata_bag'));
+        return $this->services['session.storage.native'] = new \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage(['gc_probability' => 1], $this->get('session.handler'), $this->get('session.storage.metadata_bag'));
     }
 
     /**
@@ -2789,6 +3697,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['session_listener'] = new \Symfony\Bundle\FrameworkBundle\EventListener\SessionListener($this);
     }
 
+    /**
+     * Gets the 'session' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Component\HttpFoundation\Session\Session A Symfony\Component\HttpFoundation\Session\Session instance.
+     */
+    protected function getSessionService()
+    {
+        return $this->services['session'] = new \Symfony\Component\HttpFoundation\Session\Session($this->get('session.storage.filesystem'), new \Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag(), new \Symfony\Component\HttpFoundation\Session\Flash\FlashBag());
+    }
+
     /**
      * Gets the 'streamed_response_listener' service.
      *
@@ -2815,19 +3736,6 @@ class appDevDebugProjectContainer extends Container
         return $this->services['swiftmailer.email_sender.listener'] = new \Symfony\Bundle\SwiftmailerBundle\EventListener\EmailSenderListener($this, $this->get('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE));
     }
 
-    /**
-     * Gets the 'swiftmailer.mailer.default' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Swift_Mailer A Swift_Mailer instance.
-     */
-    protected function getSwiftmailer_Mailer_DefaultService()
-    {
-        return $this->services['swiftmailer.mailer.default'] = new \Swift_Mailer($this->get('swiftmailer.mailer.default.transport'));
-    }
-
     /**
      * Gets the 'swiftmailer.mailer.default.plugin.messagelogger' service.
      *
@@ -2851,34 +3759,34 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getSwiftmailer_Mailer_Default_TransportService()
     {
-        $a = new \Swift_Transport_Esmtp_AuthHandler(array(0 => new \Swift_Transport_Esmtp_Auth_CramMd5Authenticator(), 1 => new \Swift_Transport_Esmtp_Auth_LoginAuthenticator(), 2 => new \Swift_Transport_Esmtp_Auth_PlainAuthenticator()));
-        $a->setUsername(NULL);
-        $a->setPassword(NULL);
-        $a->setAuthMode(NULL);
+        $a = new \Swift_Transport_Esmtp_AuthHandler([0 => new \Swift_Transport_Esmtp_Auth_CramMd5Authenticator(), 1 => new \Swift_Transport_Esmtp_Auth_LoginAuthenticator(), 2 => new \Swift_Transport_Esmtp_Auth_PlainAuthenticator()]);
+        $a->setUsername(null);
+        $a->setPassword(null);
+        $a->setAuthMode(null);
 
-        $this->services['swiftmailer.mailer.default.transport'] = $instance = new \Swift_Transport_EsmtpTransport(new \Swift_Transport_StreamBuffer(new \Swift_StreamFilters_StringReplacementFilterFactory()), array(0 => $a), new \Swift_Events_SimpleEventDispatcher());
+        $this->services['swiftmailer.mailer.default.transport'] = $instance = new \Swift_Transport_EsmtpTransport(new \Swift_Transport_StreamBuffer(new \Swift_StreamFilters_StringReplacementFilterFactory()), [0 => $a], new \Swift_Events_SimpleEventDispatcher());
 
         $instance->setHost('localhost');
         $instance->setPort(25);
-        $instance->setEncryption(NULL);
+        $instance->setEncryption(null);
         $instance->setTimeout(30);
-        $instance->setSourceIp(NULL);
+        $instance->setSourceIp(null);
         $instance->registerPlugin($this->get('swiftmailer.mailer.default.plugin.messagelogger'));
 
         return $instance;
     }
 
     /**
-     * Gets the 'templating' service.
+     * Gets the 'swiftmailer.mailer.default' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @return \Symfony\Bundle\TwigBundle\TwigEngine A Symfony\Bundle\TwigBundle\TwigEngine instance.
+     * @return \Swift_Mailer A Swift_Mailer instance.
      */
-    protected function getTemplatingService()
+    protected function getSwiftmailer_Mailer_DefaultService()
     {
-        return $this->services['templating'] = new \Symfony\Bundle\TwigBundle\TwigEngine($this->get('twig'), $this->get('templating.name_parser'), $this->get('templating.locator'));
+        return $this->services['swiftmailer.mailer.default'] = new \Swift_Mailer($this->get('swiftmailer.mailer.default.transport'));
     }
 
     /**
@@ -2904,7 +3812,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getTemplating_Helper_AssetsService()
     {
-        return $this->services['templating.helper.assets'] = new \Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper($this->get('assets.packages'), array());
+        return $this->services['templating.helper.assets'] = new \Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper($this->get('assets.packages'), []);
     }
 
     /**
@@ -2959,6 +3867,23 @@ class appDevDebugProjectContainer extends Container
         return $this->services['templating.loader'] = new \Symfony\Bundle\FrameworkBundle\Templating\Loader\FilesystemLoader($this->get('templating.locator'));
     }
 
+    /**
+     * Gets the 'templating.locator' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator A Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator instance.
+     */
+    protected function getTemplating_LocatorService()
+    {
+        return $this->services['templating.locator'] = new \Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator($this->get('file_locator'), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev');
+    }
+
     /**
      * Gets the 'templating.name_parser' service.
      *
@@ -2973,13 +3898,16 @@ class appDevDebugProjectContainer extends Container
     }
 
     /**
-     * Gets the 'test.client' service.
+     * Gets the 'templating' service.
      *
-     * @return \Symfony\Bundle\FrameworkBundle\Client A Symfony\Bundle\FrameworkBundle\Client instance.
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Bundle\TwigBundle\TwigEngine A Symfony\Bundle\TwigBundle\TwigEngine instance.
      */
-    protected function getTest_ClientService()
+    protected function getTemplatingService()
     {
-        return new \Symfony\Bundle\FrameworkBundle\Client($this->get('kernel'), array(), new \Symfony\Component\BrowserKit\History(), new \Symfony\Component\BrowserKit\CookieJar());
+        return $this->services['templating'] = new \Symfony\Bundle\TwigBundle\TwigEngine($this->get('twig'), $this->get('templating.name_parser'), $this->get('templating.locator'));
     }
 
     /**
@@ -3002,6 +3930,16 @@ class appDevDebugProjectContainer extends Container
         return new \Symfony\Component\BrowserKit\History();
     }
 
+    /**
+     * Gets the 'test.client' service.
+     *
+     * @return \Symfony\Bundle\FrameworkBundle\Client A Symfony\Bundle\FrameworkBundle\Client instance.
+     */
+    protected function getTest_ClientService()
+    {
+        return new \Symfony\Bundle\FrameworkBundle\Client($this->get('kernel'), [], new \Symfony\Component\BrowserKit\History(), new \Symfony\Component\BrowserKit\CookieJar());
+    }
+
     /**
      * Gets the 'test.session.listener' service.
      *
@@ -3145,24 +4083,6 @@ class appDevDebugProjectContainer extends Container
         return $this->services['translation.dumper.yml'] = new \Symfony\Component\Translation\Dumper\YamlFileDumper();
     }
 
-    /**
-     * Gets the 'translation.extractor' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\Translation\Extractor\ChainExtractor A Symfony\Component\Translation\Extractor\ChainExtractor instance.
-     */
-    protected function getTranslation_ExtractorService()
-    {
-        $this->services['translation.extractor'] = $instance = new \Symfony\Component\Translation\Extractor\ChainExtractor();
-
-        $instance->addExtractor('php', $this->get('translation.extractor.php'));
-        $instance->addExtractor('twig', $this->get('twig.translation.extractor'));
-
-        return $instance;
-    }
-
     /**
      * Gets the 'translation.extractor.php' service.
      *
@@ -3177,31 +4097,19 @@ class appDevDebugProjectContainer extends Container
     }
 
     /**
-     * Gets the 'translation.loader' service.
+     * Gets the 'translation.extractor' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @return \Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader A Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader instance.
+     * @return \Symfony\Component\Translation\Extractor\ChainExtractor A Symfony\Component\Translation\Extractor\ChainExtractor instance.
      */
-    protected function getTranslation_LoaderService()
+    protected function getTranslation_ExtractorService()
     {
-        $a = $this->get('translation.loader.xliff');
+        $this->services['translation.extractor'] = $instance = new \Symfony\Component\Translation\Extractor\ChainExtractor();
 
-        $this->services['translation.loader'] = $instance = new \Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader();
-
-        $instance->addLoader('php', $this->get('translation.loader.php'));
-        $instance->addLoader('yml', $this->get('translation.loader.yml'));
-        $instance->addLoader('xlf', $a);
-        $instance->addLoader('xliff', $a);
-        $instance->addLoader('po', $this->get('translation.loader.po'));
-        $instance->addLoader('mo', $this->get('translation.loader.mo'));
-        $instance->addLoader('ts', $this->get('translation.loader.qt'));
-        $instance->addLoader('csv', $this->get('translation.loader.csv'));
-        $instance->addLoader('res', $this->get('translation.loader.res'));
-        $instance->addLoader('dat', $this->get('translation.loader.dat'));
-        $instance->addLoader('ini', $this->get('translation.loader.ini'));
-        $instance->addLoader('json', $this->get('translation.loader.json'));
+        $instance->addExtractor('php', $this->get('translation.extractor.php'));
+        $instance->addExtractor('twig', $this->get('twig.translation.extractor'));
 
         return $instance;
     }
@@ -3349,6 +4257,36 @@ class appDevDebugProjectContainer extends Container
         return $this->services['translation.loader.yml'] = new \Symfony\Component\Translation\Loader\YamlFileLoader();
     }
 
+    /**
+     * Gets the 'translation.loader' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader A Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader instance.
+     */
+    protected function getTranslation_LoaderService()
+    {
+        $a = $this->get('translation.loader.xliff');
+
+        $this->services['translation.loader'] = $instance = new \Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader();
+
+        $instance->addLoader('php', $this->get('translation.loader.php'));
+        $instance->addLoader('yml', $this->get('translation.loader.yml'));
+        $instance->addLoader('xlf', $a);
+        $instance->addLoader('xliff', $a);
+        $instance->addLoader('po', $this->get('translation.loader.po'));
+        $instance->addLoader('mo', $this->get('translation.loader.mo'));
+        $instance->addLoader('ts', $this->get('translation.loader.qt'));
+        $instance->addLoader('csv', $this->get('translation.loader.csv'));
+        $instance->addLoader('res', $this->get('translation.loader.res'));
+        $instance->addLoader('dat', $this->get('translation.loader.dat'));
+        $instance->addLoader('ini', $this->get('translation.loader.ini'));
+        $instance->addLoader('json', $this->get('translation.loader.json'));
+
+        return $instance;
+    }
+
     /**
      * Gets the 'translation.writer' service.
      *
@@ -3375,19 +4313,6 @@ class appDevDebugProjectContainer extends Container
         return $instance;
     }
 
-    /**
-     * Gets the 'translator' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\Translation\DataCollectorTranslator A Symfony\Component\Translation\DataCollectorTranslator instance.
-     */
-    protected function getTranslatorService()
-    {
-        return $this->services['translator'] = new \Symfony\Component\Translation\DataCollectorTranslator(new \Symfony\Component\Translation\LoggingTranslator($this->get('translator.default'), $this->get('monolog.logger.translation')));
-    }
-
     /**
      * Gets the 'translator.default' service.
      *
@@ -3398,9 +4323,9 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getTranslator_DefaultService()
     {
-        $this->services['translator.default'] = $instance = new \Symfony\Bundle\FrameworkBundle\Translation\Translator($this, new \Symfony\Component\Translation\MessageSelector(), array('translation.loader.php' => array(0 => 'php'), 'translation.loader.yml' => array(0 => 'yml'), 'translation.loader.xliff' => array(0 => 'xlf', 1 => 'xliff'), 'translation.loader.po' => array(0 => 'po'), 'translation.loader.mo' => array(0 => 'mo'), 'translation.loader.qt' => array(0 => 'ts'), 'translation.loader.csv' => array(0 => 'csv'), 'translation.loader.res' => array(0 => 'res'), 'translation.loader.dat' => array(0 => 'dat'), 'translation.loader.ini' => array(0 => 'ini'), 'translation.loader.json' => array(0 => 'json')), array('cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/translations', 'debug' => true, 'resource_files' => array('af' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.af.xlf'), 'ar' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ar.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ar.xlf'), 'az' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.az.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.az.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.az.xlf'), 'bg' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf'), 'ca' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ca.xlf'), 'cs' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.cs.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.cs.xlf'), 'cy' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf'), 'da' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.da.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.da.xlf'), 'de' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.de.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.de.xlf'), 'el' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.el.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.el.xlf'), 'en' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.en.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.en.xlf', 3 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/messages.en.yml'), 'es' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.es.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.es.xlf'), 'et' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.et.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.et.xlf'), 'eu' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.eu.xlf'), 'fa' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.fa.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.fa.xlf'), 'fi' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.fi.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.fi.xlf'), 'fr' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.fr.xlf', 3 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/translations/messages.fr.yml', 4 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/custom-fields/Resources/translations/messages.fr.yml', 5 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/messages.fr.yml', 6 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/validators.fr.yml', 7 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Resources/translations/messages.fr.xlf'), 'gl' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.gl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.gl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.gl.xlf'), 'he' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.he.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.he.xlf'), 'hr' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.hr.xlf'), 'hu' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.hu.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.hu.xlf'), 'hy' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf'), 'id' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.id.xlf'), 'it' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.it.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.it.xlf'), 'ja' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf'), 'lb' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.lb.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.lb.xlf'), 'lt' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.lt.xlf'), 'mn' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.mn.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.mn.xlf'), 'nb' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nb.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.nb.xlf'), 'nl' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.nl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.nl.xlf', 3 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/translations/messages.nl.yml', 4 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/custom-fields/Resources/translations/messages.nl.yml', 5 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/messages.nl.yml', 6 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/validators.nl.yml'), 'no' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.no.xlf'), 'pl' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.pl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.pl.xlf'), 'pt' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pt.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.pt.xlf'), 'pt_BR' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.pt_BR.xlf'), 'ro' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ro.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ro.xlf'), 'ru' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ru.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ru.xlf'), 'sk' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sk.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sk.xlf'), 'sl' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sl.xlf'), 'sq' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sq.xlf'), 'sr_Cyrl' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sr_Cyrl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sr_Cyrl.xlf'), 'sr_Latn' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sr_Latn.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sr_Latn.xlf'), 'sv' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sv.xlf'), 'th' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf'), 'tr' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.tr.xlf'), 'uk' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.uk.xlf'), 'vi' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf'), 'zh_CN' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.zh_CN.xlf'), 'zh_TW' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf'), 'lv' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.lv.xlf'), 'pt_PT' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.pt_PT.xlf'), 'ua' => array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ua.xlf'))), array());
+        $this->services['translator.default'] = $instance = new \Symfony\Bundle\FrameworkBundle\Translation\Translator($this, new \Symfony\Component\Translation\MessageSelector(), ['translation.loader.php' => [0 => 'php'], 'translation.loader.yml' => [0 => 'yml'], 'translation.loader.xliff' => [0 => 'xlf', 1 => 'xliff'], 'translation.loader.po' => [0 => 'po'], 'translation.loader.mo' => [0 => 'mo'], 'translation.loader.qt' => [0 => 'ts'], 'translation.loader.csv' => [0 => 'csv'], 'translation.loader.res' => [0 => 'res'], 'translation.loader.dat' => [0 => 'dat'], 'translation.loader.ini' => [0 => 'ini'], 'translation.loader.json' => [0 => 'json']], ['cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/translations', 'debug' => true, 'resource_files' => ['af' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.af.xlf'], 'ar' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ar.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ar.xlf'], 'az' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.az.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.az.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.az.xlf'], 'bg' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf'], 'ca' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ca.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ca.xlf'], 'cs' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.cs.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.cs.xlf'], 'cy' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf'], 'da' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.da.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.da.xlf'], 'de' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.de.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.de.xlf'], 'el' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.el.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.el.xlf'], 'en' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.en.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.en.xlf', 3 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/messages.en.yml'], 'es' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.es.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.es.xlf'], 'et' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.et.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.et.xlf'], 'eu' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.eu.xlf'], 'fa' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.fa.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.fa.xlf'], 'fi' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.fi.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.fi.xlf'], 'fr' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.fr.xlf', 3 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/translations/messages.fr.yml', 4 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/custom-fields/Resources/translations/messages.fr.yml', 5 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/messages.fr.yml', 6 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/validators.fr.yml', 7 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Resources/translations/messages.fr.xlf'], 'gl' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.gl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.gl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.gl.xlf'], 'he' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.he.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.he.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.he.xlf'], 'hr' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.hr.xlf'], 'hu' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.hu.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.hu.xlf'], 'hy' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hy.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.hy.xlf'], 'id' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.id.xlf'], 'it' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.it.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.it.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.it.xlf'], 'ja' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf'], 'lb' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.lb.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.lb.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.lb.xlf'], 'lt' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.lt.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.lt.xlf'], 'mn' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.mn.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.mn.xlf'], 'nb' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nb.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.nb.xlf'], 'nl' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.nl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.nl.xlf', 3 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/main/Resources/translations/messages.nl.yml', 4 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/custom-fields/Resources/translations/messages.nl.yml', 5 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/messages.nl.yml', 6 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/translations/validators.nl.yml'], 'no' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.no.xlf'], 'pl' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.pl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.pl.xlf'], 'pt' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pt.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.pt.xlf'], 'pt_BR' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.pt_BR.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.pt_BR.xlf'], 'ro' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ro.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ro.xlf'], 'ru' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.ru.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ru.xlf'], 'sk' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sk.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sk.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sk.xlf'], 'sl' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sl.xlf'], 'sq' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sq.xlf'], 'sr_Cyrl' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sr_Cyrl.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sr_Cyrl.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sr_Cyrl.xlf'], 'sr_Latn' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sr_Latn.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sr_Latn.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sr_Latn.xlf'], 'sv' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.sv.xlf', 2 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.sv.xlf'], 'th' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf'], 'tr' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.tr.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.tr.xlf'], 'uk' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.uk.xlf'], 'vi' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.vi.xlf'], 'zh_CN' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf', 1 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.zh_CN.xlf'], 'zh_TW' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.zh_TW.xlf'], 'lv' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/translations/validators.lv.xlf'], 'pt_PT' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.pt_PT.xlf'], 'ua' => [0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Exception/../Resources/translations/security.ua.xlf']]], []);
 
-        $instance->setFallbackLocales(array(0 => 'fr'));
+        $instance->setFallbackLocales([0 => 'fr']);
 
         return $instance;
     }
@@ -3419,64 +4344,16 @@ class appDevDebugProjectContainer extends Container
     }
 
     /**
-     * Gets the 'twig' service.
+     * Gets the 'translator' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @return \Twig_Environment A Twig_Environment instance.
+     * @return \Symfony\Component\Translation\DataCollectorTranslator A Symfony\Component\Translation\DataCollectorTranslator instance.
      */
-    protected function getTwigService()
+    protected function getTranslatorService()
     {
-        $a = $this->get('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE);
-        $b = $this->get('request_stack');
-        $c = $this->get('fragment.handler');
-
-        $d = new \Symfony\Bridge\Twig\Extension\HttpFoundationExtension($b);
-
-        $e = new \Symfony\Bridge\Twig\AppVariable();
-        $e->setEnvironment('dev');
-        $e->setDebug(true);
-        if ($this->has('security.token_storage')) {
-            $e->setTokenStorage($this->get('security.token_storage', ContainerInterface::NULL_ON_INVALID_REFERENCE));
-        }
-        if ($this->has('request_stack')) {
-            $e->setRequestStack($b);
-        }
-        $e->setContainer($this);
-
-        $this->services['twig'] = $instance = new \Twig_Environment($this->get('twig.loader'), array('form_themes' => array(0 => 'form_div_layout.html.twig', 1 => 'ChillCustomFieldsBundle:Form:fields.html.twig', 2 => 'ChillMainBundle:Form:fields.html.twig'), 'exception_controller' => 'twig.controller.exception:showAction', 'autoescape' => 'filename', 'cache' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/twig', 'charset' => 'UTF-8', 'debug' => true, 'paths' => array(), 'date' => array('format' => 'F j, Y H:i', 'interval_format' => '%d days', 'timezone' => NULL), 'number_format' => array('decimals' => 0, 'decimal_point' => '.', 'thousands_separator' => ',')));
-
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\LogoutUrlExtension($this->get('security.logout_url_generator')));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\SecurityExtension($this->get('security.authorization_checker', ContainerInterface::NULL_ON_INVALID_REFERENCE)));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\ProfilerExtension($this->get('twig.profile'), $a));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\TranslationExtension($this->get('translator')));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\AssetExtension($this->get('assets.packages'), $d));
-        $instance->addExtension(new \Symfony\Bundle\TwigBundle\Extension\ActionsExtension($c));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\CodeExtension(NULL, '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app', 'UTF-8'));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\RoutingExtension($this->get('router')));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\YamlExtension());
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\StopwatchExtension($a, true));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\ExpressionExtension());
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\HttpKernelExtension($c));
-        $instance->addExtension($d);
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\FormExtension(new \Symfony\Bridge\Twig\Form\TwigRenderer(new \Symfony\Bridge\Twig\Form\TwigRendererEngine(array(0 => 'form_div_layout.html.twig', 1 => 'ChillCustomFieldsBundle:Form:fields.html.twig', 2 => 'ChillMainBundle:Form:fields.html.twig')), $this->get('security.csrf.token_manager', ContainerInterface::NULL_ON_INVALID_REFERENCE))));
-        $instance->addExtension(new \Twig_Extension_Debug());
-        $instance->addExtension(new \Symfony\Bundle\AsseticBundle\Twig\AsseticExtension($this->get('assetic.asset_factory'), $this->get('templating.name_parser'), false, array(), array(0 => 'ChillPersonBundle', 1 => 'ChillMainBundle'), new \Symfony\Bundle\AsseticBundle\DefaultValueSupplier($this)));
-        $instance->addExtension(new \Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension());
-        $instance->addExtension($this->get('chill.main.twig.chill_menu'));
-        $instance->addExtension($this->get('twig_intl'));
-        $instance->addExtension($this->get('chill.main.twig.translatable_string'));
-        $instance->addExtension($this->get('chill.main.twig.csv_cell'));
-        $instance->addExtension($this->get('chill.custom_field.twig.custom_fields_rendering'));
-        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\DumpExtension($this->get('var_dumper.cloner')));
-        $instance->addExtension(new \Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension());
-        $instance->addGlobal('app', $e);
-        $instance->addGlobal('installation', array('name' => 'Chill'));
-        $instance->addGlobal('available_languages', array(0 => 'fr'));
-        call_user_func(array(new \Symfony\Bundle\TwigBundle\DependencyInjection\Configurator\EnvironmentConfigurator('F j, Y H:i', '%d days', NULL, 0, '.', ','), 'configure'), $instance);
-
-        return $instance;
+        return $this->services['translator'] = new \Symfony\Component\Translation\DataCollectorTranslator(new \Symfony\Component\Translation\LoggingTranslator($this->get('translator.default'), $this->get('monolog.logger.translation')));
     }
 
     /**
@@ -3586,6 +4463,69 @@ class appDevDebugProjectContainer extends Container
         return $this->services['twig_intl'] = new \Twig_Extensions_Extension_Intl();
     }
 
+    /**
+     * Gets the 'twig' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Twig_Environment A Twig_Environment instance.
+     */
+    protected function getTwigService()
+    {
+        $a = $this->get('debug.stopwatch', ContainerInterface::NULL_ON_INVALID_REFERENCE);
+        $b = $this->get('request_stack');
+        $c = $this->get('fragment.handler');
+
+        $d = new \Symfony\Bridge\Twig\Extension\HttpFoundationExtension($b);
+
+        $e = new \Symfony\Bridge\Twig\AppVariable();
+        $e->setEnvironment('dev');
+        $e->setDebug(true);
+
+        if ($this->has('security.token_storage')) {
+            $e->setTokenStorage($this->get('security.token_storage', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+        }
+
+        if ($this->has('request_stack')) {
+            $e->setRequestStack($b);
+        }
+        $e->setContainer($this);
+
+        $this->services['twig'] = $instance = new \Twig_Environment($this->get('twig.loader'), ['form_themes' => [0 => 'form_div_layout.html.twig', 1 => 'ChillCustomFieldsBundle:Form:fields.html.twig', 2 => 'ChillMainBundle:Form:fields.html.twig'], 'exception_controller' => 'twig.controller.exception:showAction', 'autoescape' => 'filename', 'cache' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/twig', 'charset' => 'UTF-8', 'debug' => true, 'paths' => [], 'date' => ['format' => 'F j, Y H:i', 'interval_format' => '%d days', 'timezone' => null], 'number_format' => ['decimals' => 0, 'decimal_point' => '.', 'thousands_separator' => ',']]);
+
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\LogoutUrlExtension($this->get('security.logout_url_generator')));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\SecurityExtension($this->get('security.authorization_checker', ContainerInterface::NULL_ON_INVALID_REFERENCE)));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\ProfilerExtension($this->get('twig.profile'), $a));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\TranslationExtension($this->get('translator')));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\AssetExtension($this->get('assets.packages'), $d));
+        $instance->addExtension(new \Symfony\Bundle\TwigBundle\Extension\ActionsExtension($c));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\CodeExtension(null, '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app', 'UTF-8'));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\RoutingExtension($this->get('router')));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\YamlExtension());
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\StopwatchExtension($a, true));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\ExpressionExtension());
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\HttpKernelExtension($c));
+        $instance->addExtension($d);
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\FormExtension(new \Symfony\Bridge\Twig\Form\TwigRenderer(new \Symfony\Bridge\Twig\Form\TwigRendererEngine([0 => 'form_div_layout.html.twig', 1 => 'ChillCustomFieldsBundle:Form:fields.html.twig', 2 => 'ChillMainBundle:Form:fields.html.twig']), $this->get('security.csrf.token_manager', ContainerInterface::NULL_ON_INVALID_REFERENCE))));
+        $instance->addExtension(new \Twig_Extension_Debug());
+        $instance->addExtension(new \Symfony\Bundle\AsseticBundle\Twig\AsseticExtension($this->get('assetic.asset_factory'), $this->get('templating.name_parser'), false, [], [0 => 'ChillPersonBundle', 1 => 'ChillMainBundle'], new \Symfony\Bundle\AsseticBundle\DefaultValueSupplier($this)));
+        $instance->addExtension(new \Doctrine\Bundle\DoctrineBundle\Twig\DoctrineExtension());
+        $instance->addExtension($this->get('chill.main.twig.chill_menu'));
+        $instance->addExtension($this->get('twig_intl'));
+        $instance->addExtension($this->get('chill.main.twig.translatable_string'));
+        $instance->addExtension($this->get('chill.main.twig.csv_cell'));
+        $instance->addExtension($this->get('chill.custom_field.twig.custom_fields_rendering'));
+        $instance->addExtension(new \Symfony\Bridge\Twig\Extension\DumpExtension($this->get('var_dumper.cloner')));
+        $instance->addExtension(new \Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension());
+        $instance->addGlobal('app', $e);
+        $instance->addGlobal('installation', ['name' => 'Chill']);
+        $instance->addGlobal('available_languages', [0 => 'fr']);
+        call_user_func([new \Symfony\Bundle\TwigBundle\DependencyInjection\Configurator\EnvironmentConfigurator('F j, Y H:i', '%d days', null, 0, '.', ','), 'configure'], $instance);
+
+        return $instance;
+    }
+
     /**
      * Gets the 'uri_signer' service.
      *
@@ -3599,19 +4539,6 @@ class appDevDebugProjectContainer extends Container
         return $this->services['uri_signer'] = new \Symfony\Component\HttpKernel\UriSigner('Not very secret');
     }
 
-    /**
-     * Gets the 'validator' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Symfony\Component\Validator\Validator\ValidatorInterface A Symfony\Component\Validator\Validator\ValidatorInterface instance.
-     */
-    protected function getValidatorService()
-    {
-        return $this->services['validator'] = $this->get('validator.builder')->getValidator();
-    }
-
     /**
      * Gets the 'validator.builder' service.
      *
@@ -3624,13 +4551,13 @@ class appDevDebugProjectContainer extends Container
     {
         $this->services['validator.builder'] = $instance = \Symfony\Component\Validator\Validation::createValidatorBuilder();
 
-        $instance->setConstraintValidatorFactory(new \Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory($this, array('validator.expression' => 'validator.expression', 'Symfony\\Component\\Validator\\Constraints\\EmailValidator' => 'validator.email', 'security.validator.user_password' => 'security.validator.user_password', 'doctrine.orm.validator.unique' => 'doctrine.orm.validator.unique')));
+        $instance->setConstraintValidatorFactory(new \Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory($this, ['validator.expression' => 'validator.expression', 'Symfony\\Component\\Validator\\Constraints\\EmailValidator' => 'validator.email', 'security.validator.user_password' => 'security.validator.user_password', 'doctrine.orm.validator.unique' => 'doctrine.orm.validator.unique']));
         $instance->setTranslator($this->get('translator'));
         $instance->setTranslationDomain('validators');
-        $instance->addXmlMappings(array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/config/validation.xml'));
-        $instance->addYamlMappings(array(0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/config/validation.yml'));
+        $instance->addXmlMappings([0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/symfony/symfony/src/Symfony/Component/Form/Resources/config/validation.xml']);
+        $instance->addYamlMappings([0 => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/vendor/chill-project/person/Resources/config/validation.yml']);
         $instance->addMethodMapping('loadValidatorMetadata');
-        $instance->addObjectInitializers(array(0 => $this->get('doctrine.orm.validator_initializer')));
+        $instance->addObjectInitializers([0 => $this->get('doctrine.orm.validator_initializer')]);
 
         return $instance;
     }
@@ -3661,6 +4588,19 @@ class appDevDebugProjectContainer extends Container
         return $this->services['validator.expression'] = new \Symfony\Component\Validator\Constraints\ExpressionValidator($this->get('property_accessor'));
     }
 
+    /**
+     * Gets the 'validator' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return \Symfony\Component\Validator\Validator\ValidatorInterface A Symfony\Component\Validator\Validator\ValidatorInterface instance.
+     */
+    protected function getValidatorService()
+    {
+        return $this->services['validator'] = $this->get('validator.builder')->getValidator();
+    }
+
     /**
      * Gets the 'var_dumper.cli_dumper' service.
      *
@@ -3671,7 +4611,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getVarDumper_CliDumperService()
     {
-        return $this->services['var_dumper.cli_dumper'] = new \Symfony\Component\VarDumper\Dumper\CliDumper(NULL, 'UTF-8');
+        return $this->services['var_dumper.cli_dumper'] = new \Symfony\Component\VarDumper\Dumper\CliDumper(null, 'UTF-8');
     }
 
     /**
@@ -3715,7 +4655,7 @@ class appDevDebugProjectContainer extends Container
      */
     protected function getWebProfiler_Controller_ProfilerService()
     {
-        return $this->services['web_profiler.controller.profiler'] = new \Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController($this->get('router', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('profiler', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('twig'), array('data_collector.config' => array(0 => 'config', 1 => '@WebProfiler/Collector/config.html.twig'), 'data_collector.request' => array(0 => 'request', 1 => '@WebProfiler/Collector/request.html.twig'), 'data_collector.ajax' => array(0 => 'ajax', 1 => '@WebProfiler/Collector/ajax.html.twig'), 'data_collector.exception' => array(0 => 'exception', 1 => '@WebProfiler/Collector/exception.html.twig'), 'data_collector.events' => array(0 => 'events', 1 => '@WebProfiler/Collector/events.html.twig'), 'data_collector.logger' => array(0 => 'logger', 1 => '@WebProfiler/Collector/logger.html.twig'), 'data_collector.time' => array(0 => 'time', 1 => '@WebProfiler/Collector/time.html.twig'), 'data_collector.memory' => array(0 => 'memory', 1 => '@WebProfiler/Collector/memory.html.twig'), 'data_collector.router' => array(0 => 'router', 1 => '@WebProfiler/Collector/router.html.twig'), 'data_collector.form' => array(0 => 'form', 1 => '@WebProfiler/Collector/form.html.twig'), 'data_collector.translation' => array(0 => 'translation', 1 => '@WebProfiler/Collector/translation.html.twig'), 'data_collector.twig' => array(0 => 'twig', 1 => '@WebProfiler/Collector/twig.html.twig'), 'data_collector.security' => array(0 => 'security', 1 => '@Security/Collector/security.html.twig'), 'swiftmailer.data_collector' => array(0 => 'swiftmailer', 1 => '@Swiftmailer/Collector/swiftmailer.html.twig'), 'data_collector.doctrine' => array(0 => 'db', 1 => '@Doctrine/Collector/db.html.twig'), 'data_collector.dump' => array(0 => 'dump', 1 => '@Debug/Profiler/dump.html.twig')), 'bottom');
+        return $this->services['web_profiler.controller.profiler'] = new \Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController($this->get('router', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('profiler', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('twig'), ['data_collector.config' => [0 => 'config', 1 => '@WebProfiler/Collector/config.html.twig'], 'data_collector.request' => [0 => 'request', 1 => '@WebProfiler/Collector/request.html.twig'], 'data_collector.ajax' => [0 => 'ajax', 1 => '@WebProfiler/Collector/ajax.html.twig'], 'data_collector.exception' => [0 => 'exception', 1 => '@WebProfiler/Collector/exception.html.twig'], 'data_collector.events' => [0 => 'events', 1 => '@WebProfiler/Collector/events.html.twig'], 'data_collector.logger' => [0 => 'logger', 1 => '@WebProfiler/Collector/logger.html.twig'], 'data_collector.time' => [0 => 'time', 1 => '@WebProfiler/Collector/time.html.twig'], 'data_collector.memory' => [0 => 'memory', 1 => '@WebProfiler/Collector/memory.html.twig'], 'data_collector.router' => [0 => 'router', 1 => '@WebProfiler/Collector/router.html.twig'], 'data_collector.form' => [0 => 'form', 1 => '@WebProfiler/Collector/form.html.twig'], 'data_collector.translation' => [0 => 'translation', 1 => '@WebProfiler/Collector/translation.html.twig'], 'data_collector.twig' => [0 => 'twig', 1 => '@WebProfiler/Collector/twig.html.twig'], 'data_collector.security' => [0 => 'security', 1 => '@Security/Collector/security.html.twig'], 'swiftmailer.data_collector' => [0 => 'swiftmailer', 1 => '@Swiftmailer/Collector/swiftmailer.html.twig'], 'data_collector.doctrine' => [0 => 'db', 1 => '@Doctrine/Collector/db.html.twig'], 'data_collector.dump' => [0 => 'dump', 1 => '@Debug/Profiler/dump.html.twig']], 'bottom');
     }
 
     /**
@@ -3730,956 +4670,4 @@ class appDevDebugProjectContainer extends Container
     {
         return $this->services['web_profiler.controller.router'] = new \Symfony\Bundle\WebProfilerBundle\Controller\RouterController($this->get('profiler', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('twig'), $this->get('router', ContainerInterface::NULL_ON_INVALID_REFERENCE));
     }
-
-    /**
-     * Gets the 'assetic.asset_factory' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Bundle\AsseticBundle\Factory\AssetFactory A Symfony\Bundle\AsseticBundle\Factory\AssetFactory instance.
-     */
-    protected function getAssetic_AssetFactoryService()
-    {
-        return $this->services['assetic.asset_factory'] = new \Symfony\Bundle\AsseticBundle\Factory\AssetFactory($this->get('kernel'), $this, $this->getParameterBag(), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/../web', true);
-    }
-
-    /**
-     * Gets the 'controller_name_converter' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser A Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser instance.
-     */
-    protected function getControllerNameConverterService()
-    {
-        return $this->services['controller_name_converter'] = new \Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser($this->get('kernel'));
-    }
-
-    /**
-     * Gets the 'doctrine.dbal.logger.profiling.default' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Doctrine\DBAL\Logging\DebugStack A Doctrine\DBAL\Logging\DebugStack instance.
-     */
-    protected function getDoctrine_Dbal_Logger_Profiling_DefaultService()
-    {
-        return $this->services['doctrine.dbal.logger.profiling.default'] = new \Doctrine\DBAL\Logging\DebugStack();
-    }
-
-    /**
-     * Gets the 'router.request_context' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Routing\RequestContext A Symfony\Component\Routing\RequestContext instance.
-     */
-    protected function getRouter_RequestContextService()
-    {
-        return $this->services['router.request_context'] = new \Symfony\Component\Routing\RequestContext('', 'GET', 'localhost', 'http', 80, 443);
-    }
-
-    /**
-     * Gets the 'security.access.decision_manager' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Core\Authorization\AccessDecisionManager A Symfony\Component\Security\Core\Authorization\AccessDecisionManager instance.
-     */
-    protected function getSecurity_Access_DecisionManagerService()
-    {
-        $a = $this->get('security.authentication.trust_resolver');
-        $b = $this->get('security.role_hierarchy');
-
-        return $this->services['security.access.decision_manager'] = new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager(array(0 => $this->get('chill.person.security.authorization.person'), 1 => new \Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter(new \Symfony\Component\Security\Core\Authorization\ExpressionLanguage(), $a, $b), 2 => new \Symfony\Component\Security\Core\Authorization\Voter\RoleHierarchyVoter($b), 3 => new \Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter($a)), 'affirmative', false, true);
-    }
-
-    /**
-     * Gets the 'security.authentication.manager' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager A Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager instance.
-     */
-    protected function getSecurity_Authentication_ManagerService()
-    {
-        $this->services['security.authentication.manager'] = $instance = new \Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager(array(0 => new \Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider($this->get('security.user.provider.concrete.chain_provider'), new \Symfony\Component\Security\Core\User\UserChecker(), 'default', $this->get('security.encoder_factory'), true), 1 => new \Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider('5593aedf3be85')), true);
-
-        $instance->setEventDispatcher($this->get('debug.event_dispatcher'));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'security.authentication.trust_resolver' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver A Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver instance.
-     */
-    protected function getSecurity_Authentication_TrustResolverService()
-    {
-        return $this->services['security.authentication.trust_resolver'] = new \Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver('Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken', 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken');
-    }
-
-    /**
-     * Gets the 'security.logout_url_generator' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Http\Logout\LogoutUrlGenerator A Symfony\Component\Security\Http\Logout\LogoutUrlGenerator instance.
-     */
-    protected function getSecurity_LogoutUrlGeneratorService()
-    {
-        $this->services['security.logout_url_generator'] = $instance = new \Symfony\Component\Security\Http\Logout\LogoutUrlGenerator($this->get('request_stack', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('router', ContainerInterface::NULL_ON_INVALID_REFERENCE), $this->get('security.token_storage', ContainerInterface::NULL_ON_INVALID_REFERENCE));
-
-        $instance->registerListener('default', '/logout', 'logout', '_csrf_token', NULL);
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'security.role_hierarchy' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Core\Role\RoleHierarchy A Symfony\Component\Security\Core\Role\RoleHierarchy instance.
-     */
-    protected function getSecurity_RoleHierarchyService()
-    {
-        return $this->services['security.role_hierarchy'] = new \Symfony\Component\Security\Core\Role\RoleHierarchy(array('CHILL_PERSON_UPDATE' => array(0 => 'CHILL_PERSON_SEE'), 'CHILL_PERSON_CREATE' => array(0 => 'CHILL_PERSON_SEE')));
-    }
-
-    /**
-     * Gets the 'security.user.provider.concrete.chain_provider' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Core\User\ChainUserProvider A Symfony\Component\Security\Core\User\ChainUserProvider instance.
-     */
-    protected function getSecurity_User_Provider_Concrete_ChainProviderService()
-    {
-        return $this->services['security.user.provider.concrete.chain_provider'] = new \Symfony\Component\Security\Core\User\ChainUserProvider(array(0 => $this->get('security.user.provider.concrete.in_memory'), 1 => $this->get('security.user.provider.concrete.users')));
-    }
-
-    /**
-     * Gets the 'security.user.provider.concrete.in_memory' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\Security\Core\User\InMemoryUserProvider A Symfony\Component\Security\Core\User\InMemoryUserProvider instance.
-     */
-    protected function getSecurity_User_Provider_Concrete_InMemoryService()
-    {
-        $this->services['security.user.provider.concrete.in_memory'] = $instance = new \Symfony\Component\Security\Core\User\InMemoryUserProvider();
-
-        $instance->createUser(new \Symfony\Component\Security\Core\User\User('admin', 'olala', array(0 => 'ROLE_ADMIN')));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'security.user.provider.concrete.users' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Bridge\Doctrine\Security\User\EntityUserProvider A Symfony\Bridge\Doctrine\Security\User\EntityUserProvider instance.
-     */
-    protected function getSecurity_User_Provider_Concrete_UsersService()
-    {
-        return $this->services['security.user.provider.concrete.users'] = new \Symfony\Bridge\Doctrine\Security\User\EntityUserProvider($this->get('doctrine'), 'Chill\\MainBundle\\Entity\\User', 'username', NULL);
-    }
-
-    /**
-     * Gets the 'session.storage.metadata_bag' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Component\HttpFoundation\Session\Storage\MetadataBag A Symfony\Component\HttpFoundation\Session\Storage\MetadataBag instance.
-     */
-    protected function getSession_Storage_MetadataBagService()
-    {
-        return $this->services['session.storage.metadata_bag'] = new \Symfony\Component\HttpFoundation\Session\Storage\MetadataBag('_sf2_meta', '0');
-    }
-
-    /**
-     * Gets the 'templating.locator' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-     *
-     * @return \Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator A Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator instance.
-     */
-    protected function getTemplating_LocatorService()
-    {
-        return $this->services['templating.locator'] = new \Symfony\Bundle\FrameworkBundle\Templating\Loader\TemplateLocator($this->get('file_locator'), '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParameter($name)
-    {
-        $name = strtolower($name);
-
-        if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
-            throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
-        }
-
-        return $this->parameters[$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasParameter($name)
-    {
-        $name = strtolower($name);
-
-        return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setParameter($name, $value)
-    {
-        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParameterBag()
-    {
-        if (null === $this->parameterBag) {
-            $this->parameterBag = new FrozenParameterBag($this->parameters);
-        }
-
-        return $this->parameterBag;
-    }
-
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'kernel.root_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app',
-            'kernel.environment' => 'dev',
-            'kernel.debug' => true,
-            'kernel.name' => 'app',
-            'kernel.cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev',
-            'kernel.logs_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/logs',
-            'kernel.bundles' => array(
-                'FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle',
-                'SecurityBundle' => 'Symfony\\Bundle\\SecurityBundle\\SecurityBundle',
-                'TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle',
-                'MonologBundle' => 'Symfony\\Bundle\\MonologBundle\\MonologBundle',
-                'SwiftmailerBundle' => 'Symfony\\Bundle\\SwiftmailerBundle\\SwiftmailerBundle',
-                'AsseticBundle' => 'Symfony\\Bundle\\AsseticBundle\\AsseticBundle',
-                'DoctrineBundle' => 'Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle',
-                'SensioFrameworkExtraBundle' => 'Sensio\\Bundle\\FrameworkExtraBundle\\SensioFrameworkExtraBundle',
-                'ChillMainBundle' => 'Chill\\MainBundle\\ChillMainBundle',
-                'ChillCustomFieldsBundle' => 'Chill\\CustomFieldsBundle\\ChillCustomFieldsBundle',
-                'ChillPersonBundle' => 'Chill\\PersonBundle\\ChillPersonBundle',
-                'ChillActivityBundle' => 'Chill\\ActivityBundle\\ChillActivityBundle',
-                'DebugBundle' => 'Symfony\\Bundle\\DebugBundle\\DebugBundle',
-                'WebProfilerBundle' => 'Symfony\\Bundle\\WebProfilerBundle\\WebProfilerBundle',
-                'SensioDistributionBundle' => 'Sensio\\Bundle\\DistributionBundle\\SensioDistributionBundle',
-                'SensioGeneratorBundle' => 'Sensio\\Bundle\\GeneratorBundle\\SensioGeneratorBundle',
-            ),
-            'kernel.charset' => 'UTF-8',
-            'kernel.container_class' => 'appDevDebugProjectContainer',
-            'database_host' => '127.0.0.1',
-            'database_port' => 5432,
-            'database_name' => 'chill_test',
-            'database_user' => 'chill',
-            'database_password' => 'chill',
-            'locale' => 'fr',
-            'controller_resolver.class' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
-            'controller_name_converter.class' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
-            'response_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
-            'streamed_response_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\StreamedResponseListener',
-            'locale_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\LocaleListener',
-            'event_dispatcher.class' => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
-            'http_kernel.class' => 'Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel',
-            'filesystem.class' => 'Symfony\\Component\\Filesystem\\Filesystem',
-            'cache_warmer.class' => 'Symfony\\Component\\HttpKernel\\CacheWarmer\\CacheWarmerAggregate',
-            'cache_clearer.class' => 'Symfony\\Component\\HttpKernel\\CacheClearer\\ChainCacheClearer',
-            'file_locator.class' => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
-            'uri_signer.class' => 'Symfony\\Component\\HttpKernel\\UriSigner',
-            'request_stack.class' => 'Symfony\\Component\\HttpFoundation\\RequestStack',
-            'fragment.handler.class' => 'Symfony\\Component\\HttpKernel\\DependencyInjection\\LazyLoadingFragmentHandler',
-            'fragment.renderer.inline.class' => 'Symfony\\Component\\HttpKernel\\Fragment\\InlineFragmentRenderer',
-            'fragment.renderer.hinclude.class' => 'Symfony\\Component\\HttpKernel\\Fragment\\HIncludeFragmentRenderer',
-            'fragment.renderer.hinclude.global_template' => NULL,
-            'fragment.renderer.esi.class' => 'Symfony\\Component\\HttpKernel\\Fragment\\EsiFragmentRenderer',
-            'fragment.path' => '/_fragment',
-            'translator.class' => 'Symfony\\Bundle\\FrameworkBundle\\Translation\\Translator',
-            'translator.identity.class' => 'Symfony\\Component\\Translation\\IdentityTranslator',
-            'translator.selector.class' => 'Symfony\\Component\\Translation\\MessageSelector',
-            'translation.loader.php.class' => 'Symfony\\Component\\Translation\\Loader\\PhpFileLoader',
-            'translation.loader.yml.class' => 'Symfony\\Component\\Translation\\Loader\\YamlFileLoader',
-            'translation.loader.xliff.class' => 'Symfony\\Component\\Translation\\Loader\\XliffFileLoader',
-            'translation.loader.po.class' => 'Symfony\\Component\\Translation\\Loader\\PoFileLoader',
-            'translation.loader.mo.class' => 'Symfony\\Component\\Translation\\Loader\\MoFileLoader',
-            'translation.loader.qt.class' => 'Symfony\\Component\\Translation\\Loader\\QtFileLoader',
-            'translation.loader.csv.class' => 'Symfony\\Component\\Translation\\Loader\\CsvFileLoader',
-            'translation.loader.res.class' => 'Symfony\\Component\\Translation\\Loader\\IcuResFileLoader',
-            'translation.loader.dat.class' => 'Symfony\\Component\\Translation\\Loader\\IcuDatFileLoader',
-            'translation.loader.ini.class' => 'Symfony\\Component\\Translation\\Loader\\IniFileLoader',
-            'translation.loader.json.class' => 'Symfony\\Component\\Translation\\Loader\\JsonFileLoader',
-            'translation.dumper.php.class' => 'Symfony\\Component\\Translation\\Dumper\\PhpFileDumper',
-            'translation.dumper.xliff.class' => 'Symfony\\Component\\Translation\\Dumper\\XliffFileDumper',
-            'translation.dumper.po.class' => 'Symfony\\Component\\Translation\\Dumper\\PoFileDumper',
-            'translation.dumper.mo.class' => 'Symfony\\Component\\Translation\\Dumper\\MoFileDumper',
-            'translation.dumper.yml.class' => 'Symfony\\Component\\Translation\\Dumper\\YamlFileDumper',
-            'translation.dumper.qt.class' => 'Symfony\\Component\\Translation\\Dumper\\QtFileDumper',
-            'translation.dumper.csv.class' => 'Symfony\\Component\\Translation\\Dumper\\CsvFileDumper',
-            'translation.dumper.ini.class' => 'Symfony\\Component\\Translation\\Dumper\\IniFileDumper',
-            'translation.dumper.json.class' => 'Symfony\\Component\\Translation\\Dumper\\JsonFileDumper',
-            'translation.dumper.res.class' => 'Symfony\\Component\\Translation\\Dumper\\IcuResFileDumper',
-            'translation.extractor.php.class' => 'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor',
-            'translation.loader.class' => 'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader',
-            'translation.extractor.class' => 'Symfony\\Component\\Translation\\Extractor\\ChainExtractor',
-            'translation.writer.class' => 'Symfony\\Component\\Translation\\Writer\\TranslationWriter',
-            'property_accessor.class' => 'Symfony\\Component\\PropertyAccess\\PropertyAccessor',
-            'kernel.secret' => 'Not very secret',
-            'kernel.http_method_override' => true,
-            'kernel.trusted_hosts' => array(
-
-            ),
-            'kernel.trusted_proxies' => array(
-
-            ),
-            'kernel.default_locale' => 'fr',
-            'test.client.class' => 'Symfony\\Bundle\\FrameworkBundle\\Client',
-            'test.client.parameters' => array(
-
-            ),
-            'test.client.history.class' => 'Symfony\\Component\\BrowserKit\\History',
-            'test.client.cookiejar.class' => 'Symfony\\Component\\BrowserKit\\CookieJar',
-            'test.session.listener.class' => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\TestSessionListener',
-            'session.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
-            'session.flashbag.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBag',
-            'session.attribute_bag.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBag',
-            'session.storage.metadata_bag.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag',
-            'session.metadata.storage_key' => '_sf2_meta',
-            'session.storage.native.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
-            'session.storage.php_bridge.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
-            'session.storage.mock_file.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockFileSessionStorage',
-            'session.handler.native_file.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
-            'session.handler.write_check.class' => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\WriteCheckSessionHandler',
-            'session_listener.class' => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
-            'session.storage.options' => array(
-                'gc_probability' => 1,
-            ),
-            'session.save_path' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/sessions',
-            'session.metadata.update_threshold' => '0',
-            'security.secure_random.class' => 'Symfony\\Component\\Security\\Core\\Util\\SecureRandom',
-            'form.resolved_type_factory.class' => 'Symfony\\Component\\Form\\ResolvedFormTypeFactory',
-            'form.registry.class' => 'Symfony\\Component\\Form\\FormRegistry',
-            'form.factory.class' => 'Symfony\\Component\\Form\\FormFactory',
-            'form.extension.class' => 'Symfony\\Component\\Form\\Extension\\DependencyInjection\\DependencyInjectionExtension',
-            'form.type_guesser.validator.class' => 'Symfony\\Component\\Form\\Extension\\Validator\\ValidatorTypeGuesser',
-            'form.type_extension.form.request_handler.class' => 'Symfony\\Component\\Form\\Extension\\HttpFoundation\\HttpFoundationRequestHandler',
-            'form.type_extension.csrf.enabled' => true,
-            'form.type_extension.csrf.field_name' => '_token',
-            'security.csrf.token_generator.class' => 'Symfony\\Component\\Security\\Csrf\\TokenGenerator\\UriSafeTokenGenerator',
-            'security.csrf.token_storage.class' => 'Symfony\\Component\\Security\\Csrf\\TokenStorage\\SessionTokenStorage',
-            'security.csrf.token_manager.class' => 'Symfony\\Component\\Security\\Csrf\\CsrfTokenManager',
-            'templating.engine.delegating.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\DelegatingEngine',
-            'templating.name_parser.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
-            'templating.filename_parser.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateFilenameParser',
-            'templating.cache_warmer.template_paths.class' => 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\TemplatePathsCacheWarmer',
-            'templating.locator.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
-            'templating.loader.filesystem.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\FilesystemLoader',
-            'templating.loader.cache.class' => 'Symfony\\Component\\Templating\\Loader\\CacheLoader',
-            'templating.loader.chain.class' => 'Symfony\\Component\\Templating\\Loader\\ChainLoader',
-            'templating.finder.class' => 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\TemplateFinder',
-            'templating.helper.assets.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\AssetsHelper',
-            'templating.helper.router.class' => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Helper\\RouterHelper',
-            'templating.helper.code.file_link_format' => NULL,
-            'templating.loader.cache.path' => NULL,
-            'templating.engines' => array(
-                0 => 'twig',
-            ),
-            'validator.class' => 'Symfony\\Component\\Validator\\Validator\\ValidatorInterface',
-            'validator.builder.class' => 'Symfony\\Component\\Validator\\ValidatorBuilderInterface',
-            'validator.builder.factory.class' => 'Symfony\\Component\\Validator\\Validation',
-            'validator.mapping.cache.apc.class' => 'Symfony\\Component\\Validator\\Mapping\\Cache\\ApcCache',
-            'validator.mapping.cache.prefix' => '',
-            'validator.validator_factory.class' => 'Symfony\\Bundle\\FrameworkBundle\\Validator\\ConstraintValidatorFactory',
-            'validator.expression.class' => 'Symfony\\Component\\Validator\\Constraints\\ExpressionValidator',
-            'validator.email.class' => 'Symfony\\Component\\Validator\\Constraints\\EmailValidator',
-            'validator.translation_domain' => 'validators',
-            'validator.api' => '2.5-bc',
-            'translator.logging' => true,
-            'profiler.class' => 'Symfony\\Component\\HttpKernel\\Profiler\\Profiler',
-            'profiler_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\ProfilerListener',
-            'data_collector.config.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\ConfigDataCollector',
-            'data_collector.request.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\RequestDataCollector',
-            'data_collector.exception.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\ExceptionDataCollector',
-            'data_collector.events.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\EventDataCollector',
-            'data_collector.logger.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\LoggerDataCollector',
-            'data_collector.time.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\TimeDataCollector',
-            'data_collector.memory.class' => 'Symfony\\Component\\HttpKernel\\DataCollector\\MemoryDataCollector',
-            'data_collector.router.class' => 'Symfony\\Bundle\\FrameworkBundle\\DataCollector\\RouterDataCollector',
-            'form.resolved_type_factory.data_collector_proxy.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\Proxy\\ResolvedTypeFactoryDataCollectorProxy',
-            'form.type_extension.form.data_collector.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\Type\\DataCollectorTypeExtension',
-            'data_collector.form.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\FormDataCollector',
-            'data_collector.form.extractor.class' => 'Symfony\\Component\\Form\\Extension\\DataCollector\\FormDataExtractor',
-            'profiler_listener.only_exceptions' => false,
-            'profiler_listener.only_master_requests' => false,
-            'profiler.storage.dsn' => 'file:/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/profiler',
-            'profiler.storage.username' => '',
-            'profiler.storage.password' => '',
-            'profiler.storage.lifetime' => 86400,
-            'router.class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
-            'router.request_context.class' => 'Symfony\\Component\\Routing\\RequestContext',
-            'routing.loader.class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\DelegatingLoader',
-            'routing.resolver.class' => 'Symfony\\Component\\Config\\Loader\\LoaderResolver',
-            'routing.loader.xml.class' => 'Symfony\\Component\\Routing\\Loader\\XmlFileLoader',
-            'routing.loader.yml.class' => 'Symfony\\Component\\Routing\\Loader\\YamlFileLoader',
-            'routing.loader.php.class' => 'Symfony\\Component\\Routing\\Loader\\PhpFileLoader',
-            'router.options.generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-            'router.options.generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-            'router.options.generator_dumper_class' => 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper',
-            'router.options.matcher_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
-            'router.options.matcher_base_class' => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
-            'router.options.matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper',
-            'router.cache_warmer.class' => 'Symfony\\Bundle\\FrameworkBundle\\CacheWarmer\\RouterCacheWarmer',
-            'router.options.matcher.cache_class' => 'appDevUrlMatcher',
-            'router.options.generator.cache_class' => 'appDevUrlGenerator',
-            'router_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
-            'router.request_context.host' => 'localhost',
-            'router.request_context.scheme' => 'http',
-            'router.request_context.base_url' => '',
-            'router.resource' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/config/routing.yml',
-            'router.cache_class_prefix' => 'appDev',
-            'request_listener.http_port' => 80,
-            'request_listener.https_port' => 443,
-            'annotations.reader.class' => 'Doctrine\\Common\\Annotations\\AnnotationReader',
-            'annotations.cached_reader.class' => 'Doctrine\\Common\\Annotations\\CachedReader',
-            'annotations.file_cache_reader.class' => 'Doctrine\\Common\\Annotations\\FileCacheReader',
-            'debug.debug_handlers_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\DebugHandlersListener',
-            'debug.stopwatch.class' => 'Symfony\\Component\\Stopwatch\\Stopwatch',
-            'debug.error_handler.throw_at' => -1,
-            'debug.event_dispatcher.class' => 'Symfony\\Component\\HttpKernel\\Debug\\TraceableEventDispatcher',
-            'debug.container.dump' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml',
-            'debug.controller_resolver.class' => 'Symfony\\Component\\HttpKernel\\Controller\\TraceableControllerResolver',
-            'security.context.class' => 'Symfony\\Component\\Security\\Core\\SecurityContext',
-            'security.user_checker.class' => 'Symfony\\Component\\Security\\Core\\User\\UserChecker',
-            'security.encoder_factory.generic.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactory',
-            'security.encoder.digest.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\MessageDigestPasswordEncoder',
-            'security.encoder.plain.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\PlaintextPasswordEncoder',
-            'security.encoder.pbkdf2.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\Pbkdf2PasswordEncoder',
-            'security.encoder.bcrypt.class' => 'Symfony\\Component\\Security\\Core\\Encoder\\BCryptPasswordEncoder',
-            'security.user.provider.in_memory.class' => 'Symfony\\Component\\Security\\Core\\User\\InMemoryUserProvider',
-            'security.user.provider.in_memory.user.class' => 'Symfony\\Component\\Security\\Core\\User\\User',
-            'security.user.provider.chain.class' => 'Symfony\\Component\\Security\\Core\\User\\ChainUserProvider',
-            'security.authentication.trust_resolver.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolver',
-            'security.authentication.trust_resolver.anonymous_class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\AnonymousToken',
-            'security.authentication.trust_resolver.rememberme_class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\RememberMeToken',
-            'security.authentication.manager.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
-            'security.authentication.session_strategy.class' => 'Symfony\\Component\\Security\\Http\\Session\\SessionAuthenticationStrategy',
-            'security.access.decision_manager.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
-            'security.access.simple_role_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\RoleVoter',
-            'security.access.authenticated_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\AuthenticatedVoter',
-            'security.access.role_hierarchy_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\RoleHierarchyVoter',
-            'security.access.expression_voter.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\ExpressionVoter',
-            'security.firewall.class' => 'Symfony\\Component\\Security\\Http\\Firewall',
-            'security.firewall.map.class' => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
-            'security.firewall.context.class' => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
-            'security.matcher.class' => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
-            'security.expression_matcher.class' => 'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher',
-            'security.role_hierarchy.class' => 'Symfony\\Component\\Security\\Core\\Role\\RoleHierarchy',
-            'security.http_utils.class' => 'Symfony\\Component\\Security\\Http\\HttpUtils',
-            'security.validator.user_password.class' => 'Symfony\\Component\\Security\\Core\\Validator\\Constraints\\UserPasswordValidator',
-            'security.expression_language.class' => 'Symfony\\Component\\Security\\Core\\Authorization\\ExpressionLanguage',
-            'security.authentication.retry_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\RetryAuthenticationEntryPoint',
-            'security.channel_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\ChannelListener',
-            'security.authentication.form_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\FormAuthenticationEntryPoint',
-            'security.authentication.listener.form.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\UsernamePasswordFormAuthenticationListener',
-            'security.authentication.listener.simple_form.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\SimpleFormAuthenticationListener',
-            'security.authentication.listener.simple_preauth.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\SimplePreAuthenticationListener',
-            'security.authentication.listener.basic.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\BasicAuthenticationListener',
-            'security.authentication.basic_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\BasicAuthenticationEntryPoint',
-            'security.authentication.listener.digest.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\DigestAuthenticationListener',
-            'security.authentication.digest_entry_point.class' => 'Symfony\\Component\\Security\\Http\\EntryPoint\\DigestAuthenticationEntryPoint',
-            'security.authentication.listener.x509.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\X509AuthenticationListener',
-            'security.authentication.listener.anonymous.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\AnonymousAuthenticationListener',
-            'security.authentication.switchuser_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\SwitchUserListener',
-            'security.logout_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\LogoutListener',
-            'security.logout.handler.session.class' => 'Symfony\\Component\\Security\\Http\\Logout\\SessionLogoutHandler',
-            'security.logout.handler.cookie_clearing.class' => 'Symfony\\Component\\Security\\Http\\Logout\\CookieClearingLogoutHandler',
-            'security.logout.success_handler.class' => 'Symfony\\Component\\Security\\Http\\Logout\\DefaultLogoutSuccessHandler',
-            'security.access_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\AccessListener',
-            'security.access_map.class' => 'Symfony\\Component\\Security\\Http\\AccessMap',
-            'security.exception_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\ExceptionListener',
-            'security.context_listener.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\ContextListener',
-            'security.authentication.provider.dao.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\DaoAuthenticationProvider',
-            'security.authentication.provider.simple.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\SimpleAuthenticationProvider',
-            'security.authentication.provider.pre_authenticated.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\PreAuthenticatedAuthenticationProvider',
-            'security.authentication.provider.anonymous.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\AnonymousAuthenticationProvider',
-            'security.authentication.success_handler.class' => 'Symfony\\Component\\Security\\Http\\Authentication\\DefaultAuthenticationSuccessHandler',
-            'security.authentication.failure_handler.class' => 'Symfony\\Component\\Security\\Http\\Authentication\\DefaultAuthenticationFailureHandler',
-            'security.authentication.simple_success_failure_handler.class' => 'Symfony\\Component\\Security\\Http\\Authentication\\SimpleAuthenticationHandler',
-            'security.authentication.provider.rememberme.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\Provider\\RememberMeAuthenticationProvider',
-            'security.authentication.listener.rememberme.class' => 'Symfony\\Component\\Security\\Http\\Firewall\\RememberMeListener',
-            'security.rememberme.token.provider.in_memory.class' => 'Symfony\\Component\\Security\\Core\\Authentication\\RememberMe\\InMemoryTokenProvider',
-            'security.authentication.rememberme.services.persistent.class' => 'Symfony\\Component\\Security\\Http\\RememberMe\\PersistentTokenBasedRememberMeServices',
-            'security.authentication.rememberme.services.simplehash.class' => 'Symfony\\Component\\Security\\Http\\RememberMe\\TokenBasedRememberMeServices',
-            'security.rememberme.response_listener.class' => 'Symfony\\Component\\Security\\Http\\RememberMe\\ResponseListener',
-            'templating.helper.logout_url.class' => 'Symfony\\Bundle\\SecurityBundle\\Templating\\Helper\\LogoutUrlHelper',
-            'templating.helper.security.class' => 'Symfony\\Bundle\\SecurityBundle\\Templating\\Helper\\SecurityHelper',
-            'twig.extension.logout_url.class' => 'Symfony\\Bridge\\Twig\\Extension\\LogoutUrlExtension',
-            'twig.extension.security.class' => 'Symfony\\Bridge\\Twig\\Extension\\SecurityExtension',
-            'data_collector.security.class' => 'Symfony\\Bundle\\SecurityBundle\\DataCollector\\SecurityDataCollector',
-            'security.access.denied_url' => NULL,
-            'security.authentication.manager.erase_credentials' => true,
-            'security.authentication.session_strategy.strategy' => 'migrate',
-            'security.access.always_authenticate_before_granting' => false,
-            'security.authentication.hide_user_not_found' => true,
-            'security.role_hierarchy.roles' => array(
-                'CHILL_PERSON_UPDATE' => array(
-                    0 => 'CHILL_PERSON_SEE',
-                ),
-                'CHILL_PERSON_CREATE' => array(
-                    0 => 'CHILL_PERSON_SEE',
-                ),
-            ),
-            'twig.class' => 'Twig_Environment',
-            'twig.loader.filesystem.class' => 'Symfony\\Bundle\\TwigBundle\\Loader\\FilesystemLoader',
-            'twig.loader.chain.class' => 'Twig_Loader_Chain',
-            'templating.engine.twig.class' => 'Symfony\\Bundle\\TwigBundle\\TwigEngine',
-            'twig.cache_warmer.class' => 'Symfony\\Bundle\\TwigBundle\\CacheWarmer\\TemplateCacheCacheWarmer',
-            'twig.extension.trans.class' => 'Symfony\\Bridge\\Twig\\Extension\\TranslationExtension',
-            'twig.extension.actions.class' => 'Symfony\\Bundle\\TwigBundle\\Extension\\ActionsExtension',
-            'twig.extension.code.class' => 'Symfony\\Bridge\\Twig\\Extension\\CodeExtension',
-            'twig.extension.routing.class' => 'Symfony\\Bridge\\Twig\\Extension\\RoutingExtension',
-            'twig.extension.yaml.class' => 'Symfony\\Bridge\\Twig\\Extension\\YamlExtension',
-            'twig.extension.form.class' => 'Symfony\\Bridge\\Twig\\Extension\\FormExtension',
-            'twig.extension.httpkernel.class' => 'Symfony\\Bridge\\Twig\\Extension\\HttpKernelExtension',
-            'twig.extension.debug.stopwatch.class' => 'Symfony\\Bridge\\Twig\\Extension\\StopwatchExtension',
-            'twig.extension.expression.class' => 'Symfony\\Bridge\\Twig\\Extension\\ExpressionExtension',
-            'twig.form.engine.class' => 'Symfony\\Bridge\\Twig\\Form\\TwigRendererEngine',
-            'twig.form.renderer.class' => 'Symfony\\Bridge\\Twig\\Form\\TwigRenderer',
-            'twig.translation.extractor.class' => 'Symfony\\Bridge\\Twig\\Translation\\TwigExtractor',
-            'twig.exception_listener.class' => 'Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener',
-            'twig.controller.exception.class' => 'Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController',
-            'twig.controller.preview_error.class' => 'Symfony\\Bundle\\TwigBundle\\Controller\\PreviewErrorController',
-            'twig.exception_listener.controller' => 'twig.controller.exception:showAction',
-            'twig.form.resources' => array(
-                0 => 'form_div_layout.html.twig',
-                1 => 'ChillCustomFieldsBundle:Form:fields.html.twig',
-                2 => 'ChillMainBundle:Form:fields.html.twig',
-            ),
-            'monolog.logger.class' => 'Symfony\\Bridge\\Monolog\\Logger',
-            'monolog.gelf.publisher.class' => 'Gelf\\MessagePublisher',
-            'monolog.gelfphp.publisher.class' => 'Gelf\\Publisher',
-            'monolog.handler.stream.class' => 'Monolog\\Handler\\StreamHandler',
-            'monolog.handler.console.class' => 'Symfony\\Bridge\\Monolog\\Handler\\ConsoleHandler',
-            'monolog.handler.group.class' => 'Monolog\\Handler\\GroupHandler',
-            'monolog.handler.buffer.class' => 'Monolog\\Handler\\BufferHandler',
-            'monolog.handler.rotating_file.class' => 'Monolog\\Handler\\RotatingFileHandler',
-            'monolog.handler.syslog.class' => 'Monolog\\Handler\\SyslogHandler',
-            'monolog.handler.syslogudp.class' => 'Monolog\\Handler\\SyslogUdpHandler',
-            'monolog.handler.null.class' => 'Monolog\\Handler\\NullHandler',
-            'monolog.handler.test.class' => 'Monolog\\Handler\\TestHandler',
-            'monolog.handler.gelf.class' => 'Monolog\\Handler\\GelfHandler',
-            'monolog.handler.rollbar.class' => 'Monolog\\Handler\\RollbarHandler',
-            'monolog.handler.flowdock.class' => 'Monolog\\Handler\\FlowdockHandler',
-            'monolog.handler.browser_console.class' => 'Monolog\\Handler\\BrowserConsoleHandler',
-            'monolog.handler.firephp.class' => 'Symfony\\Bridge\\Monolog\\Handler\\FirePHPHandler',
-            'monolog.handler.chromephp.class' => 'Symfony\\Bridge\\Monolog\\Handler\\ChromePhpHandler',
-            'monolog.handler.debug.class' => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
-            'monolog.handler.swift_mailer.class' => 'Symfony\\Bridge\\Monolog\\Handler\\SwiftMailerHandler',
-            'monolog.handler.native_mailer.class' => 'Monolog\\Handler\\NativeMailerHandler',
-            'monolog.handler.socket.class' => 'Monolog\\Handler\\SocketHandler',
-            'monolog.handler.pushover.class' => 'Monolog\\Handler\\PushoverHandler',
-            'monolog.handler.raven.class' => 'Monolog\\Handler\\RavenHandler',
-            'monolog.handler.newrelic.class' => 'Monolog\\Handler\\NewRelicHandler',
-            'monolog.handler.hipchat.class' => 'Monolog\\Handler\\HipChatHandler',
-            'monolog.handler.slack.class' => 'Monolog\\Handler\\SlackHandler',
-            'monolog.handler.cube.class' => 'Monolog\\Handler\\CubeHandler',
-            'monolog.handler.amqp.class' => 'Monolog\\Handler\\AmqpHandler',
-            'monolog.handler.error_log.class' => 'Monolog\\Handler\\ErrorLogHandler',
-            'monolog.handler.loggly.class' => 'Monolog\\Handler\\LogglyHandler',
-            'monolog.handler.logentries.class' => 'Monolog\\Handler\\LogEntriesHandler',
-            'monolog.handler.whatfailuregroup.class' => 'Monolog\\Handler\\WhatFailureGroupHandler',
-            'monolog.activation_strategy.not_found.class' => 'Symfony\\Bundle\\MonologBundle\\NotFoundActivationStrategy',
-            'monolog.handler.fingers_crossed.class' => 'Monolog\\Handler\\FingersCrossedHandler',
-            'monolog.handler.fingers_crossed.error_level_activation_strategy.class' => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
-            'monolog.handler.filter.class' => 'Monolog\\Handler\\FilterHandler',
-            'monolog.handler.mongo.class' => 'Monolog\\Handler\\MongoDBHandler',
-            'monolog.mongo.client.class' => 'MongoClient',
-            'monolog.handler.elasticsearch.class' => 'Monolog\\Handler\\ElasticSearchHandler',
-            'monolog.elastica.client.class' => 'Elastica\\Client',
-            'monolog.swift_mailer.handlers' => array(
-
-            ),
-            'monolog.handlers_to_channels' => array(
-
-            ),
-            'swiftmailer.class' => 'Swift_Mailer',
-            'swiftmailer.transport.sendmail.class' => 'Swift_Transport_SendmailTransport',
-            'swiftmailer.transport.mail.class' => 'Swift_Transport_MailTransport',
-            'swiftmailer.transport.failover.class' => 'Swift_Transport_FailoverTransport',
-            'swiftmailer.plugin.redirecting.class' => 'Swift_Plugins_RedirectingPlugin',
-            'swiftmailer.plugin.impersonate.class' => 'Swift_Plugins_ImpersonatePlugin',
-            'swiftmailer.plugin.messagelogger.class' => 'Swift_Plugins_MessageLogger',
-            'swiftmailer.plugin.antiflood.class' => 'Swift_Plugins_AntiFloodPlugin',
-            'swiftmailer.transport.smtp.class' => 'Swift_Transport_EsmtpTransport',
-            'swiftmailer.plugin.blackhole.class' => 'Swift_Plugins_BlackholePlugin',
-            'swiftmailer.spool.file.class' => 'Swift_FileSpool',
-            'swiftmailer.spool.memory.class' => 'Swift_MemorySpool',
-            'swiftmailer.email_sender.listener.class' => 'Symfony\\Bundle\\SwiftmailerBundle\\EventListener\\EmailSenderListener',
-            'swiftmailer.data_collector.class' => 'Symfony\\Bundle\\SwiftmailerBundle\\DataCollector\\MessageDataCollector',
-            'swiftmailer.mailer.default.transport.name' => 'smtp',
-            'swiftmailer.mailer.default.delivery.enabled' => true,
-            'swiftmailer.mailer.default.transport.smtp.encryption' => NULL,
-            'swiftmailer.mailer.default.transport.smtp.port' => 25,
-            'swiftmailer.mailer.default.transport.smtp.host' => 'localhost',
-            'swiftmailer.mailer.default.transport.smtp.username' => NULL,
-            'swiftmailer.mailer.default.transport.smtp.password' => NULL,
-            'swiftmailer.mailer.default.transport.smtp.auth_mode' => NULL,
-            'swiftmailer.mailer.default.transport.smtp.timeout' => 30,
-            'swiftmailer.mailer.default.transport.smtp.source_ip' => NULL,
-            'swiftmailer.mailer.default.spool.enabled' => false,
-            'swiftmailer.mailer.default.plugin.impersonate' => NULL,
-            'swiftmailer.mailer.default.single_address' => NULL,
-            'swiftmailer.spool.enabled' => false,
-            'swiftmailer.delivery.enabled' => true,
-            'swiftmailer.single_address' => NULL,
-            'swiftmailer.mailers' => array(
-                'default' => 'swiftmailer.mailer.default',
-            ),
-            'swiftmailer.default_mailer' => 'default',
-            'assetic.asset_factory.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
-            'assetic.asset_manager.class' => 'Assetic\\Factory\\LazyAssetManager',
-            'assetic.asset_manager_cache_warmer.class' => 'Symfony\\Bundle\\AsseticBundle\\CacheWarmer\\AssetManagerCacheWarmer',
-            'assetic.cached_formula_loader.class' => 'Assetic\\Factory\\Loader\\CachedFormulaLoader',
-            'assetic.config_cache.class' => 'Assetic\\Cache\\ConfigCache',
-            'assetic.config_loader.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Loader\\ConfigurationLoader',
-            'assetic.config_resource.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Resource\\ConfigurationResource',
-            'assetic.coalescing_directory_resource.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Resource\\CoalescingDirectoryResource',
-            'assetic.directory_resource.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Resource\\DirectoryResource',
-            'assetic.filter_manager.class' => 'Symfony\\Bundle\\AsseticBundle\\FilterManager',
-            'assetic.worker.ensure_filter.class' => 'Assetic\\Factory\\Worker\\EnsureFilterWorker',
-            'assetic.worker.cache_busting.class' => 'Assetic\\Factory\\Worker\\CacheBustingWorker',
-            'assetic.value_supplier.class' => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
-            'assetic.node.paths' => array(
-
-            ),
-            'assetic.cache_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/assetic',
-            'assetic.bundles' => array(
-                0 => 'ChillPersonBundle',
-                1 => 'ChillMainBundle',
-            ),
-            'assetic.twig_extension.class' => 'Symfony\\Bundle\\AsseticBundle\\Twig\\AsseticExtension',
-            'assetic.twig_formula_loader.class' => 'Assetic\\Extension\\Twig\\TwigFormulaLoader',
-            'assetic.helper.dynamic.class' => 'Symfony\\Bundle\\AsseticBundle\\Templating\\DynamicAsseticHelper',
-            'assetic.helper.static.class' => 'Symfony\\Bundle\\AsseticBundle\\Templating\\StaticAsseticHelper',
-            'assetic.php_formula_loader.class' => 'Symfony\\Bundle\\AsseticBundle\\Factory\\Loader\\AsseticHelperFormulaLoader',
-            'assetic.debug' => true,
-            'assetic.use_controller' => false,
-            'assetic.enable_profiler' => false,
-            'assetic.read_from' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/../web',
-            'assetic.write_to' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/../web',
-            'assetic.variables' => array(
-
-            ),
-            'assetic.java.bin' => '/usr/bin/java',
-            'assetic.node.bin' => '/usr/local/bin/node',
-            'assetic.ruby.bin' => '/usr/local/opt/ruby/bin/ruby',
-            'assetic.sass.bin' => '/usr/local/bin/sass',
-            'assetic.filter.cssrewrite.class' => 'Assetic\\Filter\\CssRewriteFilter',
-            'assetic.twig_extension.functions' => array(
-
-            ),
-            'doctrine_cache.apc.class' => 'Doctrine\\Common\\Cache\\ApcCache',
-            'doctrine_cache.array.class' => 'Doctrine\\Common\\Cache\\ArrayCache',
-            'doctrine_cache.file_system.class' => 'Doctrine\\Common\\Cache\\FilesystemCache',
-            'doctrine_cache.php_file.class' => 'Doctrine\\Common\\Cache\\PhpFileCache',
-            'doctrine_cache.mongodb.class' => 'Doctrine\\Common\\Cache\\MongoDBCache',
-            'doctrine_cache.mongodb.collection.class' => 'MongoCollection',
-            'doctrine_cache.mongodb.connection.class' => 'MongoClient',
-            'doctrine_cache.mongodb.server' => 'localhost:27017',
-            'doctrine_cache.riak.class' => 'Doctrine\\Common\\Cache\\RiakCache',
-            'doctrine_cache.riak.bucket.class' => 'Riak\\Bucket',
-            'doctrine_cache.riak.connection.class' => 'Riak\\Connection',
-            'doctrine_cache.riak.bucket_property_list.class' => 'Riak\\BucketPropertyList',
-            'doctrine_cache.riak.host' => 'localhost',
-            'doctrine_cache.riak.port' => 8087,
-            'doctrine_cache.memcache.class' => 'Doctrine\\Common\\Cache\\MemcacheCache',
-            'doctrine_cache.memcache.connection.class' => 'Memcache',
-            'doctrine_cache.memcache.host' => 'localhost',
-            'doctrine_cache.memcache.port' => 11211,
-            'doctrine_cache.memcached.class' => 'Doctrine\\Common\\Cache\\MemcachedCache',
-            'doctrine_cache.memcached.connection.class' => 'Memcached',
-            'doctrine_cache.memcached.host' => 'localhost',
-            'doctrine_cache.memcached.port' => 11211,
-            'doctrine_cache.redis.class' => 'Doctrine\\Common\\Cache\\RedisCache',
-            'doctrine_cache.redis.connection.class' => 'Redis',
-            'doctrine_cache.redis.host' => 'localhost',
-            'doctrine_cache.redis.port' => 6379,
-            'doctrine_cache.couchbase.class' => 'Doctrine\\Common\\Cache\\CouchbaseCache',
-            'doctrine_cache.couchbase.connection.class' => 'Couchbase',
-            'doctrine_cache.couchbase.hostnames' => 'localhost:8091',
-            'doctrine_cache.wincache.class' => 'Doctrine\\Common\\Cache\\WinCacheCache',
-            'doctrine_cache.xcache.class' => 'Doctrine\\Common\\Cache\\XcacheCache',
-            'doctrine_cache.zenddata.class' => 'Doctrine\\Common\\Cache\\ZendDataCache',
-            'doctrine_cache.security.acl.cache.class' => 'Doctrine\\Bundle\\DoctrineCacheBundle\\Acl\\Model\\AclCache',
-            'doctrine.dbal.logger.chain.class' => 'Doctrine\\DBAL\\Logging\\LoggerChain',
-            'doctrine.dbal.logger.profiling.class' => 'Doctrine\\DBAL\\Logging\\DebugStack',
-            'doctrine.dbal.logger.class' => 'Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger',
-            'doctrine.dbal.configuration.class' => 'Doctrine\\DBAL\\Configuration',
-            'doctrine.data_collector.class' => 'Doctrine\\Bundle\\DoctrineBundle\\DataCollector\\DoctrineDataCollector',
-            'doctrine.dbal.connection.event_manager.class' => 'Symfony\\Bridge\\Doctrine\\ContainerAwareEventManager',
-            'doctrine.dbal.connection_factory.class' => 'Doctrine\\Bundle\\DoctrineBundle\\ConnectionFactory',
-            'doctrine.dbal.events.mysql_session_init.class' => 'Doctrine\\DBAL\\Event\\Listeners\\MysqlSessionInit',
-            'doctrine.dbal.events.oracle_session_init.class' => 'Doctrine\\DBAL\\Event\\Listeners\\OracleSessionInit',
-            'doctrine.class' => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
-            'doctrine.entity_managers' => array(
-                'default' => 'doctrine.orm.default_entity_manager',
-            ),
-            'doctrine.default_entity_manager' => 'default',
-            'doctrine.dbal.connection_factory.types' => array(
-
-            ),
-            'doctrine.connections' => array(
-                'default' => 'doctrine.dbal.default_connection',
-            ),
-            'doctrine.default_connection' => 'default',
-            'doctrine.orm.configuration.class' => 'Doctrine\\ORM\\Configuration',
-            'doctrine.orm.entity_manager.class' => 'Doctrine\\ORM\\EntityManager',
-            'doctrine.orm.manager_configurator.class' => 'Doctrine\\Bundle\\DoctrineBundle\\ManagerConfigurator',
-            'doctrine.orm.cache.array.class' => 'Doctrine\\Common\\Cache\\ArrayCache',
-            'doctrine.orm.cache.apc.class' => 'Doctrine\\Common\\Cache\\ApcCache',
-            'doctrine.orm.cache.memcache.class' => 'Doctrine\\Common\\Cache\\MemcacheCache',
-            'doctrine.orm.cache.memcache_host' => 'localhost',
-            'doctrine.orm.cache.memcache_port' => 11211,
-            'doctrine.orm.cache.memcache_instance.class' => 'Memcache',
-            'doctrine.orm.cache.memcached.class' => 'Doctrine\\Common\\Cache\\MemcachedCache',
-            'doctrine.orm.cache.memcached_host' => 'localhost',
-            'doctrine.orm.cache.memcached_port' => 11211,
-            'doctrine.orm.cache.memcached_instance.class' => 'Memcached',
-            'doctrine.orm.cache.redis.class' => 'Doctrine\\Common\\Cache\\RedisCache',
-            'doctrine.orm.cache.redis_host' => 'localhost',
-            'doctrine.orm.cache.redis_port' => 6379,
-            'doctrine.orm.cache.redis_instance.class' => 'Redis',
-            'doctrine.orm.cache.xcache.class' => 'Doctrine\\Common\\Cache\\XcacheCache',
-            'doctrine.orm.cache.wincache.class' => 'Doctrine\\Common\\Cache\\WinCacheCache',
-            'doctrine.orm.cache.zenddata.class' => 'Doctrine\\Common\\Cache\\ZendDataCache',
-            'doctrine.orm.metadata.driver_chain.class' => 'Doctrine\\Common\\Persistence\\Mapping\\Driver\\MappingDriverChain',
-            'doctrine.orm.metadata.annotation.class' => 'Doctrine\\ORM\\Mapping\\Driver\\AnnotationDriver',
-            'doctrine.orm.metadata.xml.class' => 'Doctrine\\ORM\\Mapping\\Driver\\SimplifiedXmlDriver',
-            'doctrine.orm.metadata.yml.class' => 'Doctrine\\ORM\\Mapping\\Driver\\SimplifiedYamlDriver',
-            'doctrine.orm.metadata.php.class' => 'Doctrine\\ORM\\Mapping\\Driver\\PHPDriver',
-            'doctrine.orm.metadata.staticphp.class' => 'Doctrine\\ORM\\Mapping\\Driver\\StaticPHPDriver',
-            'doctrine.orm.proxy_cache_warmer.class' => 'Symfony\\Bridge\\Doctrine\\CacheWarmer\\ProxyCacheWarmer',
-            'form.type_guesser.doctrine.class' => 'Symfony\\Bridge\\Doctrine\\Form\\DoctrineOrmTypeGuesser',
-            'doctrine.orm.validator.unique.class' => 'Symfony\\Bridge\\Doctrine\\Validator\\Constraints\\UniqueEntityValidator',
-            'doctrine.orm.validator_initializer.class' => 'Symfony\\Bridge\\Doctrine\\Validator\\DoctrineInitializer',
-            'doctrine.orm.security.user.provider.class' => 'Symfony\\Bridge\\Doctrine\\Security\\User\\EntityUserProvider',
-            'doctrine.orm.listeners.resolve_target_entity.class' => 'Doctrine\\ORM\\Tools\\ResolveTargetEntityListener',
-            'doctrine.orm.listeners.attach_entity_listeners.class' => 'Doctrine\\ORM\\Tools\\AttachEntityListenersListener',
-            'doctrine.orm.naming_strategy.default.class' => 'Doctrine\\ORM\\Mapping\\DefaultNamingStrategy',
-            'doctrine.orm.naming_strategy.underscore.class' => 'Doctrine\\ORM\\Mapping\\UnderscoreNamingStrategy',
-            'doctrine.orm.quote_strategy.default.class' => 'Doctrine\\ORM\\Mapping\\DefaultQuoteStrategy',
-            'doctrine.orm.quote_strategy.ansi.class' => 'Doctrine\\ORM\\Mapping\\AnsiQuoteStrategy',
-            'doctrine.orm.entity_listener_resolver.class' => 'Doctrine\\ORM\\Mapping\\DefaultEntityListenerResolver',
-            'doctrine.orm.second_level_cache.default_cache_factory.class' => 'Doctrine\\ORM\\Cache\\DefaultCacheFactory',
-            'doctrine.orm.second_level_cache.default_region.class' => 'Doctrine\\ORM\\Cache\\Region\\DefaultRegion',
-            'doctrine.orm.second_level_cache.filelock_region.class' => 'Doctrine\\ORM\\Cache\\Region\\FileLockRegion',
-            'doctrine.orm.second_level_cache.logger_chain.class' => 'Doctrine\\ORM\\Cache\\Logging\\CacheLoggerChain',
-            'doctrine.orm.second_level_cache.logger_statistics.class' => 'Doctrine\\ORM\\Cache\\Logging\\StatisticsCacheLogger',
-            'doctrine.orm.second_level_cache.cache_configuration.class' => 'Doctrine\\ORM\\Cache\\CacheConfiguration',
-            'doctrine.orm.second_level_cache.regions_configuration.class' => 'Doctrine\\ORM\\Cache\\RegionsConfiguration',
-            'doctrine.orm.auto_generate_proxy_classes' => true,
-            'doctrine.orm.proxy_dir' => '/Users/marcu/Projects/Chill/vendor/chill-project/activity/Tests/Fixtures/App/app/cache/dev/doctrine/orm/Proxies',
-            'doctrine.orm.proxy_namespace' => 'Proxies',
-            'sensio_framework_extra.view.guesser.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Templating\\TemplateGuesser',
-            'sensio_framework_extra.controller.listener.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
-            'sensio_framework_extra.routing.loader.annot_dir.class' => 'Symfony\\Component\\Routing\\Loader\\AnnotationDirectoryLoader',
-            'sensio_framework_extra.routing.loader.annot_file.class' => 'Symfony\\Component\\Routing\\Loader\\AnnotationFileLoader',
-            'sensio_framework_extra.routing.loader.annot_class.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Routing\\AnnotatedRouteControllerLoader',
-            'sensio_framework_extra.converter.listener.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
-            'sensio_framework_extra.converter.manager.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
-            'sensio_framework_extra.converter.doctrine.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
-            'sensio_framework_extra.converter.datetime.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
-            'sensio_framework_extra.view.listener.class' => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
-            'chill_main.installation_name' => 'Chill',
-            'chill_main.available_languages' => array(
-                0 => 'fr',
-            ),
-            'chill_main.routing.resources' => array(
-                0 => '@ChillPersonBundle/Resources/config/routing.yml',
-                1 => '@ChillCustomFieldsBundle/Resources/config/routing.yml',
-                2 => '@ChillMainBundle/Resources/config/routing.yml',
-            ),
-            'chill_custom_fields.customizables_entities' => array(
-                0 => array(
-                    'class' => 'Chill\\PersonBundle\\Entity\\Person',
-                    'name' => 'PersonEntity',
-                    'options' => array(
-
-                    ),
-                ),
-            ),
-            'cl_chill_person.search.use_double_metaphone' => false,
-            'web_profiler.controller.profiler.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Controller\\ProfilerController',
-            'web_profiler.controller.router.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Controller\\RouterController',
-            'web_profiler.controller.exception.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Controller\\ExceptionController',
-            'twig.extension.webprofiler.class' => 'Symfony\\Bundle\\WebProfilerBundle\\Twig\\WebProfilerExtension',
-            'web_profiler.debug_toolbar.position' => 'bottom',
-            'sensio_distribution.webconfigurator.class' => 'Sensio\\Bundle\\DistributionBundle\\Configurator\\Configurator',
-            'sensio_distribution.webconfigurator.doctrine_step.class' => 'Sensio\\Bundle\\DistributionBundle\\Configurator\\Step\\DoctrineStep',
-            'sensio_distribution.webconfigurator.secret_step.class' => 'Sensio\\Bundle\\DistributionBundle\\Configurator\\Step\\SecretStep',
-            'sensio_distribution.security_checker.class' => 'SensioLabs\\Security\\SecurityChecker',
-            'sensio_distribution.security_checker.command.class' => 'SensioLabs\\Security\\Command\\SecurityCheckerCommand',
-            'data_collector.templates' => array(
-                'data_collector.config' => array(
-                    0 => 'config',
-                    1 => '@WebProfiler/Collector/config.html.twig',
-                ),
-                'data_collector.request' => array(
-                    0 => 'request',
-                    1 => '@WebProfiler/Collector/request.html.twig',
-                ),
-                'data_collector.ajax' => array(
-                    0 => 'ajax',
-                    1 => '@WebProfiler/Collector/ajax.html.twig',
-                ),
-                'data_collector.exception' => array(
-                    0 => 'exception',
-                    1 => '@WebProfiler/Collector/exception.html.twig',
-                ),
-                'data_collector.events' => array(
-                    0 => 'events',
-                    1 => '@WebProfiler/Collector/events.html.twig',
-                ),
-                'data_collector.logger' => array(
-                    0 => 'logger',
-                    1 => '@WebProfiler/Collector/logger.html.twig',
-                ),
-                'data_collector.time' => array(
-                    0 => 'time',
-                    1 => '@WebProfiler/Collector/time.html.twig',
-                ),
-                'data_collector.memory' => array(
-                    0 => 'memory',
-                    1 => '@WebProfiler/Collector/memory.html.twig',
-                ),
-                'data_collector.router' => array(
-                    0 => 'router',
-                    1 => '@WebProfiler/Collector/router.html.twig',
-                ),
-                'data_collector.form' => array(
-                    0 => 'form',
-                    1 => '@WebProfiler/Collector/form.html.twig',
-                ),
-                'data_collector.translation' => array(
-                    0 => 'translation',
-                    1 => '@WebProfiler/Collector/translation.html.twig',
-                ),
-                'data_collector.twig' => array(
-                    0 => 'twig',
-                    1 => '@WebProfiler/Collector/twig.html.twig',
-                ),
-                'data_collector.security' => array(
-                    0 => 'security',
-                    1 => '@Security/Collector/security.html.twig',
-                ),
-                'swiftmailer.data_collector' => array(
-                    0 => 'swiftmailer',
-                    1 => '@Swiftmailer/Collector/swiftmailer.html.twig',
-                ),
-                'data_collector.doctrine' => array(
-                    0 => 'db',
-                    1 => '@Doctrine/Collector/db.html.twig',
-                ),
-                'data_collector.dump' => array(
-                    0 => 'dump',
-                    1 => '@Debug/Profiler/dump.html.twig',
-                ),
-            ),
-            'console.command.ids' => array(
-                0 => 'sensio_distribution.security_checker.command',
-            ),
-        );
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
index e0279c2ae..914d09ffd 100644
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
@@ -1,7 +1,16 @@
 <?php
 
-use Symfony\Component\HttpFoundation\Request;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Debug\Debug;
+use Symfony\Component\HttpFoundation\Request;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
@@ -11,16 +20,17 @@ use Symfony\Component\Debug\Debug;
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
-    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+
+    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
 }
 
-$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
 Debug::enable();
 
-require_once __DIR__.'/../app/AppKernel.php';
+require_once __DIR__ . '/../app/AppKernel.php';
 
 $kernel = new AppKernel('dev', true);
 $kernel->loadClassCache();
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
deleted file mode 100644
index 1e1d65d91..000000000
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
+++ /dev/null
@@ -1,88 +0,0 @@
-<h2 class="badge-title">
-    <span class="title_label">
-
-        {% if activity.date %}
-            <h3>{{ activity.date|format_date('short') }}</h3>
-        {% endif %}
-
-        <div class="duration">
-            {% if activity.durationTime and t.durationTimeVisible %}
-                <p>
-                    <abbr class="fa fa-fw fa-hourglass-end" title="{{ 'Duration Time'|trans }}"></abbr>
-                    {{ activity.durationTime|date('H:i') }}
-                </p>
-            {% endif %}
-
-            {% if activity.travelTime and t.travelTimeVisible %}
-                <p>
-                    <abbr class="fa fa-fw fa-car" title="{{ 'Travel time'|trans }}"></abbr>
-                    {{ activity.travelTime|date('H:i') }}
-                </p>
-            {% endif %}
-        </div>
-
-    </span>
-    <span class="title_action">
-
-        {{ activity.type.name | localize_translatable_string }}
-
-        <ul class="small_in_title">
-            <li>
-                <abbr title="{{ 'location'|trans }}">{{ 'location'|trans ~ ': ' }}</abbr>
-                {# TODO {% if activity.location %}{{ activity.location }}{% endif %} #}
-                Domicile de l'usager
-            </li>
-            {% if activity.user and t.userVisible %}
-                <li>
-                    <abbr title="{{ 'Referrer'|trans }}">{{ 'Referrer'|trans ~ ': ' }}</abbr>
-                    {{ activity.user.usernameCanonical }}
-                </li>
-            {% endif %}
-        </ul>
-
-        <ul class="list-content">
-            {%- if t.reasonsVisible -%}
-                {%- if activity.reasons is not empty -%}
-                    <li class="reasons">
-                        {% for r in activity.reasons %}
-                            {{ r|chill_entity_render_box }}
-                        {% endfor %}
-                    </li>
-                {%- endif -%}
-            {% endif %}
-            {%- if t.socialIssuesVisible %}
-                {%- if activity.socialIssues is not empty -%}
-                    <li class="social-issues">
-                        {% for r in activity.socialIssues %}
-                            {{ r|chill_entity_render_box }}
-                        {% endfor %}
-                    </li>
-                {%- endif -%}
-            {% endif %}
-            {%- if t.socialActionsVisible -%}
-                {%- if activity.socialActions is not empty -%}
-                    <li class="social-actions">
-                        {% for r in activity.socialActions %}
-                            {{ r|chill_entity_render_box }}
-                        {% endfor %}
-                    </li>
-                {%- endif -%}
-            {% endif %}
-        </ul>
-
-    </span>
-</h2>
-
-{#
-{% if context == 'person' and activity.accompanyingPeriod is not empty %}
-    <div class="mt-3">
-        <a class="btn btn-sm btn-outline-primary"
-           title="{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}"
-           href="{{ chill_path_add_return_path(
-               "chill_person_accompanying_course_index",
-               { 'accompanying_period_id': activity.accompanyingPeriod.id }
-           ) }}"><i class="fa fa-random"></i>
-        </a>
-    </div>
-{% endif %}
-#}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
index 89a790588..d6d0ed43d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -3,96 +3,109 @@
     {{ path(pathname, parms) }}
 {% endmacro %}
 
-{% if context == 'person' %}
-    {% set blocs = [
-        {   'title': 'Others persons'|trans,
+{% macro insert_onthefly(type, entity) %}
+    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+        action: 'show', displayBadge: true,
+        targetEntity: { name: type, id: entity.id },
+        buttonText: entity|chill_entity_render_string
+    } %}
+{% endmacro %}
+
+{% macro computeWidth(nbBlocks) %}
+    {{ 'flex-basis: ' ~ (100 / nbBlocks)|round(1) ~ '%;' }}
+{% endmacro %}
+
+{% set blocks = [] %}
+{% if entity.activityType.personsVisible %}
+    {% if context == 'person' %}
+        {% set blocks = blocks|merge([{
+            'title': 'Others persons'|trans,
             'items': entity.persons,
+            'type': 'person',
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },
-        {   'title': 'Third parties'|trans,
-            'items': entity.thirdParties,
-            'path' : 'chill_3party_3party_show',
-            'key'  : 'thirdparty_id'
-        },
-        {   'title': 'Users concerned'|trans,
-            'items': entity.users,
-            'path' : 'admin_user_show',
-            'key'  : 'id'
-        },
-    ] %}
-{% else %}
-    {% set blocs = [
-        {   'title': 'Persons in accompanying course'|trans,
+        }]) %}
+    {% else %}
+        {% set blocks = blocks|merge([{
+            'title': 'Persons in accompanying course'|trans,
             'items': entity.personsAssociated,
+            'type': 'person',
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },
-        {   'title': 'Third persons'|trans,
+        },{
+            'title': 'Third persons'|trans,
             'items': entity.personsNotAssociated,
+            'type': 'person',
             'path' : 'chill_person_view',
-            'key'  : 'person_id'
-        },
-        {   'title': 'Third parties'|trans,
-            'items': entity.thirdParties,
-            'path' : 'chill_3party_3party_show',
-            'key'  : 'thirdparty_id'
-        },
-        {   'title': 'Users concerned'|trans,
-            'items': entity.users,
-            'path' : 'admin_user_show',
-            'key'  : 'id'
-        },
-    ] %}
+            'key'  : 'person_id',
+        }]) %}
+    {% endif %}
+{% endif %}
+{% if entity.activityType.thirdPartiesVisible %}
+    {% set blocks = blocks|merge([{
+        'title': 'Third parties'|trans,
+        'items': entity.thirdParties,
+        'type': 'thirdparty',
+        'path' : 'chill_crud_3party_3party_view',
+        'key'  : 'id',
+    }]) %}
+{% endif %}
+{% if entity.activityType.usersVisible %}
+    {% set blocks = blocks|merge([{
+        'title': 'Users concerned'|trans,
+        'items': entity.users,
+        'type': 'user',
+        'key'  : 'id',
+    }]) %}
 {% endif %}
 
 {% if (with_display == 'bloc') %}
 <div class="{{ context }} flex-bloc concerned-groups">
-    {% for bloc in blocs %}
-    <div class="item-bloc">
-        <div class="item-row">
-            <div class="item-col">
-                <h4>{{ bloc.title }}</h4>
-            </div>
-            <div class="item-col">
-                <ul class="list-content">
-                    {% for item in bloc.items %}
-                    <li>
-                        <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({
-                                    'render': 'raw',
-                                    'addAltNames': false
-                                }) }}
-                            </span>
-                        </a>
-                    </li>
-                    {% endfor %}
-                </ul>
+    {% for bloc in blocks %}
+
+        <div class="item-bloc" style="{{ _self.computeWidth(loop.length) }}">
+            <div class="item-row">
+                <div class="item-col">
+                    <h4>{{ bloc.title }}</h4>
+                </div>
+                <div class="item-col">
+                    <ul class="list-content">
+                        {% for item in bloc.items %}
+                            <li>
+                                {% if bloc.type == 'user' %}
+                                    <span class="badge-user">
+                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                                    </span>
+                                {% else %}
+                                    {{ _self.insert_onthefly(bloc.type, item) }}
+                                {% endif %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
             </div>
         </div>
-    </div>
+
     {% endfor %}
 </div>
 {% endif %}
 
 {% if (with_display == 'row') %}
 <div class="concerned-groups">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
     <div class="group">
         {% if bloc.items|length > 0 %}
             <h4>{{ bloc.title }}</h4>
             <ul class="list-content">
                 {% for item in bloc.items %}
                 <li>
-                    <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({
-                                'render': 'raw',
-                                'addAltNames': false
-                            }) }}
+                    {% if bloc.type == 'user' %}
+                        <span class="badge-user">
+                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                         </span>
-                    </a>
+                    {% else %}
+                        {{ _self.insert_onthefly(bloc.type, item) }}
+                    {% endif %}
                 </li>
                 {% endfor %}
             </ul>
@@ -104,22 +117,23 @@
 
 {% if (with_display == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
         <div class="wl-row">
             {% if bloc.items|length > 0 %}
                 <div class="wl-col title">
-                    <h4>{{ bloc.title }}</h4>
+                    <h3>{{ bloc.title }}</h3>
                 </div>
                 <div class="wl-col list">
                     {% 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 %}">
-                            <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                                {{ item|chill_entity_render_box({
-                                    'render': 'raw',
-                                    'addAltNames': false
-                                }) }}
-                            </a>
+                        <span class="wl-item">
+                            {% if bloc.type == 'user' %}
+                                <span class="badge-user">
+                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                                </span>
+                            {% else %}
+                                {{ _self.insert_onthefly(bloc.type, item) }}
+                            {% endif %}
                         </span>
 
                     {% endfor %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deleteAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deleteAccompanyingCourse.html.twig
index fbdf45c23..5c37a889c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deleteAccompanyingCourse.html.twig
+++ b/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 %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 07e5d7a59..235a5b7f2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -1,5 +1,12 @@
-<h1>{{ "Update activity"|trans }}</h1>
-<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
+<h1>
+    {{ "Update activity"|trans }}
+</h1>
+<h2 class="badge-title mb-5">
+    <span class="title_label"></span>
+    <span class="title_action">
+        {{ entity.type.name | localize_translatable_string }}
+    </span>
+</h2>
 
 {{ form_start(edit_form) }}
 {{ form_errors(edit_form) }}
@@ -28,27 +35,32 @@
     {{ form_row(edit_form.socialActions) }}
 {% endif %}
 
+{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
 <div id="social-issues-acc"></div>
+{% endif %}
 
 {%- if edit_form.reasons is defined -%}
     {{ form_row(edit_form.reasons) }}
 {% endif %}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{%- if edit_form.persons is defined or edit_form.thirdParties is defined or edit_form.users is defined -%}
+    <h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
 
-{%- if edit_form.persons is defined -%}
-    {{ form_widget(edit_form.persons) }}
-{% endif %}
-{%- if edit_form.thirdParties is defined -%}
-    {{ form_widget(edit_form.thirdParties) }}
-{% endif %}
-{%- if edit_form.users is defined -%}
-    {{ form_widget(edit_form.users) }}
+    {%- if edit_form.persons is defined -%}
+        {{ form_widget(edit_form.persons) }}
+    {% endif %}
+    {%- if edit_form.thirdParties is defined -%}
+        {{ form_widget(edit_form.thirdParties) }}
+    {% endif %}
+    {%- if edit_form.users is defined -%}
+        {{ form_widget(edit_form.users) }}
+    {% endif %}
+
+    <div id="add-persons"></div>
 {% endif %}
 
-<div id="add-persons"></div>
 
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
 
 {%- if edit_form.date is defined -%}
     {{ form_row(edit_form.date) }}
@@ -68,7 +80,6 @@
 {% endif %}
 
 {%- if edit_form.comment is defined -%}
-    {# TODO .. public and private #}
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
@@ -92,16 +103,16 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
-                {{ 'Cancel'|trans }}
-            </a>
-        </li>
-        <li>
-            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-        </li>
-    </ul>
-{{ form_end(edit_form) }}
+<ul class="record_actions sticky-form-buttons">
+    <li class="cancel">
+        <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
+            {{ 'Cancel'|trans }}
+        </a>
+    </li>
+    <li>
+        <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+    </li>
+</ul>
 
+{{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index fef381527..8efdd0148 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -3,7 +3,6 @@
     {% if activities|length == 0 %}
         <p class="chill-no-data-statement">
             {{ "There isn't any activities."|trans }}
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
         </p>
 
     {% else %}
@@ -11,49 +10,195 @@
             {% for activity in activities %}
                 {% set t = activity.type %}
                 <div class="item-bloc">
+
                     <div class="item-row">
-                        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+                        <div class="wrap-list">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    {% if activity.date %}
+                                        <p class="date-label">
+                                            {{ activity.date|format_date('short') }}
+                                        </p>
+                                    {% endif %}
+                                </div>
+                                <div class="wl-col list">
+                                    <h2 class="badge-title">
+                                        <span class="title_label"></span>
+                                        <span class="title_action">
+                                            {{ activity.type.name | localize_translatable_string }}
+
+                                            {% if activity.emergency %}
+                                                <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                            {% endif %}
+                                        </span>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
                     </div>
 
-                    {%  if activity.comment.comment is not empty
-                        or activity.persons|length > 0
-                        or activity.thirdParties|length > 0
-                        or activity.users|length > 0
-                    %}
-                    <div class="main">
-                        {% if activity.comment.comment is not empty %}
-                            {{ activity.comment|chill_entity_render_box({
-                                'disable_markdown': false,
-                                'limit_lines': 3,
-                                'metadata': false,
-                            }) }}
-                        {% endif %}
+                    <div class="item-row column separator">
+                        <div class="wrap-list">
+                            {% if activity.location and t.locationVisible %}
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'location'|trans }}</h3></div>
+                                    <div class="wl-col list">
+                                        <p class="wl-item">
+                                            <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                                            {{ activity.location.name }}
+                                        </p>
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
+                                    <div class="wl-col list">
+                                        <p class="wl-item">
+                                            {{ activity.sentReceived|capitalize|trans }}
+                                        </p>
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {% if activity.user and t.userVisible %}
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
+                                    <div class="wl-col list">
+                                        <p class="wl-item">
+                                            {{ activity.user.usernameCanonical|chill_entity_render_string|capitalize }}
+                                        </p>
+                                    </div>
+                                </div>
+                            {% endif %}
+                        </div>
 
                         {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
                             'context': context,
-                            'with_display': 'row',
+                            'with_display': 'wrap-list',
                             'entity': activity,
                             'badge_person': true
                         } %}
+
+                        <div class="wrap-list">
+                            {%- if activity.reasons is not empty and t.reasonsVisible -%}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Reasons'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {% for r in activity.reasons %}
+                                            <p class="wl-item reasons">
+                                                {{ r|chill_entity_render_box }}
+                                            </p>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {%- if activity.socialIssues is not empty and t.socialIssuesVisible -%}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Social issues'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {% for r in activity.socialIssues %}
+                                            <p class="wl-item social-issues">
+                                                {{ r|chill_entity_render_box }}
+                                            </p>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {%- if activity.socialActions is not empty and t.socialActionsVisible -%}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Social actions'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {% for r in activity.socialActions %}
+                                            <p class="wl-item social-actions">
+                                                {{ r|chill_entity_render_box }}
+                                            </p>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
+                                durationTime
+                                travelTime
+                                comment
+                                {% if activity.comment.comment is not empty and is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
+                                    <div class="wl-row">
+                                        <div class="wl-col title">
+                                            <h3>{{ 'Comment'|trans }}</h3>
+                                        </div>
+                                        <div class="wl-col list">
+                                            {{ activity.comment|chill_entity_render_box({
+                                                'disable_markdown': false,
+                                                'limit_lines': 3,
+                                                'metadata': false
+                                            }) }}
+                                        </div>
+                                    </div>
+                                {% endif %}
+                                documents
+                                attendee
+                            #}
+                        </div>
                     </div>
-                    {% endif %}
 
                     <div class="item-row separator">
-                        <div class="updatedBy"></div>
                         <ul class="record_actions">
+                            {% if context == 'person' and activity.accompanyingPeriod is not empty %}
+                                {#
+                                    Disable person_id in following links, for redirect to accompanyingCourse context
+                                #}
+                                {% set person_id = null %}
+                                {% set accompanying_course_id = activity.accompanyingPeriod.id %}
+                                <li>
+                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
+                                           'accompanying_period_id': accompanying_course_id
+                                       }) }}"
+                                       class="btn btn-primary"
+                                       title="{{ 'See activity in accompanying course context'|trans }}">
+                                       <i class="fa fa-random fa-fw"></i>
+                                       {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
+                                    </a>
+                                </li>
+                            {% endif %}
                             <li>
-                                <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-                                   class="btn btn-sm btn-show "></a>
+                                <a href="{{ path('chill_activity_activity_show', {'id': activity.id,
+                                        'person_id': person_id,
+                                        'accompanying_period_id': accompanying_course_id
+                                    }) }}"
+                                   class="btn btn-show"
+                                   title="{{ 'Show'|trans }}"></a>
                             </li>
                             {% if no_action is not defined or no_action == false %}
-                                <li>
-                                    <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-                                       class="btn btn-sm btn-update "></a>
-                                </li>
-                                <li>
-                                    <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
-                                       class="btn btn-sm btn-delete "></a>
-                                </li>
+                                {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+                                    <li>
+                                        <a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
+                                                'person_id': person_id,
+                                                'accompanying_period_id': accompanying_course_id
+                                            }) }}"
+                                           class="btn btn-update"
+                                           title="{{ 'Edit'|trans }}"></a>
+                                    </li>
+                                {% endif %}
+                                {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
+                                    <li>
+                                        <a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
+                                                'person_id': person_id,
+                                                'accompanying_period_id': accompanying_course_id
+                                            }) }}"
+                                           class="btn btn-delete"
+                                           title="{{ 'Delete'|trans }}"></a>
+                                    </li>
+                                {% endif %}
                             {% endif %}
                         </ul>
                     </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
index d1f9ec517..431a06ba6 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -20,12 +20,14 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
 
+    {% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-                {{ 'Add a new activity' | trans }}
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
+               class="btn btn-create">{{ 'Create'|trans }}
             </a>
         </li>
     </ul>
+    {% endif %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 830fecfb9..158bd0e1b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -36,12 +36,14 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
-               class="btn btn-create disabled" tabindex="-1" role="button" aria-disabled="true">{{ 'Add a new activity' | trans }}
+               class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
             </a>
         </li>
     </ul>
+    {% endif %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
index 567c0b132..0f426c5a9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -2,9 +2,89 @@
     {% for activity in activities | slice(0,5) %}
         {% set t = activity.type %}
 
-        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a>
+        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+            class="dashboard-link" title="{{ 'Show the activity'|trans }}">
 
-        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+            <div class="dashboard">
+                <span class="title_label"></span>
+                <span class="title_action">
 
+                    {%- if activity.date -%}
+                        <p class="date-label">{{ activity.date|format_date('short') }}</p>
+                    {%- endif -%}
+
+                    <span class="like-h3">{{ activity.type.name | localize_translatable_string }}</span>
+
+                    {% if activity.emergency %}
+                        <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
+                    {% endif %}
+
+                    <ul class="small_in_title mt-3">
+
+                        {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                            <li>
+                                <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
+                                <b>{{ activity.sentReceived|capitalize|trans }}</b>
+                            </li>
+                        {% endif %}
+
+                        {% if activity.location and t.locationVisible %}
+                            <li>
+                                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                                <b>
+                                    <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                                    {{ activity.location.name }}
+                                </b>
+                            </li>
+                        {% endif %}
+
+                        {% if activity.user and t.userVisible %}
+                            <li>
+                                <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
+                                <b>{{ activity.user.usernameCanonical }}</b>
+                            </li>
+                        {% endif %}
+
+                        <li class="associated-persons">
+                            <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
+                            {% for p in activity.personsAssociated %}
+                                <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                            {% endfor %}
+                        </li>
+                    </ul>
+
+                    <ul class="list-content my-3">
+                        {%- if t.reasonsVisible -%}
+                            {%- if activity.reasons is not empty -%}
+                                <li class="reasons">
+                                    {% for r in activity.reasons %}
+                                        {{ r|chill_entity_render_box }}
+                                    {% endfor %}
+                                </li>
+                            {%- endif -%}
+                        {% endif %}
+                        {%- if t.socialIssuesVisible %}
+                            {%- if activity.socialIssues is not empty -%}
+                                <li class="social-issues">
+                                    {% for r in activity.socialIssues %}
+                                        {{ r|chill_entity_render_box }}
+                                    {% endfor %}
+                                </li>
+                            {%- endif -%}
+                        {% endif %}
+                        {%- if t.socialActionsVisible -%}
+                            {%- if activity.socialActions is not empty -%}
+                                <li class="social-actions">
+                                    {% for r in activity.socialActions %}
+                                        {{ r|chill_entity_render_box }}
+                                    {% endfor %}
+                                </li>
+                            {%- endif -%}
+                        {% endif %}
+                    </ul>
+
+                </span>
+            </div>
+        </a>
     {% endfor %}
 </div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 10afd77a2..a0668119c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -1,10 +1,16 @@
-<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
-<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
+<h1>
+    {{ "Activity creation"|trans }}
+</h1>
+<h2 class="badge-title mb-5">
+    <span class="title_label"></span>
+    <span class="title_action">
+        {{ entity.type.name | localize_translatable_string }}
+    </span>
+</h2>
 
 {{ form_start(form) }}
 {{ form_errors(form) }}
 
-
 {%- if form.emergency is defined -%}
     {{ form_row(form.emergency) }}
 {% endif %}
@@ -29,27 +35,33 @@
     {{ form_row(form.socialActions) }}
 {% endif %}
 
-<div id="social-issues-acc"></div>
+{%- if form.socialIssues is defined or form.socialIssues is defined -%}
+    <div id="social-issues-acc"></div>
+{% endif %}
 
 {%- if form.reasons is defined -%}
     {{ form_row(form.reasons) }}
 {% endif %}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{%- if form.persons is defined or form.thirdParties is defined or form.users is defined -%}
+
+    <h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
+
+    {%- if form.persons is defined -%}
+        {{ form_widget(form.persons) }}
+    {% endif %}
+    {%- if form.thirdParties is defined -%}
+        {{ form_widget(form.thirdParties) }}
+    {% endif %}
+    {%- if form.users is defined -%}
+        {{ form_widget(form.users) }}
+    {% endif %}
+
+    <div id="add-persons"></div>
 
-{%- if form.persons is defined -%}
-    {{ form_widget(form.persons) }}
-{% endif %}
-{%- if form.thirdParties is defined -%}
-    {{ form_widget(form.thirdParties) }}
-{% endif %}
-{%- if form.users is defined -%}
-    {{ form_widget(form.users) }}
 {% endif %}
 
-<div id="add-persons"></div>
-
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
 
 {%- if form.date is defined -%}
     {{ form_row(form.date) }}
@@ -97,7 +109,7 @@
     </a>
   </li>
   <li>
-    <button class="btn btn-create" type="submit">
+    <button class="btn btn-save" type="submit">
       {{ 'Create'|trans }}
     </button>
   </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 101ad5502..505d8c6cb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -22,6 +22,7 @@
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
         window.activity = {{ activity_json|json_encode|raw }};
+        {% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index e11ab863b..cb5b135b3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,128 +1,185 @@
 {%- set t = entity.type -%}
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
 
-<h1>
-  {{ "Activity"|trans }}
-  {%- if t.emergencyVisible and entity.emergency -%}
-  <span class="badge bg-secondary">
-    {{- 'Emergency'|trans -}}
-  </span>
-{%- endif -%}
-</h1>
+<h1>{{ "Activity"|trans }}</h1>
 
-<dl class="chill_view_data">
+<div class="flex-table">
+    <div class="item-bloc">
 
-    <dt class="inline">{{ 'by'|trans|capitalize }}</dt>
-    <dd>{{ entity.user }}</dd>
+        <div class="item-row">
+            <div class="wrap-list">
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        {% if entity.date %}
+                            <p class="date-label">
+                                {{ entity.date|format_date('short') }}
+                            </p>
+                        {% endif %}
+                    </div>
+                    <div class="wl-col list">
+                        <h2 class="badge-title">
+                            <span class="title_label"></span>
+                            <span class="title_action">
+                                {{ entity.type.name | localize_translatable_string }}
+                                {% if entity.emergency %}
+                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                {% endif %}
+                            </span>
+                        </h2>
+                    </div>
+                </div>
+            </div>
+        </div>
 
-    <dt class="inline">{{ 'Type'|trans }}</dt>
-    <dd>{{ entity.type.name | localize_translatable_string }}</dd>
+        <div class="item-row separator">
+            <dl class="chill_view_data">
+                <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
+                <dd>{{ entity.user }}</dd>
 
-    {%- if entity.scope -%}
-        <dt class="inline">{{ 'Scope'|trans }}</dt>
-        <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
-    {% endif %}
+                {%- if entity.scope -%}
+                    <dt class="inline">{{ 'Scope'|trans }}</dt>
+                    <dd>
+                        <span class="scope">{{ entity.scope.name|localize_translatable_string }}</span>
+                    </dd>
+                {% endif %}
 
-    {% if t.socialIssuesVisible %}
-      <dt class="inline">{{ 'Social issues'|trans }}</dt>
-      <dd>
-        {% if entity.socialIssues|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social issues'|trans }}</p>
-        {% else %}
-          {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
-        {% endif %}
-      </dd>
-    {% endif %}
+                {% if t.socialIssuesVisible %}
+                    <dt class="inline">{{ 'Social issues'|trans }}</dt>
+                    <dd>
+                        {% if entity.socialIssues|length == 0 %}
+                            <p class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</p>
+                        {% else %}
+                            {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
+                        {% endif %}
+                    </dd>
+                {% endif %}
 
-    {% if t.socialActionsVisible %}
-      <dt class="inline">{{ 'Social actions'|trans }}</dt>
-      <dd>
-        {% if entity.socialActions|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social actions'|trans }}</p>
-        {% else %}
-          {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
-        {% endif %}
-      </dd>
-    {% endif %}
+                {% if t.socialActionsVisible %}
+                    <dt class="inline">{{ 'Social actions'|trans }}</dt>
+                    <dd>
+                        {% if entity.socialActions|length == 0 %}
+                            <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
+                        {% else %}
+                            {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
+                        {% endif %}
+                    </dd>
+                {% endif %}
 
-    {% if t.reasonsVisible %}
-    <dt class="inline">{{ 'Reasons'|trans }}</dt>
-    {%- if entity.reasons is empty -%}
-    <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
-    {%- else -%}
-    <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
-    {%- endif -%}
-    {% endif %}
+                {% if t.reasonsVisible %}
+                    <dt class="inline">{{ 'Reasons'|trans }}</dt>
+                    <dd>
+                        {%- if entity.reasons is empty -%}
+                            <span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span>
+                        {%- else -%}
+                            {% for r in entity.reasons %}{{ r|chill_entity_render_box }}{% endfor %}
+                        {%- endif -%}
+                    </dd>
+                {% endif %}
+            </dl>
+        </div>
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+    </div>
+</div>
 
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+<h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
 
-    <dt class="inline">{{ 'Date'|trans }}</dt>
-    <dd>{{ entity.date|format_date('long') }}</dd>
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+    'context': context,
+    'with_display': 'bloc',
+    'badge_person': 'true'
+} %}
 
-    {% if t.locationVisible %}
-        <dt class="inline">{{ 'Activity location'|trans }}</dt>
-        <dd>
-            {% if entity.location is not null %}
-                <p>
-                    <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
-                    {{ entity.location.name }}
-                </p>
-                {{ entity.location.address|chill_entity_render_box }}
-            {% else %}
-                <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
+
+<div class="flex-table">
+    <div class="item-bloc">
+
+        <dl class="chill_view_data">
+            <dt class="inline">{{ 'Date'|trans }}</dt>
+            <dd>{{ entity.date|format_date('long') }}</dd>
+
+            {% if t.locationVisible %}
+                <dt class="inline">{{ 'Activity location'|trans }}</dt>
+                <dd>
+                    {% if entity.location is not null %}
+                        <p>
+                            <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
+                            {{ entity.location.name }}
+                        </p>
+                        <div class="ms-3">{{ entity.location.address|chill_entity_render_box }}</div>
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+                    {% endif %}
+                </dd>
             {% endif %}
-        </dd>
-    {% endif %}
 
-    {% if t.durationTimeVisible %}
-    <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-    <dd>{% if entity.durationTime is not null %}
-            {{ entity.durationTime|date('H:i') }}
-        {% else %}
-            {{ 'None'|trans|capitalize }}
-        {% endif %}
-    </dd>
-    {% endif %}
+            {% if t.durationTimeVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                <dt class="inline">{{ 'Duration Time'|trans }}</dt>
+                <dd>
+                    {% if entity.durationTime is not null %}
+                        {{ entity.durationTime|date('H:i') }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
+                    {% endif %}
+                </dd>
+            {% endif %}
 
-    {% if t.travelTimeVisible %}
-    <dt class="inline">{{ 'Travel time'|trans }}</dt>
-    <dd>{% if entity.travelTime is not null %}
-            {{ entity.travelTime|date('H:i') }}
-        {% else %}
-            {{ 'None'|trans|capitalize }}
-        {% endif %}
-    </dd>
-    {% endif %}
+            {% if t.travelTimeVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                <dt class="inline">{{ 'Travel time'|trans }}</dt>
+                <dd>
+                    {% if entity.travelTime is not null %}
+                        {{ entity.travelTime|date('H:i') }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
+                    {% endif %}
+                </dd>
+            {% endif %}
 
-    {% if t.commentVisible %}
-    <dt class="inline">{{ 'activity.comment'|trans }}</dt>
-      {%- if entity.comment.empty -%}
-          <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
-      {%- else -%}
-          <dd>{{ entity.comment|chill_entity_render_box }}</dd>
-      {%- endif -%}
-    {% endif %}
+            {% if t.commentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                <dt class="inline">{{ 'activity.comment'|trans }}</dt>
+                <dd>
+                    {%- if entity.comment.empty -%}
+                        <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
+                    {%- else -%}
+                        {{ entity.comment|chill_entity_render_box }}
+                    {%- endif -%}
+                </dd>
+            {% endif %}
 
-    {% if t.documentsVisible and entity.documents|length > 0 %}
-      <dt>{{ 'Documents'|trans }}</dt>
-      <dd>
-        <ul>
-        {% for d in entity.documents %}
-          <li>{{ m.download_button(d) }}</li>
-        {% endfor %}
-        </ul>
-      </dd>
-    {% endif %}
+            {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                <dt class="inline">{{ 'Documents'|trans }}</dt>
+                <dd>
+                    {% if entity.documents|length > 0 %}
+                        <ul>
+                            {% for d in entity.documents %}
+                                <li>{{ m.download_button(d) }}</li>
+                            {% endfor %}
+                        </ul>
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
+                    {% endif %}
+                </dd>
+            {% endif %}
 
-    {% if t.attendeeVisible %}
-    <dt class="inline">{{ 'Attendee'|trans }}</dt>
-    <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
-    {% endif %}
+            {% if t.attendeeVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                <dt class="inline">{{ 'Attendee'|trans }}</dt>
+                <dd>
+                    {% if entity.attendee is not null %}
+                        {% if entity.attendee %}
+                            {{ 'present'|trans|capitalize }}
+                        {% else %}
+                            {{ 'not present'|trans|capitalize }}
+                        {% endif %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
+                    {% endif %}
+                </dd>
+            {% endif %}
 
-</dl>
+        </dl>
+
+    </div>
+</div>
 
 {% set person_id = null %}
 {% if person %}
@@ -140,23 +197,24 @@
             {{ 'Back to the list'|trans }}
         </a>
     </li>
+    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
     <li>
         <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
             {{ 'Edit'|trans }}
         </a>
     </li>
-
-    {# TODO
+    {% endif %}
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
-    #}
-
     <li>
         <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
-
-    {#
     {% endif %}
-    #}
 </ul>
+<script>
+    import ShowPane from "../../../../ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane";
+    export default {
+        components: {ShowPane}
+    }
+</script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index c6a87b87d..b74b315a3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -8,8 +8,6 @@
 
 {% block content -%}
 <div class="activity-show">
-
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 </div>
 {% endblock content %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
index 5128e9a64..79badfe26 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
@@ -1,4 +1,2 @@
 
-{{ dump(notification) }}
-
 <a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 8462c4178..5e92f8fa2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -8,8 +8,6 @@
 
 {% block personcontent -%}
 <div class="activity-show">
-
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 </div>
 {% endblock personcontent %}
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
index 93d8117a9..39b0deef9 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
@@ -1,69 +1,56 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Security\Authorization;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Entity\Center;
+use function in_array;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const STATS = 'CHILL_ACTIVITY_STATS';
-    const LISTS  = 'CHILL_ACTIVITY_LIST';
-    
+    public const LISTS = 'CHILL_ACTIVITY_LIST';
+
+    public const STATS = 'CHILL_ACTIVITY_STATS';
+
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $helper;
-    
+
     public function __construct(AuthorizationHelper $helper)
     {
         $this->helper = $helper;
     }
 
-    private function getAttributes()
+    public function getRoles(): array
     {
-        return array(self::STATS, self::LISTS);
+        return $this->getAttributes();
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Activity' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return $this->getAttributes();
     }
 
     protected function getSupportedClasses()
     {
-        return array(Center::class);
-    }
-    
-    protected function supports($attribute, $subject)
-    {
-        if ($subject instanceof Center 
-            && \in_array($attribute, $this->getAttributes())) {
-            
-            return true;
-        }
-        
-        return false;
+        return [Center::class];
     }
 
     protected function isGranted($attribute, $object, $user = null)
@@ -71,22 +58,22 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
         if (!$user instanceof \Symfony\Component\Security\Core\User\UserInterface) {
             return false;
         }
-        
+
         return $this->helper->userHasAccess($user, $object, $attribute);
     }
 
-    public function getRoles()
+    protected function supports($attribute, $subject)
     {
-        return $this->getAttributes();
+        if ($subject instanceof Center
+            && in_array($attribute, $this->getAttributes(), true)) {
+            return true;
+        }
+
+        return false;
     }
 
-    public function getRolesWithoutScope()
+    private function getAttributes()
     {
-        return $this->getAttributes();
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return [ 'Activity' => $this->getRoles() ];
+        return [self::STATS, self::LISTS];
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
index cc9cecf52..6d38c789c 100644
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -1,51 +1,68 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Security\Authorization;
 
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
+use function in_array;
 
-/**
- * Voter for Activity class
- */
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_ACTIVITY_CREATE';
-    const SEE    = 'CHILL_ACTIVITY_SEE';
-    const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
-    const UPDATE = 'CHILL_ACTIVITY_UPDATE';
-    const DELETE = 'CHILL_ACTIVITY_DELETE';
-    const FULL = 'CHILL_ACTIVITY_FULL';
+    /**
+     * allow to create an activity, which will either be associated to an
+     * accompanying course or person.
+     *
+     * It is safe for usage in template and controller
+     */
+    public const CREATE = 'CHILL_ACTIVITY_CREATE';
+
+    /**
+     * role to allow to create an activity associated win an accompanying course.
+     *
+     * Before using this, check if @see{self::CREATE} is not sufficiant
+     *
+     * @internal
+     */
+    public const CREATE_ACCOMPANYING_COURSE = 'CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE';
+
+    /**
+     * role to allow to create an activity associated with a person.
+     *
+     * Before using this, check if @see{self::CREATE} is not sufficiant
+     *
+     * @internal
+     */
+    public const CREATE_PERSON = 'CHILL_ACTIVITY_CREATE_PERSON';
+
+    public const DELETE = 'CHILL_ACTIVITY_DELETE';
+
+    public const FULL = 'CHILL_ACTIVITY_FULL';
+
+    public const SEE = 'CHILL_ACTIVITY_SEE';
+
+    public const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
+
+    public const UPDATE = 'CHILL_ACTIVITY_UPDATE';
 
     private const ALL = [
         self::CREATE,
@@ -53,13 +70,13 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         self::UPDATE,
         self::DELETE,
         self::SEE_DETAILS,
-        self::FULL
+        self::FULL,
     ];
 
-    protected VoterHelperInterface $voterHelper;
-
     protected Security $security;
 
+    protected VoterHelperInterface $voterHelper;
+
     public function __construct(
         Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
@@ -72,13 +89,35 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
             ->build();
     }
 
+    public function getRoles(): array
+    {
+        return [
+            self::SEE,
+            self::SEE_DETAILS,
+            self::CREATE_PERSON,
+            self::CREATE_ACCOMPANYING_COURSE,
+            self::UPDATE,
+            self::DELETE,
+            self::FULL,
+        ];
+    }
 
-    protected function supports($attribute, $subject)
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Activity' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
+    }
+
+    protected function supports($attribute, $subject): bool
     {
         return $this->voterHelper->supports($attribute, $subject);
     }
 
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
         if (!$token->getUser() instanceof User) {
             return false;
@@ -90,33 +129,43 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                 if (!$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
                     return false;
                 }
+
+                // change attribute CREATE
+                if (self::CREATE === $attribute) {
+                    $attribute = self::CREATE_PERSON;
+                }
             } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
                 if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
                     return false;
                 }
+
+                if (self::CREATE === $attribute) {
+                    if (AccompanyingPeriod::STEP_CLOSED === $subject->getAccompanyingPeriod()->getStep()) {
+                        return false;
+                    }
+                    $attribute = self::CREATE_ACCOMPANYING_COURSE;
+                }
             } else {
-                throw new \RuntimeException("could not determine context of activity");
+                throw new RuntimeException('Could not determine context of activity.');
+            }
+        } elseif ($subject instanceof AccompanyingPeriod) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+                if (in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
+                    return false;
+                }
+            }
+
+            // transform the attribute
+            if (self::CREATE === $attribute) {
+                $attribute = self::CREATE_ACCOMPANYING_COURSE;
+            }
+        } elseif ($subject instanceof Person) {
+            // transform the attribute
+            if (self::CREATE === $attribute) {
+                $attribute = self::CREATE_PERSON;
             }
         }
 
         return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
-
-
-    public function getRoles()
-    {
-        return self::ALL;
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return [];
-    }
-
-
-    public function getRolesWithHierarchy()
-    {
-        return [ 'Activity' => $this->getRoles() ];
-    }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
index 6e2f6c897..23aae25c8 100644
--- a/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
+++ b/src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php
@@ -1,37 +1,26 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2020, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Templating\Entity;
 
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 
 /**
- * Render activity reason
- *
+ * Render activity reason.
  */
 class ActivityReasonRender extends AbstractChillEntityRender
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
@@ -41,34 +30,29 @@ class ActivityReasonRender extends AbstractChillEntityRender
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-
     public function renderBox($entity, array $options): string
     {
         return
-            $this->getDefaultOpeningBox('activity-reason').
-            '<span class="badge bg-chill-pink">'.
-            '<i class="fa fa-question-circle"></i>&nbsp;'.
-            '<span class="category">'.
+            $this->getDefaultOpeningBox('activity-reason') .
+            '<span class="badge bg-chill-pink">' .
+            '<i class="fa fa-question-circle"></i>&nbsp;' .
+            '<span class="category">' .
             $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
-            ).
-            '</span>'.
-            '<span class="separator">&nbsp;>&nbsp;</span>'.
-            '<span class="reason">'.
+            ) .
+            '</span>' .
+            '<span class="separator">&nbsp;>&nbsp;</span>' .
+            '<span class="reason">' .
             $this->translatableStringHelper->localize(
                 $entity->getName()
-            ).
-            '</span>'.
-            '</span>'.
-            $this->getDefaultClosingBox()
-            ;
+            ) .
+            '</span>' .
+            '</span>' .
+            $this->getDefaultClosingBox();
     }
 
     /**
-     *
      * @param ActivityReason $entity
-     * @param array $options
-     * @return string
      */
     public function renderString($entity, array $options): string
     {
@@ -76,7 +60,8 @@ class ActivityReasonRender extends AbstractChillEntityRender
 
         if (null !== $entity->getCategory()) {
             $category = $this->translatableStringHelper->localize(
-                $entity->getCategory()->getName()). ' > ';
+                $entity->getCategory()->getName()
+            ) . ' > ';
         }
 
         return $category .
diff --git a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
index ea78e8a67..91f96dad8 100644
--- a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
+++ b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php
@@ -1,22 +1,14 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Test;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -24,26 +16,19 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
 
 /**
- * Prepare entities useful in tests
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Prepare entities useful in tests.
  */
 trait PrepareActivityTrait
 {
     /**
-     * Return an activity with a scope and a person inside
-     * 
-     * @param Scope $scope
-     * @param Person $person
+     * Return an activity with a scope and a person inside.
+     *
      * @return Activity
      */
     public function prepareActivity(Scope $scope, Person $person)
     {
         return (new Activity())
             ->setScope($scope)
-            ->setPerson($person)
-                ;
+            ->setPerson($person);
     }
-    
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
index f1e6ecacd..febf3b820 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -1,16 +1,82 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
+use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\HttpFoundation\Response;
+use function count;
+use function in_array;
 
-class ActivityControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityControllerTest extends WebTestCase
 {
+    public function getSecuredPagesAuthenticated()
+    {
+        self::bootKernel();
+
+        $person = $this->getPersonFromFixtures();
+        $activities = $this->getActivitiesForPerson($person);
+
+        $user = $this->createFakeUser();
+
+        return [
+            [
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/', $person->getId()),
+            ],
+            [
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/new', $person->getId()),
+            ],
+            [
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId()),
+            ],
+            [
+                $this->getAuthenticatedClient('center b_social'),
+                sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId()),
+            ],
+            [
+                $this->getAuthenticatedClient($user->getUsername()),
+                sprintf('fr/person/%d/activity/new', $person->getId()),
+            ],
+        ];
+    }
+
+    /**
+     * Provide a client unauthenticated and.
+     */
+    public function getSecuredPagesUnauthenticated()
+    {
+        self::bootKernel();
+        $person = $this->getPersonFromFixtures();
+        $activities = $this->getActivitiesForPerson($person);
+
+        return [
+            [sprintf('fr/person/%d/activity/', $person->getId())],
+            [sprintf('fr/person/%d/activity/new', $person->getId())],
+            [sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())],
+            [sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())],
+        ];
+    }
 
     /**
      * @dataProvider getSecuredPagesUnauthenticated
+     *
+     * @param mixed $url
      */
     public function testAccessIsDeniedForUnauthenticated($url)
     {
@@ -19,13 +85,15 @@ class ActivityControllerTest extends WebTestCase
         $client->request('GET', $url);
 
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertTrue($client->getResponse()->isRedirect('http://localhost/login'),
-              sprintf('the page "%s" does not redirect to http://localhost/login', $url));
+        $this->assertTrue(
+            $client->getResponse()->isRedirect('http://localhost/login'),
+            sprintf('the page "%s" does not redirect to http://localhost/login', $url)
+        );
     }
 
     /**
-     *
      * @dataProvider getSecuredPagesAuthenticated
+     *
      * @param type $client
      * @param type $url
      */
@@ -36,63 +104,6 @@ class ActivityControllerTest extends WebTestCase
         $this->assertEquals(403, $client->getResponse()->getStatusCode());
     }
 
-    public function getSecuredPagesAuthenticated()
-    {
-        static::bootKernel();
-
-        $person = $this->getPersonFromFixtures();
-        $activities = $this->getActivitiesForPerson($person);
-
-
-        $user = $this->createFakeUser();
-
-
-
-        return array(
-            array(
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/', $person->getId())
-            ),
-            array(
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/new', $person->getId())
-            ),
-            array(
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId())
-            ),
-            array(
-                $this->getAuthenticatedClient('center b_social'),
-                sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId())
-            ),
-            array(
-                $this->getAuthenticatedClient($user->getUsername()),
-                sprintf('fr/person/%d/activity/new', $person->getId())
-            )
-        );
-    }
-
-
-
-    /**
-     * Provide a client unauthenticated and
-     *
-     */
-    public function getSecuredPagesUnauthenticated()
-    {
-        static::bootKernel();
-        $person = $this->getPersonFromFixtures();
-        $activities = $this->getActivitiesForPerson($person);
-
-        return array(
-            [ sprintf('fr/person/%d/activity/', $person->getId()) ],
-            [ sprintf('fr/person/%d/activity/new', $person->getId()) ],
-            [ sprintf('fr/person/%d/activity/%d/show', $person->getId(), $activities[0]->getId()) ],
-            [ sprintf('fr/person/%d/activity/%d/edit', $person->getId(), $activities[0]->getId()) ],
-        );
-    }
-
-
     public function testCompleteScenario()
     {
         // Create a new client to browse the application
@@ -100,27 +111,32 @@ class ActivityControllerTest extends WebTestCase
         $person = $this->getPersonFromFixtures();
 
         // Create a new entry in the database
-        $crawler = $client->request('GET', sprintf('en/person/%d/activity/',
-              $person->getId()));
-        $this->assertEquals(200, $client->getResponse()->getStatusCode(),
-              "Unexpected HTTP status code for GET /activity/");
+        $crawler = $client->request('GET', sprintf(
+            'en/person/%d/activity/',
+            $person->getId()
+        ));
+        $this->assertEquals(
+            200,
+            $client->getResponse()->getStatusCode(),
+            'Unexpected HTTP status code for GET /activity/'
+        );
         $crawler = $client->click($crawler->selectLink('Ajouter une nouvelle activité')
-              ->link());
+            ->link());
 
         $reason1 = $this->getRandomActivityReason();
-        $reason2 = $this->getRandomActivityReason(array($reason1->getId()));
+        $reason2 = $this->getRandomActivityReason([$reason1->getId()]);
 
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Ajouter une nouvelle activité')->form(array(
-            'chill_activitybundle_activity'=> array(
-               'date' => '15-01-2015',
-               'durationTime' => 600,
-            //   'remark' => 'blabla',
-               'scope' => $this->getRandomScope('center a_social', 'Center A')->getId(),
-               'type'   => $this->getRandomActivityType()->getId()
-            )
-        ));
-        $form['chill_activitybundle_activity[reasons]']->select(array ($reason1->getId(), $reason2->getId()));
+        $form = $crawler->selectButton('Ajouter une nouvelle activité')->form([
+            'chill_activitybundle_activity' => [
+                'date' => '15-01-2015',
+                'durationTime' => 600,
+                //   'remark' => 'blabla',
+                'scope' => $this->getRandomScope('center a_social', 'Center A')->getId(),
+                'type' => $this->getRandomActivityType()->getId(),
+            ],
+        ]);
+        $form['chill_activitybundle_activity[reasons]']->select([$reason1->getId(), $reason2->getId()]);
 
         $client->submit($form);
 
@@ -128,18 +144,21 @@ class ActivityControllerTest extends WebTestCase
         $crawler = $client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(0, $crawler->filter('dd:contains("January 15, 2015")')->count(),
-              'Missing element dd:contains("January 15, 2015")');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('dd:contains("January 15, 2015")')->count(),
+            'Missing element dd:contains("January 15, 2015")'
+        );
 
         // Edit the entity
         $crawler = $client->click($crawler->selectLink("Modifier l'activité")->link());
 
-        $form = $crawler->selectButton("Sauver l'activité")->form(array(
-            'chill_activitybundle_activity'  => array(
-               'date' => '25-01-2015',
-             //  'remark' => 'Foo'
-            )
-        ));
+        $form = $crawler->selectButton("Sauver l'activité")->form([
+            'chill_activitybundle_activity' => [
+                'date' => '25-01-2015',
+                //  'remark' => 'Foo'
+            ],
+        ]);
 
         $client->submit($form);
 
@@ -148,164 +167,33 @@ class ActivityControllerTest extends WebTestCase
         $crawler = $client->followRedirect();
 
         // check that new data are present
-        $this->assertGreaterThan(0,
-              $crawler->filter('dd:contains("January 25, 2015")')->count(),
-              'Missing element dd:contains("January 25, 2015")');
-        $this->assertGreaterThan(0,
-              $crawler->filter('dd:contains("Foo")')->count(),
-              'Missing element dd:contains("Foo")');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('dd:contains("January 25, 2015")')->count(),
+            'Missing element dd:contains("January 25, 2015")'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('dd:contains("Foo")')->count(),
+            'Missing element dd:contains("Foo")'
+        );
 
         // delete the actvity
-       $crawler = $client->click($crawler->selectLink("Supprimer")->link());
+        $crawler = $client->click($crawler->selectLink('Supprimer')->link());
 
-       $button = $crawler->selectButton('Supprimer');
+        $button = $crawler->selectButton('Supprimer');
 
-       $form = $button->form();
+        $form = $button->form();
 
-       $client->submit($form);
-       $this->assertTrue($client->getResponse()->isRedirect(sprintf('/en/person/%d/activity/',
-              $person->getId())));
+        $client->submit($form);
+        $this->assertTrue($client->getResponse()->isRedirect(sprintf(
+            '/en/person/%d/activity/',
+            $person->getId()
+        )));
 
-       $crawler = $client->followRedirect();
+        $crawler = $client->followRedirect();
 
-       $this->assertNotContains('January 25, 2015', $crawler->text());
-
-    }
-
-    /**
-     *
-     * @return \Symfony\Component\BrowserKit\Client
-     */
-    private function getAuthenticatedClient($username = 'center a_social')
-    {
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => 'password',
-        ));
-    }
-
-    /**
-     *
-     * @return \Chill\PersonBundle\Entity\Person
-     */
-    private function getPersonFromFixtures()
-    {
-        $em = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager');
-
-        $person = $em->getRepository('ChillPersonBundle:Person')
-              ->findOneBy(array(
-                 'firstName' => 'Depardieu',
-                 'lastName' => 'Gérard'
-              ));
-
-        if ($person === NULL) {
-            throw new \RuntimeException("We need a person with firstname Gérard and"
-                  . " lastname Depardieu. Did you add fixtures ?");
-        }
-
-        return $person;
-    }
-
-    private function getActivitiesForPerson(\Chill\PersonBundle\Entity\Person $person)
-    {
-        $em = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager');
-
-        $activities = $em->getRepository('ChillActivityBundle:Activity')
-                ->findBy(array('person' => $person));
-
-        if (count($activities) === 0) {
-            throw new \RuntimeException("We need activities associated with this "
-                    . "person. Did you forget to add fixtures ?");
-        }
-
-        return $activities;
-    }
-
-    /**
-     *
-     * @param string $username
-     * @param string $centerName
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getRandomScope($username, $centerName)
-    {
-        $user = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillMainBundle:User')
-              ->findOneByUsername($username);
-
-        if ($user === NULL) {
-            throw new \RuntimeException("The user with username $username "
-                  . "does not exists in database. Did you add fixtures ?");
-        }
-
-        $center = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillMainBundle:Center')
-              ->findOneByName($centerName);
-
-        // get scope reachable by both role UPDATE and DELETE
-        $reachableScopesUpdate = static::$kernel->getContainer()
-              ->get('chill.main.security.authorization.helper')
-              ->getReachableScopes($user, new Role('CHILL_ACTIVITY_UPDATE'),
-                    $center);
-        $reachableScopesDelete = static::$kernel->getContainer()
-              ->get('chill.main.security.authorization.helper')
-              ->getReachableScopes($user, new Role('CHILL_ACTIVITY_DELETE'),
-                    $center);
-        $reachableScopesId = array_intersect(
-              array_map(function ($s) { return $s->getId(); }, $reachableScopesDelete),
-              array_map(function ($s) { return $s->getId(); }, $reachableScopesUpdate)
-              );
-        if (count($reachableScopesId) === 0) {
-            throw new \RuntimeException("there are not scope reachable for "
-                  . "both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE");
-        }
-
-        foreach($reachableScopesUpdate as $scope) {
-            if (in_array($scope->getId(), $reachableScopesId)) {
-                $reachableScopes[] = $scope;
-            }
-        }
-
-        return $reachableScopes[array_rand($reachableScopes)];
-    }
-
-    /**
-     *
-     * @param int[] $excludeIds An array of id to exclude
-     * @return \Chill\ActivityBundle\Entity\ActivityReason
-     */
-    private function getRandomActivityReason(array $excludeIds = array())
-    {
-        $reasons = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillActivityBundle:ActivityReason')
-              ->findAll();
-
-        $reason = $reasons[array_rand($reasons)];
-
-        if (in_array($reason->getId(), $excludeIds)) {
-            return $this->getRandomActivityReason($excludeIds);
-        }
-
-        return $reason;
-    }
-
-    /**
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    private function getRandomActivityType()
-    {
-        $types = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillActivityBundle:ActivityType')
-              ->findAll();
-
-        return $types[array_rand($types)];
+        $this->assertNotContains('January 25, 2015', $crawler->text());
     }
 
     /**
@@ -316,15 +204,15 @@ class ActivityControllerTest extends WebTestCase
      */
     private function createFakeUser()
     {
-        $container = static::$kernel->getContainer();
+        $container = self::$kernel->getContainer();
         $em = $container->get('doctrine.orm.entity_manager');
 
         //get the social PermissionGroup, and remove CHILL_ACTIVITY_*
         $socialPermissionGroup = $em
-                ->getRepository('ChillMainBundle:PermissionsGroup')
-                ->findOneByName('social');
+            ->getRepository('ChillMainBundle:PermissionsGroup')
+            ->findOneByName('social');
         $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup())
-                ->setName('social without activity');
+            ->setName('social without activity');
         //copy role scopes where ACTIVITY is not present
         foreach ($socialPermissionGroup->getRoleScopes() as $roleScope) {
             if (!strpos($roleScope->getRole(), 'ACTIVITY')) {
@@ -334,8 +222,8 @@ class ActivityControllerTest extends WebTestCase
         //create groupCenter
         $groupCenter = new \Chill\MainBundle\Entity\GroupCenter();
         $groupCenter->setCenter($em->getRepository('ChillMainBundle:Center')
-                ->findOneBy(array('name' => 'Center A')))
-                ->setPermissionsGroup($withoutActivityPermissionGroup);
+            ->findOneBy(['name' => 'Center A']))
+            ->setPermissionsGroup($withoutActivityPermissionGroup);
         $em->persist($withoutActivityPermissionGroup);
         $em->persist($groupCenter);
 
@@ -344,10 +232,10 @@ class ActivityControllerTest extends WebTestCase
         $username = $faker->name;
         $user = new \Chill\MainBundle\Entity\User();
         $user
-                ->setPassword($container->get('security.password_encoder')
-                        ->encodePassword($user, 'password'))
-                ->setUsername($username)
-                ->addGroupCenter($groupCenter);
+            ->setPassword($container->get('security.password_encoder')
+            ->encodePassword($user, 'password'))
+            ->setUsername($username)
+            ->addGroupCenter($groupCenter);
 
         $em->persist($user);
 
@@ -355,4 +243,146 @@ class ActivityControllerTest extends WebTestCase
 
         return $user;
     }
+
+    private function getActivitiesForPerson(\Chill\PersonBundle\Entity\Person $person)
+    {
+        $em = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager');
+
+        $activities = $em->getRepository('ChillActivityBundle:Activity')
+            ->findBy(['person' => $person]);
+
+        if (count($activities) === 0) {
+            throw new RuntimeException('We need activities associated with this '
+                    . 'person. Did you forget to add fixtures ?');
+        }
+
+        return $activities;
+    }
+
+    /**
+     * @param mixed $username
+     *
+     * @return \Symfony\Component\BrowserKit\Client
+     */
+    private function getAuthenticatedClient($username = 'center a_social')
+    {
+        return self::createClient([], [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => 'password',
+        ]);
+    }
+
+    /**
+     * @return \Chill\PersonBundle\Entity\Person
+     */
+    private function getPersonFromFixtures()
+    {
+        $em = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager');
+
+        $person = $em->getRepository('ChillPersonBundle:Person')
+            ->findOneBy([
+                'firstName' => 'Depardieu',
+                'lastName' => 'Gérard',
+            ]);
+
+        if (null === $person) {
+            throw new RuntimeException('We need a person with firstname Gérard and'
+                  . ' lastname Depardieu. Did you add fixtures ?');
+        }
+
+        return $person;
+    }
+
+    /**
+     * @param int[] $excludeIds An array of id to exclude
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityReason
+     */
+    private function getRandomActivityReason(array $excludeIds = [])
+    {
+        $reasons = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillActivityBundle:ActivityReason')
+            ->findAll();
+
+        $reason = $reasons[array_rand($reasons)];
+
+        if (in_array($reason->getId(), $excludeIds, true)) {
+            return $this->getRandomActivityReason($excludeIds);
+        }
+
+        return $reason;
+    }
+
+    /**
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    private function getRandomActivityType()
+    {
+        $types = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillActivityBundle:ActivityType')
+            ->findAll();
+
+        return $types[array_rand($types)];
+    }
+
+    /**
+     * @param string $username
+     * @param string $centerName
+     *
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getRandomScope($username, $centerName)
+    {
+        $user = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:User')
+            ->findOneByUsername($username);
+
+        if (null === $user) {
+            throw new RuntimeException("The user with username {$username} "
+                  . 'does not exists in database. Did you add fixtures ?');
+        }
+
+        $center = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:Center')
+            ->findOneByName($centerName);
+
+        // get scope reachable by both role UPDATE and DELETE
+        $reachableScopesUpdate = self::$kernel->getContainer()
+            ->get('chill.main.security.authorization.helper')
+            ->getReachableScopes(
+                $user,
+                new Role('CHILL_ACTIVITY_UPDATE'),
+                $center
+            );
+        $reachableScopesDelete = self::$kernel->getContainer()
+            ->get('chill.main.security.authorization.helper')
+            ->getReachableScopes(
+                $user,
+                new Role('CHILL_ACTIVITY_DELETE'),
+                $center
+            );
+        $reachableScopesId = array_intersect(
+            array_map(static function ($s) { return $s->getId(); }, $reachableScopesDelete),
+            array_map(static function ($s) { return $s->getId(); }, $reachableScopesUpdate)
+        );
+
+        if (count($reachableScopesId) === 0) {
+            throw new RuntimeException('there are not scope reachable for '
+                  . 'both CHILL_ACTIVITY_UPDATE and CHILL_ACTIVITY_DELETE');
+        }
+
+        foreach ($reachableScopesUpdate as $scope) {
+            if (in_array($scope->getId(), $reachableScopesId, true)) {
+                $reachableScopes[] = $scope;
+            }
+        }
+
+        return $reachableScopes[array_rand($reachableScopes)];
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
index 9222d4b39..a6277608f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonCategoryControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ActivityReasonCategoryControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityReasonCategoryControllerTest extends WebTestCase
 {
     public function testToWrite()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class ActivityReasonCategoryControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
index 5ee8cf977..a2ae8c13f 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityReasonControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ActivityReasonControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityReasonControllerTest extends WebTestCase
 {
     public function testToWrite()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class ActivityReasonControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
index 9249f14ae..a07f03770 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityTypeControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ActivityTypeControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityTypeControllerTest extends WebTestCase
 {
     public function testToWrite()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class ActivityTypeControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
index a79ee50d3..cded1edeb 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
@@ -1,80 +1,72 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * Add tests for ActivityReasonAggregator
+ * Add tests for ActivityReasonAggregator.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ActivityReasonAggregatorTest extends AbstractAggregatorTest
+final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
     /**
-     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
      */
     private $aggregator;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $container = static::$kernel->getContainer();
-        
-        $this->aggregator = $container->get('chill.activity.export.reason_aggregator');   
-        
+        self::bootKernel();
+
+        $container = self::$kernel->getContainer();
+
+        $this->aggregator = $container->get('chill.activity.export.reason_aggregator');
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
+
         $container->get('request_stack')
-                ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
+
     public function getAggregator()
     {
         return $this->aggregator;
     }
-    
+
     public function getFormData()
     {
-        return array(
-            array('level' => 'reasons'),
-            array('level' => 'categories')
-        );
+        return [
+            ['level' => 'reasons'],
+            ['level' => 'categories'],
+        ];
     }
-    
+
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$kernel->getContainer()
+
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -86,8 +78,7 @@ class ActivityReasonAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category')
-        );
+                ->join('reasons.category', 'category'),
+        ];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
index d3e4efd84..0b0c6500a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
@@ -1,79 +1,71 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * Add tests for ActivityTypeAggregator
+ * Add tests for ActivityTypeAggregator.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ActivityTypeAggregatorTest extends AbstractAggregatorTest
+final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
     /**
-     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
      */
     private $aggregator;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $container = static::$kernel->getContainer();
-        
-        $this->aggregator = $container->get('chill.activity.export.type_aggregator');   
-        
+        self::bootKernel();
+
+        $container = self::$kernel->getContainer();
+
+        $this->aggregator = $container->get('chill.activity.export.type_aggregator');
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
+
         $container->get('request_stack')
-                ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
+
     public function getAggregator()
     {
         return $this->aggregator;
     }
-    
+
     public function getFormData()
     {
-        return array(
-            array()
-        );
+        return [
+            [],
+        ];
     }
-    
+
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$kernel->getContainer()
+
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -85,8 +77,7 @@ class ActivityTypeAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category')
-        );
+                ->join('reasons.category', 'category'),
+        ];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
index 45f974a56..426de911d 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
@@ -1,78 +1,71 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * Add tests for ActivityUsernAggregator
+ * Add tests for ActivityUsernAggregator.
  *
+ * @internal
+ * @coversNothing
  */
-class ActivityUserAggregatorTest extends AbstractAggregatorTest
+final class ActivityUserAggregatorTest extends AbstractAggregatorTest
 {
     /**
-     *
      * @var \Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
      */
     private $aggregator;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $container = static::$kernel->getContainer();
-        
-        $this->aggregator = $container->get('chill.activity.export.user_aggregator');   
-        
+        self::bootKernel();
+
+        $container = self::$kernel->getContainer();
+
+        $this->aggregator = $container->get('chill.activity.export.user_aggregator');
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
+
         $container->get('request_stack')
-                ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
+
     public function getAggregator()
     {
         return $this->aggregator;
     }
-    
+
     public function getFormData()
     {
-        return array(
-            array()
-        );
+        return [
+            [],
+        ];
     }
-    
+
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$kernel->getContainer()
+
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -84,8 +77,7 @@ class ActivityUserAggregatorTest extends AbstractAggregatorTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category')
-        );
+                ->join('reasons.category', 'category'),
+        ];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php
index 4f9918fd0..3981c1948 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php
@@ -1,32 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CountActivityTest extends AbstractExportTest
+final class CountActivityTest extends AbstractExportTest
 {
     /**
-     *
-     * @var 
+     * @var
      */
     private $export;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        /* @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
+        self::bootKernel();
+
+        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
         $container = self::$kernel->getContainer();
-        
+
         $this->export = $container->get('chill.activity.export.count_activity');
     }
-    
+
     public function getExport()
     {
         return $this->export;
@@ -34,17 +41,16 @@ class CountActivityTest extends AbstractExportTest
 
     public function getFormData()
     {
-        return array(
-            array()
-        );
+        return [
+            [],
+        ];
     }
 
     public function getModifiersCombination()
     {
-        return array(
-            array('activity'),
-            array('activity', 'person')
-        );
+        return [
+            ['activity'],
+            ['activity', 'person'],
+        ];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php
index dbb660e55..df1e64fd7 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php
@@ -1,88 +1,46 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ListActivityTest extends AbstractExportTest
+final class ListActivityTest extends AbstractExportTest
 {
     /**
-     *
      * @var \Chill\ActivityBundle\Export\Export\ListActivity
      */
     private $export;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        /* @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
+        self::bootKernel();
+
+        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
         $container = self::$kernel->getContainer();
-        
+
         $this->export = $container->get('chill.activity.export.list_activity');
-        
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
+
         $container->get('request_stack')
-                ->push($request->reveal());
-    }
-    
-    
-
-    public function getFormData()
-    {
-        return array(
-            array('fields' => array(
-                'id',  
-                'date', 
-                'durationTime', 
-                'attendee', 
-                'user_username', 
-                'circle_name', 
-                'type_name', 
-                'person_firstname',
-                'person_lastname',
-                'person_id'
-            )),
-            array('fields' => array(
-                'id',  
-                'list_reasons'
-            )),
-        );
-    }
-
-    public function getModifiersCombination()
-    {
-        return array(
-            array('activity'),
-            array('activity', 'person')
-        );
+            ->push($request->reveal());
     }
 
     public function getExport()
@@ -90,4 +48,33 @@ class ListActivityTest extends AbstractExportTest
         return $this->export;
     }
 
+    public function getFormData()
+    {
+        return [
+            ['fields' => [
+                'id',
+                'date',
+                'durationTime',
+                'attendee',
+                'user_username',
+                'circle_name',
+                'type_name',
+                'person_firstname',
+                'person_lastname',
+                'person_id',
+            ]],
+            ['fields' => [
+                'id',
+                'list_reasons',
+            ]],
+        ];
+    }
+
+    public function getModifiersCombination()
+    {
+        return [
+            ['activity'],
+            ['activity', 'person'],
+        ];
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php
index f43374fd8..12587e5a3 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php
@@ -1,32 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * Test the "sum" part of StatActivityDuration
+ * Test the "sum" part of StatActivityDuration.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class StatActivityDurationSumTest extends AbstractExportTest
+final class StatActivityDurationSumTest extends AbstractExportTest
 {
     /**
-     *
      * @var \Chill\ActivityBundle\Export\Export\StatActivityDuration
      */
     private $export;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        /* @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
+        self::bootKernel();
+
+        /** @var \Symfony\Component\DependencyInjection\ContainerInterface $container */
         $container = self::$kernel->getContainer();
-        
+
         $this->export = $container->get('chill.activity.export.sum_activity_duration');
     }
-    
+
     public function getExport()
     {
         return $this->export;
@@ -34,17 +43,16 @@ class StatActivityDurationSumTest extends AbstractExportTest
 
     public function getFormData()
     {
-        return array(
-            array()
-        );
+        return [
+            [],
+        ];
     }
 
     public function getModifiersCombination()
     {
-        return array(
-            array('activity'),
-            array('activity', 'person')
-        );
+        return [
+            ['activity'],
+            ['activity', 'person'],
+        ];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
index 1c4ca4c21..46c1e0ef6 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
@@ -1,59 +1,48 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ActivityReasonFilterTest extends AbstractFilterTest
+final class ActivityReasonFilterTest extends AbstractFilterTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Filter\GenderFilter
      */
     private $filter;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $container = static::$kernel->getContainer();
-        
+        self::bootKernel();
+
+        $container = self::$kernel->getContainer();
+
         $this->filter = $container->get('chill.activity.export.reason_filter');
-        
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
+
         $container->get('request_stack')
-                ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
-    
+
     public function getFilter()
     {
         return $this->filter;
@@ -61,36 +50,35 @@ class ActivityReasonFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$kernel->getContainer()
-                ->get('doctrine.orm.entity_manager')
-                ;
-        
-        $reasons = $em->createQuery("SELECT reason "
-                . "FROM ChillActivityBundle:ActivityReason reason")
-                ->getResult();
-        
+
+        $em = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager');
+
+        $reasons = $em->createQuery('SELECT reason '
+                . 'FROM ChillActivityBundle:ActivityReason reason')
+            ->getResult();
+
         // generate an array of 5 different combination of results
-        for ($i=0; $i < 5; $i++) {
-            $r[] = array('reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1)));
+        for ($i = 0; 5 > $i; ++$i) {
+            $r[] = ['reasons' => new ArrayCollection(array_splice($reasons, ($i + 1) * -1))];
         }
-        
+
         return $r;
     }
 
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$kernel->getContainer()
+
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity'),
@@ -102,8 +90,7 @@ class ActivityReasonFilterTest extends AbstractFilterTest
                 ->select('count(activity.id)')
                 ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.reasons', 'reasons')
-                ->join('reasons.category', 'category')
-        );
+                ->join('reasons.category', 'category'),
+        ];
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
index 5b922e6f3..b69e4d8b2 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
@@ -1,56 +1,50 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use DateTime;
+use function array_slice;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
+final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
      */
     private $filter;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $container = static::$kernel->getContainer();
-        
+        self::bootKernel();
+
+        $container = self::$kernel->getContainer();
+
         $this->filter = $container->get('chill.activity.export.'
             . 'person_having_an_activity_between_date_filter');
-        
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
+
         $container->get('request_stack')
-                ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
+
     public function getFilter()
     {
         return $this->filter;
@@ -58,49 +52,33 @@ class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        $date_from = \DateTime::createFromFormat('Y-m-d', '2015-01-15');
-        $date_to   = new \DateTime(); // today
+        $date_from = DateTime::createFromFormat('Y-m-d', '2015-01-15');
+        $date_to = new DateTime(); // today
         $reasons = $this->getActivityReasons();
 
-        
-        $data = array();
-        for ($i = 0; $i < 4; $i++) {
-            $data[] = array(
+        $data = [];
+
+        for ($i = 0; 4 > $i; ++$i) {
+            $data[] = [
                 'date_from' => $date_from,
-                'date_to'   => $date_to,
-                'reasons'   => array_slice($reasons, 0, 1 + $i)
-            );
+                'date_to' => $date_to,
+                'reasons' => array_slice($reasons, 0, 1 + $i),
+            ];
         }
-        
+
         return $data;
     }
-    
-    /**
-     * Return all activity reasons
-     * 
-     * @return \Chill\ActivityBundle\Entity\ActivityReason[]
-     */
-    private function getActivityReasons() 
-    {
-        if (static::$kernel === null) {
-            static::bootKernel();
-        }
-        
-        return static::$kernel->getContainer()
-            ->get('chill_activity.repository.reason')
-            ->findAll();
-    }
 
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$kernel->getContainer()
+
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(person.id)')
                 ->from('ChillPersonBundle:Person', 'person')
@@ -112,6 +90,22 @@ class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
                 ->join('activity.person', 'person')
                 // add a fake where clause
                 ->where('person.id > 0'),
-        );
+        ];
+    }
+
+    /**
+     * Return all activity reasons.
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityReason[]
+     */
+    private function getActivityReasons()
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        return self::$kernel->getContainer()
+            ->get('chill_activity.repository.reason')
+            ->findAll();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
index 07e48cb56..3ba204d9a 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
@@ -1,193 +1,185 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Form;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Form\ActivityType;
+use DateTime;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
 
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ActivityTypeTest extends KernelTestCase
+final class ActivityTypeTest extends KernelTestCase
 {
     /**
-     *
-     * @var \Symfony\Component\Form\FormBuilderInterface
+     * @var \Chill\MainBundle\Entity\Center
      */
-    protected $formBuilder;
+    protected $center;
 
     /**
-     *
      * @var \Symfony\Component\DependencyInjection\ContainerInterface
      */
     protected $container;
 
     /**
-     *
+     * @var \Symfony\Component\Form\FormBuilderInterface
+     */
+    protected $formBuilder;
+
+    /**
      * @var \Symfony\Component\Security\Core\User\UserInterface
      */
     protected $user;
 
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\Center
-     */
-    protected $center;
-
     public function setUp()
     {
         self::bootKernel();
 
         $this->container = self::$kernel->getContainer();
 
-        $prophet = new \Prophecy\Prophet;
-
+        $prophet = new \Prophecy\Prophet();
 
         $this->formBuilder = $this->container
-                ->get('form.factory')
-                ->createBuilder(FormType::class, null, array(
-                    'csrf_protection' => false,
-                    'csrf_field_name' => '_token'
-                ));
+            ->get('form.factory')
+            ->createBuilder(FormType::class, null, [
+                'csrf_protection' => false,
+                'csrf_field_name' => '_token',
+            ]);
 
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
 
         self::$kernel->getContainer()
-                ->get('request_stack')
-                ->push($request);
+            ->get('request_stack')
+            ->push($request);
 
         $this->user = $this->container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:User')
-                ->findOneBy(array('username' => 'center a_social'));
+            ->getRepository('ChillMainBundle:User')
+            ->findOneBy(['username' => 'center a_social']);
         $this->center = $this->container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:Center')
-                ->findOneBy(array('name' => 'Center A'));
+            ->getRepository('ChillMainBundle:Center')
+            ->findOneBy(['name' => 'Center A']);
         $token = $prophet->prophesize();
         $token->willExtend(AbstractToken::class);
         $token->getUser()->willReturn($this->user);
         $this->container->get('security.token_storage')
-                ->setToken($token->reveal());
-
+            ->setToken($token->reveal());
     }
 
     public function testForm()
     {
         $form = $this->formBuilder
-                ->add('activity', ActivityType::class, array(
-                    'center' => $this->center,
-                    'role' => new Role('CHILL_ACTIVITY_CREATE')
-                ))
-                ->getForm();
+            ->add('activity', ActivityType::class, [
+                'center' => $this->center,
+                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+            ])
+            ->getForm();
 
-        $form->submit(array());
+        $form->submit([]);
 
         $this->assertTrue($form->isSynchronized());
         $this->assertTrue($form->isValid());
         $this->assertInstanceOf(Activity::class, $form->getData()['activity']);
-
     }
 
     public function testFormSubmitting()
     {
         $form = $this->formBuilder
-                ->add('activity', ActivityType::class, array(
-                    'center' => $this->center,
-                    'role' => new Role('CHILL_ACTIVITY_CREATE')
-                ))
-                ->getForm();
+            ->add('activity', ActivityType::class, [
+                'center' => $this->center,
+                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+            ])
+            ->getForm();
 
-        $form->submit(array( 'activity' => array(
+        $form->submit(['activity' => [
             'date' => '9-3-2015',
             'durationTime' => 300,
-          //  'remark' => 'blabla',
-            'attendee' => true
-        )));
+            //  'remark' => 'blabla',
+            'attendee' => true,
+        ]]);
 
 //        var_dump($form->getErrors()->count()); var_dump($form->isValid());
 //        foreach($form->getErrors() as $e) { fwrite(STDOUT, var_dump($e->getMessage())); }
 //        var_dump($form->getErrors());
 
-        $this->assertTrue($form->isSynchronized(), "Test the form is synchronized");
-        $this->assertTrue($form->isValid(), "test the form is valid");
+        $this->assertTrue($form->isSynchronized(), 'Test the form is synchronized');
+        $this->assertTrue($form->isValid(), 'test the form is valid');
         $this->assertInstanceOf(Activity::class, $form->getData()['activity']);
 
         // test the activity
-        /* @var $activity Activity */
+        /** @var Activity $activity */
         $activity = $form->getData()['activity'];
 
-        $this->assertEquals('09-03-2015', $activity->getDate()->format('d-m-Y'),
-                "Test the date is correct");
-        $this->assertEquals('00:05', $activity->getDurationTime()->format('H:i'),
-                "Test the formatted hour is correct");
+        $this->assertEquals(
+            '09-03-2015',
+            $activity->getDate()->format('d-m-Y'),
+            'Test the date is correct'
+        );
+        $this->assertEquals(
+            '00:05',
+            $activity->getDurationTime()->format('H:i'),
+            'Test the formatted hour is correct'
+        );
         $this->assertEquals(true, $activity->getAttendee());
-     //   $this->assertEquals('blabla', $activity->getRemark());
-
+        //   $this->assertEquals('blabla', $activity->getRemark());
     }
 
     /**
      * Test that the form correctly build even with a durationTime which is not in
-     * the listed in the possible durationTime
+     * the listed in the possible durationTime.
      */
     public function testFormWithActivityHavingDifferentTime()
     {
         $activity = new Activity();
-        $activity->setDurationTime(\DateTime::createFromFormat('U', 60));
+        $activity->setDurationTime(DateTime::createFromFormat('U', 60));
 
         $builder = $this->container
-                ->get('form.factory')
-                ->createBuilder(FormType::class, array('activity' => $activity), array(
-                    'csrf_protection' => false,
-                    'csrf_field_name' => '_token'
-                ));
+            ->get('form.factory')
+            ->createBuilder(FormType::class, ['activity' => $activity], [
+                'csrf_protection' => false,
+                'csrf_field_name' => '_token',
+            ]);
 
         $form = $builder
-                ->add('activity', ActivityType::class, array(
-                    'center' => $this->center,
-                    'role' => new Role('CHILL_ACTIVITY_CREATE')
-                ))
-                ->getForm();
+            ->add('activity', ActivityType::class, [
+                'center' => $this->center,
+                'role' => new Role('CHILL_ACTIVITY_CREATE'),
+            ])
+            ->getForm();
 
-
-        $form->submit(array( 'activity' => array(
+        $form->submit(['activity' => [
             'date' => '9-3-2015',
             'durationTime' => 60,
-          //  'remark' => 'blabla',
-            'attendee' => true
-        )));
+            //  'remark' => 'blabla',
+            'attendee' => true,
+        ]]);
 
         $this->assertTrue($form->isSynchronized());
         $this->assertTrue($form->isValid());
 
         // test the activity
-        /* @var $activity Activity */
+        /** @var Activity $activity */
         $activity = $form->getData()['activity'];
 
-        $this->assertEquals('00:01', $activity->getDurationTime()->format('H:i'),
-                "Test the formatted hour is correct");
+        $this->assertEquals(
+            '00:01',
+            $activity->getDurationTime()->format('H:i'),
+            'Test the formatted hour is correct'
+        );
 
         // test the view : we want to be sure that the entry with 60 seconds exists
         $view = $form->createView();
@@ -195,11 +187,11 @@ class ActivityTypeTest extends KernelTestCase
         $this->assertTrue(isset($view['activity']['durationTime']));
 
         // map all the values in an array
-        $values = array_map(function($choice) { return $choice->value; },
-                $view['activity']['durationTime']->vars['choices']);
+        $values = array_map(
+            static function ($choice) { return $choice->value; },
+            $view['activity']['durationTime']->vars['choices']
+        );
 
         $this->assertContains(60, $values);
-
     }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
index 59812009e..7d186192e 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php
@@ -1,110 +1,98 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Form\Type;
 
-use Symfony\Component\Form\Test\TypeTestCase;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Form\PreloadedExtension;
+use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- * Test translatableActivityReason
+ * Test translatableActivityReason.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class TranslatableActivityReasonTest extends TypeTestCase
+final class TranslatableActivityReasonTest extends TypeTestCase
 {
     /**
-     *
-     * @var Prophecy\Prophet 
+     * @var Prophecy\Prophet
      */
     private static $prophet;
-    
+
     public function setUp()
     {
         parent::setUp();
-        
-        
     }
-    
-    protected function getExtensions()
-    {
-        $entityType = $this->getEntityType();
-        
-        return array(new PreloadedExtension(array(
-           'entity' => $entityType
-        ), array()));
-    }
-    
-    
+
     public function testSimple()
     {
         $translatableActivityReasonType = new TranslatableActivityReason(
-              $this->getTranslatableStringHelper()
-              );
-        
-        $this->markTestSkipped("See issue 651");
+            $this->getTranslatableStringHelper()
+        );
+
+        $this->markTestSkipped('See issue 651');
     }
-    
+
     /**
-     * 
-     * @param string $locale
-     * @param string $fallbackLocale
-     * @return TranslatableStringHelper
-     */
-    protected function getTranslatableStringHelper($locale = 'en', 
-          $fallbackLocale = 'en')
-    {
-        $prophet = new \Prophecy\Prophet;
-        $requestStack = $prophet->prophesize();
-        $request = $prophet->prophesize();
-        $translator = $prophet->prophesize();
-        
-        $request->willExtend('Symfony\Component\HttpFoundation\Request');
-        $request->getLocale()->willReturn($fallbackLocale);
-        
-        $requestStack->willExtend('Symfony\Component\HttpFoundation\RequestStack');
-        $requestStack->getCurrentRequest()->will(function () use ($request) {
-            return $request;
-        });
-        
-        $translator->willExtend('Symfony\Component\Translation\Translator');
-        $translator->getFallbackLocales()->willReturn($locale);
-        
-        return new TranslatableStringHelper($requestStack->reveal(), 
-              $translator->reveal());
-        
-    }
-    
-    /**
-     * 
      * @return \Symfony\Bridge\Doctrine\Form\Type\EntityType
      */
     protected function getEntityType()
     {
         $managerRegistry = (new \Prophecy\Prophet())->prophesize();
-        
+
         $managerRegistry->willImplement('Doctrine\Common\Persistence\ManagerRegistry');
-        
+
         return new \Symfony\Bridge\Doctrine\Form\Type\EntityType($managerRegistry->reveal());
     }
+
+    protected function getExtensions()
+    {
+        $entityType = $this->getEntityType();
+
+        return [new PreloadedExtension([
+            'entity' => $entityType,
+        ], [])];
+    }
+
+    /**
+     * @param string $locale
+     * @param string $fallbackLocale
+     *
+     * @return TranslatableStringHelper
+     */
+    protected function getTranslatableStringHelper(
+        $locale = 'en',
+        $fallbackLocale = 'en'
+    ) {
+        $prophet = new \Prophecy\Prophet();
+        $requestStack = $prophet->prophesize();
+        $request = $prophet->prophesize();
+        $translator = $prophet->prophesize();
+
+        $request->willExtend('Symfony\Component\HttpFoundation\Request');
+        $request->getLocale()->willReturn($fallbackLocale);
+
+        $requestStack->willExtend('Symfony\Component\HttpFoundation\RequestStack');
+        $requestStack->getCurrentRequest()->will(static function () use ($request) {
+            return $request;
+        });
+
+        $translator->willExtend('Symfony\Component\Translation\Translator');
+        $translator->getFallbackLocales()->willReturn($locale);
+
+        return new TranslatableStringHelper(
+            $requestStack->reveal(),
+            $translator->reveal()
+        );
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
index b0f1e6e95..5c1dcd958 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -1,116 +1,103 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Form\Type;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class TranslatableActivityTypeTest extends KernelTestCase
+final class TranslatableActivityTypeTest extends KernelTestCase
 {
-    
     /**
-     *
      * @var \Symfony\Component\Form\FormBuilderInterface
      */
     protected $builder;
-    
+
     /**
-     *
      * @var \Symfony\Component\DependencyInjection\ContainerInterface
      */
     protected $container;
-    
+
     public function setUp()
     {
         self::bootKernel();
-        
+
         $this->container = self::$kernel->getContainer();
-        
+
         $this->builder = $this->container
-                ->get('form.factory')
-                ->createBuilder(FormType::class, null, array(
-                    'csrf_protection' => false,
-                    'csrf_field_name' => '_token'
-                ));
-        
+            ->get('form.factory')
+            ->createBuilder(FormType::class, null, [
+                'csrf_protection' => false,
+                'csrf_field_name' => '_token',
+            ]);
+
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
-        
+
         $this->container->get('request_stack')
-                ->push($request);
+            ->push($request);
     }
-    
-    /**
-     * 
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    protected function getRandomType($active = true)
-    {
-        $types = $this->container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillActivityBundle:ActivityType')
-                ->findBy(array('active' => $active));
-        
-        return $types[array_rand($types)];
-    }
-    
+
     public function testForm()
     {
         $type = $this->getRandomType();
         $form = $this->builder->add('type', TranslatableActivityType::class)
-                ->getForm();
-        
-        $form->submit(array(
-            'type' => $type->getId()
-        ));
-        
+            ->getForm();
+
+        $form->submit([
+            'type' => $type->getId(),
+        ]);
+
         $this->assertTrue($form->isSynchronized());
-        $this->assertInstanceOf(\Chill\ActivityBundle\Entity\ActivityType::class, 
-                $form->getData()['type'], 
-                "The data is an instance of Chill\ActivityBundle\Entity\ActivityType");
+        $this->assertInstanceOf(
+            \Chill\ActivityBundle\Entity\ActivityType::class,
+            $form->getData()['type'],
+            'The data is an instance of Chill\\ActivityBundle\\Entity\\ActivityType'
+        );
         $this->assertEquals($type->getId(), $form->getData()['type']->getId());
-        
+
         // test the ordering of the types in the form
         // since 2016-11-14 the types are not alphabetically ordered, skipping
         /*$view = $form->createView();
-        
+
         $this->assertGreaterThan(0, count($view['type']->vars['choices']),
                 "test that there are at least one choice");
-        
+
         foreach($view['type']->vars['choices'] as $choice) {
             // initialize the previous value is not set (this is the  first)
-            if (!isset($previous)) { 
-                $previous = $choice->label; 
+            if (!isset($previous)) {
+                $previous = $choice->label;
             } else {
                 $this->assertTrue($previous < $choice->label);
                 $previous = $choice->label;
             }
         }*/
-        
     }
-    
-    
-    
+
+    /**
+     * @param mixed $active
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    protected function getRandomType($active = true)
+    {
+        $types = $this->container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillActivityBundle:ActivityType')
+            ->findBy(['active' => $active]);
+
+        return $types[array_rand($types)];
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
index 2a9cd6fae..46351a052 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
@@ -1,103 +1,57 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Security\Authorization;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
+use Chill\ActivityBundle\Test\PrepareActivityTrait;
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Test\PrepareUserTrait;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\PrepareCenterTrait;
 use Chill\MainBundle\Test\PrepareScopeTrait;
+use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\PersonBundle\Test\PreparePersonTrait;
-use Chill\ActivityBundle\Test\PrepareActivityTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ActivityVoterTest extends KernelTestCase
+final class ActivityVoterTest extends KernelTestCase
 {
-    use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait, 
-            PreparePersonTrait, PrepareActivityTrait;
-    
+    use PrepareActivityTrait;
+    use PrepareCenterTrait;
+    use PreparePersonTrait;
+    use PrepareScopeTrait;
+    use PrepareUserTrait;
+
     /**
-     *
-     * @var \Chill\PersonBundle\Security\Authorization\PersonVoter
-     */
-    protected $voter;
-    
-    /**
-     *
      * @var \Prophecy\Prophet
      */
     protected $prophet;
-    
+
+    /**
+     * @var \Chill\PersonBundle\Security\Authorization\PersonVoter
+     */
+    protected $voter;
+
     public function setUp()
     {
-        static::bootKernel();
-        $this->voter = static::$kernel->getContainer()
-              ->get('chill.activity.security.authorization.activity_voter');
+        self::bootKernel();
+        $this->voter = self::$kernel->getContainer()
+            ->get('chill.activity.security.authorization.activity_voter');
         $this->prophet = new \Prophecy\Prophet();
     }
-    
-    public function testNullUser()
-    {
-        $token = $this->prepareToken();
-        $center = $this->prepareCenter(1, 'center');
-        $person = $this->preparePerson($center);
-        $scope = $this->prepareScope(1, 'default');
-        $activity = $this->prepareActivity($scope, $person);
-        
-        $this->assertEquals(
-                VoterInterface::ACCESS_DENIED,
-                $this->voter->vote($token, $activity, array('CHILL_ACTIVITY_SEE')), 
-                "assert that a null user is not allowed to see"
-                );
-    }
-    
-    /**
-     * 
-     * @dataProvider dataProvider_testVoteAction
-     * @param type $expectedResult
-     * @param User $user
-     * @param Scope $scope
-     * @param Center $center
-     * @param string $attribute
-     * @param string $message
-     */
-    public function testVoteAction($expectedResult, User $user, Scope $scope, 
-            Center $center, $attribute, $message)
-    {
-        $token = $this->prepareToken($user);
-        $activity = $this->prepareActivity($scope, $this->preparePerson($center));
-        
-        $this->assertEquals(
-                $expectedResult,
-                $this->voter->vote($token, $activity, array($attribute)),
-                $message
-            );
-    }
-    
+
     public function dataProvider_testVoteAction()
     {
         $centerA = $this->prepareCenter(1, 'center A');
@@ -105,72 +59,111 @@ class ActivityVoterTest extends KernelTestCase
         $scopeA = $this->prepareScope(1, 'scope default');
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
-        
-        $userA = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 
-                'permissionsGroup' => array(
+
+        $userA = $this->prepareUser([
+            [
+                'center' => $centerA,
+                'permissionsGroup' => [
                     ['scope' => $scopeB, 'role' => 'CHILL_ACTIVITY_CREATE'],
-                    ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_SEE']
-                )
-            ),
-            array(
-               'center' => $centerB,
-               'permissionsGroup' => array(
-                     ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_CREATE'],
-                     ['scope' => $scopeC, 'role' => 'CHILL_ACTIVITY_CREATE']
-               )
-            )
-            
-        ));
-        
-        return array(
-            array(
+                    ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_SEE'],
+                ],
+            ],
+            [
+                'center' => $centerB,
+                'permissionsGroup' => [
+                    ['scope' => $scopeA, 'role' => 'CHILL_ACTIVITY_CREATE'],
+                    ['scope' => $scopeC, 'role' => 'CHILL_ACTIVITY_CREATE'],
+                ],
+            ],
+        ]);
+
+        return [
+            [
                 VoterInterface::ACCESS_GRANTED,
                 $userA,
                 $scopeB,
                 $centerA,
                 'CHILL_ACTIVITY_CREATE',
-                'assert that a user granted with same rights'
-            ),
-            array(
+                'assert that a user granted with same rights',
+            ],
+            [
                 VoterInterface::ACCESS_GRANTED,
                 $userA,
                 $scopeB,
                 $centerA,
                 'CHILL_ACTIVITY_SEE',
-                'assert that a user granted with inheritance rights'
-            ),
-            array(
+                'assert that a user granted with inheritance rights',
+            ],
+            [
                 VoterInterface::ACCESS_DENIED,
                 $userA,
                 $scopeC,
                 $centerA,
                 'CHILL_ACTIVITY_SEE',
-                'assert that a suer is denied if he is not granted right on this center'
-                
-            )
+                'assert that a suer is denied if he is not granted right on this center',
+            ],
+        ];
+    }
+
+    public function testNullUser()
+    {
+        $token = $this->prepareToken();
+        $center = $this->prepareCenter(1, 'center');
+        $person = $this->preparePerson($center);
+        $scope = $this->prepareScope(1, 'default');
+        $activity = $this->prepareActivity($scope, $person);
+
+        $this->assertEquals(
+            VoterInterface::ACCESS_DENIED,
+            $this->voter->vote($token, $activity, ['CHILL_ACTIVITY_SEE']),
+            'assert that a null user is not allowed to see'
         );
     }
-    
+
     /**
-     * prepare a token interface with correct rights
-     * 
+     * @dataProvider dataProvider_testVoteAction
+     *
+     * @param type $expectedResult
+     * @param string $attribute
+     * @param string $message
+     */
+    public function testVoteAction(
+        $expectedResult,
+        User $user,
+        Scope $scope,
+        Center $center,
+        $attribute,
+        $message
+    ) {
+        $token = $this->prepareToken($user);
+        $activity = $this->prepareActivity($scope, $this->preparePerson($center));
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->voter->vote($token, $activity, [$attribute]),
+            $message
+        );
+    }
+
+    /**
+     * prepare a token interface with correct rights.
+     *
      * if $permissions = null, user will be null (no user associated with token
-     * 
+     *
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(User $user = null)
-    {        
+    protected function prepareToken(?User $user = null)
+    {
         $token = $this->prophet->prophesize();
         $token
             ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
-        if ($user === NULL) {
+
+        if (null === $user) {
             $token->getUser()->willReturn(null);
         } else {
             $token->getUser()->willReturn($user);
         }
-        
+
         return $token->reveal();
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
index 7c25cc0d9..d069c05f4 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Timeline/TimelineProviderTest.php
@@ -1,36 +1,26 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Tests\Timeline;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class TimelineProviderTest extends WebTestCase
+final class TimelineProviderTest extends WebTestCase
 {
     public function testAnActivityIsShownOnTimeline()
     {
-        $this->markTestSkipped("we have to write fixtures before writing this tests");
+        $this->markTestSkipped('we have to write fixtures before writing this tests');
     }
-    
 }
diff --git a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
index a1c6b6c65..072ba39d9 100644
--- a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+++ b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
@@ -1,227 +1,183 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Timeline;
 
-use Chill\MainBundle\Timeline\TimelineProviderInterface;
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
-use Doctrine\ORM\EntityManager;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Timeline\TimelineProviderInterface;
+use Chill\MainBundle\Timeline\TimelineSingleQuery;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use LogicException;
+use RuntimeException;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\Scope;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
+use Symfony\Component\Security\Core\User\UserInterface;
+use function implode;
+use function in_array;
+use function strtr;
 
-/**
- * Provide activity for inclusion in timeline
- *
-*/
 class TimelineActivityProvider implements TimelineProviderInterface
 {
-    
-    /**
-     *
-     * @var EntityManager
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $helper;
-    
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\User 
-     */
-    protected $user;
+    private const SUPPORTED_CONTEXTS = ['center', 'person'];
 
     protected ActivityACLAwareRepository $aclAwareRepository;
 
-    private const SUPPORTED_CONTEXTS = [ 'center', 'person'];
-    
-    /**
-     * TimelineActivityProvider constructor.
-     *
-     * @param EntityManager $em
-     * @param AuthorizationHelper $helper
-     * @param TokenStorageInterface $storage
-     */
+    protected EntityManagerInterface $em;
+
+    protected AuthorizationHelperInterface $helper;
+
+    protected UserInterface $user;
+
     public function __construct(
-        EntityManager $em,
-        AuthorizationHelper $helper,
+        EntityManagerInterface $em,
+        AuthorizationHelperInterface $helper,
         TokenStorageInterface $storage,
         ActivityACLAwareRepository $aclAwareRepository
-    )
-    {
+    ) {
         $this->em = $em;
         $this->helper = $helper;
         $this->aclAwareRepository = $aclAwareRepository;
-        
-        if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User)
-        {
-            throw new \RuntimeException('A user should be authenticated !');
+
+        if (!$storage->getToken()->getUser() instanceof User) {
+            throw new RuntimeException('A user should be authenticated !');
         }
-        
+
         $this->user = $storage->getToken()->getUser();
     }
-    
-    /**
-     * 
-     * {@inheritDoc}
-     */
+
     public function fetchQuery($context, array $args)
     {
         if ('center' === $context) {
             return TimelineSingleQuery::fromArray($this->aclAwareRepository
                 ->queryTimelineIndexer($context, $args));
         }
-        
+
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
 
-        [$where, $parameters] =  $this->getWhereClauseForPerson($args['person']);
-        
+        [$where, $parameters] = $this->getWhereClauseForPerson($args['person']);
+
         return TimelineSingleQuery::fromArray([
-           'id' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('id'),
-           'type' => 'activity',
-           'date' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('date'),
-           'FROM' => $this->getFromClausePerson($args['person']),
-           'WHERE' => $where,
-           'parameters' => $parameters
-       ]);
+            'id' => $metadataActivity->getTableName()
+                 . '.' . $metadataActivity->getColumnName('id'),
+            'type' => 'activity',
+            'date' => $metadataActivity->getTableName()
+                 . '.' . $metadataActivity->getColumnName('date'),
+            'FROM' => $this->getFromClausePerson(),
+            'WHERE' => $where,
+            'parameters' => $parameters,
+        ]);
     }
-    
+
+    public function getEntities(array $ids): array
+    {
+        $activities = $this->em->getRepository(Activity::class)
+            ->findBy(['id' => $ids]);
+
+        $result = [];
+
+        foreach ($activities as $activity) {
+            $result[$activity->getId()] = $activity;
+        }
+
+        return $result;
+    }
+
+    public function getEntityTemplate($entity, $context, array $args): array
+    {
+        $this->checkContext($context);
+
+        return [
+            'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
+            'template_data' => [
+                'activity' => $entity,
+                'context' => $context,
+            ],
+        ];
+    }
+
+    public function supportsType($type): bool
+    {
+        return 'activity' === $type;
+    }
+
+    /**
+     * Check if the context is supported.
+     *
+     * @throws LogicException if the context is not supported
+     */
+    private function checkContext(string $context)
+    {
+        if (false === in_array($context, self::SUPPORTED_CONTEXTS, true)) {
+            throw new LogicException(
+                sprintf(
+                    "The context '%s' is not supported. Currently only 'person' is supported",
+                    $context
+                )
+            );
+        }
+    }
+
+    private function getFromClausePerson(): string
+    {
+        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+        $metadataPerson = $this->em->getClassMetadata(Person::class);
+        $associationMapping = $metadataActivity->getAssociationMapping('person');
+
+        return sprintf(
+            '%s JOIN %s ON %s.%s = %s',
+            $metadataActivity->getTableName(),
+            $metadataPerson->getTableName(),
+            $metadataPerson->getTableName(),
+            $associationMapping['joinColumns'][0]['referencedColumnName'],
+            $associationMapping['joinColumns'][0]['name']
+        );
+    }
+
     private function getWhereClauseForPerson(Person $person)
     {
         $parameters = [];
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
         $role = new Role('CHILL_ACTIVITY_SEE');
-        $reachableScopes =  $this->helper->getReachableScopes($this->user,
-            $role, $person->getCenter());
-        $whereClause = sprintf(' {activity.person_id} = ? AND {activity.scope_id} IN ({scopes_ids}) ');
+        $reachableScopes = $this->helper->getReachableScopes($this->user, $role->getRole(), $person->getCenter());
+        $whereClause = ' {activity.person_id} = ? AND {activity.scope_id} IN ({scopes_ids}) ';
         $scopes_ids = [];
 
-        // first parameter: activity.person_id 
+        // first parameter: activity.person_id
         $parameters[] = $person->getId();
 
-        // loop on reachable scopes 
+        // loop on reachable scopes
         foreach ($reachableScopes as $scope) {
-            if (\in_array($scope->getId(), $scopes_ids)) {
+            if (in_array($scope->getId(), $scopes_ids, true)) {
                 continue;
             }
-            $scopes_ids[] = '?'; 
+            $scopes_ids[] = '?';
             $parameters[] = $scope->getId();
         }
 
         return [
-            \strtr(
+            strtr(
                 $whereClause,
                 [
                     '{activity.person_id}' => $associationMapping['joinColumns'][0]['name'],
-                    '{activity.scope_id}' => $metadataActivity->getTableName().'.'.
+                    '{activity.scope_id}' => $metadataActivity->getTableName() . '.' .
                         $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'],
-                    '{scopes_ids}' => \implode(", ", $scopes_ids)
-,
+                    '{scopes_ids}' => implode(', ', $scopes_ids),
                 ]
             ),
-            $parameters
+            $parameters,
         ];
     }
-    
-    private function getFromClausePerson()
-    {
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
-        $metadataPerson = $this->em->getClassMetadata(Person::class);
-        $associationMapping = $metadataActivity->getAssociationMapping('person');
-        
-        return $metadataActivity->getTableName().' JOIN '
-            .$metadataPerson->getTableName().' ON '
-            .$metadataPerson->getTableName().'.'.
-                $associationMapping['joinColumns'][0]['referencedColumnName']
-            .' = '
-            .$associationMapping['joinColumns'][0]['name']
-            ;
-    }
-    
-    /**
-     * 
-     * {@inheritDoc}
-     */
-    public function getEntities(array $ids)
-    {
-        $activities = $this->em->getRepository(Activity::class)
-              ->findBy(array('id' => $ids));
-        
-        $result = array();
-        foreach($activities as $activity) {
-            $result[$activity->getId()] = $activity;
-        }
-        
-        return $result;
-    }
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
-    public function getEntityTemplate($entity, $context, array $args)
-    {
-        $this->checkContext($context);
-        
-        return [
-           'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
-           'template_data' => [
-              'activity' => $entity,
-              'context' => $context
-            ]
-        ];
-    }
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
-    public function supportsType($type)
-    {
-        return $type === 'activity';
-    }
-    
-    /**
-     * check if the context is supported
-     * 
-     * @param string $context
-     * @throws \LogicException if the context is not supported
-     */
-    private function checkContext($context)
-    {
-        if (FALSE === \in_array($context, self::SUPPORTED_CONTEXTS)) {
-            throw new \LogicException("The context '$context' is not "
-                  . "supported. Currently only 'person' is supported");
-        }
-    }
-
 }
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
new file mode 100644
index 000000000..e6ed66d4a
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidity.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * @Annotation
+ */
+class ActivityValidity extends Constraint
+{
+    public const IS_REQUIRED_MESSAGE = ' is required';
+
+    public const ROOT_MESSAGE = 'For this type of activity, ';
+
+    public $noPersonsMessage = 'For this type of activity, you must add at least one person';
+
+    public $noThirdPartiesMessage = 'For this type of activity, you must add at least one third party';
+
+    public $noUsersMessage = 'For this type of activity, you must add at least one user';
+
+    public $socialActionsMessage = 'For this type of activity, you must add at least one social action';
+
+    public $socialIssuesMessage = 'For this type of activity, you must add at least one social issue';
+
+    public function getTargets()
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+
+    public function makeIsRequiredMessage(string $property)
+    {
+        return self::ROOT_MESSAGE . $property . self::IS_REQUIRED_MESSAGE;
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
new file mode 100644
index 000000000..d429d4e4d
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Validator\Constraints;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use function array_merge;
+use function count;
+
+class ActivityValidityValidator extends ConstraintValidator
+{
+    public function validate($activity, Constraint $constraint)
+    {
+        if (!$constraint instanceof ActivityValidity) {
+            throw new UnexpectedTypeException($constraint, ActivityValidity::class);
+        }
+
+        if (!$activity instanceof Activity) {
+            throw new UnexpectedValueException($activity, Activity::class);
+        }
+
+        if ($activity->getActivityType()->getPersonsVisible() === 2 && count($activity->getPersons()) === 0) {
+            $this->context
+                ->buildViolation($constraint->noPersonsMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getUsersVisible() === 2 && count($activity->getUsers()) === 0) {
+            $this->context
+                ->buildViolation($constraint->noUsersMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getThirdPartiesVisible() === 2 && count($activity->getThirdParties()) === 0) {
+            $this->context
+                ->buildViolation($constraint->noThirdPartiesMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getUserVisible() === 2 && null === $activity->getUser()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('user'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getDateVisible() === 2 && null === $activity->getDate()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('date'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getLocationVisible() === 2 && null === $activity->getLocation()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('location'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getDurationTimeVisible() === 2 && null === $activity->getDurationTime()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('duration time'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getTravelTimeVisible() === 2 && null === $activity->getTravelTime()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('travel time'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getAttendeeVisible() === 2 && null === $activity->getAttendee()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('attendee'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getReasonsVisible() === 2 && null === $activity->getReasons()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('reasons'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getCommentVisible() === 2 && null === $activity->getComment()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('comment'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getSentReceivedVisible() === 2 && null === $activity->getSentReceived()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('sent/received'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getDocumentsVisible() === 2 && null === $activity->getDocuments()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('document'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getEmergencyVisible() === 2 && null === $activity->getEmergency()) {
+            $this->context
+                ->buildViolation($constraint->makeIsRequiredMessage('emergency'))
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getSocialIssuesVisible() === 2 && $activity->getSocialIssues()->count() === 0) {
+            $this->context
+                ->buildViolation($constraint->socialIssuesMessage)
+                ->addViolation();
+        }
+
+        if ($activity->getActivityType()->getSocialActionsVisible() === 2 && $activity->getSocialActions()->count() === 0) {
+            // check if a social action may be added
+            $actions = [];
+
+            foreach ($activity->getSocialIssues() as $socialIssue) {
+                /** @var SocialIssue $socialIssue */
+                $actions = array_merge($actions, $socialIssue->getRecursiveSocialActions()->toArray());
+            }
+
+            if (0 < count($actions)) {
+                $this->context
+                    ->buildViolation($constraint->socialActionsMessage)
+                    ->addViolation();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/config/services.yaml b/src/Bundle/ChillActivityBundle/config/services.yaml
index 0a65e08c8..1ca413f0e 100644
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -1,4 +1,7 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
@@ -13,17 +16,19 @@ services:
             - { name: chill.timeline, context: 'center' }
 
     Chill\ActivityBundle\Menu\:
-        autowire: true
-        autoconfigure: true
         resource: '../Menu/'
         tags: ['chill.menu_builder']
 
     Chill\ActivityBundle\Notification\:
-        autowire: true
-        autoconfigure: true
         resource: '../Notification'
 
     Chill\ActivityBundle\Security\Authorization\:
         resource: '../Security/Authorization/'
+
+    Chill\ActivityBundle\Repository\:
+        resource: '../Repository/'
+
+    Chill\ActivityBundle\Validator\Constraints\:
         autowire: true
         autoconfigure: true
+        resource: '../Validator/Constraints/'
diff --git a/src/Bundle/ChillActivityBundle/config/services/doctrine.entitylistener.yaml b/src/Bundle/ChillActivityBundle/config/services/doctrine.entitylistener.yaml
new file mode 100644
index 000000000..3c439153b
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/config/services/doctrine.entitylistener.yaml
@@ -0,0 +1,15 @@
+services:
+  Chill\ActivityBundle\EntityListener\ActivityEntityListener:
+    autowire: true
+    autoconfigure: true
+    tags:
+      -
+        name: 'doctrine.orm.entity_listener'
+        event: 'postPersist'
+        entity: 'Chill\ActivityBundle\Entity\Activity'
+        method: 'persistActionToCourse'
+      -
+        name: 'doctrine.orm.entity_listener'
+        event: 'postUpdate'
+        entity: 'Chill\ActivityBundle\Entity\Activity'
+        method: 'persistActionToCourse'
diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml
index 222e8b5e0..d8aa13098 100644
--- a/src/Bundle/ChillActivityBundle/config/services/export.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml
@@ -1,82 +1,56 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.activity.export.count_activity:
         class: Chill\ActivityBundle\Export\Export\CountActivity
-        arguments:
-            - "@doctrine.orm.entity_manager"
         tags:
             - { name: chill.export, alias: 'count_activity' }
-            
+
     chill.activity.export.sum_activity_duration:
         class: Chill\ActivityBundle\Export\Export\StatActivityDuration
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "sum"
         tags:
             - { name: chill.export, alias: 'sum_activity_duration' }
-            
+
     chill.activity.export.list_activity:
         class: Chill\ActivityBundle\Export\Export\ListActivity
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@translator"
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: chill.export, alias: 'list_activity' }
-            
+
     chill.activity.export.reason_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "@chill_activity.repository.reason"
         tags:
             - { name: chill.export_filter, alias: 'activity_reason_filter' }
-            
+
     chill.activity.export.type_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "@chill_activity.repository.activity_type"
         tags:
             - { name: chill.export_filter, alias: 'activity_type_filter' }
-            
+
     chill.activity.export.date_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityDateFilter
-        arguments:
-            - "@translator"
         tags:
             - { name: chill.export_filter, alias: 'activity_date_filter' }
 
     chill.activity.export.person_having_an_activity_between_date_filter:
         class: Chill\ActivityBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "@chill_activity.repository.reason"
-            - "@translator"
         tags:
             - #0 register as a filter
                 name: chill.export_filter
                 alias: 'activity_person_having_ac_bw_date_filter'
-            
+
     chill.activity.export.reason_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
-        arguments:
-            - "@chill_activity.repository.reason_category"
-            - "@chill_activity.repository.reason"
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: chill.export_aggregator, alias: activity_reason_aggregator }
-            
+
     chill.activity.export.type_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator
-        arguments:
-            - "@chill_activity.repository.activity_type"
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: chill.export_aggregator, alias: activity_type_aggregator }
-            
+
     chill.activity.export.user_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
-        arguments:
-            $em: "@doctrine.orm.entity_manager"
         tags:
             - { name: chill.export_aggregator, alias: activity_user_aggregator }
diff --git a/src/Bundle/ChillActivityBundle/config/services/fixtures.yaml b/src/Bundle/ChillActivityBundle/config/services/fixtures.yaml
index 4851b7838..900453a67 100644
--- a/src/Bundle/ChillActivityBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/fixtures.yaml
@@ -1,4 +1,6 @@
 services:
     Chill\ActivityBundle\DataFixtures\ORM\:
+        autowire: true
+        autoconfigure: true
         resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]
diff --git a/src/Bundle/ChillActivityBundle/config/services/repositories.yaml b/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
index 26bc58ac9..c9fe8d843 100644
--- a/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/repositories.yaml
@@ -1,28 +1,12 @@
 ---
 services:
-    chill_activity.repository.activity_type:
-        class: Doctrine\ORM\EntityRepository
-        factory: ['@doctrine.orm.entity_manager', getRepository]
-        arguments:
-            - 'Chill\ActivityBundle\Entity\ActivityType'
-
-    chill_activity.repository.reason:
-        class: Doctrine\ORM\EntityRepository
-        factory: ['@doctrine.orm.entity_manager', getRepository]
-        arguments:
-            - 'Chill\ActivityBundle\Entity\ActivityReason'
-
-    chill_activity.repository.reason_category:
-        class: Doctrine\ORM\EntityRepository
-        factory: ['@doctrine.orm.entity_manager', getRepository]
-        arguments:
-            - 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
-
-    Chill\ActivityBundle\Repository\ActivityRepository:
-        tags: [doctrine.repository_service]
-        arguments:
-            - '@Doctrine\Persistence\ManagerRegistry'
+    chill_activity.repository.activity_type: '@Chill\ActivityBundle\Repository\ActivityTypeRepository'
+    chill_activity.repository.reason: '@Chill\ActivityBundle\Repository\ActivityReasonRepository'
+    chill_activity.repository.reason_category: '@Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository'
 
+    # This is not a repository but merely a service. It needs to be moved out for simplicity.
+    # The autowire and autoconfigure should be enabled globally and removed from the definition of the service.
+    # Once autoloaded, there is no need to alias it to the interface here, it will be done automatically by Symfony.
     Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
         autowire: true
         autoconfigure: true
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
index be0eb7221..c84d3af52 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150701091248.php
@@ -1,42 +1,46 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\Migrations\Activity;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20150701091248 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0C59BB1592');
+        $this->addSql('ALTER TABLE ActivityReason DROP CONSTRAINT FK_654A2FCD12469DE2');
+        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0CC54C8C93');
+        $this->addSql('DROP SEQUENCE Activity_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE ActivityReason_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE ActivityReasonCategory_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE ActivityType_id_seq CASCADE');
+        $this->addSql('DROP TABLE Activity');
+        $this->addSql('DROP TABLE ActivityReason');
+        $this->addSql('DROP TABLE ActivityReasonCategory');
+        $this->addSql('DROP TABLE ActivityType');
+    }
+
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE Activity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE ActivityReason_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -59,25 +63,4 @@ class Version20150701091248 extends AbstractMigration
         $this->addSql('ALTER TABLE Activity ADD CONSTRAINT FK_55026B0C217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE ActivityReason ADD CONSTRAINT FK_654A2FCD12469DE2 FOREIGN KEY (category_id) REFERENCES ActivityReasonCategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0C59BB1592');
-        $this->addSql('ALTER TABLE ActivityReason DROP CONSTRAINT FK_654A2FCD12469DE2');
-        $this->addSql('ALTER TABLE Activity DROP CONSTRAINT FK_55026B0CC54C8C93');
-        $this->addSql('DROP SEQUENCE Activity_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE ActivityReason_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE ActivityReasonCategory_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE ActivityType_id_seq CASCADE');
-        $this->addSql('DROP TABLE Activity');
-        $this->addSql('DROP TABLE ActivityReason');
-        $this->addSql('DROP TABLE ActivityReasonCategory');
-        $this->addSql('DROP TABLE ActivityType');
-    }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
index 0ef11b14f..efcd68c7e 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150702093317.php
@@ -1,58 +1,28 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\Migrations\Activity;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20150702093317 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN label;');
-        $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN name JSON;');
-        $this->addSql('ALTER TABLE ActivityReason DROP COLUMN label;');
-        $this->addSql('ALTER TABLE ActivityReason ADD COLUMN name JSON;');
-        $this->addSql('ALTER TABLE ActivityType DROP COLUMN name;');
-        $this->addSql('ALTER TABLE ActivityType ADD COLUMN name JSON;');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN name;');
         $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN label VARCHAR(255) NOT NULL;');
@@ -61,4 +31,17 @@ class Version20150702093317 extends AbstractMigration
         $this->addSql('ALTER TABLE ActivityType DROP COLUMN name;');
         $this->addSql('ALTER TABLE ActivityType ADD COLUMN name VARCHAR(255) NOT NULL;');
     }
-}
\ No newline at end of file
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE ActivityReasonCategory DROP COLUMN label;');
+        $this->addSql('ALTER TABLE ActivityReasonCategory ADD COLUMN name JSON;');
+        $this->addSql('ALTER TABLE ActivityReason DROP COLUMN label;');
+        $this->addSql('ALTER TABLE ActivityReason ADD COLUMN name JSON;');
+        $this->addSql('ALTER TABLE ActivityType DROP COLUMN name;');
+        $this->addSql('ALTER TABLE ActivityType ADD COLUMN name JSON;');
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
index 8940b04c3..a4bb82319 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20150704091347.php
@@ -1,57 +1,39 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\Migrations\Activity;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Db Migration
- *
+ * Db Migration.
  */
 class Version20150704091347 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE Activity ALTER COLUMN remark DROP NOT NULL;');
-        $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE Activity ALTER COLUMN remark SET NOT NULL;');
         $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
     }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE Activity ALTER COLUMN remark DROP NOT NULL;');
+        $this->addSql('ALTER TABLE Activity ALTER COLUMN attendee DROP NOT NULL;');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
index 0dbcabbb4..80afac045 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20160222103457.php
@@ -1,60 +1,33 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Activity;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Migrate schema to allow multiple or empty reasons on an activity. 
- * 
+ * Migrate schema to allow multiple or empty reasons on an activity.
+ *
  * The relation between the activity and reason **was** oneToMany. After this
  * migration, the relation will be manyToMany.
  */
 class Version20160222103457 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
-                'Migration can only be executed safely on \'postgresql\'.');
-
-        // create the new table activity reason
-        $this->addSql('CREATE TABLE activity_activityreason ('
-                . 'activity_id INT NOT NULL, '
-                . 'activityreason_id INT NOT NULL, '
-                . 'PRIMARY KEY(activity_id, activityreason_id))'
-                );
-        $this->addSql('CREATE INDEX IDX_338A864381C06096 ON activity_activityreason (activity_id)');
-        $this->addSql('CREATE INDEX IDX_338A8643D771E0FC ON activity_activityreason (activityreason_id)');
-        $this->addSql('ALTER TABLE activity_activityreason '
-                . 'ADD CONSTRAINT FK_338A864381C06096 FOREIGN KEY (activity_id) '
-                . 'REFERENCES Activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_activityreason '
-                . 'ADD CONSTRAINT FK_338A8643D771E0FC FOREIGN KEY (activityreason_id) '
-                . 'REFERENCES ActivityReason (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-        // migrate old data to new table
-        $this->addSql('INSERT INTO activity_activityreason (activity_id, activityreason_id) '
-                . 'SELECT id, reason_id FROM activity WHERE reason_id IS NOT NULL');
-        
-
-        // remove old column
-        $this->addSql('ALTER TABLE activity DROP CONSTRAINT fk_55026b0c59bb1592');
-        $this->addSql('DROP INDEX idx_55026b0c59bb1592');
-        $this->addSql('ALTER TABLE activity DROP reason_id');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
-                'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
 
         $this->addSql('ALTER TABLE Activity ADD reason_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE Activity ADD CONSTRAINT '
@@ -63,17 +36,49 @@ class Version20160222103457 extends AbstractMigration
         $this->addSql('CREATE INDEX idx_55026b0c59bb1592 ON Activity (reason_id)');
 
         // try to keep at least on activity reason...
-        $this->addSql('UPDATE activity 
+        $this->addSql(
+            'UPDATE activity
             SET reason_id=rid
             FROM (
                     SELECT activity_id AS aid, MIN(activityreason_id) AS rid
                     FROM activity_activityreason
                     GROUP BY activity_id ) AS sb
             WHERE sb.aid = activity.id'
-                );
-        
-        
+        );
+
         $this->addSql('DROP TABLE activity_activityreason');
-        
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
+
+        // create the new table activity reason
+        $this->addSql(
+            'CREATE TABLE activity_activityreason ('
+                . 'activity_id INT NOT NULL, '
+                . 'activityreason_id INT NOT NULL, '
+                . 'PRIMARY KEY(activity_id, activityreason_id))'
+        );
+        $this->addSql('CREATE INDEX IDX_338A864381C06096 ON activity_activityreason (activity_id)');
+        $this->addSql('CREATE INDEX IDX_338A8643D771E0FC ON activity_activityreason (activityreason_id)');
+        $this->addSql('ALTER TABLE activity_activityreason '
+                . 'ADD CONSTRAINT FK_338A864381C06096 FOREIGN KEY (activity_id) '
+                . 'REFERENCES Activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE activity_activityreason '
+                . 'ADD CONSTRAINT FK_338A8643D771E0FC FOREIGN KEY (activityreason_id) '
+                . 'REFERENCES ActivityReason (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        // migrate old data to new table
+        $this->addSql('INSERT INTO activity_activityreason (activity_id, activityreason_id) '
+                . 'SELECT id, reason_id FROM activity WHERE reason_id IS NOT NULL');
+
+        // remove old column
+        $this->addSql('ALTER TABLE activity DROP CONSTRAINT fk_55026b0c59bb1592');
+        $this->addSql('DROP INDEX idx_55026b0c59bb1592');
+        $this->addSql('ALTER TABLE activity DROP reason_id');
     }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php b/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php
index 4419c3699..73ec11a9e 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php
@@ -1,29 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Activity;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add an "active" column on activitytype table
+ * Add an "active" column on activitytype table.
  */
 class Version20161114085659 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD active BOOLEAN NOT NULL DEFAULT \'t\'');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE ActivityType DROP active');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype ADD active BOOLEAN NOT NULL DEFAULT \'t\'');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php b/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php
index d581bdb3a..427fa5bf2 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210304154629.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,20 +19,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210304154629 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activity ADD comment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD comment_userId INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
 
@@ -33,4 +27,17 @@ final class Version20210304154629 extends AbstractMigration
         $this->addSql('ALTER TABLE activity DROP comment_userId');
         $this->addSql('ALTER TABLE activity DROP comment_date');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activity ADD comment_comment TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD comment_userId INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php b/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php
index 7a3f528b5..135c6e3ad 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210311114250.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,21 +19,20 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210311114250 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('UPDATE activity SET comment_comment = remark');
         $this->addSql('ALTER TABLE activity DROP remark');
     }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php b/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php
index 43f8c8460..cc75b418b 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,25 +19,23 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210401090853 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE SEQUENCE activitytypecategory_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
-        $this->addSql('CREATE TABLE activitytypecategory (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN activitytypecategory.name IS \'(DC2Type:json_array)\'');
-        $this->addSql('INSERT INTO activitytypecategory VALUES(1, \'{"fr": "Défaut", "en": "Default"}\', true)');
-
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('DROP SEQUENCE activitytypecategory_id_seq CASCADE');
         $this->addSql('DROP TABLE activitytypecategory');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SEQUENCE activitytypecategory_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
+        $this->addSql('CREATE TABLE activitytypecategory (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('INSERT INTO activitytypecategory VALUES(1, \'{"fr": "Défaut", "en": "Default"}\', true)');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php b/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php
index 53a5219bd..8a32123e1 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,49 +19,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210408122329 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD personVisible SMALLINT DEFAULT 2 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD personLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD userVisible SMALLINT DEFAULT 2 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD userLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD dateVisible SMALLINT DEFAULT 2 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD dateLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD placeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD placeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD personsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD personsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdpartyVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdpartyLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD durationTimeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD durationTimeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD attendeeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD attendeeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD reasonsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD reasonsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD commentVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD commentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD sentReceivedVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD sentReceivedLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD emergencyVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD emergencyLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD accompanyingPeriodVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD accompanyingPeriodLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialDataVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialDataLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ALTER name SET NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ALTER active DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN activitytype.name IS \'(DC2Type:json_array)\'');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE activitytype DROP personVisible');
         $this->addSql('ALTER TABLE activitytype DROP personLabel');
@@ -90,4 +55,45 @@ final class Version20210408122329 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ALTER active SET DEFAULT \'true\'');
         $this->addSql('COMMENT ON COLUMN activitytype.name IS NULL');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype ADD personVisible SMALLINT DEFAULT 2 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD personLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD userVisible SMALLINT DEFAULT 2 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD userLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD dateVisible SMALLINT DEFAULT 2 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD dateLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD placeVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD placeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD personsVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD personsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD thirdpartyVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD thirdpartyLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD durationTimeVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD durationTimeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD attendeeVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD attendeeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD reasonsVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD reasonsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD commentVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD commentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD sentReceivedVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD sentReceivedLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD documentVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD documentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD emergencyVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD emergencyLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD accompanyingPeriodVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD accompanyingPeriodLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD socialDataVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD socialDataLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ALTER name SET NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ALTER active DROP DEFAULT');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php b/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php
index 6cf9c2923..f406d8ad1 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,24 +19,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210415113216 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD thirdPartiesVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdPartiesLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype DROP thirdpartyvisible');
-        $this->addSql('ALTER TABLE activitytype DROP thirdpartylabel');
-        $this->addSql('ALTER TABLE activitytype DROP documentvisible');
-        $this->addSql('ALTER TABLE activitytype DROP documentlabel');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE activitytype ADD thirdpartyvisible SMALLINT DEFAULT 1 NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD thirdpartylabel VARCHAR(255) DEFAULT \'\' NOT NULL');
@@ -40,4 +30,21 @@ final class Version20210415113216 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype DROP documentsVisible');
         $this->addSql('ALTER TABLE activitytype DROP documentsLabel');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype ADD thirdPartiesVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD thirdPartiesLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD documentsVisible SMALLINT DEFAULT 1 NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD documentsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype DROP thirdpartyvisible');
+        $this->addSql('ALTER TABLE activitytype DROP thirdpartylabel');
+        $this->addSql('ALTER TABLE activitytype DROP documentvisible');
+        $this->addSql('ALTER TABLE activitytype DROP documentlabel');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
index 8d5dcfa84..8501767b2 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php
@@ -1,44 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
+use function count;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 final class Version20210422073711 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('CREATE SEQUENCE activitytpresence_id_seq INCREMENT BY 1 MINVALUE 1 START 6');
-        $this->addSql('CREATE TABLE activitytpresence (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-
-        $list = [
-            'Usager pésent', "Absence de l''usager",
-            "Refus de visite ou d''entretien", 'Domicile non trouvé',
-            'Domicile erronéee'
-        ];
-        for ($i = 1; $i <= count($list); $i++) {
-            $this->addSql("INSERT INTO activitytpresence VALUES(".$i.", json_build_object('fr', '".$list[$i-1]."'), true)");
-        }
-
-        $this->addSql('ALTER TABLE activity ADD emergency BOOLEAN NOT NULL DEFAULT false');
-        $this->addSql('ALTER TABLE activity ADD sentReceived VARCHAR(255) NOT NULL DEFAULT \'\' ');
-        $this->addSql('ALTER TABLE activity ALTER attendee TYPE INT USING CASE WHEN attendee is false THEN 2 WHEN attendee is true THEN 1 ELSE null END');
-        $this->addSql('ALTER TABLE activity RENAME COLUMN attendee TO attendee_id');
-        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095ABCFD782A FOREIGN KEY (attendee_id) REFERENCES activitytpresence (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE activity DROP emergency');
         $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095ABCFD782A');
@@ -49,4 +31,31 @@ final class Version20210422073711 extends AbstractMigration
         $this->addSql('DROP SEQUENCE activitytpresence_id_seq CASCADE');
         $this->addSql('DROP TABLE activitytpresence');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE activitytpresence_id_seq INCREMENT BY 1 MINVALUE 1 START 6');
+        $this->addSql('CREATE TABLE activitytpresence (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+
+        $list = [
+            'Usager pésent', "Absence de l''usager",
+            "Refus de visite ou d''entretien", 'Domicile non trouvé',
+            'Domicile erronéee',
+        ];
+
+        for ($i = 1; count($list) >= $i; ++$i) {
+            $this->addSql('INSERT INTO activitytpresence VALUES(' . $i . ", json_build_object('fr', '" . $list[$i - 1] . "'), true)");
+        }
+
+        $this->addSql('ALTER TABLE activity ADD emergency BOOLEAN NOT NULL DEFAULT false');
+        $this->addSql('ALTER TABLE activity ADD sentReceived VARCHAR(255) NOT NULL DEFAULT \'\' ');
+        $this->addSql('ALTER TABLE activity ALTER attendee TYPE INT USING CASE WHEN attendee is false THEN 2 WHEN attendee is true THEN 1 ELSE null END');
+        $this->addSql('ALTER TABLE activity RENAME COLUMN attendee TO attendee_id');
+        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095ABCFD782A FOREIGN KEY (attendee_id) REFERENCES activitytpresence (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
index 0fde71257..577d09c5e 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,12 +19,27 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210422123846 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE activity_person');
+        $this->addSql('DROP TABLE activity_thirdparty');
+        $this->addSql('DROP TABLE activity_document');
+        $this->addSql('DROP TABLE activity_user');
+
+        $this->addSql('ALTER TABLE activity DROP travelTime');
+
+        $this->addSql('ALTER TABLE activitytype DROP travelTimeVisible');
+        $this->addSql('ALTER TABLE activitytype DROP travelTimeLabel');
+        $this->addSql('ALTER TABLE activitytype DROP usersVisible');
+        $this->addSql('ALTER TABLE activitytype DROP usersLabel');
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('CREATE TABLE activity_person (activity_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(activity_id, person_id))');
         $this->addSql('CREATE INDEX IDX_66AA317681C06096 ON activity_person (activity_id)');
@@ -36,7 +58,7 @@ final class Version20210422123846 extends AbstractMigration
         $this->addSql('ALTER TABLE activity_thirdparty ADD CONSTRAINT FK_C6F0DE0381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_thirdparty ADD CONSTRAINT FK_C6F0DE03C7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A7881C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        #$this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A78C33F7837 FOREIGN KEY (document_id) REFERENCES Document (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        //$this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A78C33F7837 FOREIGN KEY (document_id) REFERENCES Document (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_user ADD CONSTRAINT FK_8E570DDB81C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE activity_user ADD CONSTRAINT FK_8E570DDBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
 
@@ -47,19 +69,4 @@ final class Version20210422123846 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ADD usersVisible SMALLINT DEFAULT 1 NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD usersLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('DROP TABLE activity_person');
-        $this->addSql('DROP TABLE activity_thirdparty');
-        $this->addSql('DROP TABLE activity_document');
-        $this->addSql('DROP TABLE activity_user');
-
-        $this->addSql('ALTER TABLE activity DROP travelTime');
-
-        $this->addSql('ALTER TABLE activitytype DROP travelTimeVisible');
-        $this->addSql('ALTER TABLE activitytype DROP travelTimeLabel');
-        $this->addSql('ALTER TABLE activitytype DROP usersVisible');
-        $this->addSql('ALTER TABLE activitytype DROP usersLabel');
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php
index 3a1a4e513..1b60bb219 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,19 +19,19 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210506071150 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ALTER durationTime SET NOT NULL');
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE activity ALTER durationtime DROP NOT NULL');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activity ALTER durationTime SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php
index b1e4e43fc..15f6a0158 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,15 +19,15 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210506090417 extends AbstractMigration
 {
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD ordering DOUBLE PRECISION DEFAULT \'0.0\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytypecategory ADD ordering DOUBLE PRECISION DEFAULT \'0.0\' NOT NULL');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE activitytypecategory DROP ordering');
         $this->addSql('ALTER TABLE activitytype DROP ordering');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype ADD ordering DOUBLE PRECISION DEFAULT \'0.0\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytypecategory ADD ordering DOUBLE PRECISION DEFAULT \'0.0\' NOT NULL');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php
index a31d23ae4..e29eb567a 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,20 +19,20 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210506094520 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype DROP CONSTRAINT FK_B38CD05112469DE2');
+        $this->addSql('ALTER TABLE activitytype DROP category_id');
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE activitytype ADD category_id INT DEFAULT 1');
         $this->addSql('ALTER TABLE activitytype ADD CONSTRAINT FK_B38CD05112469DE2 FOREIGN KEY (category_id) REFERENCES activitytypecategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype DROP CONSTRAINT FK_B38CD05112469DE2');;
-        $this->addSql('ALTER TABLE activitytype DROP category_id');
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
index ca80d7720..2163a0b65 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,24 +19,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210506112500 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE activity_storedobject (activity_id INT NOT NULL, storedobject_id INT NOT NULL, PRIMARY KEY(activity_id, storedobject_id))');
-        $this->addSql('CREATE INDEX IDX_6F660E9381C06096 ON activity_storedobject (activity_id)');
-        $this->addSql('CREATE INDEX IDX_6F660E93EE684399 ON activity_storedobject (storedobject_id)');
-        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E9381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E93EE684399 FOREIGN KEY (storedobject_id) REFERENCES chill_doc.stored_object (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('DROP TABLE activity_document');
-
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SCHEMA public');
@@ -39,4 +29,20 @@ final class Version20210506112500 extends AbstractMigration
         $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT fk_78633a7881c06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('DROP TABLE activity_storedobject');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE activity_storedobject (activity_id INT NOT NULL, storedobject_id INT NOT NULL, PRIMARY KEY(activity_id, storedobject_id))');
+        $this->addSql('CREATE INDEX IDX_6F660E9381C06096 ON activity_storedobject (activity_id)');
+        $this->addSql('CREATE INDEX IDX_6F660E93EE684399 ON activity_storedobject (storedobject_id)');
+        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E9381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E93EE684399 FOREIGN KEY (storedobject_id) REFERENCES chill_doc.stored_object (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('DROP TABLE activity_document');
+    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php b/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php
index f5a0abda6..1d6f42f6e 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,6 +19,12 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210520095626 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095AD7FA8EF0');
+        $this->addSql('ALTER TABLE activity DROP accompanyingPeriod_id');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -22,10 +35,4 @@ final class Version20210520095626 extends AbstractMigration
         $this->addSql('ALTER TABLE activity ADD accompanyingPeriod_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095AD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095AD7FA8EF0');
-        $this->addSql('ALTER TABLE activity DROP accompanyingPeriod_id');
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php b/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php
index 8eaf7e1a4..1bc26298c 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add socialIssues & socialActions fields to Activity
+ * Add socialIssues & socialActions fields to Activity.
  */
 final class Version20210528161250 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_activity_activity_chill_person_socialissue');
+        $this->addSql('DROP TABLE chill_activity_activity_chill_person_socialaction');
+    }
+
     public function getDescription(): string
     {
         return 'Add socialIssues & socialActions fields to Activity';
@@ -30,10 +43,4 @@ final class Version20210528161250 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_activity_activity_chill_person_socialaction ADD CONSTRAINT FK_548F1AD881C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_activity_activity_chill_person_socialaction ADD CONSTRAINT FK_548F1AD83DC32179 FOREIGN KEY (socialaction_id) REFERENCES chill_person_social_action (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP TABLE chill_activity_activity_chill_person_socialissue');
-        $this->addSql('DROP TABLE chill_activity_activity_chill_person_socialaction');
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php b/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php
index 4c773c161..3122df777 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -8,10 +15,18 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add info for socialIssues & socialActions in ActivityType
+ * Add info for socialIssues & socialActions in ActivityType.
  */
 final class Version20210602103243 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype DROP socialIssuesVisible');
+        $this->addSql('ALTER TABLE activitytype DROP socialIssuesLabel');
+        $this->addSql('ALTER TABLE activitytype DROP socialActionsVisible');
+        $this->addSql('ALTER TABLE activitytype DROP socialActionsLabel');
+    }
+
     public function getDescription(): string
     {
         return 'Add info for socialIssues & socialActions in ActivityType';
@@ -24,12 +39,4 @@ final class Version20210602103243 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ADD socialActionsVisible SMALLINT DEFAULT 1 NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD socialActionsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activitytype DROP socialIssuesVisible');
-        $this->addSql('ALTER TABLE activitytype DROP socialIssuesLabel');
-        $this->addSql('ALTER TABLE activitytype DROP socialActionsVisible');
-        $this->addSql('ALTER TABLE activitytype DROP socialActionsLabel');
-    }
 }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php b/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php
new file mode 100644
index 000000000..66095af3d
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20211119173555.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211119173555 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+
+    public function getDescription(): string
+    {
+        return 'remove comment on deprecated json_array type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $columns = [
+            'activitytype.name',
+            'activitytypecategory.name',
+        ];
+
+        foreach ($columns as $col) {
+            $this->addSql("COMMENT ON COLUMN {$col} IS NULL");
+        }
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php b/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php
new file mode 100644
index 000000000..034fee71a
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20211207152023.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211207152023 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException('placevisible and placelabel could not be created');
+    }
+
+    public function getDescription(): string
+    {
+        return 'DROP place visible and place label, which are replaced by location';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype DROP placevisible');
+        $this->addSql('ALTER TABLE activitytype DROP placelabel');
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 55e55d370..00715d283 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -43,6 +43,7 @@ Sent: Envoyer
 Received: Recevoir
 by: 'Par '
 location: Lieu
+Reasons: Sujets
 
 
 #forms
@@ -99,10 +100,13 @@ CHILL_ACTIVITY_LIST: Liste des activités
 Activities: Activités
 Activity configuration: Configuration des activités
 Activity configuration menu: Configuration des activités
-Activity Types: Types d'activité
+Activity types: Types d'activité
+Activity type configuration: Configuration des categories d'activités
 Activity Reasons: Sujets d'une activité
 Activity Reasons Category: Catégories de sujet d'activités
 Activity Types Categories: Catégories des types d'activité
+Activity Presences: Presences des activités
+
 
 # Crud
 crud:
@@ -136,34 +140,40 @@ ActivityReasonCategory is inactive and won't be proposed: La catégorie est inac
 # activity type type admin
 ActivityType list: Types d'activités
 Create a new activity type: Créer un nouveau type d'activité
-Persons visible: Visibilté du champ Personnes
+Persons visible: Visibilité du champ Personnes
 Persons label: Libellé du champ Personnes
-User visible: Visibilté du champ Utilisateur
+User visible: Visibilité du champ Utilisateur
 User label: Libellé du champ Utilisateur
-Date visible: Visibilté du champ Date
+Date visible: Visibilité du champ Date
 Date label: Libellé du champ Date
-Place visible: Visibilté du champ Lieu
-Place label: Libellé du champ Lieu
-Third parties visible: Visibilté du champ Tiers
+Location visible: Visibilité du champ Lieu
+Location label: Libellé du champ Lieu
+Third parties visible: Visibilité du champ Tiers
 Third parties label: Libellé du champ Tiers
-Duration time visible: Visibilté du champ Durée
+Duration time visible: Visibilité du champ Durée
 Duration time label: Libellé du champ Durée
-Travel time visible: Visibilté du champ Durée de déplacement
+Travel time visible: Visibilité du champ Durée de déplacement
 Travel time label: Libellé du champ Durée de déplacement
-Attendee visible: Visibilté du champ Présence de l'usager
+Attendee visible: Visibilité du champ Présence de l'usager
 Attendee label: Libellé du champ Présence de l'usager
-Reasons visible: Visibilté du champ Sujet
+Reasons visible: Visibilité du champ Sujet
 Reasons label: Libellé du champ Sujet
-Comment visible: Visibilté du champ Commentaire
+Comment visible: Visibilité du champ Commentaire
 Comment label: Libellé du champ Commentaire
-Emergency visible: Visibilté du champ Urgent
+Emergency visible: Visibilité du champ Urgent
 Emergency label: Libellé du champ Urgent
-Accompanying period visible: Visibilté du champ Période d'accompagnement
+Accompanying period visible: Visibilité du champ Période d'accompagnement
 Accompanying period label: Libellé du champ Période d'accompagnement
-Social data visible: Visibilté du champ Données sociales
-Social data label: Libellé du champ Données sociales
-Users visible: Visibilté du champ Utilisateurs
+Social issues visible: Visibilité du champ Problématiques sociales
+Social issues label: Libellé du champ Problématiques sociales
+Social actions visible: Visibilité du champ Action sociale
+Social actions label: Libellé du champ Action sociale
+Users visible: Visibilité du champ Utilisateurs
 Users label: Libellé du champ Utilisateurs
+Sent received visible: Visibilité du champ Entrant / Sortant
+Sent received label: Libellé du champ Entrant / Sortant
+Documents visible: Visibilité du champ Documents
+Documents label: Libellé du champ Documents
 
 # activity type category admin
 ActivityTypeCategory list: Liste des catégories des types d'activité
@@ -212,3 +222,5 @@ Aggregate by activity type: Aggréger par type d'activité
 Aggregate by activity reason: Aggréger par sujet de l'activité
 
 Last activities: Les dernières activités
+
+See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
diff --git a/src/Bundle/ChillActivityBundle/translations/validators.fr.yml b/src/Bundle/ChillActivityBundle/translations/validators.fr.yml
index edda0b67b..072ac55d2 100644
--- a/src/Bundle/ChillActivityBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/validators.fr.yml
@@ -1,2 +1,22 @@
 The reasons's level should not be empty: Le niveau du sujet ne peut pas être vide
 At least one reason must be choosen: Au moins un sujet doit être choisi
+For this type of activity, you must add at least one person: Pour ce type d'activité, vous devez ajouter au moins un usager
+For this type of activity, you must add at least one user: Pour ce type d'activité, vous devez ajouter au moins un utilisateur
+For this type of activity, you must add at least one third party: Pour ce type d'activité, vous devez ajouter au moins un tiers
+For this type of activity, user is required: Pour ce type d'activité, l'utilisateur est requis
+For this type of activity, date is required: Pour ce type d'activité, la date est requise
+For this type of activity, location is required: Pour ce type d'activité, la localisation est requise
+For this type of activity, attendee is required: Pour ce type d'activité, le champ "Présence de la personne" est requis
+For this type of activity, duration time is required: Pour ce type d'activité, la durée est requise
+For this type of activity, travel time is required: Pour ce type d'activité, la durée du trajet est requise
+For this type of activity, reasons is required: Pour ce type d'activité, le champ "sujet" est requis
+For this type of activity, comment is required: Pour ce type d'activité, un commentaire est requis
+For this type of activity, sent/received is required: Pour ce type d'activité, le champ Entrant/Sortant est requis
+For this type of activity, document is required: Pour ce type d'activité, un document est requis
+For this type of activity, emergency is required: Pour ce type d'activité, le champ "Urgent" est requis
+For this type of activity, accompanying period is required: Pour ce type d'activité, le parcours d'accompagnement est requis
+For this type of activity, you must add at least one social issue: Pour ce type d'activité, vous devez ajouter au moins une problématique sociale
+For this type of activity, you must add at least one social action: Pour ce type d'activité, vous devez indiquez au moins une action sociale
+
+# admin
+This parameter must be equal to social issue parameter: Ce paramètre doit être égal au paramètre "Visibilité du champs Problématiques sociales"
diff --git a/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php b/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
index c9640d370..c87610fae 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle;
@@ -8,4 +15,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillAsideActivityBundle extends Bundle
 {
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
index bf062b50d..43b2d2362 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -7,9 +16,8 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
-
 /**
- * Class AsideActivityBundle
+ * Class AsideActivityBundle.
  */
 class AsideActivityCategoryController extends CRUDController
 {
@@ -20,5 +28,4 @@ class AsideActivityCategoryController extends CRUDController
 
         return $query;
     }
-
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
index 3e3b38033..eee8c7dc8 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle\Controller;
@@ -7,25 +14,45 @@ namespace Chill\AsideActivityBundle\Controller;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Repository\AsideActivityCategoryRepository;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Pagination\PaginatorInterface;
-use Doctrine\Common\Collections\Criteria;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use DateTime;
+use Symfony\Component\HttpFoundation\Request;
 
 final class AsideActivityController extends CRUDController
 {
-
-    private $categoryRepository;
+    private AsideActivityCategoryRepository $categoryRepository;
 
     public function __construct(AsideActivityCategoryRepository $categoryRepository)
     {
         $this->categoryRepository = $categoryRepository;
     }
 
+    public function createEntity(string $action, Request $request): object
+    {
+        $asideActivity = new AsideActivity();
+
+        $duration = $request->query->get('duration', '300');
+        $duration = DateTime::createFromFormat('U', $duration);
+        $asideActivity->setDuration($duration);
+
+        $categoryId = $request->query->get('type', 7);
+
+        if (null === $categoryId) {
+            return $this->createNotFoundException('You must give a valid category id');
+        }
+        $category = $this->categoryRepository->find($categoryId);
+        $asideActivity->setType($category);
+
+        $note = $request->query->get('note', null);
+        $asideActivity->setNote($note);
+
+        return $asideActivity;
+    }
+
     protected function buildQueryEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null)
     {
-        $qb = parent::buildQueryEntities($action, $request, $filterOrder);
+        $qb = parent::buildQueryEntities($action, $request);
 
         if ('index' === $action) {
             $qb->where($qb->expr()->eq('e.agent', ':user'));
@@ -43,30 +70,9 @@ final class AsideActivityController extends CRUDController
         PaginatorInterface $paginator
     ) {
         if ('index' === $action) {
-           return $query->orderBy('e.date', 'DESC');
+            return $query->orderBy('e.date', 'DESC');
         }
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
-
-    public function createEntity(string $action, Request $request): object
-    {
-       $asideActivity = new AsideActivity();
-
-       $duration = $request->query->get('duration', '300');
-       $duration = \DateTime::createFromFormat('U', $duration);
-       $asideActivity->setDuration($duration);
-
-       $categoryId = $request->query->get('type', 7);
-       if($categoryId === null){
-           return $this->createNotFoundException('You must give a valid category id');
-       }
-       $category = $this->categoryRepository->find($categoryId);
-       $asideActivity->setType($category);
-
-       $note = $request->query->get('note', null);
-       $asideActivity->setNote($note);
-
-       return $asideActivity;
-    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
index 2764db282..e6fdbb5fe 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php
@@ -1,13 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\DataFixtures\ORM;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\MainBundle\Repository\UserRepository;
+use DateInterval;
+use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use function random_int;
 
 class LoadAsideActivity extends Fixture implements DependentFixtureInterface
 {
@@ -22,7 +34,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
     {
         return [
             LoadUsers::class,
-            LoadAsideActivityCategory::class
+            LoadAsideActivityCategory::class,
         ];
     }
 
@@ -30,20 +42,19 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
     {
         $user = $this->userRepository->findOneBy(['username' => 'center a_social']);
 
-        for ($i = 0; $i < 50; $i++) {
+        for ($i = 0; 50 > $i; ++$i) {
             $activity = new AsideActivity();
             $activity
                 ->setAgent($user)
-                ->setCreatedAt(new \DateTimeImmutable('now'))
+                ->setCreatedAt(new DateTimeImmutable('now'))
                 ->setCreatedBy($user)
-                ->setUpdatedAt(new \DateTimeImmutable('now'))
+                ->setUpdatedAt(new DateTimeImmutable('now'))
                 ->setUpdatedBy($user)
                 ->setType(
                     $this->getReference('aside_activity_category_0')
                 )
-                ->setDate((new \DateTimeImmutable('today'))
-                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')))
-            ;
+                ->setDate((new DateTimeImmutable('today'))
+                ->sub(new DateInterval('P' . random_int(1, 100) . 'D')));
 
             $manager->persist($activity);
         }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
index 497b260ad..da5cb721b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\DataFixtures\ORM;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
@@ -11,12 +20,12 @@ class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
     {
         foreach ([
             'Appel téléphonique',
-            'Formation'
-                 ] as $key => $label) {
+            'Formation',
+        ] as $key => $label) {
             $category = new AsideActivityCategory();
             $category->setTitle(['fr' => $label]);
             $manager->persist($category);
-            $this->setReference('aside_activity_category_'.$key, $category);
+            $this->setReference('aside_activity_category_' . $key, $category);
         }
 
         $manager->flush();
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index 59e77c3e9..f40f18aa9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
@@ -17,20 +19,14 @@ use Symfony\Component\DependencyInjection\Loader;
 
 final class ChillAsideActivityExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @phpstan-ignore-next-line
-     */
     public function load(array $configs, ContainerBuilder $container): void
     {
-
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
         $container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/menu.yaml');
@@ -42,18 +38,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
         $this->prependCruds($container);
     }
 
-    protected function prependRoute(ContainerBuilder $container)
-    {
-        //declare routes for task bundle
-        $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                  '@ChillAsideActivityBundle/config/routes.yaml',
-              )
-           )
-        ));
-    }
-
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
@@ -67,17 +51,17 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
                     'actions' => [
                         'index' => [
                             'template' => '@ChillAsideActivity/asideActivityCategory/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillAsideActivity/asideActivityCategory/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillAsideActivity/asideActivityCategory/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\AsideActivityBundle\Entity\AsideActivity::class,
@@ -88,9 +72,9 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
                     'actions' => [
                         'index' => [
                             'template' => '@ChillAsideActivity/asideActivity/index.html.twig',
-                            'role' => 'ROLE_USER'
+                            'role' => 'ROLE_USER',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_USER',
                             'template' => '@ChillAsideActivity/asideActivity/new.html.twig',
                         ],
@@ -98,17 +82,29 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
                             'role' => 'ROLE_USER',
                             'template' => '@ChillAsideActivity/asideActivity/view.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_USER',
                             'template' => '@ChillAsideActivity/asideActivity/edit.html.twig',
                         ],
                         'delete' => [
                             'role' => 'ROLE_USER',
                             'template' => '@ChillAsideActivity/asideActivity/delete.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
-            ]
+            ],
         ]);
     }
-}
\ No newline at end of file
+
+    protected function prependRoute(ContainerBuilder $container)
+    {
+        //declare routes for task bundle
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillAsideActivityBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
index 7268b92ae..3032e1b2c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -1,9 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use function is_int;
 
 class Configuration implements ConfigurationInterface
 {
@@ -13,126 +23,125 @@ class Configuration implements ConfigurationInterface
 
         $treeBuilder->getRootNode('chill_aside_activity')
             ->children()
-                ->arrayNode('form')
-                    ->canBeEnabled()
-                    ->children()
-                        ->arrayNode('time_duration')
-                        ->isRequired()
-                        ->defaultValue(
-                            [
-                                [ 'label' => '5 minutes',  'seconds' => 300], 
-                                [ 'label' => '10 minutes', 'seconds' => 600],
-                                [ 'label' => '15 minutes', 'seconds' => 900],
-                                [ 'label' => '20 minutes', 'seconds' => 1200],
-                                [ 'label' => '25 minutes', 'seconds' => 1500],
-                                [ 'label' => '30 minutes', 'seconds' => 1800],
-                                [ 'label' => '45 minutes', 'seconds' => 2700],
-                                [ 'label' => '1 hour',     'seconds' => 3600],
-                                [ 'label' => '1 hour 15',  'seconds' => 4500],
-                                [ 'label' => '1 hour 30',  'seconds' => 5400],
-                                [ 'label' => '1 hour 45',  'seconds' => 6300],
-                                [ 'label' => '2 hours',    'seconds' => 7200],
-                                [ 'label' => '2 hours 30', 'seconds' => 9000],
-                                [ 'label' => '3 hours',    'seconds' => 10800],
-                                [ 'label' => '3 hours 30', 'seconds' => 12600],
-                                [ 'label' => '4 hours',    'seconds' => 14400],
-                                [ 'label' => '4 hours 30', 'seconds' => 16200],
-                                [ 'label' => '5 hours',    'seconds' => 18000],
-                                [ 'label' => '5 hours 30', 'seconds' => 19800],
-                                [ 'label' => '6 hours',    'seconds' => 21600],
-                                [ 'label' => '6 hours 30', 'seconds' => 23400],
-                                [ 'label' => '7 hours',    'seconds' => 25200],
-                                [ 'label' => '7 hours 30', 'seconds' => 27000],
-                                [ 'label' => '8 hours',    'seconds' => 28800],
-                                [ 'label' => '8 hours 30', 'seconds' => 30600],
-                                [ 'label' => '9 hours',    'seconds' => 32400],
-                                [ 'label' => '9 hours 30', 'seconds' => 34200],
-                                [ 'label' => '10 hours',   'seconds' => 36000],
-                                [ 'label' => '1/2 day',    'seconds' => 14040],
-                                [ 'label' => '1 day',      'seconds' => 28080],
-                                [ 'label' => '1 1/2 days',   'seconds' => 42120],
-                                [ 'label' => '2 days',     'seconds' => 56160],
-                                [ 'label' => '2 1/2 days',   'seconds' => 70200],
-                                [ 'label' => '3 days',     'seconds' => 84240],
-                                [ 'label' => '3 1/2 days',   'seconds' => 98280],
-                                [ 'label' => '4 days',     'seconds' => 112320],
-                                [ 'label' => '4 1/2 days',   'seconds' => 126360],
-                                [ 'label' => '5 days',     'seconds' => 140400],
-                                [ 'label' => '5 1/2 days',   'seconds' => 154440],
-                                [ 'label' => '6 days',     'seconds' => 168480],
-                                [ 'label' => '6 1/2 days',   'seconds' => 182520],
-                                [ 'label' => '7 days',     'seconds' => 196560],
-                                [ 'label' => '7 1/2 days',   'seconds' => 210600],
-                                [ 'label' => '8 days',     'seconds' => 224640],
-                                [ 'label' => '8 1/2 days',   'seconds' => 238680],
-                                [ 'label' => '9 days',     'seconds' => 252720],
-                                [ 'label' => '9 1/2 days',   'seconds' => 266760],
-                                [ 'label' => '10 days',    'seconds' => 280800],
-                                [ 'label' => '10 1/2days',  'seconds' => 294840],
-                                [ 'label' => '11 days',    'seconds' => 308880],
-                                [ 'label' => '11 1/2 days',  'seconds' => 322920],
-                                [ 'label' => '12 days',    'seconds' => 336960],
-                                [ 'label' => '12 1/2 days',  'seconds' => 351000],
-                                [ 'label' => '13 days',    'seconds' => 365040],
-                                [ 'label' => '13 1/2 days',  'seconds' => 379080],
-                                [ 'label' => '14 days',    'seconds' => 393120],
-                                [ 'label' => '14 1/2 days',  'seconds' => 407160],
-                                [ 'label' => '15 days',    'seconds' => 421200],
-                                [ 'label' => '15 1/2 days',  'seconds' => 435240],
-                                [ 'label' => '16 days',    'seconds' => 449280],
-                                [ 'label' => '16 1/2 days',  'seconds' => 463320],
-                                [ 'label' => '17 days',    'seconds' => 477360],
-                                [ 'label' => '17 1/2 days',  'seconds' => 491400],
-                                [ 'label' => '18 days',    'seconds' => 505440],
-                                [ 'label' => '18 1/2 days',  'seconds' => 519480],
-                                [ 'label' => '19 days',    'seconds' => 533520],
-                                [ 'label' => '19 1/2 days',  'seconds' => 547560],
-                                [ 'label' => '20 days',    'seconds' => 561600],
-                                [ 'label' => '20 1/2 days',  'seconds' => 575640],
-                                [ 'label' => '21 days',    'seconds' => 580680],
-                                [ 'label' => '21 1/2 days',  'seconds' => 603720],
-                                [ 'label' => '22 days',    'seconds' => 617760],
-                                [ 'label' => '22 1/2 days',  'seconds' => 631800],
-                                [ 'label' => '23 days',    'seconds' => 645840],
-                                [ 'label' => '23 1/2 days',  'seconds' => 659880],
-                                [ 'label' => '24 days',    'seconds' => 673920],
-                                [ 'label' => '24 1/2 days',  'seconds' => 687960],
-                                [ 'label' => '25 days',    'seconds' => 702000],
-                                [ 'label' => '25 1/2 days',  'seconds' => 716040],
-                                [ 'label' => '26 days',    'seconds' => 730080],
-                                [ 'label' => '26 1/2 days',  'seconds' => 744120],
-                                [ 'label' => '27 days',    'seconds' => 758160],
-                                [ 'label' => '27 1/2 days',  'seconds' => 772200],
-                                [ 'label' => '28 days',    'seconds' => 786240],
-                                [ 'label' => '28 1/2 days',  'seconds' => 800280],
-                                [ 'label' => '29 days',    'seconds' => 814320],
-                                [ 'label' => '29 1/2 days',  'seconds' => 828360],
-                                [ 'label' => '30 days',    'seconds' => 842400],
-                            ]
-                        )
-                        ->info('The intervals of time to show in activity form')
-
-                        ->prototype('array')
-                            ->children()
-                                ->scalarNode('seconds')
-                                    ->info("The number of seconds of this duration. Must be an integer.")
-                                    ->cannotBeEmpty()
-                                    ->validate()
-                                        ->ifTrue(function($data) {
-                                            return !is_int($data);
-                                        })->thenInvalid("The value %s is not a valid integer")
-                                    ->end()
-                                ->end()
-                                ->scalarNode('label')
-                                    ->cannotBeEmpty()
-                                    ->info("The label to show into fields")
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
+            ->arrayNode('form')
+            ->canBeEnabled()
+            ->children()
+            ->arrayNode('time_duration')
+            ->isRequired()
+            ->defaultValue(
+                [
+                    ['label' => '5 minutes',  'seconds' => 300],
+                    ['label' => '10 minutes', 'seconds' => 600],
+                    ['label' => '15 minutes', 'seconds' => 900],
+                    ['label' => '20 minutes', 'seconds' => 1200],
+                    ['label' => '25 minutes', 'seconds' => 1500],
+                    ['label' => '30 minutes', 'seconds' => 1800],
+                    ['label' => '45 minutes', 'seconds' => 2700],
+                    ['label' => '1 hour',     'seconds' => 3600],
+                    ['label' => '1 hour 15',  'seconds' => 4500],
+                    ['label' => '1 hour 30',  'seconds' => 5400],
+                    ['label' => '1 hour 45',  'seconds' => 6300],
+                    ['label' => '2 hours',    'seconds' => 7200],
+                    ['label' => '2 hours 30', 'seconds' => 9000],
+                    ['label' => '3 hours',    'seconds' => 10800],
+                    ['label' => '3 hours 30', 'seconds' => 12600],
+                    ['label' => '4 hours',    'seconds' => 14400],
+                    ['label' => '4 hours 30', 'seconds' => 16200],
+                    ['label' => '5 hours',    'seconds' => 18000],
+                    ['label' => '5 hours 30', 'seconds' => 19800],
+                    ['label' => '6 hours',    'seconds' => 21600],
+                    ['label' => '6 hours 30', 'seconds' => 23400],
+                    ['label' => '7 hours',    'seconds' => 25200],
+                    ['label' => '7 hours 30', 'seconds' => 27000],
+                    ['label' => '8 hours',    'seconds' => 28800],
+                    ['label' => '8 hours 30', 'seconds' => 30600],
+                    ['label' => '9 hours',    'seconds' => 32400],
+                    ['label' => '9 hours 30', 'seconds' => 34200],
+                    ['label' => '10 hours',   'seconds' => 36000],
+                    ['label' => '1/2 day',    'seconds' => 14040],
+                    ['label' => '1 day',      'seconds' => 28080],
+                    ['label' => '1 1/2 days',   'seconds' => 42120],
+                    ['label' => '2 days',     'seconds' => 56160],
+                    ['label' => '2 1/2 days',   'seconds' => 70200],
+                    ['label' => '3 days',     'seconds' => 84240],
+                    ['label' => '3 1/2 days',   'seconds' => 98280],
+                    ['label' => '4 days',     'seconds' => 112320],
+                    ['label' => '4 1/2 days',   'seconds' => 126360],
+                    ['label' => '5 days',     'seconds' => 140400],
+                    ['label' => '5 1/2 days',   'seconds' => 154440],
+                    ['label' => '6 days',     'seconds' => 168480],
+                    ['label' => '6 1/2 days',   'seconds' => 182520],
+                    ['label' => '7 days',     'seconds' => 196560],
+                    ['label' => '7 1/2 days',   'seconds' => 210600],
+                    ['label' => '8 days',     'seconds' => 224640],
+                    ['label' => '8 1/2 days',   'seconds' => 238680],
+                    ['label' => '9 days',     'seconds' => 252720],
+                    ['label' => '9 1/2 days',   'seconds' => 266760],
+                    ['label' => '10 days',    'seconds' => 280800],
+                    ['label' => '10 1/2days',  'seconds' => 294840],
+                    ['label' => '11 days',    'seconds' => 308880],
+                    ['label' => '11 1/2 days',  'seconds' => 322920],
+                    ['label' => '12 days',    'seconds' => 336960],
+                    ['label' => '12 1/2 days',  'seconds' => 351000],
+                    ['label' => '13 days',    'seconds' => 365040],
+                    ['label' => '13 1/2 days',  'seconds' => 379080],
+                    ['label' => '14 days',    'seconds' => 393120],
+                    ['label' => '14 1/2 days',  'seconds' => 407160],
+                    ['label' => '15 days',    'seconds' => 421200],
+                    ['label' => '15 1/2 days',  'seconds' => 435240],
+                    ['label' => '16 days',    'seconds' => 449280],
+                    ['label' => '16 1/2 days',  'seconds' => 463320],
+                    ['label' => '17 days',    'seconds' => 477360],
+                    ['label' => '17 1/2 days',  'seconds' => 491400],
+                    ['label' => '18 days',    'seconds' => 505440],
+                    ['label' => '18 1/2 days',  'seconds' => 519480],
+                    ['label' => '19 days',    'seconds' => 533520],
+                    ['label' => '19 1/2 days',  'seconds' => 547560],
+                    ['label' => '20 days',    'seconds' => 561600],
+                    ['label' => '20 1/2 days',  'seconds' => 575640],
+                    ['label' => '21 days',    'seconds' => 580680],
+                    ['label' => '21 1/2 days',  'seconds' => 603720],
+                    ['label' => '22 days',    'seconds' => 617760],
+                    ['label' => '22 1/2 days',  'seconds' => 631800],
+                    ['label' => '23 days',    'seconds' => 645840],
+                    ['label' => '23 1/2 days',  'seconds' => 659880],
+                    ['label' => '24 days',    'seconds' => 673920],
+                    ['label' => '24 1/2 days',  'seconds' => 687960],
+                    ['label' => '25 days',    'seconds' => 702000],
+                    ['label' => '25 1/2 days',  'seconds' => 716040],
+                    ['label' => '26 days',    'seconds' => 730080],
+                    ['label' => '26 1/2 days',  'seconds' => 744120],
+                    ['label' => '27 days',    'seconds' => 758160],
+                    ['label' => '27 1/2 days',  'seconds' => 772200],
+                    ['label' => '28 days',    'seconds' => 786240],
+                    ['label' => '28 1/2 days',  'seconds' => 800280],
+                    ['label' => '29 days',    'seconds' => 814320],
+                    ['label' => '29 1/2 days',  'seconds' => 828360],
+                    ['label' => '30 days',    'seconds' => 842400],
+                ]
+            )
+            ->info('The intervals of time to show in activity form')
+            ->prototype('array')
+            ->children()
+            ->scalarNode('seconds')
+            ->info('The number of seconds of this duration. Must be an integer.')
+            ->cannotBeEmpty()
+            ->validate()
+            ->ifTrue(static function ($data) {
+                return !is_int($data);
+            })->thenInvalid('The value %s is not a valid integer')
+            ->end()
+            ->end()
+            ->scalarNode('label')
+            ->cannotBeEmpty()
+            ->info('The label to show into fields')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
             ->end();
 
-            return $treeBuilder;
+        return $treeBuilder;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index af4baa6d3..2f4efe580 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle\Entity;
@@ -7,26 +14,27 @@ namespace Chill\AsideActivityBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
+use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
+
 /**
  * @ORM\Entity
  * @ORM\Table(schema="chill_asideactivity")
  */
-class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
+class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 {
     /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Assert\NotBlank
      */
-    private ?int $id;
+    private \Chill\MainBundle\Entity\User $agent;
 
     /**
-     * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
-     * @ORM\JoinColumn(nullable=false)
+     * @ORM\Column(type="datetime")
      */
-    private $type;
+    private $createdAt;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
@@ -34,28 +42,6 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
      */
     private \Chill\MainBundle\Entity\User $createdBy;
 
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private $createdAt;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     */
-    private \Chill\MainBundle\Entity\User $updatedBy;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $updatedAt;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     * @Assert\NotBlank()
-     */
-    private \Chill\MainBundle\Entity\User $agent;
-
     /**
      * @ORM\Column(type="datetime")
      */
@@ -64,7 +50,14 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?\DateTimeInterface $duration = null;
+    private ?DateTimeInterface $duration = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id;
 
     /**
      * @ORM\Column(type="string", length=100, nullable=true)
@@ -76,21 +69,30 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
      */
     private $note;
 
-    public function getId(): ?int
+    /**
+     * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private $type;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private \Chill\MainBundle\Entity\User $updatedBy;
+
+    public function getAgent(): ?User
     {
-        return $this->id;
+        return $this->agent;
     }
 
-    public function getType(): ?AsideActivityCategory
+    public function getCreatedAt(): ?DateTimeInterface
     {
-        return $this->type;
-    }
-
-    public function setType(?AsideActivityCategory $type): self
-    {
-        $this->type = $type;
-
-        return $this;
+        return $this->createdAt;
     }
 
     public function getCreatedBy(): ?User
@@ -98,23 +100,39 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
         return $this->createdBy;
     }
 
-    public function setCreatedBy(?User $createdBy): self
+    public function getDate(): ?DateTimeInterface
     {
-        $this->createdBy = $createdBy;
-
-        return $this;
+        return $this->date;
     }
 
-    public function getCreatedAt(): ?\DateTimeInterface
+    public function getDuration(): ?DateTimeInterface
     {
-        return $this->createdAt;
+        return $this->duration;
     }
 
-    public function setCreatedAt(\DateTimeInterface $createdAt): self
+    public function getId(): ?int
     {
-        $this->createdAt = $createdAt;
+        return $this->id;
+    }
 
-        return $this;
+    public function getLocation(): ?string
+    {
+        return $this->location;
+    }
+
+    public function getNote(): ?string
+    {
+        return $this->note;
+    }
+
+    public function getType(): ?AsideActivityCategory
+    {
+        return $this->type;
+    }
+
+    public function getUpdatedAt(): ?DateTimeInterface
+    {
+        return $this->updatedAt;
     }
 
     public function getUpdatedBy(): ?User
@@ -122,30 +140,6 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
         return $this->updatedBy;
     }
 
-    public function setUpdatedBy(?User $updatedBy): self
-    {
-        $this->updatedBy = $updatedBy;
-
-        return $this;
-    }
-
-    public function getUpdatedAt(): ?\DateTimeInterface
-    {
-        return $this->updatedAt;
-    }
-
-    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
-    {
-        $this->updatedAt = $updatedAt;
-
-        return $this;
-    }
-
-    public function getAgent(): ?User
-    {
-        return $this->agent;
-    }
-
     public function setAgent(?User $agent): self
     {
         $this->agent = $agent;
@@ -153,35 +147,34 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
         return $this;
     }
 
-    public function getDate(): ?\DateTimeInterface
+    public function setCreatedAt(DateTimeInterface $createdAt): self
     {
-        return $this->date;
+        $this->createdAt = $createdAt;
+
+        return $this;
     }
 
-    public function setDate(\DateTimeInterface $date): self
+    public function setCreatedBy(?User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function setDate(DateTimeInterface $date): self
     {
         $this->date = $date;
 
         return $this;
     }
 
-    public function getDuration(): ?\DateTimeInterface
-    {
-        return $this->duration;
-    }
-
-    public function setDuration(?\DateTimeInterface $duration): self
+    public function setDuration(?DateTimeInterface $duration): self
     {
         $this->duration = $duration;
 
         return $this;
     }
 
-    public function getLocation(): ?string
-    {
-        return $this->location;
-    }
-
     public function setLocation(?string $location): self
     {
         $this->location = $location;
@@ -189,15 +182,31 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
         return $this;
     }
 
-    public function getNote(): ?string
-    {
-        return $this->note;
-    }
-
     public function setNote(?string $note): self
     {
         $this->note = $note;
 
         return $this;
     }
+
+    public function setType(?AsideActivityCategory $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(?User $updatedBy): self
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
index 09087226c..6418a7990 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle\Entity;
@@ -16,6 +23,11 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  */
 class AsideActivityCategory
 {
+    /**
+     * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
+     */
+    private $children;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -23,19 +35,15 @@ class AsideActivityCategory
      */
     private int $id;
 
-    /**
-     * @ORM\Column(type="json", length=255)
-     */
-    private array $title;
-
     /**
      * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
      * @ORM\Column(type="boolean")
      */
     private bool $isActive = true;
 
+    private AsideActivityCategory $oldParent;
+
     /**
-     * @var float
      * @ORM\Column(type="float", options={"default": 0.00})
      */
     private float $ordering = 0.00;
@@ -44,45 +52,49 @@ class AsideActivityCategory
      * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="children")
      * @ORM\JoinColumn(nullable=true)
      */
-    private $parent;
+    private ?AsideActivityCategory $parent = null;
 
     /**
-     * @ORM\OneToMany(targetEntity=AsideActivityCategory::class, mappedBy="parent")
+     * @ORM\Column(type="json", length=255)
      */
-    private $children;
+    private array $title;
 
     public function __construct()
     {
         $this->children = new ArrayCollection();
     }
 
+    public function addChild(self $child): self
+    {
+        if (!$this->children->contains($child)) {
+            $this->children[] = $child;
+            $child->setParent($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return Collection|self[]
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getTitle(): ?array
-    {
-        return $this->title;
-    }
-
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
     public function getIsActive(): bool
     {
         return $this->isActive;
     }
 
-    public function setIsActive(bool $isActive): self
+    public function getOrdering(): float
     {
-        $this->isActive = $isActive;
-
-        return $this;
+        return $this->ordering;
     }
 
     public function getParent(): ?self
@@ -90,9 +102,20 @@ class AsideActivityCategory
         return $this->parent;
     }
 
+    public function getTitle(): ?array
+    {
+        return $this->title;
+    }
+
+    public function hasParent(): bool
+    {
+        return null !== $this->parent;
+    }
+
     /**
+     * @Assert\Callback
      *
-     * @Assert\Callback()
+     * @param mixed $payload
      */
     public function preventRecursiveParent(ExecutionContextInterface $context, $payload)
     {
@@ -106,43 +129,10 @@ class AsideActivityCategory
             $this->parent = $this->oldParent;
             $context->buildViolation('You must not add twice the same category in the parent tree (previous result returned)')
                 ->atPath('parent')
-                ->addViolation()
-            ;
+                ->addViolation();
         }
     }
 
-    public function hasParent(): bool
-    {
-        return $this->parent !== null;
-    }
-
-    public function setParent(?self $parent): self
-    {
-        // cache the old result for changing it during validaiton
-        $this->oldParent = $this->parent;
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|self[]
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children;
-    }
-
-    public function addChild(self $child): self
-    {
-        if (!$this->children->contains($child)) {
-            $this->children[] = $child;
-            $child->setParent($this);
-        }
-
-        return $this;
-    }
-
     public function removeChild(self $child): self
     {
         if ($this->children->removeElement($child)) {
@@ -155,14 +145,37 @@ class AsideActivityCategory
         return $this;
     }
 
-    public function getOrdering(): float
+    public function setIsActive(bool $isActive): self
     {
-        return $this->ordering;
+        $this->isActive = $isActive;
+
+        return $this;
     }
 
     public function setOrdering(float $ordering): AsideActivityCategory
     {
         $this->ordering = $ordering;
+
+        return $this;
+    }
+
+    public function setParent(?self $parent): self
+    {
+        // cache the old result for changing it during validaiton
+        if ($this->parent) {
+            $this->oldParent = $this->parent;
+        }
+
+        $this->parent = $parent;
+        dump($this);
+
+        return $this;
+    }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
index 0060ab1b9..314dbe551 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
 use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -14,38 +22,44 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 final class AsideActivityCategoryType extends AbstractType
 {
+    private CategoryRender $categoryRender;
 
-    protected $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper, CategoryRender $categoryRender)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
+    public function __construct(
+        CategoryRender $categoryRender
+    ) {
         $this->categoryRender = $categoryRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', TranslatableStringFormType::class,
-        [
-           'label' => 'Nom',
-        ])
-        ->add('parent', EntityType::class, [
-            'class' => AsideActivityCategory::class,
-            'required' => false,
-            'label' => 'Parent',
-            'choice_label' => function (AsideActivityCategory $category){
-                $options = [];
-                return $this->categoryRender->renderString($category, $options);
-            }
-        ])
-        ->add('ordering', NumberType::class)
-        ->add('isActive', ChoiceType::class,
-        [
-            'choices' => [
-                'Yes' => true,
-                'No' => false
-            ],
-            'expanded' => true
-        ]);
+        $builder->add(
+            'title',
+            TranslatableStringFormType::class,
+            [
+                'label' => 'Nom',
+            ]
+        )
+            ->add('parent', EntityType::class, [
+                'class' => AsideActivityCategory::class,
+                'required' => false,
+                'label' => 'Parent',
+                'choice_label' => function (AsideActivityCategory $category) {
+                    $options = [];
+
+                    return $this->categoryRender->renderString($category, $options);
+                },
+            ])
+            ->add('ordering', NumberType::class)
+            ->add(
+                'isActive',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Yes' => true,
+                        'No' => false,
+                    ],
+                    'expanded' => true,
+                ]
+            );
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index 53ce5bd40..b0147a20f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Form;
 
 use Chill\AsideActivityBundle\Entity\AsideActivity;
@@ -8,35 +17,37 @@ use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use DateInterval;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Templating\EngineInterface;
+use function in_array;
 
 final class AsideActivityFormType extends AbstractType
 {
-    protected array $timeChoices;
-    private TokenStorageInterface $storage;
     private CategoryRender $categoryRender;
 
-    public function __construct (
-        TranslatableStringHelper $translatableStringHelper,
+    private TokenStorageInterface $storage;
+
+    private array $timeChoices;
+
+    public function __construct(
         ParameterBagInterface $parameterBag,
         TokenStorageInterface $storage,
         CategoryRender $categoryRender
-    ){
+    ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
-        $this->translatableStringHelper = $translatableStringHelper;
         $this->storage = $storage;
         $this->categoryRender = $categoryRender;
     }
@@ -56,57 +67,65 @@ final class AsideActivityFormType extends AbstractType
         ];
 
         $builder
-            ->add('agent', EntityType::class,
-            [
-                'label' => 'For agent',
-                'required' => true,
-                'class' => User::class,
-                'data' => $this->storage->getToken()->getUser(),
-                'query_builder' => function(EntityRepository $er){
-                    return $er->createQueryBuilder('u')->where('u.enabled = true');
-                },
-                'attr' => array('class' => 'select2 '),
-                'placeholder' => 'Choose the agent for whom this activity is created',
-                'choice_label' => 'username'
-            ])
-            ->add('date', ChillDateType::class,
-            [
-                'label' => 'date',
-                'data' => new \DateTime(),
-                'required' => true
-            ])
-            ->add('type', EntityType::class,
-            [
-                'label' => 'Type',
-                'required' => true,
-                'class' => AsideActivityCategory::class,
-                'placeholder' => 'Choose the activity category',
-                'query_builder' => function(EntityRepository $er) {
-                    $qb = $er->createQueryBuilder('ac');
-                    $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
-                        ->addOrderBy('ac.ordering', 'ASC')
-                    ;
+            ->add(
+                'agent',
+                EntityType::class,
+                [
+                    'label' => 'For agent',
+                    'required' => true,
+                    'class' => User::class,
+                    'data' => $this->storage->getToken()->getUser(),
+                    'query_builder' => static function (EntityRepository $er) {
+                        return $er->createQueryBuilder('u')->where('u.enabled = true');
+                    },
+                    'attr' => ['class' => 'select2 '],
+                    'placeholder' => 'Choose the agent for whom this activity is created',
+                    'choice_label' => 'username',
+                ]
+            )
+            ->add(
+                'date',
+                ChillDateType::class,
+                [
+                    'label' => 'date',
+                    'data' => new DateTime(),
+                    'required' => true,
+                ]
+            )
+            ->add(
+                'type',
+                EntityType::class,
+                [
+                    'label' => 'Type',
+                    'required' => true,
+                    'class' => AsideActivityCategory::class,
+                    'placeholder' => 'Choose the activity category',
+                    'query_builder' => static function (EntityRepository $er) {
+                        $qb = $er->createQueryBuilder('ac');
+                        $qb->where($qb->expr()->eq('ac.isActive', 'TRUE'))
+                            ->addOrderBy('ac.ordering', 'ASC');
 
-                    return $qb;
-                },
-                'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
-                    $options = [];
-                    return $this->categoryRender->renderString($asideActivityCategory, $options);
-                },
-            ])
+                        return $qb;
+                    },
+                    'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
+                        $options = [];
+
+                        return $this->categoryRender->renderString($asideActivityCategory, $options);
+                    },
+                ]
+            )
             ->add('duration', ChoiceType::class, $durationTimeOptions)
             ->add('note', ChillTextareaType::class, [
                 'label' => 'Note',
                 'required' => false,
             ]);
 
-            foreach (['duration'] as $fieldName)
-            {
-                $builder->get($fieldName)
+        foreach (['duration'] as $fieldName) {
+            $builder->get($fieldName)
                 ->addModelTransformer($durationTimeTransformer);
 
             $builder->get($fieldName)
-                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
+                ->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $formEvent) use (
                     $timeChoices,
                     $builder,
                     $durationTimeTransformer,
@@ -115,31 +134,32 @@ final class AsideActivityFormType extends AbstractType
                 ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new \DateTimeZone('GMT');
-                    /* @var $data \DateTimeImmutable */
-                    $data = $formEvent->getData() === NULL ?
-                        \DateTime::createFromFormat('U', 300) :
+                    $timezoneUTC = new DateTimeZone('GMT');
+                    /** @var DateTimeImmutable $data */
+                    $data = $formEvent->getData() === null ?
+                        DateTime::createFromFormat('U', '300') :
                         $formEvent->getData();
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
-                    $data->add(new \DateInterval('PT'.$seconds.'S'));
+                    $data->add(new DateInterval('PT' . $seconds . 'S'));
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
+                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, array_merge(
-                            $durationTimeOptions, [
+                            $durationTimeOptions,
+                            [
                                 'choices' => $timeChoices,
-                                'auto_initialize' => false
+                                'auto_initialize' => false,
                             ]
                         ));
                         $form->addModelTransformer($durationTimeTransformer);
                         $formEvent->getForm()->getParent()->add($form->getForm());
                     }
                 });
-            }
+        }
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
index ecc1a1f90..2d5968e48 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
@@ -1,9 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Menu;
 
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
+use function in_array;
 
 final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
@@ -14,11 +24,6 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
         $this->security = $security;
     }
 
-    public static function getMenuIds(): array
-    {
-        return ['admin_index', 'admin_section', 'admin_aside_activity'];
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         // all the entries below must have ROLE_ADMIN permissions
@@ -26,23 +31,27 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'])) {
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
             $menu->addChild('Aside activities', [
-                'route' => 'chill_crud_aside_activity_category_index'
+                'route' => 'chill_crud_aside_activity_category_index',
             ])
                 ->setExtras([
                     'order' => 900,
-                    'explain' => "Configure aside activities categories"
+                    'explain' => 'Aside activity type configuration',
                 ]);
         } else {
             $menu
                 ->addChild('Aside activity categories', [
-                    'route' => 'chill_crud_aside_activity_category_index'
+                    'route' => 'chill_crud_aside_activity_category_index',
                 ])
                 ->setExtras([
-                    'order' => '50'
+                    'order' => '50',
                 ]);
         }
+    }
 
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'admin_aside_activity'];
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
index 8a8d65156..700ee58f1 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php
@@ -1,23 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
- * Class SectionMenuBuilder
- *
- * @package Chill\AsideActivityBundle\Menu
+ * Class SectionMenuBuilder.
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected TranslatorInterface $translator;
     public AuthorizationCheckerInterface $authorizationChecker;
 
+    protected TranslatorInterface $translator;
+
     public function __construct(TranslatorInterface $translator, AuthorizationCheckerInterface $authorizationChecker)
     {
         $this->translator = $translator;
@@ -26,38 +33,33 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
 
     /**
      * @param $menuId
-     * @param MenuItem $menu
-     * @param array $parameters
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if ($this->authorizationChecker->isGranted('ROLE_USER')){
+        if ($this->authorizationChecker->isGranted('ROLE_USER')) {
             $menu->addChild($this->translator->trans('Create an aside activity'), [
-                    'route' => 'chill_crud_aside_activity_new'
-                ])
+                'route' => 'chill_crud_aside_activity_new',
+            ])
                 ->setExtras([
                     'order' => 11,
-                    'icons' => [ 'plus' ]
+                    'icons' => ['plus'],
                 ]);
             $menu->addChild($this->translator->trans('Phonecall'), [
                 'route' => 'chill_crud_aside_activity_new',
                 'routeParameters' => [
                     'type' => 1,
                     'duration' => 900,
-                ]
+                ],
             ])
-            ->setExtras([
-                'order' => 12,
-                'icons' => ['plus']
-            ]);
+                ->setExtras([
+                    'order' => 12,
+                    'icons' => ['plus'],
+                ]);
         }
     }
 
-    /**
-     * @return array
-     */
     public static function getMenuIds(): array
     {
-        return [ 'section' ];
+        return ['section'];
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
index 4858e6ee7..943aeed4c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
@@ -1,62 +1,45 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
 use Chill\TaskBundle\Templating\UI\CountNotificationTask;
+use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
-
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
 
     /**
-     *
      * @var CountNotificationTask
      */
     public $counter;
 
-    /*
+    /**
      * @var TokenStorageInterface
      */
     public $tokenStorage;
 
     /**
-     *
      * @var TranslatorInterface
      */
     public $translator;
 
-    /**
-     *
-     * @var AuthorizationCheckerInterface
-     */
-    public $authorizationChecker;
-
     public function __construct(
         CountNotificationTask $counter,
         TokenStorageInterface $tokenStorage,
@@ -69,24 +52,21 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationChecker = $authorizationChecker;
     }
 
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if ($this->authorizationChecker->isGranted('ROLE_USER')){
-        $menu->addChild("My aside activities", [
-                'route' => 'chill_crud_aside_activity_index'
+        if ($this->authorizationChecker->isGranted('ROLE_USER')) {
+            $menu->addChild('My aside activities', [
+                'route' => 'chill_crud_aside_activity_index',
             ])
-            ->setExtras([
-                'order' => 10,
-                'icon' => 'tasks'
-            ]);
+                ->setExtras([
+                    'order' => 10,
+                    'icon' => 'tasks',
+                ]);
         }
-
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'user' ];
+        return ['user'];
     }
-    
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
index bcae0ef2c..791bd0d5b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle\Repository;
@@ -12,13 +19,12 @@ use Doctrine\Persistence\ObjectRepository;
 class AsideActivityCategoryRepository implements ObjectRepository
 {
     private EntityRepository $repository;
-    
+
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(AsideActivityCategory::class);
     }
 
-
     public function find($id): ?AsideActivityCategory
     {
         return $this->repository->find($id);
@@ -33,6 +39,9 @@ class AsideActivityCategoryRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return AsideActivityCategory[]
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -49,4 +58,4 @@ class AsideActivityCategoryRepository implements ObjectRepository
     {
         return AsideActivityCategory::class;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
index 054259b63..a318837f7 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\AsideActivityBundle\Repository;
@@ -32,6 +39,9 @@ final class AsideActivityRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return AsideActivity[]
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -48,5 +58,4 @@ final class AsideActivityRepository implements ObjectRepository
     {
         return AsideActivity::class;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
index 2c8373daf..00dc1d3ea 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
@@ -1,7 +1,7 @@
 {% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
 
 {% block admin_content %}
-	<h1>{{ 'Aside Activity Type list'|trans }}</h1>
+	<h1>{{ 'Aside Activity Type List'|trans }}</h1>
 
 	<table class="records_list table table-bordered border-dark">
 		<thead>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
index 902ed7a68..8b49098e4 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Templating\Entity;
 
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
@@ -9,13 +18,15 @@ use Symfony\Component\Templating\EngineInterface;
 
 final class CategoryRender implements ChillEntityRenderInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-    private EngineInterface $engine;
+    public const DEFAULT_ARGS = [
+        self::SEPERATOR_KEY => ' > ',
+    ];
 
     public const SEPERATOR_KEY = 'default.separator';
-    public const DEFAULT_ARGS = [
-        self::SEPERATOR_KEY => ' > '
-    ];
+
+    private EngineInterface $engine;
+
+    private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
     {
@@ -23,39 +34,11 @@ final class CategoryRender implements ChillEntityRenderInterface
         $this->engine = $engine;
     }
 
-    /**
-     * @param AsideActivityCategory $asideActivityCategory
-     */
-    public function renderString($asideActivityCategory, array $options): string
-    {
-        $options = array_merge(self::DEFAULT_ARGS, $options);
-
-        $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
-
-        while ($asideActivityCategory->hasParent()) {
-            $asideActivityCategory = $asideActivityCategory->getParent();
-            $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
-        }
-
-        $titles = array_reverse($titles);
-
-        return implode($options[self::SEPERATOR_KEY], $titles);
-
-    }
-
-    /**
-     * @param AsideActivityCategory $asideActivityCategory
-     */
-    public function supports($asideActivityCategory, array $options): bool
-    {
-        return $asideActivityCategory instanceof AsideActivityCategory;
-    }
-
     public function buildParents(AsideActivityCategory $asideActivityCategory)
     {
         $parents = [];
 
-        while($asideActivityCategory->hasParent()) {
+        while ($asideActivityCategory->hasParent()) {
             $asideActivityCategory = $parents[] = $asideActivityCategory->getParent();
         }
 
@@ -70,11 +53,42 @@ final class CategoryRender implements ChillEntityRenderInterface
         $options = array_merge(self::DEFAULT_ARGS, $options);
         $parents = $this->buildParents($asideActivityCategory);
 
-        return $this->engine->render('@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
-        [
-            'asideActivityCategory' => $asideActivityCategory,
-            'parents' => $parents,
-            'options' => $options
-        ]);
+        return $this->engine->render(
+            '@ChillAsideActivity/Entity/asideActivityCategory.html.twig',
+            [
+                'asideActivityCategory' => $asideActivityCategory,
+                'parents' => $parents,
+                'options' => $options,
+            ]
+        );
+    }
+
+    /**
+     * @param AsideActivityCategory $asideActivityCategory
+     */
+    public function renderString($asideActivityCategory, array $options): string
+    {
+        $options = array_merge(self::DEFAULT_ARGS, $options);
+
+        $titles = [
+            $this->translatableStringHelper->localize($asideActivityCategory->getTitle()),
+        ];
+
+        while ($asideActivityCategory->hasParent()) {
+            $asideActivityCategory = $asideActivityCategory->getParent();
+            $titles[] = $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
+        }
+
+        $titles = array_reverse($titles);
+
+        return implode($options[self::SEPERATOR_KEY], $titles);
+    }
+
+    /**
+     * @param AsideActivityCategory $asideActivityCategory
+     */
+    public function supports($asideActivityCategory, array $options): bool
+    {
+        return $asideActivityCategory instanceof AsideActivityCategory;
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
index 301da25e1..3f8a514d2 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php
@@ -1,14 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Tests\Controller;
 
-use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function array_pop;
+use function shuffle;
 
-
-class AccompanyingCourseControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AsideActivityControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
@@ -19,31 +33,6 @@ class AccompanyingCourseControllerTest extends WebTestCase
         $this->client = $this->getClientAuthenticated();
     }
 
-   public function testIndexWithoutUsers()
-    {
-        $this->client->request('GET', '/fr/asideactivity'); 
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    public function testNewWithoutUsers()
-    {
-        $this->client->request('GET', '/fr/asideactivity/new'); 
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    /**
-     * @dataProvider generateAsideActivityId
-     */
-
-    public function testEditWithoutUsers(int $asideActivityId)
-    {
-        $this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
     public function generateAsideActivityId()
     {
         self::bootKernel();
@@ -59,15 +48,38 @@ class AccompanyingCourseControllerTest extends WebTestCase
             ->setParameter('center_name', 'center a_social')
             ->setMaxResults(100)
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
 
-        \shuffle($asideActivityIds);
+        shuffle($asideActivityIds);
 
-        yield [ \array_pop($asideActivityIds)['id'] ];
-        yield [ \array_pop($asideActivityIds)['id'] ];
-        yield [ \array_pop($asideActivityIds)['id'] ];
+        yield [array_pop($asideActivityIds)['id']];
+
+        yield [array_pop($asideActivityIds)['id']];
+
+        yield [array_pop($asideActivityIds)['id']];
     }
 
+    /**
+     * @dataProvider generateAsideActivityId
+     */
+    public function testEditWithoutUsers(int $asideActivityId)
+    {
+        $this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
 
-}
\ No newline at end of file
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+    public function testIndexWithoutUsers()
+    {
+        $this->client->request('GET', '/fr/asideactivity');
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+
+    public function testNewWithoutUsers()
+    {
+        $this->client->request('GET', '/fr/asideactivity/new');
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
index 13bee6404..f02b623d0 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210706124644.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,16 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210706124644 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE AsideActivity DROP CONSTRAINT FK_E9FA2191C54C8C93');
+        $this->addSql('DROP SEQUENCE AsideActivity_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE AsideActivityType_id_seq CASCADE');
+        $this->addSql('DROP TABLE AsideActivity');
+        $this->addSql('DROP TABLE AsideActivityType');
+    }
+
     public function getDescription(): string
     {
         return 'Aside activity category entity created';
@@ -16,7 +33,6 @@ final class Version20210706124644 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-                
         $this->addSql('CREATE SEQUENCE AsideActivity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE AsideActivityType_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
         $this->addSql('CREATE TABLE AsideActivity (id INT NOT NULL, type_id INT NOT NULL, agent_id INT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL, location VARCHAR(100) DEFAULT NULL, note TEXT DEFAULT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
@@ -32,14 +48,4 @@ final class Version20210706124644 extends AbstractMigration
         $this->addSql('ALTER TABLE AsideActivity ADD CONSTRAINT FK_E9FA21913414710B FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         // this up() migration is auto-generated, please modify it to your needs
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE AsideActivity DROP CONSTRAINT FK_E9FA2191C54C8C93');
-        $this->addSql('DROP SEQUENCE AsideActivity_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE AsideActivityType_id_seq CASCADE');
-        $this->addSql('DROP TABLE AsideActivity');
-        $this->addSql('DROP TABLE AsideActivityType');
-    }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
index 85b99c572..d14898422 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,31 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210804082249 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP CONSTRAINT FK_A866DA0EC54C8C93');
+        $this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivity_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivityCategory_id_seq CASCADE');
+        $this->addSql('CREATE SEQUENCE asideactivity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE asideactivitytype_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE asideactivitytype (id INT NOT NULL, title VARCHAR(255) NOT NULL, isactive BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE TABLE asideactivity (id INT NOT NULL, type_id INT NOT NULL, agent_id INT NOT NULL, createdby_id INT NOT NULL, updatedby_id INT DEFAULT NULL, createdat TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedat TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL, location VARCHAR(100) DEFAULT NULL, note TEXT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX idx_e9fa21913174800f ON asideactivity (createdby_id)');
+        $this->addSql('CREATE INDEX idx_e9fa2191c54c8c93 ON asideactivity (type_id)');
+        $this->addSql('CREATE INDEX idx_e9fa219165ff1aec ON asideactivity (updatedby_id)');
+        $this->addSql('CREATE INDEX idx_e9fa21913414710b ON asideactivity (agent_id)');
+        $this->addSql('COMMENT ON COLUMN asideactivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa2191c54c8c93 FOREIGN KEY (type_id) REFERENCES asideactivitytype (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913174800f FOREIGN KEY (createdby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa219165ff1aec FOREIGN KEY (updatedby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913414710b FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('DROP TABLE chill_asideactivity.AsideActivity');
+        $this->addSql('DROP TABLE chill_asideactivity.AsideActivityCategory');
+        $this->addSql('DROP SCHEMA chill_asideactivity');
+    }
+
     public function getDescription(): string
     {
         return 'Aside activity entity created';
@@ -39,29 +71,4 @@ final class Version20210804082249 extends AbstractMigration
         $this->addSql('DROP TABLE asideactivitytype');
         $this->addSql('DROP TABLE asideactivity');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE SCHEMA public');
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP CONSTRAINT FK_A866DA0EC54C8C93');
-        $this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivity_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_asideactivity.AsideActivityCategory_id_seq CASCADE');
-        $this->addSql('CREATE SEQUENCE asideactivity_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE SEQUENCE asideactivitytype_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE asideactivitytype (id INT NOT NULL, title VARCHAR(255) NOT NULL, isactive BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE TABLE asideactivity (id INT NOT NULL, type_id INT NOT NULL, agent_id INT NOT NULL, createdby_id INT NOT NULL, updatedby_id INT DEFAULT NULL, createdat TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedat TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL, location VARCHAR(100) DEFAULT NULL, note TEXT DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE INDEX idx_e9fa21913174800f ON asideactivity (createdby_id)');
-        $this->addSql('CREATE INDEX idx_e9fa2191c54c8c93 ON asideactivity (type_id)');
-        $this->addSql('CREATE INDEX idx_e9fa219165ff1aec ON asideactivity (updatedby_id)');
-        $this->addSql('CREATE INDEX idx_e9fa21913414710b ON asideactivity (agent_id)');
-        $this->addSql('COMMENT ON COLUMN asideactivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa2191c54c8c93 FOREIGN KEY (type_id) REFERENCES asideactivitytype (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913174800f FOREIGN KEY (createdby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa219165ff1aec FOREIGN KEY (updatedby_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE asideactivity ADD CONSTRAINT fk_e9fa21913414710b FOREIGN KEY (agent_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('DROP TABLE chill_asideactivity.AsideActivity');
-        $this->addSql('DROP TABLE chill_asideactivity.AsideActivityCategory');
-        $this->addSql('DROP SCHEMA chill_asideactivity');
-    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
index 75c7b81b2..889c7f177 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,12 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210806140343 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ADD duration INT DEFAULT NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Duration changed to type integer';
@@ -19,10 +32,4 @@ final class Version20210806140343 extends AbstractMigration
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE chill_asideactivity.asideactivity DROP duration');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ADD duration INT DEFAULT NULL');
-    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
index 5c572e650..62fe73244 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,12 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210806140710 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP duration');
+    }
+
     public function getDescription(): string
     {
         return 'Duration changed back to timestamp';
@@ -19,11 +32,4 @@ final class Version20210806140710 extends AbstractMigration
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD duration TIME(0) WITHOUT TIME ZONE DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP duration');
-
-    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
index 2984108c2..d6d4deef4 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,20 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210810084456 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.createdat IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.date IS \'(DC2Type:datetime_immutable)\'');
+    }
+
     public function getDescription(): string
     {
         return 'createdat, updatedat and date given a type timestamp';
@@ -27,19 +48,4 @@ final class Version20210810084456 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_asideactivity.asideactivity.updatedAt IS NULL');
         $this->addSql('COMMENT ON COLUMN chill_asideactivity.asideactivity.date IS NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER createdAt DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER updatedAt DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity ALTER date DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.createdat IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.updatedat IS \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.date IS \'(DC2Type:datetime_immutable)\'');
-
-    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
index 13ba8749c..67a1db139 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210922182907.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210922182907 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivityCategory DROP parent');
+    }
+
     public function getDescription(): string
     {
         return 'Parent and children added to aside activity category entity';
@@ -18,11 +30,6 @@ final class Version20210922182907 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD parent_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD CONSTRAINT FK_7BF90DBE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_asideactivity.AsideActivityCategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_7BF90DBE727ACA70 ON chill_asideactivity.asideactivitycategory (parent_id)');   
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivityCategory DROP parent');
+        $this->addSql('CREATE INDEX IDX_7BF90DBE727ACA70 ON chill_asideactivity.asideactivitycategory (parent_id)');
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
index 42763638e..cfa5f3ce5 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20211004134012.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\AsideActivity;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * allow to add an ordering to aside activity categories
+ * allow to add an ordering to aside activity categories.
  */
 final class Version20211004134012 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory DROP ordering');
+    }
+
     public function getDescription(): string
     {
         return 'allow to add an ordering to aside activity categories';
@@ -21,9 +33,4 @@ final class Version20211004134012 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory ADD ordering DOUBLE PRECISION NOT NULL DEFAULT 0.00');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_asideactivity.asideactivitycategory DROP ordering');
-    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index dac2430bd..6d219626d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -3,6 +3,7 @@ Show the aside activity: Voir l'activité annexe
 Edit the aside activity: Modifier l'activité annexe
 Remove aside activity: Supprimer l'activité annexe
 Aside activity: Activité annexe
+Aside Activity Type List: Liste des catégories d'activités annexes
 Duration time: Durée
 durationTime: durée
 user_username: nom de l'utilisateur
@@ -156,6 +157,11 @@ The activity has been successfully removed.: L'activité a été supprimée.
 
 #Menu
 Create an aside activity: "Créer une activité annexe"
+Aside activity categories: Catégories des activités annexes
 Aside activity configuration menu: "Menu de configuration des activités annexes"
-Aside activity configuration: "Configuration des activités annexes"
 Phonecall: "Appel téléphonique"
+
+# admin
+Aside activities: Activités annexes
+Aside activity types: Types d'activités annexes
+Aside activity type configuration: Configuration des categories d'activités annexes
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
index 91ad6b7bf..707ae0221 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
@@ -1,22 +1,24 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Calculator;
 
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 interface CalculatorInterface
 {
     /**
-     * 
      * @param AbstractElement[] $elements
      */
-    public function calculate(array $elements) : ?CalculatorResult;
-    
+    public function calculate(array $elements): ?CalculatorResult;
+
     public function getAlias();
 }
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
index ae90a448e..2a9a89b13 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -1,67 +1,73 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Calculator;
 
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
+use OutOfBoundsException;
+use function array_key_exists;
+use function array_keys;
+use function implode;
+
 class CalculatorManager
 {
     /**
-     *
      * @var CalculatorInterface[]
      */
     protected $calculators = [];
-    
+
     protected $defaultCalculator = [];
-    
+
     public function addCalculator(CalculatorInterface $calculator, bool $default)
     {
         $this->calculators[$calculator::getAlias()] = $calculator;
-        
+
         if ($default) {
             $this->defaultCalculator[] = $calculator::getAlias();
         }
     }
-    
+
     /**
-     * 
-     * @param string $alias
-     * @return CalculatorInterface
-     */
-    public function getCalculator($alias)
-    {
-        if (FALSE === \array_key_exists($alias, $this->calculators)) {
-            throw new \OutOfBoundsException("The calculator with alias '$alias' does "
-                . "not exists. Possible values are ". \implode(", ", \array_keys($this->calculators)));
-        }
-        
-        return $this->calculators[$alias];
-    }
-    
-    /**
-     * 
      * @param AbstractElement[] $elements
+     *
      * @return CalculatorResult[]
      */
     public function calculateDefault(array $elements)
     {
         $results = [];
-        
+
         foreach ($this->defaultCalculator as $alias) {
             $calculator = $this->calculators[$alias];
             $result = $calculator->calculate($elements);
-            
-            if ($result !== null) {
+
+            if (null !== $result) {
                 $results[$calculator::getAlias()] = $result;
             }
         }
-        
+
         return $results;
     }
+
+    /**
+     * @param string $alias
+     *
+     * @return CalculatorInterface
+     */
+    public function getCalculator($alias)
+    {
+        if (false === array_key_exists($alias, $this->calculators)) {
+            throw new OutOfBoundsException("The calculator with alias '{$alias}' does "
+                . 'not exists. Possible values are ' . implode(', ', array_keys($this->calculators)));
+        }
+
+        return $this->calculators[$alias];
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
index 1066dab25..7de147ffb 100644
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
@@ -1,23 +1,27 @@
 <?php
-/*
- * 
- */
-namespace Chill\AMLI\BudgetBundle\Calculator;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\BudgetBundle\Calculator;
+
 class CalculatorResult
 {
-    const TYPE_RATE = 'rate';
-    const TYPE_CURRENCY = 'currency';
-    const TYPE_PERCENTAGE = 'percentage';
-    
-    public $type;
-    
-    public $result;
-    
+    public const TYPE_CURRENCY = 'currency';
+
+    public const TYPE_PERCENTAGE = 'percentage';
+
+    public const TYPE_RATE = 'rate';
+
     public $label;
+
+    public $result;
+
+    public $type;
 }
diff --git a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php b/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
index 0d68e1cbf..add60c5df 100644
--- a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
+++ b/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
@@ -1,16 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Chill\AMLI\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillAMLIBudgetBundle extends Bundle
 {
     public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container)
     {
         parent::build($container);
-        
+
         $container->addCompilerPass(new CalculatorCompilerPass());
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
index 2cc579d6b..dc3ffe20d 100644
--- a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
@@ -1,72 +1,70 @@
 <?php
-/*
- */
-namespace Chill\AMLI\BudgetBundle\Config;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\BudgetBundle\Config;
+
 class ConfigRepository
 {
     /**
-     *
-     * @var array
-     */
-    protected $resources;
-    
-    /**
-     *
      * @var array
      */
     protected $charges;
-    
+
+    /**
+     * @var array
+     */
+    protected $resources;
+
     public function __construct($resources, $charges)
     {
         $this->resources = $resources;
         $this->charges = $charges;
     }
-    
+
     /**
-     * 
-     * @return array where keys are the resource'key and label the ressource label
-     */
-    public function getResourcesLabels()
-    {
-        $resources = array();
-        
-        foreach ($this->resources as $definition) {
-            $resources[$definition['key']] = $this->normalizeLabel($definition['labels']);
-        }
-        
-        return $resources;
-    }
-    
-    /**
-     * 
      * @return array where keys are the resource'key and label the ressource label
      */
     public function getChargesLabels()
     {
-        $charges = array();
-        
+        $charges = [];
+
         foreach ($this->charges as $definition) {
             $charges[$definition['key']] = $this->normalizeLabel($definition['labels']);
         }
-        
+
         return $charges;
     }
-    
-    private function normalizeLabel($labels) 
+
+    /**
+     * @return array where keys are the resource'key and label the ressource label
+     */
+    public function getResourcesLabels()
     {
-        $normalizedLabels = array();
-        
+        $resources = [];
+
+        foreach ($this->resources as $definition) {
+            $resources[$definition['key']] = $this->normalizeLabel($definition['labels']);
+        }
+
+        return $resources;
+    }
+
+    private function normalizeLabel($labels)
+    {
+        $normalizedLabels = [];
+
         foreach ($labels as $labelDefinition) {
             $normalizedLabels[$labelDefinition['lang']] = $labelDefinition['label'];
         }
-        
+
         return $normalizedLabels;
     }
-
 }
diff --git a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
index 9ef3758b0..fd596cc3a 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
@@ -1,38 +1,45 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
-use Doctrine\ORM\EntityManagerInterface;
 use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Translation\TranslatorInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Translation\TranslatorInterface;
+use function get_class;
 
 abstract class AbstractElementController extends Controller
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
      * @var LoggerInterface
      */
     protected $chillMainLogger;
-    
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -44,94 +51,14 @@ abstract class AbstractElementController extends Controller
     }
 
     /**
-     * @return AbstractElement the newly created element
-     */
-    abstract protected function createNewElement();
-    
-    abstract protected function getType();
-
-    /**
-     * 
-     */
-    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
-    {
-        /* @var $element \Chill\AMLI\BudgetBundle\Entity\AbstractElement */
-        $element = $this->createNewElement()
-            ->setPerson($person)
-            ;
-        
-        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
-        
-        $form = $this->createForm($this->getType(), $element);
-        $form->add('submit', SubmitType::class);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() and $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($element);
-            $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
-            
-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $person->getId()
-            ]);
-        } elseif ($form->isSubmitted()) {
-            $this->addFlash('error', $this->translator->trans('This form contains errors'));
-        }
-        
-        return $this->render($template, array(
-            'form' => $form->createView(),
-            'person' => $person,
-            'element' => $element
-        ));
-    }
-
-    /**
-     * 
-     * @param AbstractElement $element
-     * @param Request $request
-     * @param string $template
-     * @param string $flashOnSuccess
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
-    {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
-        
-        $form = $this->createForm($this->getType(), $element);
-        $form->add('submit', SubmitType::class);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() and $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans($flashOnSuccess));
-            
-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $element->getPerson()->getId()
-            ]);
-        }
-        
-        return $this->render($template, array(
-            'element' => $element,
-            'form' => $form->createView(),
-            'person' => $element->getPerson()
-        ));
-    }
-    
-    /**
-     * 
      * Route(
      *  "{_locale}/family-members/family-members/{id}/delete",
      *  name="chill_family_members_family_members_delete"
-     * )
-     * 
-     * @param AbstractElement $element
-     * @param Request $request
+     * ).
+     *
+     * @param mixed $template
+     * @param mixed $flashMessage
+     *
      * @return \Symfony\Component\BrowserKit\Response
      */
     protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
@@ -145,63 +72,140 @@ abstract class AbstractElementController extends Controller
             $form->handleRequest($request);
 
             if ($form->isValid()) {
-                $this->chillMainLogger->notice("A budget element has been removed", array(
-                   'family_element' => get_class($element),
-                   'by_user' => $this->getUser()->getUsername(),
-                   'family_member_id' => $element->getId(),
-                   'amount' => $element->getAmount(),
-                   'type' => $element->getType()
-                ));
+                $this->chillMainLogger->notice('A budget element has been removed', [
+                    'family_element' => get_class($element),
+                    'by_user' => $this->getUser()->getUsername(),
+                    'family_member_id' => $element->getId(),
+                    'amount' => $element->getAmount(),
+                    'type' => $element->getType(),
+                ]);
 
                 $em = $this->getDoctrine()->getManager();
                 $em->remove($element);
                 $em->flush();
 
                 $this->addFlash('success', $this->translator
-                        ->trans($flashMessage));
+                    ->trans($flashMessage));
 
-                return $this->redirectToRoute('chill_budget_elements_index', array(
-                     'id' => $element->getPerson()->getId()
-                  ));
+                return $this->redirectToRoute('chill_budget_elements_index', [
+                    'id' => $element->getPerson()->getId(),
+                ]);
             }
         }
 
-
-        return $this->render($template, array(
-           'element' => $element,
-           'delete_form' => $form->createView()
-        ));
+        return $this->render($template, [
+            'element' => $element,
+            'delete_form' => $form->createView(),
+        ]);
     }
-    
+
+    /**
+     * @param string $template
+     * @param string $flashOnSuccess
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
+    {
+        $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
+
+        $form = $this->createForm($this->getType(), $element);
+        $form->add('submit', SubmitType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->flush();
+
+            $this->addFlash('success', $this->translator->trans($flashOnSuccess));
+
+            return $this->redirectToRoute('chill_budget_elements_index', [
+                'id' => $element->getPerson()->getId(),
+            ]);
+        }
+
+        return $this->render($template, [
+            'element' => $element,
+            'form' => $form->createView(),
+            'person' => $element->getPerson(),
+        ]);
+    }
+
+    /**
+     * @param mixed $template
+     * @param mixed $flashMessageOnSuccess
+     */
+    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
+    {
+        /** @var \Chill\AMLI\BudgetBundle\Entity\AbstractElement $element */
+        $element = $this->createNewElement()
+            ->setPerson($person);
+
+        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
+
+        $form = $this->createForm($this->getType(), $element);
+        $form->add('submit', SubmitType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($element);
+            $em->flush();
+
+            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));
+
+            return $this->redirectToRoute('chill_budget_elements_index', [
+                'id' => $person->getId(),
+            ]);
+        }
+
+        if ($form->isSubmitted()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
+        }
+
+        return $this->render($template, [
+            'form' => $form->createView(),
+            'person' => $person,
+            'element' => $element,
+        ]);
+    }
+
     /**
      * Route(
      *  "{_locale}/family-members/family-members/{id}/view",
      *  name="chill_family_members_family_members_view"
-     * )
+     * ).
+     *
+     * @param mixed $template
      */
     protected function _view(AbstractElement $element, $template)
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
-        
-        return $this->render($template, array(
-            'element' => $element
-        ));
+
+        return $this->render($template, [
+            'element' => $element,
+        ]);
     }
-    
+
+    /**
+     * @return AbstractElement the newly created element
+     */
+    abstract protected function createNewElement();
+
+    abstract protected function getType();
+
     /**
      * Creates a form to delete a help request entity by id.
      *
-     * @param mixed $id The entity id
-     *
      * @return \Symfony\Component\Form\Form The form
      */
     private function createDeleteForm()
     {
         return $this->createFormBuilder()
             ->setMethod(Request::METHOD_DELETE)
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
     }
-
 }
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
index 370d1abb2..b06773609 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -1,102 +1,98 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\AMLI\BudgetBundle\Controller\AbstractElementController;
 use Chill\AMLI\BudgetBundle\Entity\Charge;
 use Chill\AMLI\BudgetBundle\Form\ChargeType;
 use Chill\PersonBundle\Entity\Person;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Request;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ChargeController extends AbstractElementController
 {
-    protected function getType()
-    {
-        return ChargeType::class;
-    }
-    
-    protected function createNewElement()
-    {
-        return new Charge();
-    }
-    
     /**
-     * 
      * @Route(
-     *  "{_locale}/budget/charge/{id}/view",
-     *  name="chill_budget_charge_view"
+     *     "{_locale}/budget/charge/{id}/delete",
+     *     name="chill_budget_charge_delete"
      * )
-     * @param Charge $charge
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function deleteAction(Request $request, Charge $charge)
+    {
+        return $this->_delete(
+            $charge,
+            $request,
+            '@ChillAMLIBudget/Charge/confirm_delete.html.twig',
+            'Charge deleted'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/{id}/edit",
+     *     name="chill_budget_charge_edit"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function editAction(Request $request, Charge $charge)
+    {
+        return $this->_edit(
+            $charge,
+            $request,
+            '@ChillAMLIBudget/Charge/edit.html.twig',
+            'Charge updated'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/by-person/{id}/new",
+     *     name="chill_budget_charge_new"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newAction(Request $request, Person $person)
+    {
+        return $this->_new(
+            $person,
+            $request,
+            '@ChillAMLIBudget/Charge/new.html.twig',
+            'Charge created'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/{id}/view",
+     *     name="chill_budget_charge_view"
+     * )
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function viewAction(Charge $charge)
     {
         return $this->_view($charge, '@ChillAMLIBudget/Charge/view.html.twig');
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/charge/by-person/{id}/new",
-     *  name="chill_budget_charge_new"
-     * )
-     * 
-     * @param Request $request
-     * @param Person $person
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function newAction(Request $request, Person $person)
+
+    protected function createNewElement()
     {
-        return $this->_new(
-            $person, 
-            $request, 
-            '@ChillAMLIBudget/Charge/new.html.twig', 
-            'Charge created');
+        return new Charge();
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/charge/{id}/edit",
-     *  name="chill_budget_charge_edit"
-     * )
-     * 
-     * @param Request $request
-     * @param Charge $charge
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function editAction(Request $request, Charge $charge)
+
+    protected function getType()
     {
-        return $this->_edit(
-            $charge, 
-            $request, 
-            '@ChillAMLIBudget/Charge/edit.html.twig', 
-            'Charge updated');
-    }
-    
-    /**
-     * 
-     * @Route(
-     *  "{_locale}/budget/charge/{id}/delete",
-     *  name="chill_budget_charge_delete"
-     * )
-     * 
-     * @param Request $request
-     * @param Charge $charge
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function deleteAction(Request $request, Charge $charge)
-    {
-        return $this->_delete(
-            $charge, 
-            $request, 
-            '@ChillAMLIBudget/Charge/confirm_delete.html.twig', 
-            'Charge deleted');
+        return ChargeType::class;
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
index d5f6b4bea..b0c01732b 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -1,46 +1,52 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Translation\TranslatorInterface;
-use Psr\Log\LoggerInterface;
+use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
 use Chill\AMLI\BudgetBundle\Entity\Charge;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
-use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
+use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_merge;
+use function count;
 
 class ElementController extends Controller
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
-    
-    /**
-     *
      * @var CalculatorManager
      */
     protected $calculator;
-    
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $chillMainLogger;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -52,45 +58,44 @@ class ElementController extends Controller
         $this->chillMainLogger = $chillMainLogger;
         $this->calculator = $calculator;
     }
-    
+
     /**
      * @Route(
-     *  "{_locale}/budget/elements/by-person/{id}",
-     *  name="chill_budget_elements_index"
+     *     "{_locale}/budget/elements/by-person/{id}",
+     *     name="chill_budget_elements_index"
      * )
      */
     public function indexAction(Person $person)
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $person);
-        
+
         $charges = $this->em
             ->getRepository(Charge::class)
             ->findByPerson($person);
         $ressources = $this->em
             ->getRepository(Resource::class)
             ->findByPerson($person);
-        
-        $now = new \DateTime('now');
-        
+
+        $now = new DateTime('now');
+
         $actualCharges = $this->em
             ->getRepository(Charge::class)
             ->findByPersonAndDate($person, $now);
         $actualResources = $this->em
             ->getRepository(Resource::class)
             ->findByPersonAndDate($person, $now);
-        
-        $elements = \array_merge($actualCharges, $actualResources);
-        
+
+        $elements = array_merge($actualCharges, $actualResources);
+
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
-        
-        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', array(
+
+        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', [
             'person' => $person,
             'charges' => $charges,
             'resources' => $ressources,
-            'results' => $results ?? []
-        ));
+            'results' => $results ?? [],
+        ]);
     }
-
 }
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
index 8b252ea48..4ee8bd082 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -1,103 +1,98 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\AMLI\BudgetBundle\Controller\AbstractElementController;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
 use Chill\AMLI\BudgetBundle\Form\ResourceType;
 use Chill\PersonBundle\Entity\Person;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Request;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ResourceController extends AbstractElementController
 {
-
-    protected function getType()
-    {
-        return ResourceType::class;
-    }
-    
-    protected function createNewElement()
-    {
-        return new Resource();
-    }
-    
     /**
-     * 
      * @Route(
-     *  "{_locale}/budget/resource/{id}/view",
-     *  name="chill_budget_resource_view"
+     *     "{_locale}/budget/resource/{id}/delete",
+     *     name="chill_budget_resource_delete"
      * )
-     * @param Request $request
-     * @param Resource $resource
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function deleteAction(Request $request, Resource $resource)
+    {
+        return $this->_delete(
+            $resource,
+            $request,
+            '@ChillAMLIBudget/Resource/confirm_delete.html.twig',
+            'Resource deleted'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/resource/{id}/edit",
+     *     name="chill_budget_resource_edit"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function editAction(Request $request, Resource $resource)
+    {
+        return $this->_edit(
+            $resource,
+            $request,
+            '@ChillAMLIBudget/Resource/edit.html.twig',
+            'Resource updated'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/resource/by-person/{id}/new",
+     *     name="chill_budget_resource_new"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newAction(Request $request, Person $person)
+    {
+        return $this->_new(
+            $person,
+            $request,
+            '@ChillAMLIBudget/Resource/new.html.twig',
+            'Resource created'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/resource/{id}/view",
+     *     name="chill_budget_resource_view"
+     * )
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function viewAction(Resource $resource)
     {
         return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig');
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/resource/by-person/{id}/new",
-     *  name="chill_budget_resource_new"
-     * )
-     * 
-     * @param Request $request
-     * @param Person $person
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function newAction(Request $request, Person $person)
+
+    protected function createNewElement()
     {
-        return $this->_new(
-            $person, 
-            $request, 
-            '@ChillAMLIBudget/Resource/new.html.twig', 
-            'Resource created');
+        return new Resource();
     }
-    
-    /**
-     * @Route(
-     *  "{_locale}/budget/resource/{id}/edit",
-     *  name="chill_budget_resource_edit"
-     * )
-     * 
-     * @param Request $request
-     * @param Resource $resource
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function editAction(Request $request, Resource $resource)
+
+    protected function getType()
     {
-        return $this->_edit(
-            $resource, 
-            $request, 
-            '@ChillAMLIBudget/Resource/edit.html.twig', 
-            'Resource updated');
-    }
-    
-    /**
-     * 
-     * @Route(
-     *  "{_locale}/budget/resource/{id}/delete",
-     *  name="chill_budget_resource_delete"
-     * )
-     * 
-     * @param Request $request
-     * @param Resource $resource
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function deleteAction(Request $request, Resource $resource)
-    {
-        return $this->_delete($resource, 
-            $request, 
-            '@ChillAMLIBudget/Resource/confirm_delete.html.twig', 
-            'Resource deleted');
+        return ResourceType::class;
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
index edbf226b6..bea107131 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
@@ -1,30 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services/config.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/security.yaml');
@@ -32,7 +38,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
         $loader->load('services/templating.yaml');
         $loader->load('services/menu.yaml');
         $loader->load('services/calculator.yaml');
-        
+
         $this->storeConfig('resources', $config, $container);
         $this->storeConfig('charges', $config, $container);
     }
@@ -42,36 +48,35 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
         $this->prependAuthorization($container);
         $this->prependRoutes($container);
     }
-    
-    protected function storeConfig($position, array $config, ContainerBuilder $container) 
+
+    /** (non-PHPdoc).
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
+     */
+    public function prependRoutes(ContainerBuilder $container)
     {
-        $container
-            ->setParameter(sprintf('chill_budget.%s', $position), $config[$position])
-            ;
+        //add routes for custom bundle
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillAMLIBudgetBundle/config/routing.yaml',
+                ],
+            ],
+        ]);
     }
 
     protected function prependAuthorization(ContainerBuilder $container)
     {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-               BudgetElementVoter::UPDATE => [ BudgetElementVoter::SHOW ],
-               BudgetElementVoter::CREATE => [ BudgetElementVoter::SHOW ]
-           )
-        ));
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                BudgetElementVoter::UPDATE => [BudgetElementVoter::SHOW],
+                BudgetElementVoter::CREATE => [BudgetElementVoter::SHOW],
+            ],
+        ]);
     }
-    
-    /* (non-PHPdoc)
-     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
-     */
-    public function prependRoutes(ContainerBuilder $container) 
+
+    protected function storeConfig($position, array $config, ContainerBuilder $container)
     {
-        //add routes for custom bundle
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillAMLIBudgetBundle/config/routing.yaml'
-              )
-           )
-        ));
+        $container
+            ->setParameter(sprintf('chill_budget.%s', $position), $config[$position]);
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
index 30e5ae8da..0a53e5160 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
@@ -1,29 +1,31 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CalculatorCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         $manager = $container->getDefinition('Chill\AMLI\BudgetBundle\Calculator\CalculatorManager');
-        
+
         foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
-            foreach($tags as $tag) {
+            foreach ($tags as $tag) {
                 $reference = new Reference($id);
 
-                $manager->addMethodCall('addCalculator', [ $reference, $tag['default'] ?? false ]);
+                $manager->addMethodCall('addCalculator', [$reference, $tag['default'] ?? false]);
             }
         }
     }
diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
index 1e1769d89..407be6bff 100644
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -12,66 +21,61 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_amli_budget');
         $rootNode = $treeBuilder->getRootNode('chill_amli_budget');
-        
+
         $rootNode
             ->children()
-            
+
                 // ressources
-                ->arrayNode('resources')->isRequired()->requiresAtLeastOneElement()
-                    ->arrayPrototype()
-                        ->children()
-                            ->scalarNode('key')->isRequired()->cannotBeEmpty()
-                                ->info('the key stored in database')
-                                ->example('salary')
-                            ->end()
-                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-                                            ->example('fr')
-                                        ->end()
-                                        ->scalarNode('label')->isRequired()->cannotBeEmpty()
-                                            ->example('Salaire')
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            
-                ->arrayNode('charges')->isRequired()->requiresAtLeastOneElement()
-                    ->arrayPrototype()
-                        ->children()
-                            ->scalarNode('key')->isRequired()->cannotBeEmpty()
-                                ->info('the key stored in database')
-                                ->example('salary')
-                            ->end()
-                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-                                            ->example('fr')
-                                        ->end()
-                                        ->scalarNode('label')->isRequired()->cannotBeEmpty()
-                                            ->example('Salaire')
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            
+            ->arrayNode('resources')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+            ->info('the key stored in database')
+            ->example('salary')
             ->end()
-            ;
+            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+            ->example('fr')
+            ->end()
+            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+            ->example('Salaire')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('charges')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+            ->info('the key stored in database')
+            ->example('salary')
+            ->end()
+            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+            ->example('fr')
+            ->end()
+            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+            ->example('Salaire')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+
+            ->end();
 
         return $treeBuilder;
     }
diff --git a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
index 985af9676..5f43c4262 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -1,46 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * AbstractElement
+ * AbstractElement.
  *
- * @ORM\MappedSuperclass()
+ * @ORM\MappedSuperclass
  */
 abstract class AbstractElement
 {
-    
-    /**
-     *
-     * @var Person
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Person"
-     * )
-     */
-    private $person;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="type", type="string", length=255)
-     */
-    private $type;
-
     /**
      * @var decimal
      *
      * @ORM\Column(name="amount", type="decimal", precision=10, scale=2)
      * @Assert\GreaterThan(
-     *  value=0
+     *     value=0
      * )
      * @Assert\NotNull(
-     *  message="The amount cannot be empty"
+     *     message="The amount cannot be empty"
      * )
-     * 
      */
     private $amount;
 
@@ -52,52 +46,82 @@ abstract class AbstractElement
     private $comment;
 
     /**
-     * @var \DateTimeImmutable
+     * @var DateTimeImmutable|null
+     *
+     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
+     * @Assert\GreaterThan(
+     *     propertyPath="startDate",
+     *     message="The budget element's end date must be after the start date"
+     * )
+     */
+    private $endDate;
+
+    /**
+     * @var Person
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Person"
+     * )
+     */
+    private $person;
+
+    /**
+     * @var DateTimeImmutable
      *
      * @ORM\Column(name="startDate", type="datetime_immutable")
-     * @Assert\Date()
+     * @Assert\Date
      */
     private $startDate;
 
     /**
-     * @var \DateTimeImmutable|null
+     * @var string
      *
-     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
-     * @Assert\GreaterThan(
-     *   propertyPath="startDate",
-     *   message="The budget element's end date must be after the start date"
-     * )
+     * @ORM\Column(name="type", type="string", length=255)
      */
-    private $endDate;
-    
-    abstract public function isCharge(): bool;
-    
-    abstract public function isResource(): bool;
-    
+    private $type;
+
+    /**
+     * Get amount.
+     *
+     * @return float
+     */
+    public function getAmount()
+    {
+        return (float) $this->amount;
+    }
+
+    /**
+     * Get comment.
+     *
+     * @return string|null
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * Get endDate.
+     *
+     * @return DateTimeImmutable|null
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+
     public function getPerson(): Person
     {
         return $this->person;
     }
 
-    public function setPerson(Person $person)
-    {
-        $this->person = $person;
-        
-        return $this;
-    }
-    
     /**
-     * Set type.
+     * Get startDate.
      *
-     * @param string $type
-     *
-     * @return AbstractElement
+     * @return DateTimeImmutable
      */
-    public function setType($type)
+    public function getStartDate()
     {
-        $this->type = $type;
-
-        return $this;
+        return $this->startDate;
     }
 
     /**
@@ -110,6 +134,15 @@ abstract class AbstractElement
         return $this->type;
     }
 
+    abstract public function isCharge(): bool;
+
+    public function isEmpty()
+    {
+        return 0 === $this->amount;
+    }
+
+    abstract public function isResource(): bool;
+
     /**
      * Set amount.
      *
@@ -124,16 +157,6 @@ abstract class AbstractElement
         return $this;
     }
 
-    /**
-     * Get amount.
-     *
-     * @return double
-     */
-    public function getAmount()
-    {
-        return (double) $this->amount;
-    }
-
     /**
      * Set comment.
      *
@@ -149,27 +172,40 @@ abstract class AbstractElement
     }
 
     /**
-     * Get comment.
+     * Set endDate.
      *
-     * @return string|null
+     * @return AbstractElement
      */
-    public function getComment()
+    public function setEndDate(?DateTimeInterface $endDate = null)
     {
-        return $this->comment;
+        if ($endDate instanceof DateTime) {
+            $this->endDate = DateTimeImmutable::createFromMutable($endDate);
+        } elseif (null === $endDate) {
+            $this->endDate = null;
+        } else {
+            $this->endDate = $endDate;
+        }
+
+        return $this;
+    }
+
+    public function setPerson(Person $person)
+    {
+        $this->person = $person;
+
+        return $this;
     }
 
     /**
      * Set startDate.
      *
-     * @param \DateTimeInterface  $startDate
-     *
      * @return AbstractElement
      */
-    public function setStartDate(\DateTimeInterface $startDate)
+    public function setStartDate(DateTimeInterface $startDate)
     {
-        if ($startDate instanceof \DateTime) {
-            $this->startDate = \DateTimeImmutable::createFromMutable($startDate);
-        } elseif (NULL === $startDate) {
+        if ($startDate instanceof DateTime) {
+            $this->startDate = DateTimeImmutable::createFromMutable($startDate);
+        } elseif (null === $startDate) {
             $this->startDate = null;
         } else {
             $this->startDate = $startDate;
@@ -179,47 +215,16 @@ abstract class AbstractElement
     }
 
     /**
-     * Get startDate.
+     * Set type.
      *
-     * @return \DateTimeImmutable
-     */
-    public function getStartDate()
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * Set endDate.
-     *
-     * @param \DateTimeInterface|null $endDate
+     * @param string $type
      *
      * @return AbstractElement
      */
-    public function setEndDate(\DateTimeInterface $endDate = null)
+    public function setType($type)
     {
-        if ($endDate instanceof \DateTime) {
-            $this->endDate = \DateTimeImmutable::createFromMutable($endDate);
-        } elseif (NULL === $endDate) {
-            $this->endDate = null;
-        } else {
-            $this->endDate = $endDate;
-        }
+        $this->type = $type;
 
         return $this;
     }
-
-    /**
-     * Get endDate.
-     *
-     * @return \DateTimeImmutable|null
-     */
-    public function getEndDate()
-    {
-        return $this->endDate;
-    }
-    
-    public function isEmpty()
-    {
-        return $this->amount == 0;
-    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
index a330c382d..e893f99af 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -1,18 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Charge
+ * Charge.
  *
  * @ORM\Table(name="chill_budget.charge")
  * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ChargeRepository")
  */
 class Charge extends AbstractElement implements HasCenterInterface
 {
+    public const HELP_ASKED = 'running';
+
+    public const HELP_NO = 'no';
+
+    public const HELP_NOT_RELEVANT = 'not-relevant';
+
+    public const HELP_YES = 'yes';
+
+    public const HELPS = [
+        self::HELP_ASKED,
+        self::HELP_NO,
+        self::HELP_YES,
+        self::HELP_NOT_RELEVANT,
+    ];
+
+    /**
+     * @var string
+     * @ORM\Column(name="help", type="string", nullable=true)
+     */
+    private $help = self::HELP_NOT_RELEVANT;
+
     /**
      * @var int
      *
@@ -21,30 +52,20 @@ class Charge extends AbstractElement implements HasCenterInterface
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-    
-    /**
-     *
-     * @var string
-     * @ORM\Column(name="help", type="string", nullable=true)
-     */
-    private $help = self::HELP_NOT_RELEVANT;
-    
-    const HELP_ASKED = 'running';
-    const HELP_NO = 'no';
-    const HELP_YES = 'yes';
-    const HELP_NOT_RELEVANT = 'not-relevant';
-    
-    const HELPS = [
-        self::HELP_ASKED,
-        self::HELP_NO,
-        self::HELP_YES,
-        self::HELP_NOT_RELEVANT
-    ];
-    
-        
+
     public function __construct()
     {
-        $this->setStartDate(new \DateTimeImmutable('today'));
+        $this->setStartDate(new DateTimeImmutable('today'));
+    }
+
+    public function getCenter(): \Chill\MainBundle\Entity\Center
+    {
+        return $this->getPerson()->getCenter();
+    }
+
+    public function getHelp()
+    {
+        return $this->help;
     }
 
     /**
@@ -56,23 +77,6 @@ class Charge extends AbstractElement implements HasCenterInterface
     {
         return $this->id;
     }
-    
-    public function getHelp()
-    {
-        return $this->help;
-    }
-
-    public function setHelp($help)
-    {
-        $this->help = $help;
-        
-        return $this;
-    }
-
-    public function getCenter(): \Chill\MainBundle\Entity\Center
-    {
-        return $this->getPerson()->getCenter();
-    }
 
     public function isCharge(): bool
     {
@@ -83,4 +87,11 @@ class Charge extends AbstractElement implements HasCenterInterface
     {
         return false;
     }
+
+    public function setHelp($help)
+    {
+        $this->help = $help;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
index 390268592..bd13e0dd0 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
@@ -1,12 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Resource
+ * Resource.
  *
  * @ORM\Table(name="chill_budget.resource")
  * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ResourceRepository")
@@ -21,13 +31,17 @@ class Resource extends AbstractElement implements HasCenterInterface
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-    
+
     public function __construct()
     {
-        $this->setStartDate(new \DateTimeImmutable('today'));
+        $this->setStartDate(new DateTimeImmutable('today'));
+    }
+
+    public function getCenter(): \Chill\MainBundle\Entity\Center
+    {
+        return $this->getPerson()->getCenter();
     }
 
-    
     /**
      * Get id.
      *
@@ -38,11 +52,6 @@ class Resource extends AbstractElement implements HasCenterInterface
         return $this->id;
     }
 
-    public function getCenter(): \Chill\MainBundle\Entity\Center
-    {
-        return $this->getPerson()->getCenter();
-    }
-
     public function isCharge(): bool
     {
         return false;
diff --git a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
index da219abb9..f64283b5a 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
@@ -1,124 +1,115 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Form;
 
+use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
+use Chill\AMLI\BudgetBundle\Entity\Charge;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\AMLI\BudgetBundle\Entity\Charge;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use function array_flip;
+use function asort;
 
 class ChargeType extends AbstractType
 {
-   /**
-     *
-     * @var ConfigRepository
-     */
-    protected $configRepository;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
+    protected ConfigRepository $configRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-        ConfigRepository $configRepository, 
-        TranslatableStringHelper $translatableStringHelper
+        ConfigRepository $configRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
     ) {
         $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('type', ChoiceType::class, [
                 'choices' => $this->getTypes(),
-                'placeholder' => 'Choose a charge type'
+                'placeholder' => 'Choose a charge type',
             ])
             ->add('amount', MoneyType::class)
-            ->add('comment', TextAreaType::class, [
-                'required' => false
-            ])  
-            ;
-        
+            ->add('comment', TextareaType::class, [
+                'required' => false,
+            ]);
+
         if ($options['show_start_date']) {
             $builder->add('startDate', ChillDateType::class, [
-                'label' => 'Start of validity period'
+                'label' => 'Start of validity period',
             ]);
         }
-        
+
         if ($options['show_end_date']) {
             $builder->add('endDate', ChillDateType::class, [
                 'required' => false,
-                'label' => 'End of validity period'
+                'label' => 'End of validity period',
             ]);
         }
-        
+
         if ($options['show_help']) {
             $builder->add('help', ChoiceType::class, [
                 'choices' => [
                     'charge.help.running' => Charge::HELP_ASKED,
                     'charge.help.no' => Charge::HELP_NO,
                     'charge.help.yes' => Charge::HELP_YES,
-                    'charge.help.not-concerned' => Charge::HELP_NOT_RELEVANT
+                    'charge.help.not-concerned' => Charge::HELP_NOT_RELEVANT,
                 ],
                 'placeholder' => 'Choose a status',
                 'required' => false,
-                'label' => 'Help to pay charges'
+                'label' => 'Help to pay charges',
             ]);
         }
     }
-    
-    private function getTypes()
-    {
-        $charges = $this->configRepository
-            ->getChargesLabels();
-        
-        // rewrite labels to filter in language
-        foreach ($charges as $key => $labels) {
-            $charges[$key] = $this->translatableStringHelper->localize($labels);
-        }
-        
-        \asort($charges);
-        
-        return \array_flip($charges);
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
+
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\AMLI\BudgetBundle\Entity\Charge',
+        $resolver->setDefaults([
+            'data_class' => Charge::class,
             'show_start_date' => true,
             'show_end_date' => true,
-            'show_help' => true
-        ));
-        
+            'show_help' => true,
+        ]);
+
         $resolver
             ->setAllowedTypes('show_start_date', 'boolean')
             ->setAllowedTypes('show_end_date', 'boolean')
-            ->setAllowedTypes('show_help', 'boolean')
-            ;
+            ->setAllowedTypes('show_help', 'boolean');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'chill_amli_budgetbundle_charge';
     }
 
+    private function getTypes()
+    {
+        $charges = $this->configRepository
+            ->getChargesLabels();
 
+        // rewrite labels to filter in language
+        foreach ($charges as $key => $labels) {
+            $charges[$key] = $this->translatableStringHelper->localize($labels);
+        }
+
+        asort($charges);
+
+        return array_flip($charges);
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
index abf7191ab..ddb4dd777 100644
--- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
@@ -1,108 +1,99 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Form;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
 use Chill\AMLI\BudgetBundle\Entity\Resource;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use function array_flip;
 
 class ResourceType extends AbstractType
 {
-    /**
-     *
-     * @var ConfigRepository
-     */
-    protected $configRepository;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
+    protected ConfigRepository $configRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-        ConfigRepository $configRepository, 
-        TranslatableStringHelper $translatableStringHelper
+        ConfigRepository $configRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
     ) {
         $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('type', ChoiceType::class, [
                 'choices' => $this->getTypes(),
                 'placeholder' => 'Choose a resource type',
-                'label' => 'Resource element type'
+                'label' => 'Resource element type',
             ])
             ->add('amount', MoneyType::class)
-            ->add('comment', TextAreaType::class, [
-                'required' => false
-            ])  
-            ;
-        
+            ->add('comment', TextareaType::class, [
+                'required' => false,
+            ]);
+
         if ($options['show_start_date']) {
             $builder->add('startDate', ChillDateType::class, [
-                'label' => 'Start of validity period'
+                'label' => 'Start of validity period',
             ]);
         }
-        
+
         if ($options['show_end_date']) {
             $builder->add('endDate', ChillDateType::class, [
                 'required' => false,
-                'label' => 'End of validity period'
+                'label' => 'End of validity period',
             ]);
         }
     }
-    
-    private function getTypes()
-    {
-        $resources = $this->configRepository
-            ->getResourcesLabels();
-        
-        // rewrite labels to filter in language
-        foreach ($resources as $key => $labels) {
-            $resources[$key] = $this->translatableStringHelper->localize($labels);
-        }
-        
-        asort($resources);
-        
-        return \array_flip($resources);
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
+
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => Resource::class,
             'show_start_date' => true,
-            'show_end_date' => true
-        ));
-        
+            'show_end_date' => true,
+        ]);
+
         $resolver
             ->setAllowedTypes('show_start_date', 'boolean')
-            ->setAllowedTypes('show_end_date', 'boolean')
-            ;
+            ->setAllowedTypes('show_end_date', 'boolean');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'chill_amli_budgetbundle_resource';
     }
 
+    private function getTypes()
+    {
+        $resources = $this->configRepository
+            ->getResourcesLabels();
 
+        // rewrite labels to filter in language
+        foreach ($resources as $key => $labels) {
+            $resources[$key] = $this->translatableStringHelper->localize($labels);
+        }
+
+        asort($resources);
+
+        return array_flip($resources);
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
index f2b395267..d97080d11 100644
--- a/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
@@ -1,60 +1,61 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Menu;
 
+use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker, 
+        AuthorizationCheckerInterface $authorizationChecker,
         TranslatorInterface $translator
     ) {
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
     }
 
-    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $parameters['person'];
-        
+
         if ($this->authorizationChecker->isGranted(BudgetElementVoter::SHOW, $person)) {
             $menu->addChild(
-                $this->translator->trans('Budget'), [
+                $this->translator->trans('Budget'),
+                [
                     'route' => 'chill_budget_elements_index',
-                    'routeParameters' => [ 'id' => $person->getId() ],
-                ])
-                ->setExtra('order', 460)
-                ;
+                    'routeParameters' => ['id' => $person->getId()],
+                ]
+            )
+                ->setExtra('order', 460);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'person' ];
+        return ['person'];
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
index 73a310d24..56f21b6fb 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
@@ -1,35 +1,44 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
+use DateTime;
 
 /**
- * ChargeRepository
+ * ChargeRepository.
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
 class ChargeRepository extends \Doctrine\ORM\EntityRepository
 {
-    public function findByPersonAndDate(Person $person, \DateTime $date, $sort = null)
+    public function findByPersonAndDate(Person $person, DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
-        
+
         $qb->where('c.person = :person')
             ->andWhere('c.startDate < :date')
-            ->andWhere('c.startDate < :date OR c.startDate IS NULL')
-            ;
-        
-        if ($sort !== null) {
+            ->andWhere('c.startDate < :date OR c.startDate IS NULL');
+
+        if (null !== $sort) {
             $qb->orderBy($sort);
         }
-        
+
         $qb->setParameters([
             'person' => $person,
-            'date' => $date
+            'date' => $date,
         ]);
-        
+
         return $qb->getQuery()->getResult();
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
index 50197ce65..f7440a281 100644
--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -1,35 +1,44 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
+use DateTime;
 
 /**
- * ResourceRepository
+ * ResourceRepository.
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
 class ResourceRepository extends \Doctrine\ORM\EntityRepository
 {
-    public function findByPersonAndDate(Person $person, \DateTime $date, $sort = null)
+    public function findByPersonAndDate(Person $person, DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
-        
+
         $qb->where('c.person = :person')
             ->andWhere('c.startDate < :date')
-            ->andWhere('c.startDate < :date OR c.startDate IS NULL')
-            ;
-        
-        if ($sort !== null) {
+            ->andWhere('c.startDate < :date OR c.startDate IS NULL');
+
+        if (null !== $sort) {
             $qb->orderBy($sort);
         }
-        
+
         $qb->setParameters([
             'person' => $person,
-            'date' => $date
+            'date' => $date,
         ]);
-        
+
         return $qb->getQuery()->getResult();
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php b/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php
index b326cb452..e2842b1e1 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php
+++ b/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Application\Migrations;
 
@@ -6,10 +15,17 @@ use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 
 /**
- * create schema for chill budget
+ * create schema for chill budget.
  */
 final class Version20180522080432 extends AbstractMigration
 {
+    public function down(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('CREATE SCHEMA chill_budget CASCADE');
+    }
+
     public function up(Schema $schema)
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -28,14 +44,5 @@ final class Version20180522080432 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_budget.charge.endDate IS \'(DC2Type:datetime_immutable)\'');
         $this->addSql('ALTER TABLE chill_budget.resource ADD CONSTRAINT FK_5E0A5E97217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_budget.charge ADD CONSTRAINT FK_5C99D2C3217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-     
-    }
-
-    public function down(Schema $schema)
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SCHEMA chill_budget CASCADE');
-        
     }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php b/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php
index b9c01cd7c..059d7f2c1 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php
+++ b/src/Bundle/ChillBudgetBundle/Resources/migrations/Version20181219145631.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Application\Migrations;
 
@@ -6,21 +15,21 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * autorise les valeurs nulles dans "HELP"
+ * autorise les valeurs nulles dans "HELP".
  */
 final class Version20181219145631 extends AbstractMigration
 {
-    public function up(Schema $schema) : void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_budget.charge ALTER help DROP NOT NULL');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_budget.charge ALTER help SET NOT NULL');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_budget.charge ALTER help DROP NOT NULL');
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
index 2f7530938..71a5f2523 100644
--- a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+++ b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
@@ -1,79 +1,82 @@
 <?php
-/*
- */
-namespace Chill\AMLI\BudgetBundle\Security\Authorization;
-
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\BudgetBundle\Security\Authorization;
+
+use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Security\Core\Role\Role;
+use function in_array;
+
 class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_BUDGET_ELEMENT_CREATE';
-    const DELETE = 'CHILL_BUDGET_ELEMENT_DELETE';
-    const UPDATE = 'CHILL_BUDGET_ELEMENT_UPDATE';
-    const SHOW   = 'CHILL_BUDGET_ELEMENT_SHOW';
-    
-    const ROLES = [
+    public const CREATE = 'CHILL_BUDGET_ELEMENT_CREATE';
+
+    public const DELETE = 'CHILL_BUDGET_ELEMENT_DELETE';
+
+    public const ROLES = [
         self::CREATE,
         self::DELETE,
         self::SHOW,
-        self::UPDATE
+        self::UPDATE,
     ];
-    
+
+    public const SHOW = 'CHILL_BUDGET_ELEMENT_SHOW';
+
+    public const UPDATE = 'CHILL_BUDGET_ELEMENT_UPDATE';
+
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     public function __construct(AuthorizationHelper $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
 
-    
-    protected function supports($attribute, $subject)
-    {
-        return (\in_array($attribute, self::ROLES) && $subject instanceof AbstractElement)
-            or
-                ($subject instanceof Person && \in_array($attribute, [ self::SHOW, self::CREATE ]));
-    }
-    
-    protected function voteOnAttribute($attribute, $subject, \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $token)
-    {
-        $user = $token->getUser();
-        
-        if (FALSE === $user instanceof User) {
-            return false;
-        }
-        
-        return $this->authorizationHelper
-            ->userHasAccess($user, $subject, new Role($attribute));
-    }
-    
-    public function getRoles()
-    {
-        return self::ROLES;
-    } 
-    
-    public function getRolesWithHierarchy(): array
-    {
-        return [ 'Budget elements' => self::ROLES ];
-    } 
-    
-    public function getRolesWithoutScope()
+    public function getRoles(): array
     {
         return self::ROLES;
     }
 
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Budget elements' => self::ROLES];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return self::ROLES;
+    }
+
+    protected function supports($attribute, $subject)
+    {
+        return (in_array($attribute, self::ROLES, true) && $subject instanceof AbstractElement)
+                || ($subject instanceof Person && in_array($attribute, [self::SHOW, self::CREATE], true));
+    }
+
+    protected function voteOnAttribute($attribute, $subject, \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $token)
+    {
+        $user = $token->getUser();
+
+        if (false === $user instanceof User) {
+            return false;
+        }
+
+        return $this->authorizationHelper
+            ->userHasAccess($user, $subject, new Role($attribute));
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Templating/Twig.php b/src/Bundle/ChillBudgetBundle/Templating/Twig.php
index f20d4cf84..b477e9a14 100644
--- a/src/Bundle/ChillBudgetBundle/Templating/Twig.php
+++ b/src/Bundle/ChillBudgetBundle/Templating/Twig.php
@@ -1,65 +1,65 @@
 <?php
-/*
- * 
- */
-namespace Chill\AMLI\BudgetBundle\Templating;
-
-use Twig\Extension\AbstractExtension;
-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Twig\TwigFilter;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\BudgetBundle\Templating;
+
+use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use UnexpectedValueException;
+
 class Twig extends AbstractExtension
 {
     /**
-     *
      * @var ConfigRepository
      */
     protected $configRepository;
-    
+
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     public function __construct(
-        ConfigRepository $configRepository, 
+        ConfigRepository $configRepository,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('budget_element_type_display', [ $this, 'displayLink' ], [ 'is_safe' => [ 'html' ]])
-        ];
-    }
-    
     public function displayLink($link, $family)
     {
-        switch($family) {
+        switch ($family) {
             case 'resource':
                 return $this->translatableStringHelper->localize(
                     $this->configRepository->getResourcesLabels()[$link]
-                    );
+                );
+
             case 'charge':
                 return $this->translatableStringHelper->localize(
                     $this->configRepository->getChargesLabels()[$link]
-                    );
+                );
+
             default:
-                throw new \UnexpectedValueException("This family of element: $family is not "
+                throw new UnexpectedValueException("This family of element: {$family} is not "
                     . "supported. Supported families are 'resource', 'charge'");
         }
-
     }
 
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('budget_element_type_display', [$this, 'displayLink'], ['is_safe' => ['html']]),
+        ];
+    }
 }
diff --git a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
index b672d51ef..b82539150 100644
--- a/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
+++ b/src/Bundle/ChillBudgetBundle/Tests/Controller/ElementControllerTest.php
@@ -1,23 +1,35 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\BudgetBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ElementControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ElementControllerTest extends WebTestCase
 {
-    public function testList()
-    {
-        $client = static::createClient();
-
-        $crawler = $client->request('GET', '/list');
-    }
-
     public function testIndex()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         $crawler = $client->request('GET', '/index');
     }
 
+    public function testList()
+    {
+        $client = self::createClient();
+
+        $crawler = $client->request('GET', '/list');
+    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
index cfbfa5b38..11b985224 100644
--- a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
+++ b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
index 1c81df4a3..70cf34cd4 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
@@ -1,34 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 
-
 class CalendarAPIController extends ApiController
 {
-
-
-    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
-    {
-        switch($action) {
-            case '_index':
-                switch ($request->getMethod()) {
-                    case Request::METHOD_GET:
-                        return [ 'groups' => [ 'calendar:read' ] ];
-                }
-        }
-        return parent::getContextForSerialization($action, $request, $_format, $entity);
-    }
-
     protected function customizeQuery(string $action, Request $request, $qb): void
     {
         if ($request->query->has('main_user')) {
-
             $qb->where('e.mainUser = :main_user')
-               ->setParameter('main_user', $request->query->get('main_user'));
+                ->setParameter('main_user', $request->query->get('main_user'));
         }
     }
 
+    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
+    {
+        switch ($action) {
+            case '_index':
+                switch ($request->getMethod()) {
+                    case Request::METHOD_GET:
+                        return ['groups' => ['calendar:read']];
+                }
+        }
+
+        return parent::getContextForSerialization($action, $request, $_format, $entity);
+    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index a62963e07..68640f3f4 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -1,64 +1,49 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Controller;
 
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Form;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Symfony\Component\Serializer\SerializerInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Exception;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\SerializerInterface;
 
-/**
- * Class CalendarController
- *
- * @package Chill\CalendarBundle\Controller
- */
 class CalendarController extends AbstractController
 {
-    protected EventDispatcherInterface $eventDispatcher;
-
     protected AuthorizationHelper $authorizationHelper;
 
+    protected EventDispatcherInterface $eventDispatcher;
+
     protected LoggerInterface $logger;
 
-    protected SerializerInterface $serializer;
-
     protected PaginatorFactory $paginator;
 
+    protected SerializerInterface $serializer;
+
     private CalendarRepository $calendarRepository;
 
     public function __construct(
@@ -77,8 +62,129 @@ class CalendarController extends AbstractController
         $this->calendarRepository = $calendarRepository;
     }
 
+    /**
+     * Delete a calendar item.
+     *
+     * @Route("/{_locale}/calendar/{id}/delete", name="chill_calendar_calendar_delete")
+     */
+    public function deleteAction(Request $request, int $id)
+    {
+        $view = null;
+        $em = $this->getDoctrine()->getManager();
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = '@ChillCalendar/Calendar/confirm_deleteByAccompanyingCourse.html.twig';
+        } elseif ($user instanceof User) {
+            $view = '@ChillCalendar/Calendar/confirm_deleteByUser.html.twig';
+        }
+
+        /** @var Calendar $entity */
+        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Calendar entity.');
+        }
+
+        $form = $this->createDeleteForm($id, $user, $accompanyingPeriod);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->logger->notice('A calendar event has been removed', [
+                    'by_user' => $this->getUser()->getUsername(),
+                    'calendar_id' => $entity->getId(),
+                ]);
+
+                $em->remove($entity);
+                $em->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                    ->trans('The calendar item has been successfully removed.'));
+
+                $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+
+                return $this->redirectToRoute('chill_calendar_calendar_list', $params);
+            }
+        }
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+            'calendar' => $entity,
+            'delete_form' => $form->createView(),
+            'accompanyingCourse' => $accompanyingPeriod,
+        ]);
+    }
+
+    /**
+     * Edit a calendar item.
+     *
+     * @Route("/{_locale}/calendar/calendar/{id}/edit", name="chill_calendar_calendar_edit")
+     */
+    public function editAction(int $id, Request $request): Response
+    {
+        $view = null;
+        $em = $this->getDoctrine()->getManager();
+
+        [$user, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = '@ChillCalendar/Calendar/editByAccompanyingCourse.html.twig';
+        } elseif ($user instanceof User) {
+            $view = '@ChillCalendar/Calendar/editByUser.html.twig';
+        }
+
+        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Calendar entity.');
+        }
+
+        $form = $this->createForm(CalendarType::class, $entity, [
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em->persist($entity);
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
+
+            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
+
+            return $this->redirectToRoute('chill_calendar_calendar_list', $params);
+        }
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
+        }
+
+        $deleteForm = $this->createDeleteForm($id, $user, $accompanyingPeriod);
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+
+        return $this->render($view, [
+            'entity' => $entity,
+            'form' => $form->createView(),
+            'delete_form' => $deleteForm->createView(),
+            'accompanyingCourse' => $accompanyingPeriod,
+            'user' => $user,
+            'entity_json' => $entity_array,
+        ]);
+    }
+
     /**
      * Lists all Calendar entities.
+     *
      * @Route("/{_locale}/calendar/calendar/", name="chill_calendar_calendar_list")
      */
     public function listAction(Request $request): Response
@@ -88,18 +194,17 @@ class CalendarController extends AbstractController
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($user instanceof User) {
-
             $calendarItems = $this->calendarRepository->findByUser($user);
 
             $view = '@ChillCalendar/Calendar/listByUser.html.twig';
 
             return $this->render($view, [
                 'calendarItems' => $calendarItems,
-                'user' => $user
+                'user' => $user,
             ]);
+        }
 
-        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
             $paginator = $this->paginator->create($total);
             $calendarItems = $this->calendarRepository->findBy(
@@ -114,24 +219,28 @@ class CalendarController extends AbstractController
             return $this->render($view, [
                 'calendarItems' => $calendarItems,
                 'accompanyingCourse' => $accompanyingPeriod,
-                'paginator' => $paginator
+                'paginator' => $paginator,
             ]);
         }
+
+        throw new Exception('Unable to list actions.');
     }
 
     /**
-     * Create a new calendar item
+     * Create a new calendar item.
+     *
      * @Route("/{_locale}/calendar/calendar/new", name="chill_calendar_calendar_new")
      */
     public function newAction(Request $request): Response
     {
+        $view = null;
         $em = $this->getDoctrine()->getManager();
 
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = '@ChillCalendar/Calendar/newByAccompanyingCourse.html.twig';
-        } 
+        }
         // elseif ($user instanceof User) {
         //     $view = '@ChillCalendar/Calendar/newUser.html.twig';
         // }
@@ -161,72 +270,78 @@ class CalendarController extends AbstractController
             $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
 
             return $this->redirectToRoute('chill_calendar_calendar_list', $params);
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
+        }
+
+        if ($form->isSubmitted() && !$form->isValid()) {
             $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
         }
 
-
-        if ($view === null) {
+        if (null === $view) {
             throw $this->createNotFoundException('Template not found');
         }
 
         $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-        
+
         return $this->render($view, [
             'user' => $user,
             'accompanyingCourse' => $accompanyingPeriod,
             'entity' => $entity,
             'form' => $form->createView(),
-            'entity_json' => $entity_array
+            'entity_json' => $entity_array,
         ]);
     }
 
     /**
-     * Show a calendar item
+     * Show a calendar item.
+     *
      * @Route("/{_locale}/calendar/calendar/{id}/show", name="chill_calendar_calendar_show")
      */
-    public function showAction(Request $request, $id): Response
+    public function showAction(Request $request, int $id): Response
     {
+        $view = null;
         $em = $this->getDoctrine()->getManager();
 
         [$user, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = '@ChillCalendar/Calendar/showByAccompanyingCourse.html.twig';
-        } 
-        elseif ($user instanceof User) {
+        } elseif ($user instanceof User) {
             $view = '@ChillCalendar/Calendar/showByUser.html.twig';
         }
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        /** @var Calendar $entity */
         $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
 
-        if (!$entity) {
+        if (null === $entity) {
             throw $this->createNotFoundException('Unable to find Calendar entity.');
         }
-        
+
         if (null !== $accompanyingPeriod) {
-           $entity->personsAssociated = $entity->getPersonsAssociated();
-           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
+            // @TODO: These properties are declared dynamically.
+            // It must be removed.
+            // @See https://wiki.php.net/rfc/deprecate_dynamic_properties
+            $entity->personsAssociated = $entity->getPersonsAssociated();
+            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
         }
 
         // $deleteForm = $this->createDeleteForm($id, $accompanyingPeriod);
 
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
+        $personsId = array_map(
+            static fn (Person $p): int => $p->getId(),
+            $entity->getPersons()->toArray()
+        );
 
-        $personsId = [];
-        foreach ($entity->getPersons() as $p) {
-            array_push($personsId, $p->getId());
-        }
-
-        $professionalsId = [];
-        foreach ($entity->getProfessionals() as $p) {
-            array_push($professionalsId, $p->getId());
-        }
+        $professionalsId = array_map(
+            static fn (ThirdParty $thirdParty): ?int => $thirdParty->getId(),
+            $entity->getProfessionals()->toArray()
+        );
 
         $durationTime = $entity->getEndDate()->diff($entity->getStartDate());
-        $durationTimeInMinutes = $durationTime->days*1440 + $durationTime->h*60 + $durationTime->i;
+        $durationTimeInMinutes = $durationTime->days * 1440 + $durationTime->h * 60 + $durationTime->i;
 
         $activityData = [
             'calendarId' => $id,
@@ -240,134 +355,32 @@ class CalendarController extends AbstractController
 
         return $this->render($view, [
             'accompanyingCourse' => $accompanyingPeriod,
-            'entity'      => $entity,
+            'entity' => $entity,
             'user' => $user,
-            'activityData' => $activityData
+            'activityData' => $activityData,
             //'delete_form' => $deleteForm->createView(),
         ]);
     }
 
-
-
-     /**
-     * Edit a calendar item
-     * @Route("/{_locale}/calendar/calendar/{id}/edit", name="chill_calendar_calendar_edit")
-     */
-    public function editAction($id, Request $request): Response
+    private function buildParamsToUrl(?User $user, ?AccompanyingPeriod $accompanyingPeriod): array
     {
-        $em = $this->getDoctrine()->getManager();
+        $params = [];
 
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillCalendar/Calendar/editByAccompanyingCourse.html.twig';
-        }
-         elseif ($user instanceof User) {
-            $view = '@ChillCalendar/Calendar/editByUser.html.twig';
+        if (null !== $user) {
+            $params['user_id'] = $user->getId();
         }
 
-        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Calendar entity.');
+        if (null !== $accompanyingPeriod) {
+            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
         }
 
-        $form = $this->createForm(CalendarType::class, $entity, [
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em->persist($entity);
-            $em->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
-
-            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-            return $this->redirectToRoute('chill_calendar_calendar_list', $params);
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
-        }
-
-        $deleteForm = $this->createDeleteForm($id, $user, $accompanyingPeriod);
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-        
-        return $this->render($view, [
-            'entity' => $entity,
-            'form' => $form->createView(),
-            'delete_form' => $deleteForm->createView(),
-            'accompanyingCourse' => $accompanyingPeriod,
-            'user' => $user,
-            'entity_json' => $entity_array
-        ]);
-    }
-
-     /**
-     * Delete a calendar item
-     * @Route("/{_locale}/calendar/{id}/delete", name="chill_calendar_calendar_delete")
-     */
-    public function deleteAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillCalendar/Calendar/confirm_deleteByAccompanyingCourse.html.twig';
-        } 
-        elseif ($user instanceof User) {
-            $view = '@ChillCalendar/Calendar/confirm_deleteByUser.html.twig';
-        }
-
-        /* @var $entity Calendar */
-        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Calendar entity.');
-        }
-
-        $form = $this->createDeleteForm($id, $user, $accompanyingPeriod);
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-
-                $this->logger->notice("A calendar event has been removed", [
-                   'by_user' => $this->getUser()->getUsername(),
-                   'calendar_id' => $entity->getId()
-                ]);
-
-                $em->remove($entity);
-                $em->flush();
-
-                $this->addFlash('success', $this->get('translator')
-                      ->trans("The calendar item has been successfully removed."));
-
-                $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-                return $this->redirectToRoute('chill_calendar_calendar_list', $params);
-            }
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-           'calendar' => $entity,
-           'delete_form' => $form->createView(),
-           'accompanyingCourse' => $accompanyingPeriod,
-        ]);
+        return $params;
     }
 
     /**
      * Creates a form to delete a Calendar entity by id.
      */
-    private function createDeleteForm(int $id, ?User $user, ?AccompanyingPeriod $accompanyingPeriod): Form
+    private function createDeleteForm(int $id, ?User $user, ?AccompanyingPeriod $accompanyingPeriod): FormInterface
     {
         $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
         $params['id'] = $id;
@@ -376,8 +389,7 @@ class CalendarController extends AbstractController
             ->setAction($this->generateUrl('chill_calendar_calendar_delete', $params))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm()
-        ;
+            ->getForm();
     }
 
     private function getEntity(Request $request): array
@@ -389,7 +401,7 @@ class CalendarController extends AbstractController
             $user_id = $request->get('user_id');
             $user = $em->getRepository(User::class)->find($user_id);
 
-            if ($user === null) {
+            if (null === $user) {
                 throw $this->createNotFoundException('User not found');
             }
 
@@ -399,35 +411,18 @@ class CalendarController extends AbstractController
             $accompanying_period_id = $request->get('accompanying_period_id');
             $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
 
-            if ($accompanyingPeriod === null) {
+            if (null === $accompanyingPeriod) {
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
             // TODO Add permission
             // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
-            throw $this->createNotFoundException("Person or Accompanying Period not found");
+            throw $this->createNotFoundException('Person or Accompanying Period not found');
         }
 
         return [
-            $user, $accompanyingPeriod
+            $user, $accompanyingPeriod,
         ];
     }
-
-    private function buildParamsToUrl(
-        ?User $user,
-        ?AccompanyingPeriod $accompanyingPeriod
-    ): array {
-        $params = [];
-
-        if ($user) {
-            $params['user_id'] = $user->getId();
-        }
-
-        if ($accompanyingPeriod) {
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
-        }
-
-        return $params;
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
index 672e9527c..f62323a29 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php
@@ -1,18 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use Chill\MainBundle\Serializer\Model\Collection;
+use Symfony\Component\Routing\Annotation\Route;
+use function count;
 
 class CalendarRangeAPIController extends ApiController
 {
-
     /**
      * @Route("/api/1.0/calendar/calendar-range-available.{_format}", name="chill_api_single_calendar_range_available")
      */
@@ -20,7 +27,7 @@ class CalendarRangeAPIController extends ApiController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $sql = 'SELECT c FROM ChillCalendarBundle:CalendarRange c 
+        $sql = 'SELECT c FROM ChillCalendarBundle:CalendarRange c
         WHERE NOT EXISTS (SELECT cal.id FROM ChillCalendarBundle:Calendar cal WHERE cal.calendarRange = c.id)';
 
         if ($request->query->has('user')) {
@@ -34,8 +41,7 @@ class CalendarRangeAPIController extends ApiController
 
         $results = $query->getResult();
 
-        return $this->json(['count' => count($results), 'results' => $results], Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]);
+        return $this->json(['count' => count($results), 'results' => $results], Response::HTTP_OK, [], ['groups' => ['read']]);
         //TODO use also the paginator, eg return $this->serializeCollection('get', $request, $_format, $paginator, $results);
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
index 0bf19418f..e708672a9 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php
@@ -1,30 +1,34 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
-use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepository;
 use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 
-
 class LoadCalendarRange extends Fixture implements FixtureGroupInterface, OrderedFixtureInterface
 {
+    public static array $references = [];
+
+    private UserRepository $userRepository;
 
     public function __construct(
-        EntityManagerInterface $em
+        UserRepository $userRepository
     ) {
-        $this->userRepository = $em->getRepository(User::class);
-    }
-
-    public function getOrder(): int
-    {
-        return 40003;
+        $this->userRepository = $userRepository;
     }
 
     public static function getGroups(): array
@@ -32,13 +36,16 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
         return ['calendar'];
     }
 
-    public static $references = [];
+    public function getOrder(): int
+    {
+        return 40003;
+    }
 
     public function load(ObjectManager $manager): void
     {
         $arr = range(-50, 50);
-        
-        print "Creating calendar range ('plage de disponibilités')\n";
+
+        echo "Creating calendar range ('plage de disponibilités')\n";
 
         $users = $this->userRepository->findAll();
 
@@ -57,26 +64,24 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere
             '10:00:00',
             '11:30:00',
             '13:30:00',
-            '15:00:00'
+            '15:00:00',
         ];
 
         foreach ($users as $u) {
             foreach ($days as $d) {
-                foreach ($hours as $h){
-                    $event = $d.' '.$h;
+                foreach ($hours as $h) {
+                    $event = $d . ' ' . $h;
                     $startEvent = new DateTimeImmutable($event);
-                    $endEvent = new DateTimeImmutable($event.' + 1 hours');
-                    $calendarRange= (new CalendarRange())
+                    $endEvent = new DateTimeImmutable($event . ' + 1 hours');
+                    $calendarRange = (new CalendarRange())
                         ->setUser($u)
                         ->setStartDate($startEvent)
                         ->setEndDate($endEvent);
-        
+
                     $manager->persist($calendarRange);
                 }
-
             }
-
         }
         $manager->flush();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index 370b08f07..fca57288e 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\CancelReason;
@@ -7,20 +16,19 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 
-
 class LoadCancelReason extends Fixture implements FixtureGroupInterface
 {
-    public function getOrder(): int
-    {
-        return 40001;
-    }
+    public static $references = [];
 
     public static function getGroups(): array
     {
         return ['calendar'];
     }
 
-    public static $references = [];
+    public function getOrder(): int
+    {
+        return 40001;
+    }
 
     public function load(ObjectManager $manager): void
     {
@@ -31,12 +39,12 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($arr as $a) {
-            print "Creating calendar cancel reason : " . $a['name'] . "\n";
-            $cancelReason= (new CancelReason())
+            echo 'Creating calendar cancel reason : ' . $a['name'] . "\n";
+            $cancelReason = (new CancelReason())
                 ->setCanceledBy($a['name'])
                 ->setActive(true);
             $manager->persist($cancelReason);
-            $reference = 'CancelReason_'.$a['name'];
+            $reference = 'CancelReason_' . $a['name'];
             $this->addReference($reference, $cancelReason);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
index 9c265b3ac..77519d773 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\DataFixtures\ORM;
 
 use Chill\CalendarBundle\Entity\Invite;
@@ -7,20 +16,19 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 
-
 class LoadInvite extends Fixture implements FixtureGroupInterface
 {
-    public function getOrder(): int
-    {
-        return 40002;
-    }
+    public static $references = [];
 
     public static function getGroups(): array
     {
         return ['calendar'];
     }
 
-    public static $references = [];
+    public function getOrder(): int
+    {
+        return 40002;
+    }
 
     public function load(ObjectManager $manager): void
     {
@@ -30,11 +38,11 @@ class LoadInvite extends Fixture implements FixtureGroupInterface
         ];
 
         foreach ($arr as $a) {
-            print "Creating calendar invite : " . $a['name']['fr'] . "\n";
-            $invite= (new Invite())
+            echo 'Creating calendar invite : ' . $a['name']['fr'] . "\n";
+            $invite = (new Invite())
                 ->setStatus($a['name']);
             $manager->persist($invite);
-            $reference = 'Invite_'.$a['name']['fr'];
+            $reference = 'Invite_' . $a['name']['fr'];
             $this->addReference($reference, $invite);
             static::$references[] = $reference;
         }
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index eaa8a1416..d0a5c3d94 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -1,30 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillCalendarExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
         $loader->load('services/controller.yml');
         $loader->load('services/fixtures.yml');
@@ -37,22 +43,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
         $this->preprendRoutes($container);
         $this->prependCruds($container);
     }
-    
-    protected function preprendRoutes(ContainerBuilder $container)
-    {
 
-        $container->prependExtensionConfig('chill_main', [
-           'routing' => [
-              'resources' => [
-                 '@ChillCalendarBundle/Resources/config/routing.yml'
-              ]
-           ]
-        ]);
-    }
-    
-    /**
-     * @param ContainerBuilder $container
-     */
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
@@ -77,9 +68,9 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
                                 Request::METHOD_POST => true,
                                 Request::METHOD_PATCH => true,
                                 Request::METHOD_DELETE => true,
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'controller' => \Chill\CalendarBundle\Controller\CalendarAPIController::class,
@@ -91,20 +82,29 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
-                            ]
+                                Request::METHOD_HEAD => true,
+                            ],
                         ],
-                    ]
-                ]
-            ]
+                    ],
+                ],
+            ],
         ]);
     }
 
-
+    protected function preprendRoutes(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillCalendarBundle/Resources/config/routing.yml',
+                ],
+            ],
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
index 40524b53e..f1e744cb8 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -12,9 +21,6 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_calendar');
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index b5314f02b..d026b399c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -1,28 +1,34 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Entity;
 
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Location;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\CalendarBundle\Entity\CancelReason;
-use Chill\CalendarBundle\Entity\CalendarRange;
-use Chill\CalendarBundle\Entity\Invite;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\CalendarBundle\Repository\CalendarRepository;
-use DateInterval;
 use DateTimeImmutable;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Serializer\Annotation as Serializer;
+use function in_array;
 
 /**
  * @ORM\Table(name="chill_calendar.calendar")
@@ -30,67 +36,32 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  */
 class Calendar
 {
-    const STATUS_VALID = 'valid';
-    const STATUS_CANCELED = 'canceled';
-    const STATUS_MOVED = 'moved';
+    public const STATUS_CANCELED = 'canceled';
 
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"calendar:read"})
-     */
-    private ?int $id;
+    public const STATUS_MOVED = 'moved';
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"read"})
-     * @Serializer\Groups({"calendar:read"})
-     */
-    private ?User $user = null;
+    public const STATUS_VALID = 'valid';
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     * @Groups({"read"})
      */
     private AccompanyingPeriod $accompanyingPeriod;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @Serializer\Groups({"calendar:read"})
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\Activity")
      */
-    private ?User $mainUser;
+    private ?Activity $activity = null;
 
     /**
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\PersonBundle\Entity\Person",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
-     * @Groups({"read"})
-     * @Serializer\Groups({"calendar:read"})
+     * @ORM\ManyToOne(targetEntity="CalendarRange", inversedBy="calendars")
      */
-    private Collection $persons;
+    private ?CalendarRange $calendarRange = null;
 
     /**
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
-     * @Groups({"read"})
-     * @Serializer\Groups({"calendar:read"})
+     * @ORM\ManyToOne(targetEntity="CancelReason")
      */
-    private Collection $professionals;
-
-    /**
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Invite",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
-     * @Groups({"read"})
-     */
-    private Collection $invites;
+    private ?CancelReason $cancelReason = null;
 
     /**
      * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
@@ -102,40 +73,24 @@ class Calendar
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
      */
-    private ?\DateTimeImmutable $startDate = null;
+    private ?DateTimeImmutable $endDate = null;
 
     /**
-     * @ORM\Column(type="datetimetz_immutable")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
      * @Serializer\Groups({"calendar:read"})
      */
-    private ?\DateTimeImmutable $endDate = null;
-
-    //TODO Lieu
+    private ?int $id;
 
     /**
-     * @ORM\Column(type="string", length=255)
+     * @ORM\ManyToMany(
+     *     targetEntity="Invite",
+     * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
+     * @Groups({"read"})
      */
-    private ?string $status = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="CancelReason")
-     */
-    private ?CancelReason $cancelReason = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="CalendarRange", inversedBy="calendars")
-     */
-    private ?CalendarRange $calendarRange = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\Activity")
-     */
-    private ?Activity $activity = null;
-
-    /**
-     * @ORM\Column(type="boolean", nullable=true)
-     */
-    private ?bool $sendSMS;
+    private Collection $invites;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
@@ -143,6 +98,54 @@ class Calendar
      */
     private ?Location $location = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private ?User $mainUser;
+
+    /**
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\PersonBundle\Entity\Person",
+     * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
+     * @Groups({"read"})
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private Collection $persons;
+
+    /**
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty",
+     * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
+     * @Groups({"read"})
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private Collection $professionals;
+
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     */
+    private ?bool $sendSMS;
+
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
+    private ?string $status = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @Groups({"read"})
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private ?User $user = null;
 
     public function __construct()
     {
@@ -152,164 +155,6 @@ class Calendar
         $this->invites = new ArrayCollection();
     }
 
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getSendSMS(): ?bool
-    {
-        return $this->sendSMS;
-    }
-
-    public function setSendSMS(?bool $sendSMS): self
-    {
-        $this->sendSMS = $sendSMS;
-
-        return $this;
-    }
-
-    public function getComment(): CommentEmbeddable
-    {
-        return $this->comment;
-    }
-
-    public function setComment(CommentEmbeddable $comment): self
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    public function getStartDate(): ?\DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    public function setStartDate(\DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(\DateTimeImmutable $endDate): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
-
-    public function getStatus(): ?string
-    {
-        return $this->status;
-    }
-
-    public function setStatus(string $status): self
-    {
-        $this->status = $status;
-
-        return $this;
-    }
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function setUser(?User $user): self
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    public function getAccompanyingPeriod(): ?AccompanyingPeriod
-    {
-        return $this->accompanyingPeriod;
-    }
-
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
-    {
-        $this->accompanyingPeriod = $accompanyingPeriod;
-
-        return $this;
-    }
-
-    public function getMainUser(): ?User
-    {
-        return $this->mainUser;
-    }
-
-    public function setMainUser(?User $mainUser): self
-    {
-        $this->mainUser = $mainUser;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|Person[]
-     */
-    public function getPersons(): Collection
-    {
-        return $this->persons;
-    }
-
-    public function addPerson(?Person $person): self
-    {
-        if (null !== $person) {
-            $this->persons[] = $person;
-        }
-
-        return $this;
-    }
-
-    public function removePerson(Person $person): self
-    {
-        $this->persons->removeElement($person);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|ThirdParty[]
-     */
-    public function getProfessionals(): Collection
-    {
-        return $this->professionals;
-    }
-
-    public function addProfessional(?ThirdParty $professional): self
-    {
-        if (null !== $professional) {
-            $this->professionals[] = $professional;
-        }
-
-        return $this;
-    }
-
-    public function removeProfessional(ThirdParty $professional): self
-    {
-        $this->professionals->removeElement($professional);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|Invite[]
-     */
-    public function getInvites(): Collection
-    {
-        return $this->invites;
-    }
-
     public function addInvite(?Invite $invite): self
     {
         if (null !== $invite) {
@@ -319,35 +164,27 @@ class Calendar
         return $this;
     }
 
-    public function removeInvite(Invite $invite): self
+    public function addPerson(?Person $person): self
     {
-        $this->invites->removeElement($invite);
+        if (null !== $person) {
+            $this->persons[] = $person;
+        }
 
         return $this;
     }
 
-    public function getCancelReason(): ?CancelReason
+    public function addProfessional(?ThirdParty $professional): self
     {
-        return $this->cancelReason;
-    }
-
-    public function setCancelReason(?CancelReason $cancelReason): self
-    {
-        $this->cancelReason = $cancelReason;
+        if (null !== $professional) {
+            $this->professionals[] = $professional;
+        }
 
         return $this;
     }
 
-    public function getCalendarRange(): ?CalendarRange
+    public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
-        return $this->calendarRange;
-    }
-
-    public function setCalendarRange(?CalendarRange $calendarRange): self
-    {
-        $this->calendarRange = $calendarRange;
-
-        return $this;
+        return $this->accompanyingPeriod;
     }
 
     public function getActivity(): ?Activity
@@ -355,24 +192,71 @@ class Calendar
         return $this->activity;
     }
 
-    public function setActivity(?Activity $activity): self
+    public function getCalendarRange(): ?CalendarRange
     {
-        $this->activity = $activity;
+        return $this->calendarRange;
+    }
 
-        return $this;
+    public function getCancelReason(): ?CancelReason
+    {
+        return $this->cancelReason;
+    }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Collection|Invite[]
+     */
+    public function getInvites(): Collection
+    {
+        return $this->invites;
+    }
+
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    public function getMainUser(): ?User
+    {
+        return $this->mainUser;
+    }
+
+    /**
+     * @return Collection|Person[]
+     */
+    public function getPersons(): Collection
+    {
+        return $this->persons;
     }
 
     public function getPersonsAssociated(): array
     {
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
+
             foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
                 if ($this->persons->contains($participation->getPerson())) {
                     $personsAssociated[] = $participation->getPerson();
                 }
             }
+
             return $personsAssociated;
         }
+
         return [];
     }
 
@@ -380,22 +264,52 @@ class Calendar
     {
         if (null !== $this->accompanyingPeriod) {
             $personsNotAssociated = [];
+
             foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated())) {
-                     $personsNotAssociated[] = $person;
+                if (!in_array($person, $this->getPersonsAssociated(), true)) {
+                    $personsNotAssociated[] = $person;
                 }
             }
+
             return $personsNotAssociated;
         }
+
         return [];
     }
 
+    /**
+     * @return Collection|ThirdParty[]
+     */
+    public function getProfessionals(): Collection
+    {
+        return $this->professionals;
+    }
+
+    public function getSendSMS(): ?bool
+    {
+        return $this->sendSMS;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getStatus(): ?string
+    {
+        return $this->status;
+    }
 
     public function getThirdParties(): Collection
     {
         return $this->getProfessionals();
     }
 
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
     public function getusers(): Collection
     {
         return $this->getInvites(); //TODO get users of the invite
@@ -415,22 +329,108 @@ class Calendar
         ]));
     }
 
-    /**
-     * @return Location|null
-     */
-    public function getLocation(): ?Location
+    public function removeInvite(Invite $invite): self
     {
-        return $this->location;
-    }
+        $this->invites->removeElement($invite);
 
-    /**
-     * @param Location|null $location
-     * @return Calendar
-     */
-    public function setLocation(?Location $location): Calendar
-    {
-        $this->location = $location;
         return $this;
     }
 
+    public function removePerson(Person $person): self
+    {
+        $this->persons->removeElement($person);
+
+        return $this;
+    }
+
+    public function removeProfessional(ThirdParty $professional): self
+    {
+        $this->professionals->removeElement($professional);
+
+        return $this;
+    }
+
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    {
+        $this->accompanyingPeriod = $accompanyingPeriod;
+
+        return $this;
+    }
+
+    public function setActivity(?Activity $activity): self
+    {
+        $this->activity = $activity;
+
+        return $this;
+    }
+
+    public function setCalendarRange(?CalendarRange $calendarRange): self
+    {
+        $this->calendarRange = $calendarRange;
+
+        return $this;
+    }
+
+    public function setCancelReason(?CancelReason $cancelReason): self
+    {
+        $this->cancelReason = $cancelReason;
+
+        return $this;
+    }
+
+    public function setComment(CommentEmbeddable $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setEndDate(DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setLocation(?Location $location): Calendar
+    {
+        $this->location = $location;
+
+        return $this;
+    }
+
+    public function setMainUser(?User $mainUser): self
+    {
+        $this->mainUser = $mainUser;
+
+        return $this;
+    }
+
+    public function setSendSMS(?bool $sendSMS): self
+    {
+        $this->sendSMS = $sendSMS;
+
+        return $this;
+    }
+
+    public function setStartDate(DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function setStatus(string $status): self
+    {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    public function setUser(?User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index 312e4bb41..b29a9db08 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -1,9 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Entity;
 
 use Chill\CalendarBundle\Repository\CalendarRangeRepository;
 use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -15,6 +25,18 @@ use Symfony\Component\Serializer\Annotation\Groups;
  */
 class CalendarRange
 {
+    /**
+     * @ORM\OneToMany(targetEntity=Calendar::class,
+     * mappedBy="calendarRange")
+     */
+    private Collection $calendars;
+
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @groups({"read", "write"})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -23,30 +45,18 @@ class CalendarRange
      */
     private $id;
 
+    /**
+     * @ORM\Column(type="datetimetz_immutable")
+     * @groups({"read", "write"})
+     */
+    private ?DateTimeImmutable $startDate = null;
+
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      * @groups({"read", "write"})
      */
     private ?User $user = null;
 
-    /**
-     * @ORM\Column(type="datetimetz_immutable")
-     * @groups({"read", "write"})
-     */
-    private ?\DateTimeImmutable $startDate = null;
-
-    /**
-     * @ORM\Column(type="datetimetz_immutable")
-     * @groups({"read", "write"})
-     */
-    private ?\DateTimeImmutable $endDate = null;
-
-    /**
-     * @ORM\OneToMany(targetEntity=Calendar::class,
-     *  mappedBy="calendarRange")
-     */
-    private Collection $calendars;
-
     //TODO Lieu
 
     public function __construct()
@@ -54,38 +64,38 @@ class CalendarRange
         $this->calendars = new ArrayCollection();
     }
 
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getStartDate(): ?\DateTimeImmutable
+    public function getStartDate(): ?DateTimeImmutable
     {
         return $this->startDate;
     }
 
-    public function setStartDate(\DateTimeImmutable $startDate): self
+    public function getUser(): ?User
     {
-        $this->startDate = $startDate;
-
-        return $this;
+        return $this->user;
     }
 
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(\DateTimeImmutable $endDate): self
+    public function setEndDate(DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
 
         return $this;
     }
 
-    public function getUser(): ?User
+    public function setStartDate(DateTimeImmutable $startDate): self
     {
-        return $this->user;
+        $this->startDate = $startDate;
+
+        return $this;
     }
 
     public function setUser(?User $user): self
@@ -94,6 +104,4 @@ class CalendarRange
 
         return $this;
     }
-
-
 }
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index ce3d1f6e4..635508671 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Entity;
 
 use Chill\CalendarBundle\Repository\CancelReasonRepository;
@@ -11,17 +20,11 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CancelReason
 {
+    public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
 
-    const CANCELEDBY_USER = 'CANCELEDBY_USER';
-    const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
-    const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+    public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
 
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
+    public const CANCELEDBY_USER = 'CANCELEDBY_USER';
 
     /**
      * @ORM\Column(type="boolean")
@@ -34,18 +37,35 @@ class CancelReason
     private $canceledBy;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="json")
      */
     private $name = [];
 
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
+    public function getCanceledBy(): ?string
+    {
+        return $this->canceledBy;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getActive(): ?bool
+    public function getName(): ?array
     {
-        return $this->active;
+        return $this->name;
     }
 
     public function setActive(bool $active): self
@@ -55,11 +75,6 @@ class CancelReason
         return $this;
     }
 
-    public function getCanceledBy(): ?string
-    {
-        return $this->canceledBy;
-    }
-
     public function setCanceledBy(string $canceledBy): self
     {
         $this->canceledBy = $canceledBy;
@@ -67,11 +82,6 @@ class CancelReason
         return $this;
     }
 
-    public function getName(): ?array
-    {
-        return $this->name;
-    }
-
     public function setName(array $name): self
     {
         $this->name = $name;
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Invite.php b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
index 5baca36ab..464c5485a 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Invite.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Invite.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Entity;
 
 use Chill\CalendarBundle\Repository\InviteRepository;
@@ -19,16 +28,16 @@ class Invite
      */
     private $id;
 
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $status = [];
+
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
     private User $user;
 
-    /**
-     * @ORM\Column(type="json_array")
-     */
-    private array $status = [];
-
     public function getId(): ?int
     {
         return $this->id;
@@ -39,6 +48,11 @@ class Invite
         return $this->status;
     }
 
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
     public function setStatus(array $status): self
     {
         $this->status = $status;
@@ -46,11 +60,6 @@ class Invite
         return $this;
     }
 
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
     public function setUser(?User $user): self
     {
         $this->user = $user;
diff --git a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
index d7073597a..c79cccbf5 100644
--- a/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
+++ b/src/Bundle/ChillCalendarBundle/Event/ListenToActivityCreate.php
@@ -1,14 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Event;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Component\HttpFoundation\RequestStack;
+use function array_key_exists;
 
 class ListenToActivityCreate
 {
-
     private RequestStack $requestStack;
 
     public function __construct(RequestStack $requestStack)
@@ -24,9 +33,10 @@ class ListenToActivityCreate
         if (null === $request) {
             return;
         }
-        
+
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
+
             if (array_key_exists('calendarId', $activityData)) {
                 $calendarId = $activityData['calendarId'];
 
@@ -40,8 +50,5 @@ class ListenToActivityCreate
                 $em->flush();
             }
         }
-
-
-
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index f6e4d2baa..f36c7f07b 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -1,53 +1,56 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Form;
 
-use Chill\MainBundle\Entity\Location;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-
-use Chill\MainBundle\Form\Type\CommentType;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Entity\CancelReason;
 use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
+
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use DateTimeImmutable;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CalendarType extends AbstractType
 {
+    protected ObjectManager $om;
 
     protected TranslatableStringHelper $translatableStringHelper;
-    protected ObjectManager $om;
 
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
         ObjectManager $om
-    )
-    {
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->om = $om;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('comment', CommentType::class, [
-                'required' => false
+                'required' => false,
             ])
             // ->add('cancelReason', EntityType::class, [
             //     'required' => false,
@@ -60,184 +63,176 @@ class CalendarType extends AbstractType
                 'required' => false,
                 'choices' => [
                     'Oui' => true,
-                    'Non' => false
+                    'Non' => false,
                 ],
-                'expanded' => true
-            ])
-            ;
-
+                'expanded' => true,
+            ]);
 
         $builder->add('mainUser', HiddenType::class);
         $builder->get('mainUser')
             ->addModelTransformer(new CallbackTransformer(
-                function (?User $user): int {
-                    if (NULL !== $user) {
+                static function (?User $user): int {
+                    if (null !== $user) {
                         $res = $user->getId();
                     } else {
                         $res = -1; //TODO cannot be null in any ways...
                     }
+
                     return $res;
                 },
                 function (?int $userId): User {
                     return $this->om->getRepository(user::class)->findOneBy(['id' => (int) $userId]);
                 }
-            ))
-        ;
+            ));
 
         $builder->add('startDate', HiddenType::class);
         $builder->get('startDate')
             ->addModelTransformer(new CallbackTransformer(
-                function (?DateTimeImmutable $dateTimeImmutable): string {
-                    if (NULL !== $dateTimeImmutable) {
+                static function (?DateTimeImmutable $dateTimeImmutable): string {
+                    if (null !== $dateTimeImmutable) {
                         $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s');
                     } else {
                         $res = '';
                     }
+
                     return $res;
                 },
-                function (?string $dateAsString): DateTimeImmutable {
+                static function (?string $dateAsString): DateTimeImmutable {
                     dump($dateAsString);
+
                     return new DateTimeImmutable($dateAsString);
                 }
-            ))
-        ;
+            ));
 
         $builder->add('endDate', HiddenType::class);
         $builder->get('endDate')
             ->addModelTransformer(new CallbackTransformer(
-                function (?DateTimeImmutable $dateTimeImmutable): string {
-                    if (NULL !== $dateTimeImmutable) {
+                static function (?DateTimeImmutable $dateTimeImmutable): string {
+                    if (null !== $dateTimeImmutable) {
                         $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s');
                     } else {
                         $res = '';
                     }
+
                     return $res;
                 },
-                function (?string $dateAsString): DateTimeImmutable {
+                static function (?string $dateAsString): DateTimeImmutable {
                     return new DateTimeImmutable($dateAsString);
                 }
-            ))
-        ;
+            ));
 
         $builder->add('persons', HiddenType::class);
         $builder->get('persons')
             ->addModelTransformer(new CallbackTransformer(
-                function (iterable $personsAsIterable): string {
+                static function (iterable $personsAsIterable): string {
                     $personIds = [];
+
                     foreach ($personsAsIterable as $value) {
                         $personIds[] = $value->getId();
                     }
+
                     return implode(',', $personIds);
                 },
                 function (?string $personsAsString): array {
                     return array_map(
-                        fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
+                        fn (string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
                         explode(',', $personsAsString)
                     );
                 }
-            ))
-        ;
+            ));
 
         $builder->add('professionals', HiddenType::class);
         $builder->get('professionals')
             ->addModelTransformer(new CallbackTransformer(
-                function (iterable $thirdpartyAsIterable): string {
+                static function (iterable $thirdpartyAsIterable): string {
                     $thirdpartyIds = [];
+
                     foreach ($thirdpartyAsIterable as $value) {
                         $thirdpartyIds[] = $value->getId();
                     }
+
                     return implode(',', $thirdpartyIds);
                 },
                 function (?string $thirdpartyAsString): array {
                     return array_map(
-                        fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
+                        fn (string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
                         explode(',', $thirdpartyAsString)
                     );
                 }
-            ))
-        ;
+            ));
 
         $builder->add('calendarRange', HiddenType::class);
         $builder->get('calendarRange')
             ->addModelTransformer(new CallbackTransformer(
-                function (?CalendarRange $calendarRange): ?int {
-                    if (NULL !== $calendarRange) {
+                static function (?CalendarRange $calendarRange): ?int {
+                    if (null !== $calendarRange) {
                         $res = $calendarRange->getId();
                     } else {
                         $res = -1;
                     }
+
                     return $res;
                 },
                 function (?string $calendarRangeId): ?CalendarRange {
-                    if (NULL !== $calendarRangeId) {
+                    if (null !== $calendarRangeId) {
                         $res = $this->om->getRepository(CalendarRange::class)->findOneBy(['id' => (int) $calendarRangeId]);
                     } else {
-                        $res = NULL;
+                        $res = null;
                     }
+
                     return $res;
                 }
-            ))
-        ;
+            ));
 
         $builder->add('location', HiddenType::class)
             ->get('location')
             ->addModelTransformer(new CallbackTransformer(
-                function (?Location $location): string {
+                static function (?Location $location): string {
                     if (null === $location) {
                         return '';
                     }
+
                     return $location->getId();
                 },
-                function (?string $id): Location {
+                function (?string $id): ?Location {
                     return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                 }
-            ))
-        ;
+            ));
 
-    //     $builder->add('invites', HiddenType::class);
-    //     $builder->get('invites')
-    //        ->addModelTransformer(new CallbackTransformer(
-    //            function (iterable $usersAsIterable): string {
-    //                $userIds = [];
-    //                foreach ($usersAsIterable as $value) {
-    //                    $userIds[] = $value->getId();
-    //                }
-    //                return implode(',', $userIds);
-    //            },
-    //            function (?string $usersAsString): array {
-    //                return array_map(
-    //                    fn(string $id): ?Invite => $this->om->getRepository(Invite::class)->findOneBy(['id' => (int) $id]),
-    //                    explode(',', $usersAsString)
-    //                );
-    //            }
-    //        ))
-    //    ;
+        $builder->add('invites', HiddenType::class);
+        $builder->get('invites')
+            ->addModelTransformer(new CallbackTransformer(
+                static function (iterable $usersAsIterable): string {
+                    $userIds = [];
 
+                    foreach ($usersAsIterable as $value) {
+                        $userIds[] = $value->getId();
+                    }
+
+                    return implode(',', $userIds);
+                },
+                function (?string $usersAsString): array {
+                    return array_map(
+                        fn (string $id): ?Invite => $this->om->getRepository(Invite::class)->findOneBy(['id' => (int) $id]),
+                        explode(',', $usersAsString)
+                    );
+                }
+            ));
+    }
 
-    }/**
-     * {@inheritdoc}
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => Calendar::class
+            'data_class' => Calendar::class,
         ]);
 
         $resolver
             ->setRequired(['accompanyingPeriod'])
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
-        ;
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'chill_calendarbundle_calendar';
     }
-
-
 }
-
-
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
index 4f0cf7b30..eca770fe0 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
@@ -11,10 +20,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected TokenStorageInterface $tokenStorage;
-
     protected AuthorizationHelper $authorizationHelper;
 
+    protected TokenStorageInterface $tokenStorage;
+
     protected TranslatorInterface $translator;
 
     public function __construct(
@@ -26,10 +35,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
     }
-    public static function getMenuIds(): array
-    {
-        return ['accompanyingCourse'];
-    }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
@@ -40,8 +45,13 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 'route' => 'chill_calendar_calendar_list',
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),
-                ]])
+                ], ])
                 ->setExtras(['order' => 35]);
         }
     }
+
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 14e775234..37526c25e 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -1,60 +1,45 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
 use Chill\TaskBundle\Templating\UI\CountNotificationTask;
+use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
-
-/**
- *
- * @author Champs-Libres
- */
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
 
     /**
-     *
      * @var CountNotificationTask
      */
     public $counter;
 
-    /*
+    /**
      * @var TokenStorageInterface
      */
     public $tokenStorage;
 
     /**
-     *
      * @var TranslatorInterface
      */
     public $translator;
 
-    /**
-     *
-     * @var AuthorizationCheckerInterface
-     */
-    public $authorizationChecker;
-
     public function __construct(
         CountNotificationTask $counter,
         TokenStorageInterface $tokenStorage,
@@ -67,28 +52,23 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationChecker = $authorizationChecker;
     }
 
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $user = $this->tokenStorage->getToken()->getUser();
 
-        if ($this->authorizationChecker->isGranted('ROLE_USER')){
-        $menu->addChild("My calendar list", [
+        if ($this->authorizationChecker->isGranted('ROLE_USER')) {
+            $menu->addChild('My calendar list', [
                 'route' => 'chill_calendar_calendar_list',
-                'routeParameters' => [
-                    'user_id' => $user->getId(),
-                ]
             ])
-            ->setExtras([
-                'order' => 9,
-                'icon' => 'tasks'
-            ]);
+                ->setExtras([
+                    'order' => 9,
+                    'icon' => 'tasks',
+                ]);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'user' ];
+        return ['user'];
     }
-    
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
index 152c0f097..5286c5515 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\CalendarRange;
@@ -34,7 +43,7 @@ class CalendarRangeRepository extends ServiceEntityRepository
             ->getResult()
         ;
     }
-    */
+     */
 
     /*
     public function findOneBySomeField($value): ?CalendarRange
@@ -46,5 +55,5 @@ class CalendarRangeRepository extends ServiceEntityRepository
             ->getOneOrNullResult()
         ;
     }
-    */
+     */
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index b87f4f525..55fba5f80 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -1,9 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Calendar;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -16,13 +24,12 @@ use Doctrine\Persistence\ManagerRegistry;
  */
 class CalendarRepository extends ServiceEntityRepository
 {
-
     // private EntityRepository $repository;
 
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Calendar::class);
-       // $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
+        // $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
 
     // /**
@@ -40,7 +47,7 @@ class CalendarRepository extends ServiceEntityRepository
             ->getResult()
         ;
     }
-    */
+     */
 
     /*
     public function findOneBySomeField($value): ?Calendar
@@ -52,5 +59,5 @@ class CalendarRepository extends ServiceEntityRepository
             ->getOneOrNullResult()
         ;
     }
-    */
+     */
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php
index 5bd07fbd9..47e0bfa44 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\CancelReason;
@@ -34,7 +43,7 @@ class CancelReasonRepository extends ServiceEntityRepository
             ->getResult()
         ;
     }
-    */
+     */
 
     /*
     public function findOneBySomeField($value): ?CancelReason
@@ -46,5 +55,5 @@ class CancelReasonRepository extends ServiceEntityRepository
             ->getOneOrNullResult()
         ;
     }
-    */
+     */
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index ece11269f..53aa8b2a1 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Invite;
@@ -34,7 +43,7 @@ class InviteRepository extends ServiceEntityRepository
             ->getResult()
         ;
     }
-    */
+     */
 
     /*
     public function findOneBySomeField($value): ?Invite
@@ -46,5 +55,5 @@ class InviteRepository extends ServiceEntityRepository
             ->getOneOrNullResult()
         ;
     }
-    */
+     */
 }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
index b4578ea2b..edfb7f236 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js
@@ -1,5 +1,6 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from 'ChillActivityAssets/vuejs/Activity/api';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -28,9 +29,58 @@ const mapEntity = (entity) => {
 const store = createStore({
    strict: debug,
    state: {
-     activity: mapEntity(window.entity),
+     activity: mapEntity(window.entity), // activity is the calendar entity actually
      currentEvent: null
    },
+   getters: {
+      suggestedEntities(state) {
+         if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
+           return [];
+         }
+         const allEntities = [
+           ...store.getters.suggestedPersons,
+           ...store.getters.suggestedRequestor,
+           ...store.getters.suggestedUser,
+           ...store.getters.suggestedResources
+         ];
+         const uniqueIds = [...new Set(allEntities.map(i => `${i.type}-${i.id}`))];
+         return Array.from(uniqueIds, id => allEntities.filter(r => `${r.type}-${r.id}` === id)[0]);
+       },
+       suggestedPersons(state) {
+         const existingPersonIds = state.activity.persons.map(p => p.id);
+         return state.activity.accompanyingPeriod.participations
+           .filter(p => p.endDate === null)
+           .map(p => p.person)
+           .filter(p => !existingPersonIds.includes(p.id))
+       },
+      suggestedRequestor(state) {
+        const existingPersonIds = state.activity.persons.map(p => p.id);
+        const existingThirdPartyIds = state.activity.thirdParties.map(p => p.id);
+        return [state.activity.accompanyingPeriod.requestor]
+          .filter(r =>
+            (r.type === 'person' && !existingPersonIds.includes(r.id)) ||
+            (r.type === 'thirdparty' && !existingThirdPartyIds.includes(r.id))
+          );
+      },
+      suggestedUser(state) {
+        const existingUserIds = state.activity.users.map(p => p.id);
+        return [state.activity.accompanyingPeriod.user]
+          .filter(
+            u => !existingUserIds.includes(u.id)
+          );
+      },
+      suggestedResources(state) {
+        const resources = state.activity.accompanyingPeriod.resources;
+        const existingPersonIds = state.activity.persons.map(p => p.id);
+        const existingThirdPartyIds = state.activity.thirdParties.map(p => p.id);
+        return state.activity.accompanyingPeriod.resources
+          .map(r => r.resource)
+          .filter(r =>
+            (r.type === 'person' && !existingPersonIds.includes(r.id)) ||
+            (r.type === 'thirdparty' && !existingThirdPartyIds.includes(r.id))
+          );
+      }
+   },
    mutations: {
       
       // ConcernedGroups
@@ -139,8 +189,35 @@ const store = createStore({
       updateLocation({ commit }, value) {
          console.log('### action: updateLocation', value);
          let hiddenLocation = document.getElementById("chill_calendarbundle_calendar_location");
-         hiddenLocation.value = value.id;
-         commit('updateLocation', value);
+         if (value.onthefly) {
+             const body = {
+                 "type": "location",
+                 "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                 "locationType": {
+                     "id": value.locationType.id,
+                     "type": "location-type"
+                 }
+             };
+             if (value.address.id) {
+                 Object.assign(body, {
+                     "address": {
+                         "id": value.address.id
+                     },
+                 })
+             }
+             postLocation(body)
+                 .then(
+                     location => hiddenLocation.value = location.id
+                 ).catch(
+                     err => {
+                         console.log(err.message);
+                     }
+                 );
+         } else {
+             hiddenLocation.value = value.id;
+         }
+         commit("updateLocation", value);
+
       }
 
   }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index 5dfde6fc3..7c59996d2 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -41,8 +41,8 @@
     <dd>
         {% if entity.location is not null %}
             <p>
-                <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
                 {{ entity.location.name }}
+                <span> ({{ entity.location.locationType.title|localize_translatable_string }})</span>
             </p>
             {{ entity.location.address|chill_entity_render_box }}
         {% else %}
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
index 00fca668a..06e0cd5a9 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php
@@ -1,47 +1,58 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CalendarBundle\Tests\Controller;
 
-use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use function random_int;
 
-class CalendarControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CalendarControllerTest extends WebTestCase
 {
-
     /**
-     * Setup before each test method (see phpunit doc)
+     * Setup before each test method (see phpunit doc).
      */
     public function setUp()
     {
-        static::bootKernel();
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        self::bootKernel();
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
 
     public function provideAccompanyingPeriod(): iterable
     {
-        static::bootKernel();
-        $em= static::$container->get(EntityManagerInterface::class);
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
 
         $nb = $em->createQueryBuilder()
             ->from(AccompanyingPeriod::class, 'ac')
             ->select('COUNT(ac) AS nb')
             ->getQuery()
-            ->getSingleScalarResult()
-            ;
+            ->getSingleScalarResult();
 
-        yield [ $em->createQueryBuilder()
+        yield [$em->createQueryBuilder()
             ->from(AccompanyingPeriod::class, 'ac')
             ->select('ac.id')
-            ->setFirstResult(\random_int(0, $nb))
+            ->setFirstResult(random_int(0, $nb))
             ->setMaxResults(1)
             ->getQuery()
-            ->getSingleScalarResult()
+            ->getSingleScalarResult(),
         ];
     }
 
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php
index 7e535fe27..20d21f499 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Calendar;
@@ -8,10 +15,34 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create the schema chill_calendar and several calendar entities
+ * Create the schema chill_calendar and several calendar entities.
  */
 final class Version20210715141731 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons DROP CONSTRAINT FK_AEE94715A40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals DROP CONSTRAINT FK_FADF2C77A40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties DROP CONSTRAINT FK_2BAB7EFDA40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAA40A2C8');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACC5CB285D');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACE980772F');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAEA417747');
+        $this->addSql('DROP SEQUENCE chill_calendar.calendar_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_calendar.calendar_range_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_calendar.cancel_reason_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_calendar.invite_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_calendar.calendar');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_persons');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_thirdparties');
+        $this->addSql('DROP TABLE chill_calendar.calendar_to_invites');
+        $this->addSql('DROP TABLE chill_calendar.calendar_range');
+        $this->addSql('DROP TABLE chill_calendar.cancel_reason');
+        $this->addSql('DROP TABLE chill_calendar.invite');
+        $this->addSql('DROP SCHEMA chill_calendar');
+    }
+
     public function getDescription(): string
     {
         return 'Create the schema chill_calendar and several calendar entities';
@@ -50,10 +81,7 @@ final class Version20210715141731 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:date_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:date_immutable)\'');
         $this->addSql('CREATE TABLE chill_calendar.cancel_reason (id INT NOT NULL, active BOOLEAN NOT NULL, canceledBy JSON NOT NULL, name JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.name IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS \'(DC2Type:json_array)\'');
         $this->addSql('CREATE TABLE chill_calendar.invite (id INT NOT NULL, user_id INT DEFAULT NULL, status JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.invite.status IS \'(DC2Type:json_array)\'');
         $this->addSql('CREATE INDEX IDX_F517FFA7A76ED395 ON chill_calendar.invite (user_id)');
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
@@ -72,28 +100,4 @@ final class Version20210715141731 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_calendar.calendar_range ADD CONSTRAINT FK_38D57D05A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_calendar.invite ADD CONSTRAINT FK_F517FFA7A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {        
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons DROP CONSTRAINT FK_AEE94715A40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals DROP CONSTRAINT FK_FADF2C77A40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties DROP CONSTRAINT FK_2BAB7EFDA40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAA40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACC5CB285D');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACE980772F');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAEA417747');
-        $this->addSql('DROP SEQUENCE chill_calendar.calendar_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_calendar.calendar_range_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_calendar.cancel_reason_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_calendar.invite_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_calendar.calendar');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_persons');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_thirdparties');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_invites');
-        $this->addSql('DROP TABLE chill_calendar.calendar_range');
-        $this->addSql('DROP TABLE chill_calendar.cancel_reason');
-        $this->addSql('DROP TABLE chill_calendar.invite');
-        $this->addSql('DROP SCHEMA chill_calendar');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php
index 3f85968c4..ecafff926 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Calendar;
@@ -8,10 +15,21 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Adapt calendar entities
+ * Adapt calendar entities.
  */
 final class Version20210723074557 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
+        $this->addSql('CREATE INDEX idx_fadf2c77217bbb47 ON chill_calendar.calendar_to_non_professionals (person_id)');
+        $this->addSql('CREATE INDEX idx_fadf2c77a40a2c8 ON chill_calendar.calendar_to_non_professionals (calendar_id)');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77a40a2c8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy TYPE JSON');
+        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy DROP DEFAULT');
+    }
+
     public function getDescription(): string
     {
         return 'Adapt calendar entities';
@@ -24,16 +42,4 @@ final class Version20210723074557 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby DROP DEFAULT');
         $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
-        $this->addSql('CREATE INDEX idx_fadf2c77217bbb47 ON chill_calendar.calendar_to_non_professionals (person_id)');
-        $this->addSql('CREATE INDEX idx_fadf2c77a40a2c8 ON chill_calendar.calendar_to_non_professionals (calendar_id)');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77a40a2c8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy TYPE JSON');
-        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledby IS \'(DC2Type:json_array)\'');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
index 0af4fb1b8..f3a7e1928 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Calendar;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Alter startDate and endDate to datetimetz_immutable
+ * Alter startDate and endDate to datetimetz_immutable.
  */
 final class Version20210723142003 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startdate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.enddate IS \'(DC2Type:date_immutable)\'');
+    }
+
     public function getDescription(): string
     {
         return 'Alter startDate and endDate to datetimetz_immutable';
@@ -26,14 +43,4 @@ final class Version20210723142003 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:datetimetz_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:datetimetz_immutable)\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startdate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.enddate IS \'(DC2Type:date_immutable)\'');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php
index 5b77338c3..eb055a27e 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Calendar;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Alter startDate and endDate to datetimetz_immutable on calendarRange
+ * Alter startDate and endDate to datetimetz_immutable on calendarRange.
  */
 final class Version20210723142842 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:date_immutable)\'');
+    }
+
     public function getDescription(): string
     {
         return 'Alter startDate and endDate to datetimetz_immutable on calendarRange';
@@ -26,14 +43,4 @@ final class Version20210723142842 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:datetimetz_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:datetimetz_immutable)\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:date_immutable)\'');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php b/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php
new file mode 100644
index 000000000..2567557e8
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20211119173557.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211119173557 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+
+    public function getDescription(): string
+    {
+        return 'remove comment on deprecated json_array type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $columns = [
+            'chill_calendar.cancel_reason.name',
+            'chill_calendar.invite.status',
+        ];
+
+        foreach ($columns as $col) {
+            $this->addSql("COMMENT ON COLUMN {$col} IS NULL");
+        }
+    }
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php b/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
index 7150e5026..65cded145 100644
--- a/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/ChillCustomFieldsBundle.php
@@ -1,9 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Chill\CustomFieldsBundle\DependencyInjection\CustomFieldCompilerPass;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillCustomFieldsBundle extends Bundle
 {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
index b037975ab..633f70f05 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
@@ -1,75 +1,64 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Command;
 
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Doctrine\ORM\EntityManager;
+use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Yaml\Parser;
 use Symfony\Component\Yaml\Exception\ParseException;
-use Chill\CustomFieldsBundle\Entity\CustomField;
+use Symfony\Component\Yaml\Parser;
+use function count;
 
 /**
  * Class for the command 'chill:custom_fields:populate_group' that
- * Create custom fields from a yml file
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc.ducobu@champs-libres.coop>
+ * Create custom fields from a yml file.
  */
 class CreateFieldsOnGroupCommand extends Command
 {
-    const ARG_PATH = 'path';
-    const ARG_DELETE = 'delete';
-    
+    public const ARG_DELETE = 'delete';
+
+    public const ARG_PATH = 'path';
+
+    private $availableLanguages;
+
     /**
      * @var CustomFieldProvider
      */
     private $customFieldProvider;
-    
+
+    private $customizablesEntities;
+
     /**
      * @var EntityManager
      */
     private $entityManager;
-    
+
     /**
      * @var ValidatorInterface
      */
     private $validator;
-    
-    private $availableLanguages;
-    private $customizablesEntities;
-    
+
     /**
      * CreateFieldsOnGroupCommand constructor.
      *
-     * @param CustomFieldProvider $customFieldProvider
-     * @param EntityManager $entityManager
-     * @param ValidatorInterface $validator
      * @param $availableLanguages
      * @param $customizablesEntities
      */
@@ -87,19 +76,26 @@ class CreateFieldsOnGroupCommand extends Command
         $this->customizablesEntities = $customizablesEntities;
         parent::__construct();
     }
-    
+
     protected function configure()
     {
         $this->setName('chill:custom_fields:populate_group')
             ->setDescription('Create custom fields from a yml file')
-            ->addArgument(self::ARG_PATH, InputOption::VALUE_REQUIRED,
-                'Path to description file')
-            ->addOption(self::ARG_DELETE, null, InputOption::VALUE_NONE,
-                'If set, delete existing fields');
+            ->addArgument(
+                self::ARG_PATH,
+                InputOption::VALUE_REQUIRED,
+                'Path to description file'
+            )
+            ->addOption(
+                self::ARG_DELETE,
+                null,
+                InputOption::VALUE_NONE,
+                'If set, delete existing fields'
+            );
     }
 
     /**
-     * Delete the existing custom fields for a given customFieldGroup
+     * Delete the existing custom fields for a given customFieldGroup.
      *
      * @param CustomFieldsGroup $customFieldsGroup : The custom field group
      */
@@ -111,27 +107,25 @@ class CreateFieldsOnGroupCommand extends Command
             $em->remove($field);
         }
     }
-    
+
     /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @return int|null|void
+     * @return int|void|null
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $helper = $this->getHelperSet()->get('question');
-        
+
         $em = $this->entityManager;
-        
+
         $customFieldsGroups = $em
             ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
             ->findAll();
-        
+
         if (count($customFieldsGroups) === 0) {
             $output->writeln('<error>There aren\'t any CustomFieldsGroup recorded'
                 . ' Please create at least one.</error>');
-        } 
-        
+        }
+
         $table = new Table($output);
         $table
             ->setHeaders(array_merge(
@@ -139,126 +133,129 @@ class CreateFieldsOnGroupCommand extends Command
                 $this->availableLanguages
             ))
             ->setRows($this->_prepareRows($customFieldsGroups))
-            ->render()
-        ;
-        
+            ->render();
+
         $question = new Question(
-            "Enter the customfieldGroup's id on which the custom fields should be added: ");
+            "Enter the customfieldGroup's id on which the custom fields should be added: "
+        );
         $question->setNormalizer(
-            function($answer) use ($customFieldsGroups) {
+            static function ($answer) use ($customFieldsGroups) {
                 foreach ($customFieldsGroups as $customFieldsGroup) {
-                    if ($answer == $customFieldsGroup->getId()) {
+                    if ($customFieldsGroup->getId() === $answer) {
                         return $customFieldsGroup;
                     }
                 }
-                throw new \RunTimeException('The id does not match an existing '
-                    . 'CustomFieldsGroup');
+
+                throw new RuntimeException('The id does not match an existing CustomFieldsGroup');
             }
         );
         $customFieldsGroup = $helper->ask($input, $output, $question);
 
-        
         if ($input->getOption(self::ARG_DELETE)) {
             $this->deleteFieldsForCFGroup($customFieldsGroup);
         }
-            
-        $fieldsInput = $this->_parse($input->getArgument(self::ARG_PATH), 
-            $output);
-        
+
+        $fieldsInput = $this->_parse(
+            $input->getArgument(self::ARG_PATH),
+            $output
+        );
+
         $fields = $this->_addFields($customFieldsGroup, $fieldsInput, $output);
     }
-    
-    private function _prepareRows ($customFieldsGroups) 
-    {
-        $rows = array();
-        $languages = $this->availableLanguages;
-        //gather entitites and create an array to access them easily
-        $customizableEntities = array();
-        foreach ($this->customizablesEntities as $entry) {
-            $customizableEntities[$entry['class']] = $entry['name'];
-        }
-        
-        array_walk($customFieldsGroups, 
-            function(CustomFieldsGroup $customFieldGroup, $key)
-                use ($languages, &$rows, $customizableEntities) {
-                    //set id and entity
-                    $row = array(
-                        $customFieldGroup->getId(),
-                        $customizableEntities[$customFieldGroup->getEntity()]
-                    );
-                    
-                    foreach ($languages as $lang) {
-                        //todo replace with service to find lang when available
-                        $row[] = (isset($customFieldGroup->getName()[$lang])) ?
-                                $customFieldGroup->getName()[$lang] :
-                            'Not available in this language';
-                    }
-                    $rows[] = $row;
-                }
-        );
-              
-        return $rows;
-    }
-    
-    private function _parse($path, OutputInterface $output)
-    {
-        $parser = new Parser();
-        
-        if (!file_exists($path)) {
-            throw new \RunTimeException("file does not exist");
-        }
-        
-        try {
-            $values = $parser->parse(file_get_contents($path));
-        } catch (ParseException $ex) {
-            throw new \RunTimeException("The yaml file is not valid", 0, $ex);
-        }
-        
-        return $values;
-    }
-    
+
     private function _addFields(CustomFieldsGroup $group, $values, OutputInterface $output)
     {
-        
         $em = $this->entityManager;
 
         $languages = $this->availableLanguages;
-        
-        foreach($values['fields'] as $slug => $field) {
+
+        foreach ($values['fields'] as $slug => $field) {
             //check the cf type exists
             $cfType = $this->customFieldProvider->getCustomFieldByType($field['type']);
-            if ($cfType === NULL) {
-                throw new \RunTimeException('the type '.$field['type'].' '
+
+            if (null === $cfType) {
+                throw new RuntimeException('the type ' . $field['type'] . ' '
                     . 'does not exists');
             }
-            
+
             $cf = new CustomField();
             $cf->setSlug($slug)
                 ->setName($field['name'])
-                ->setOptions(isset($field['options']) ? $field['options'] : array() )
+                ->setOptions($field['options'] ?? [])
                 ->setOrdering($field['ordering'])
                 ->setType($field['type'])
                 ->setCustomFieldsGroup($group);
-            
+
             //add to table
-            $names = array();
+            $names = [];
+
             foreach ($languages as $lang) {
                 //todo replace with service to find lang when available
                 $names[] = (isset($cf->getName()[$lang])) ?
                     $cf->getName()[$lang] :
                         'Not available in this language';
             }
-            
+
             if ($this->validator->validate($cf)) {
                 $em->persist($cf);
-                $output->writeln("<info>Adding Custom Field of type "
-                    .$cf->getType()."\t with slug ".$cf->getSlug().
-                    "\t and names : ".implode($names, ', ')."</info>");
+                $output->writeln('<info>Adding Custom Field of type '
+                    . $cf->getType() . "\t with slug " . $cf->getSlug() .
+                    "\t and names : " . implode(', ', $names) . '</info>');
             } else {
-                throw new \RunTimeException("Error in field ".$slug);
+                throw new RuntimeException('Error in field ' . $slug);
             }
         }
-        
+
         $em->flush();
     }
+
+    private function _parse($path, OutputInterface $output)
+    {
+        $parser = new Parser();
+
+        if (!file_exists($path)) {
+            throw new RuntimeException('file does not exist');
+        }
+
+        try {
+            $values = $parser->parse(file_get_contents($path));
+        } catch (ParseException $ex) {
+            throw new RuntimeException('The yaml file is not valid', 0, $ex);
+        }
+
+        return $values;
+    }
+
+    private function _prepareRows($customFieldsGroups)
+    {
+        $rows = [];
+        $languages = $this->availableLanguages;
+        //gather entitites and create an array to access them easily
+        $customizableEntities = [];
+
+        foreach ($this->customizablesEntities as $entry) {
+            $customizableEntities[$entry['class']] = $entry['name'];
+        }
+
+        array_walk(
+            $customFieldsGroups,
+            static function (CustomFieldsGroup $customFieldGroup, $key) use ($languages, &$rows, $customizableEntities) {
+                //set id and entity
+                $row = [
+                    $customFieldGroup->getId(),
+                    $customizableEntities[$customFieldGroup->getEntity()],
+                ];
+
+                foreach ($languages as $lang) {
+                    //todo replace with service to find lang when available
+                    $row[] = (isset($customFieldGroup->getName()[$lang])) ?
+                                $customFieldGroup->getName()[$lang] :
+                            'Not available in this language';
+                }
+                $rows[] = $row;
+            }
+        );
+
+        return $rows;
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
index 86bd3c5fa..26a252cf5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
@@ -1,33 +1,21 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class AdminController
- * Controller for the custom fields configuration section (in admin section)
- *
- * @package Chill\CustomFieldsBundle\Controller
+ * Controller for the custom fields configuration section (in admin section).
  */
 class AdminController extends AbstractController
 {
@@ -35,4 +23,4 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillCustomFieldsBundle:Admin:layout.html.twig');
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
index da6f65e5f..4ec9a8c67 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
@@ -1,26 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\CustomFieldsBundle\Form\CustomFieldType;
-
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class CustomFieldController
- *
- * @package Chill\CustomFieldsBundle\Controller
+ * Class CustomFieldController.
  */
 class CustomFieldController extends AbstractController
 {
-
     /**
      * Creates a new CustomField entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -34,95 +38,27 @@ class CustomFieldController extends AbstractController
             $em->flush();
 
             $this->addFlash('success', $this->get('translator')
-                  ->trans('The custom field has been created'));
+                ->trans('The custom field has been created'));
 
-            return $this->redirect($this->generateUrl('customfieldsgroup_show',
-                  array('id' => $entity->getCustomFieldsGroup()->getId())));
+            return $this->redirect($this->generateUrl(
+                'customfieldsgroup_show',
+                ['id' => $entity->getCustomFieldsGroup()->getId()]
+            ));
         }
 
         $this->addFlash('error', $this->get('translator')
-              ->trans("The custom field form contains errors"));
+            ->trans('The custom field form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', array(
+        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a CustomField entity.
-     *
-     * @param CustomField $entity The entity
-     * @param string
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(CustomField $entity, $type)
-    {
-        $form = $this->createForm(CustomFieldType::class, $entity, array(
-            'action' => $this->generateUrl('customfield_create',
-                  array('type' => $type)),
-            'method' => 'POST',
-            'type' => $type,
-            'group_widget' => ($entity->getCustomFieldsGroup()) ? 'hidden' :'entity'
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new CustomField entity.
-     *
-     */
-    public function newAction(Request $request)
-    {
-        $entity = new CustomField();
-
-        //add the custom field group if defined in URL
-        $cfGroupId = $request->query->get('customFieldsGroup', null);
-
-        if ($cfGroupId !== null) {
-            $cfGroup = $this->getDoctrine()->getManager()
-                  ->getRepository(CustomFieldsGroup::class)
-                  ->find($cfGroupId);
-            if (!$cfGroup) {
-                throw $this->createNotFoundException('CustomFieldsGroup with id '
-                      . $cfGroupId.' is not found !');
-            }
-            $entity->setCustomFieldsGroup($cfGroup);
-        }
-
-        $form   = $this->createCreateForm($entity, $request->query->get('type'));
-
-        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a CustomField entity.
-     *
-     * @deprecated is not used since there is no link to show action
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository(CustomField::class)->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find CustomField entity.');
-        }
-
-        return $this->render('ChillCustomFieldsBundle:CustomField:show.html.twig', array(
-            'entity'      => $entity,        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing CustomField entity.
      *
+     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -136,35 +72,67 @@ class CustomFieldController extends AbstractController
 
         $editForm = $this->createEditForm($entity, $entity->getType());
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-    * Creates a form to edit a CustomField entity.
-    *
-    * @param CustomField $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(CustomField $entity, $type)
+     * Displays a form to create a new CustomField entity.
+     */
+    public function newAction(Request $request)
     {
-        $form = $this->createForm(CustomFieldType::class, $entity, array(
-            'action' => $this->generateUrl('customfield_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-            'type' => $type,
-            'group_widget' => 'hidden'
-        ));
+        $entity = new CustomField();
 
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        //add the custom field group if defined in URL
+        $cfGroupId = $request->query->get('customFieldsGroup', null);
 
-        return $form;
+        if (null !== $cfGroupId) {
+            $cfGroup = $this->getDoctrine()->getManager()
+                ->getRepository(CustomFieldsGroup::class)
+                ->find($cfGroupId);
+
+            if (!$cfGroup) {
+                throw $this->createNotFoundException('CustomFieldsGroup with id '
+                      . $cfGroupId . ' is not found !');
+            }
+            $entity->setCustomFieldsGroup($cfGroup);
+        }
+
+        $form = $this->createCreateForm($entity, $request->query->get('type'));
+
+        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
     }
+
+    /**
+     * Finds and displays a CustomField entity.
+     *
+     * @deprecated is not used since there is no link to show action
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository(CustomField::class)->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find CustomField entity.');
+        }
+
+        return $this->render('ChillCustomFieldsBundle:CustomField:show.html.twig', [
+            'entity' => $entity,        ]);
+    }
+
     /**
      * Edits an existing CustomField entity.
      *
+     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -183,17 +151,65 @@ class CustomFieldController extends AbstractController
             $em->flush();
 
             $this->addFlash('success', $this->get('translator')
-                  ->trans("The custom field has been updated"));
+                ->trans('The custom field has been updated'));
 
-            return $this->redirect($this->generateUrl('customfield_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('customfield_edit', ['id' => $id]));
         }
 
         $this->addFlash('error', $this->get('translator')
-              ->trans("The custom field form contains errors"));
+            ->trans('The custom field form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a CustomField entity.
+     *
+     * @param CustomField $entity The entity
+     * @param string
+     * @param mixed $type
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(CustomField $entity, $type)
+    {
+        $form = $this->createForm(CustomFieldType::class, $entity, [
+            'action' => $this->generateUrl(
+                'customfield_create',
+                ['type' => $type]
+            ),
+            'method' => 'POST',
+            'type' => $type,
+            'group_widget' => ($entity->getCustomFieldsGroup()) ? 'hidden' : 'entity',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a CustomField entity.
+     *
+     * @param CustomField $entity The entity
+     * @param mixed $type
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(CustomField $entity, $type)
+    {
+        $form = $this->createForm(CustomFieldType::class, $entity, [
+            'action' => $this->generateUrl('customfield_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+            'type' => $type,
+            'group_widget' => 'hidden',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
index 268b5480b..5398c5f38 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
@@ -1,47 +1,50 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Controller;
 
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\CustomFieldsBundle\Form\CustomFieldsGroupType;
+use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldsGroupToIdTransformer;
+use Chill\CustomFieldsBundle\Form\Type\CustomFieldType as FormTypeCustomField;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Doctrine\ORM\Query;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
-use Doctrine\ORM\Query;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldsGroupToIdTransformer;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
-use Chill\CustomFieldsBundle\Form\CustomFieldsGroupType;
-use Chill\CustomFieldsBundle\Form\CustomFieldType;
-use Chill\CustomFieldsBundle\Form\Type\CustomFieldType as FormTypeCustomField;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 /**
- * Class CustomFieldsGroupController
- *
- * @package Chill\CustomFieldsBundle\Controller
+ * Class CustomFieldsGroupController.
  */
 class CustomFieldsGroupController extends AbstractController
 {
-    
     /**
      * @var CustomFieldProvider
      */
     private $customfieldProvider;
-    
+
     /**
      * @var TranslatorInterface
      */
     private $translator;
-    
+
     /**
      * CustomFieldsGroupController constructor.
-     *
-     * @param CustomFieldProvider $customFieldProvider
-     * @param TranslatorInterface $translator
      */
     public function __construct(
         CustomFieldProvider $customFieldProvider,
@@ -50,76 +53,9 @@ class CustomFieldsGroupController extends AbstractController
         $this->customfieldProvider = $customFieldProvider;
         $this->translator = $translator;
     }
-    
-    /**
-     * Lists all CustomFieldsGroup entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $cfGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findAll();
-        $defaultGroups = $this->getDefaultGroupsId();
-
-        $makeDefaultFormViews = array();
-        foreach ($cfGroups as $group) {
-            if (!in_array($group->getId(), $defaultGroups)){
-                $makeDefaultFormViews[$group->getId()] = $this->createMakeDefaultForm($group)->createView();
-            }
-        }
-
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:index.html.twig', array(
-            'entities' => $cfGroups,
-            'default_groups' => $defaultGroups,
-            'make_default_forms' => $makeDefaultFormViews
-        ));
-    }
-
-    /**
-     * Get an array of CustomFieldsGroupId which are marked as default
-     * for their entity
-     *
-     * @return int[]
-     */
-    private function getDefaultGroupsId()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $customFieldsGroupIds = $em->createQuery('SELECT g.id FROM '
-                . 'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d '
-                . 'JOIN d.customFieldsGroup g')
-                ->getResult(Query::HYDRATE_SCALAR);
-
-        $result = array();
-        foreach ($customFieldsGroupIds as $row) {
-            $result[] = $row['id'];
-        }
-
-        return $result;
-    }
-
-    /**
-     * create a form to make the group default
-     *
-     * @param CustomFieldsGroup $group
-     * @return \Symfony\Component\Form\Form
-     */
-    private function createMakeDefaultForm(CustomFieldsGroup $group = null)
-    {
-        return $this->createFormBuilder($group, array(
-                    'method' => 'POST',
-                    'action' => $this->generateUrl('customfieldsgroup_makedefault')
-                ))
-                ->add('id', HiddenType::class)
-                ->add('submit', SubmitType::class, array('label' => 'Make default'))
-                ->getForm();
-    }
-
 
     /**
      * Creates a new CustomFieldsGroup entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -133,101 +69,24 @@ class CustomFieldsGroupController extends AbstractController
             $em->flush();
 
             $this->addFlash('success', $this->translator
-                  ->trans("The custom fields group has been created"));
+                ->trans('The custom fields group has been created'));
 
-            return $this->redirect($this->generateUrl('customfieldsgroup_show', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('customfieldsgroup_show', ['id' => $entity->getId()]));
         }
 
         $this->addFlash('error', $this->translator
-              ->trans("The custom fields group form contains errors"));
+            ->trans('The custom fields group form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', array(
+        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a CustomFieldsGroup entity.
-     *
-     * @param CustomFieldsGroup $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(CustomFieldsGroup $entity)
-    {
-        $form = $this->createForm(CustomFieldsGroupType::class, $entity, array(
-            'action' => $this->generateUrl('customfieldsgroup_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new CustomFieldsGroup entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new CustomFieldsGroup();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a CustomFieldsGroup entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
-        }
-
-        $options = $this->getOptionsAvailable($entity->getEntity());
-
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:show.html.twig', array(
-            'entity'      => $entity,
-            'create_field_form' => $this->createCreateFieldForm($entity)->createView(),
-            'options' => $options
-        ));
-    }
-
-    /**
-     * Return an array of available key option for custom fields group
-     * on the given entity
-     *
-     * @param string $entity the entity to filter
-     */
-    private function getOptionsAvailable($entity)
-    {
-        $options = $this->getParameter('chill_custom_fields.'
-              . 'customizables_entities');
-
-        foreach($options as $key => $definition) {
-            if ($definition['class'] == $entity) {
-                foreach ($definition['options'] as $key => $value) {
-                    yield $key;
-                }
-            }
-        }
-          //    [$entity->getEntity()];
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing CustomFieldsGroup entity.
      *
+     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -241,102 +100,42 @@ class CustomFieldsGroupController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-    * Creates a form to edit a CustomFieldsGroup entity.
-    *
-    * @param CustomFieldsGroup $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(CustomFieldsGroup $entity)
-    {
-        $form = $this->createForm(CustomFieldsGroupType::class, $entity, array(
-            'action' => $this->generateUrl('customfieldsgroup_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
-
-        return $form;
-    }
-
-    private function createCreateFieldForm(CustomFieldsGroup $customFieldsGroup)
-    {
-
-        $fieldChoices = array();
-        foreach ($this->customfieldProvider->getAllFields()
-              as $key => $customType) {
-            $fieldChoices[$key] = $customType->getName();
-        }
-
-        $customfield = (new CustomField())
-              ->setCustomFieldsGroup($customFieldsGroup);
-
-        $builder = $this->get('form.factory')
-              ->createNamedBuilder(null, FormType::class, $customfield, array(
-                    'method' => 'GET',
-                    'action' => $this->generateUrl('customfield_new'),
-                    'csrf_protection' => false
-                    ))
-              ->add('type', ChoiceType::class, array(
-                    'choices' => array_combine(array_values($fieldChoices),array_keys($fieldChoices)),
-                   ))
-              ->add('customFieldsGroup', HiddenType::class)
-              ->add('submit', SubmitType::class);
-        $builder->get('customFieldsGroup')
-              ->addViewTransformer(new CustomFieldsGroupToIdTransformer(
-                       $this->getDoctrine()->getManager()));
-
-        return $builder->getForm();
-    }
-
-    /**
-     * Edits an existing CustomFieldsGroup entity.
-     *
+     * Lists all CustomFieldsGroup entities.
      */
-    public function updateAction(Request $request, $id)
+    public function indexAction()
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+        $cfGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findAll();
+        $defaultGroups = $this->getDefaultGroupsId();
 
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
+        $makeDefaultFormViews = [];
+
+        foreach ($cfGroups as $group) {
+            if (!in_array($group->getId(), $defaultGroups, true)) {
+                $makeDefaultFormViews[$group->getId()] = $this->createMakeDefaultForm($group)->createView();
+            }
         }
 
-        $editForm = $this->createEditForm($entity);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            $this->addFlash('success', $this->translator
-                  ->trans("The custom fields group has been updated"));
-
-            return $this->redirect($this->generateUrl('customfieldsgroup_edit', array('id' => $id)));
-        }
-
-        $this->addFlash('error', $this->translator
-              ->trans("The custom fields group form contains errors"));
-
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-
-           ));
+        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:index.html.twig', [
+            'entities' => $cfGroups,
+            'default_groups' => $defaultGroups,
+            'make_default_forms' => $makeDefaultFormViews,
+        ]);
     }
 
     /**
-     * Set the CustomField Group with id $cFGroupId as default
+     * Set the CustomField Group with id $cFGroupId as default.
      */
     public function makeDefaultAction(Request $request)
     {
-
         $form = $this->createMakeDefaultForm(null);
         $form->handleRequest($request);
 
@@ -346,16 +145,16 @@ class CustomFieldsGroupController extends AbstractController
 
         $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findOneById($cFGroupId);
 
-        if(!$cFGroup) {
+        if (!$cFGroup) {
             throw $this
-                  ->createNotFoundException("customFieldsGroup not found with "
-                        . "id $cFGroupId");
+                ->createNotFoundException('customFieldsGroup not found with '
+                        . "id {$cFGroupId}");
         }
 
         $cFDefaultGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup')
             ->findOneByEntity($cFGroup->getEntity());
 
-        if($cFDefaultGroup) {
+        if ($cFDefaultGroup) {
             $em->remove($cFDefaultGroup);
             $em->flush(); /*this is necessary, if not doctrine
              * will not remove old entity before adding a new one,
@@ -372,11 +171,25 @@ class CustomFieldsGroupController extends AbstractController
         $em->flush();
 
         $this->addFlash('success', $this->translator
-                  ->trans("The default custom fields group has been changed"));
+            ->trans('The default custom fields group has been changed'));
 
         return $this->redirect($this->generateUrl('customfieldsgroup'));
     }
 
+    /**
+     * Displays a form to create a new CustomFieldsGroup entity.
+     */
+    public function newAction()
+    {
+        $entity = new CustomFieldsGroup();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
     /**
      * This function render the customFieldsGroup as a form.
      *
@@ -397,33 +210,223 @@ class CustomFieldsGroupController extends AbstractController
             throw $this->createNotFoundException('Unable to find CustomFieldsGroups entity.');
         }
 
-        $form = $this->createForm(FormTypeCustomField::class, null, array('group' => $entity));
-        $form->add('submit_dump', SubmitType::class, array('label' => 'POST AND DUMP'));
-        $form->add('submit_render', SubmitType::class, array('label' => 'POST AND RENDER'));
+        $form = $this->createForm(FormTypeCustomField::class, null, ['group' => $entity]);
+        $form->add('submit_dump', SubmitType::class, ['label' => 'POST AND DUMP']);
+        $form->add('submit_render', SubmitType::class, ['label' => 'POST AND RENDER']);
         $form->handleRequest($request);
 
         $this->get('twig.loader')
-        ->addPath(__DIR__.'/../Tests/Fixtures/App/app/Resources/views/',
-            $namespace = 'test');
+            ->addPath(
+                __DIR__ . '/../Tests/Fixtures/App/app/Resources/views/',
+                $namespace = 'test'
+            );
 
         if ($form->isSubmitted()) {
             if ($form->get('submit_render')->isClicked()) {
-                return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:render_for_test.html.twig', array(
+                return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:render_for_test.html.twig', [
                     'fields' => $form->getData(),
-                    'customFieldsGroup' => $entity
-                ));
+                    'customFieldsGroup' => $entity,
+                ]);
             }
 
             //dump($form->getData());
             //dump(json_enccode($form->getData()));
         }
 
-
-
         return $this
-            ->render('@test/CustomField/simple_form_render.html.twig', array(
-                'form' => $form->createView()
-        ));
+            ->render('@test/CustomField/simple_form_render.html.twig', [
+                'form' => $form->createView(),
+            ]);
+    }
 
+    /**
+     * Finds and displays a CustomFieldsGroup entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
+        }
+
+        $options = $this->getOptionsAvailable($entity->getEntity());
+
+        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:show.html.twig', [
+            'entity' => $entity,
+            'create_field_form' => $this->createCreateFieldForm($entity)->createView(),
+            'options' => $options,
+        ]);
+    }
+
+    /**
+     * Edits an existing CustomFieldsGroup entity.
+     *
+     * @param mixed $id
+     */
+    public function updateAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
+        }
+
+        $editForm = $this->createEditForm($entity);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            $this->addFlash('success', $this->translator
+                ->trans('The custom fields group has been updated'));
+
+            return $this->redirect($this->generateUrl('customfieldsgroup_edit', ['id' => $id]));
+        }
+
+        $this->addFlash('error', $this->translator
+            ->trans('The custom fields group form contains errors'));
+
+        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    private function createCreateFieldForm(CustomFieldsGroup $customFieldsGroup)
+    {
+        $fieldChoices = [];
+
+        foreach ($this->customfieldProvider->getAllFields()
+              as $key => $customType) {
+            $fieldChoices[$key] = $customType->getName();
+        }
+
+        $customfield = (new CustomField())
+            ->setCustomFieldsGroup($customFieldsGroup);
+
+        $builder = $this->get('form.factory')
+            ->createNamedBuilder(null, FormType::class, $customfield, [
+                'method' => 'GET',
+                'action' => $this->generateUrl('customfield_new'),
+                'csrf_protection' => false,
+            ])
+            ->add('type', ChoiceType::class, [
+                'choices' => array_combine(array_values($fieldChoices), array_keys($fieldChoices)),
+            ])
+            ->add('customFieldsGroup', HiddenType::class)
+            ->add('submit', SubmitType::class);
+        $builder->get('customFieldsGroup')
+            ->addViewTransformer(new CustomFieldsGroupToIdTransformer(
+                $this->getDoctrine()->getManager()
+            ));
+
+        return $builder->getForm();
+    }
+
+    /**
+     * Creates a form to create a CustomFieldsGroup entity.
+     *
+     * @param CustomFieldsGroup $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(CustomFieldsGroup $entity)
+    {
+        $form = $this->createForm(CustomFieldsGroupType::class, $entity, [
+            'action' => $this->generateUrl('customfieldsgroup_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a CustomFieldsGroup entity.
+     *
+     * @param CustomFieldsGroup $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(CustomFieldsGroup $entity)
+    {
+        $form = $this->createForm(CustomFieldsGroupType::class, $entity, [
+            'action' => $this->generateUrl('customfieldsgroup_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+        ]);
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
+    }
+
+    /**
+     * create a form to make the group default.
+     *
+     * @param CustomFieldsGroup $group
+     *
+     * @return \Symfony\Component\Form\Form
+     */
+    private function createMakeDefaultForm(?CustomFieldsGroup $group = null)
+    {
+        return $this->createFormBuilder($group, [
+            'method' => 'POST',
+            'action' => $this->generateUrl('customfieldsgroup_makedefault'),
+        ])
+            ->add('id', HiddenType::class)
+            ->add('submit', SubmitType::class, ['label' => 'Make default'])
+            ->getForm();
+    }
+
+    /**
+     * Get an array of CustomFieldsGroupId which are marked as default
+     * for their entity.
+     *
+     * @return int[]
+     */
+    private function getDefaultGroupsId()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $customFieldsGroupIds = $em->createQuery('SELECT g.id FROM '
+                . 'ChillCustomFieldsBundle:CustomFieldsDefaultGroup d '
+                . 'JOIN d.customFieldsGroup g')
+            ->getResult(Query::HYDRATE_SCALAR);
+
+        $result = [];
+
+        foreach ($customFieldsGroupIds as $row) {
+            $result[] = $row['id'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return an array of available key option for custom fields group
+     * on the given entity.
+     *
+     * @param string $entity the entity to filter
+     */
+    private function getOptionsAvailable($entity)
+    {
+        $options = $this->getParameter('chill_custom_fields.'
+              . 'customizables_entities');
+
+        foreach ($options as $key => $definition) {
+            if ($definition['class'] === $entity) {
+                foreach ($definition['options'] as $key => $value) {
+                    yield $key;
+                }
+            }
+        }
+        //    [$entity->getEntity()];
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
index ddd019176..d821ff591 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
@@ -1,37 +1,22 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 abstract class AbstractCustomField implements CustomFieldInterface
 {
     public function isEmptyValue($value, CustomField $customField)
     {
-        return (empty($value) and $value !== FALSE);
+        return empty($value) && false !== $value;
     }
-    
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
index eaf423b7c..718f5dbb7 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
@@ -1,57 +1,49 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
 use Chill\CustomFieldsBundle\Form\Type\ChoicesListType;
 use Chill\CustomFieldsBundle\Form\Type\ChoicesType;
 use Chill\CustomFieldsBundle\Form\Type\ChoiceWithOtherType;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\CustomFieldsBundle\Entity\CustomField;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
-use Symfony\Bridge\Twig\TwigEngine;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use LogicException;
+use Symfony\Bridge\Twig\TwigEngine;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
+use function count;
+use function in_array;
+use function is_array;
+use function LogicException;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc@champs-libes.coop>
- */
 class CustomFieldChoice extends AbstractCustomField
 {
-    const ALLOW_OTHER = 'other';
-    const OTHER_VALUE_LABEL = 'otherValueLabel';
-    const MULTIPLE = 'multiple';
-    const EXPANDED = 'expanded';
-    const CHOICES = 'choices';
+    public const ALLOW_OTHER = 'other';
+
+    public const CHOICES = 'choices';
+
+    public const EXPANDED = 'expanded';
+
+    public const MULTIPLE = 'multiple';
+
+    public const OTHER_VALUE_LABEL = 'otherValueLabel';
 
     private $defaultLocales;
 
     /**
-     *
      * @var TwigEngine
      */
     private $templating;
@@ -60,48 +52,50 @@ class CustomFieldChoice extends AbstractCustomField
      * @var TranslatableStringHelper Helper that find the string in current locale from an array of translation
      */
     private $translatableStringHelper;
-    
+
     /**
      * CustomFieldChoice constructor.
-     *
-     * @param TranslatorInterface $translator
-     * @param TwigEngine $templating
-     * @param TranslatableStringHelper $translatableStringHelper
      */
     public function __construct(
         TranslatorInterface $translator,
         TwigEngine $templating,
-        TranslatableStringHelper $translatableStringHelper)
-    {
+        TranslatableStringHelper $translatableStringHelper
+    ) {
         $this->defaultLocales = $translator->getFallbackLocales();
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    public function allowOtherChoice(CustomField $cf)
+    {
+        return $cf->getOptions()[self::ALLOW_OTHER];
+    }
+
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
         //prepare choices
-        $choices = array();
+        $choices = [];
         $customFieldOptions = $customField->getOptions();
 
-        foreach($customFieldOptions[self::CHOICES] as $persistedChoices) {
-            if ($persistedChoices['active']){
+        foreach ($customFieldOptions[self::CHOICES] as $persistedChoices) {
+            if ($persistedChoices['active']) {
                 $choices[$persistedChoices['slug']] = $this->translatableStringHelper->localize($persistedChoices['name']);
             }
         }
 
         //prepare $options
-        $options = array(
+        $options = [
             'multiple' => $customFieldOptions[self::MULTIPLE],
-            'choices' =>  array_combine(array_values($choices),array_keys($choices)),
+            'choices' => array_combine(array_values($choices), array_keys($choices)),
             'required' => $customField->isRequired(),
-            'label' =>  $this->translatableStringHelper->localize($customField->getName())
-        );
+            'label' => $this->translatableStringHelper->localize($customField->getName()),
+        ];
 
         //if allow_other = true
-        if ($customFieldOptions[self::ALLOW_OTHER] == true) {
+        if (true === $customFieldOptions[self::ALLOW_OTHER]) {
             $otherValueLabel = null;
-            if(array_key_exists(self::OTHER_VALUE_LABEL, $customFieldOptions)) {
+
+            if (array_key_exists(self::OTHER_VALUE_LABEL, $customFieldOptions)) {
                 $otherValueLabel = $this->translatableStringHelper->localize(
                     $customFieldOptions[self::OTHER_VALUE_LABEL]
                 );
@@ -113,10 +107,10 @@ class CustomFieldChoice extends AbstractCustomField
                         $customField->getSlug(),
                         ChoiceWithOtherType::class,
                         $options,
-                        array('other_value_label'=> $otherValueLabel)
-                        )
-                    ->addModelTransformer(new CustomFieldDataTransformer($this, $customField)));
-
+                        ['other_value_label' => $otherValueLabel]
+                    )
+                    ->addModelTransformer(new CustomFieldDataTransformer($this, $customField))
+            );
         } else { //if allow_other = false
             //we add the 'expanded' to options
             $options['expanded'] = $customFieldOptions[self::EXPANDED];
@@ -131,41 +125,41 @@ class CustomFieldChoice extends AbstractCustomField
     public function buildOptionsForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add(self::MULTIPLE, ChoiceType::class, array(
+            ->add(self::MULTIPLE, ChoiceType::class, [
                 'expanded' => true,
                 'multiple' => false,
-                'choices' => array(
+                'choices' => [
                     'Multiple' => '1',
-                    'Unique' => '0'),
+                    'Unique' => '0', ],
                 'empty_data' => '0',
-                'label' => 'Multiplicity'
-                ))
-            ->add(self::EXPANDED, ChoiceType::class, array(
+                'label' => 'Multiplicity',
+            ])
+            ->add(self::EXPANDED, ChoiceType::class, [
                 'expanded' => true,
                 'multiple' => false,
-                'choices' => array(
+                'choices' => [
                     'Expanded' => '1',
-                    'Non expanded' => '0'),
+                    'Non expanded' => '0', ],
                 'empty_data' => '0',
-                'label' => 'Choice display'
-                ))
-            ->add(self::ALLOW_OTHER, ChoiceType::class, array(
+                'label' => 'Choice display',
+            ])
+            ->add(self::ALLOW_OTHER, ChoiceType::class, [
                 'label' => 'Allow other',
-                'choices' => array(
+                'choices' => [
                     'No' => '0',
-                    'Yes' => '1'),
+                    'Yes' => '1', ],
                 'empty_data' => '0',
                 'expanded' => true,
-                'multiple' => false
-            ))
-            ->add(self::OTHER_VALUE_LABEL, TranslatableStringFormType::class, array(
-                'label' => 'Other value label (empty if use by default)'))
-            ->add(self::CHOICES, ChoicesType::class, array(
+                'multiple' => false,
+            ])
+            ->add(self::OTHER_VALUE_LABEL, TranslatableStringFormType::class, [
+                'label' => 'Other value label (empty if use by default)', ])
+            ->add(self::CHOICES, ChoicesType::class, [
                 'entry_type' => ChoicesListType::class,
-                'allow_add' => true
-            ));
+                'allow_add' => true,
+            ]);
 
-            return $builder;
+        return $builder;
     }
 
     public function deserialize($serialized, CustomField $customField)
@@ -175,12 +169,183 @@ class CustomFieldChoice extends AbstractCustomField
 
         if ($options[self::MULTIPLE]) {
             return $this->deserializeToMultiple($serialized, $options[self::ALLOW_OTHER]);
-        } else {
-            return $this->deserializeToUnique($serialized, $options[self::ALLOW_OTHER]);
         }
+
+        return $this->deserializeToUnique($serialized, $options[self::ALLOW_OTHER]);
+
         return $serialized;
     }
 
+    public function extractOtherValue(CustomField $cf, ?array $data = null)
+    {
+        return $data['_other'];
+    }
+
+    public function getChoices(CustomField $cf)
+    {
+        if ($cf->getOptions()[self::MULTIPLE]) {
+            $choices = [];
+
+            foreach ($cf->getOptions()[self::CHOICES] as $choice) {
+                if (false === $choices['active']) {
+                    continue;
+                }
+                $choices[$choice['slug']] = $this->translatableStringHelper
+                    ->localize($choice['name']);
+            }
+
+            if ($this->allowOtherChoice($cf)) {
+                $labels = $cf->getOptions()[self::OTHER_VALUE_LABEL];
+
+                if (!is_array($labels) || count($labels) === 0) {
+                    $labels['back'] = 'other value';
+                }
+                $choices['_other'] = $this->translatableStringHelper
+                    ->localize($labels);
+            }
+
+            return $choices;
+        }
+
+        return [
+            $cf->getSlug() => $this->translatableStringHelper->localize($cf->getName()),
+        ];
+    }
+
+    public function getName()
+    {
+        return 'Choices';
+    }
+
+    /**
+     * Return true if the choice given in $choiceSlug is checked inside $data.
+     *
+     * Used in list exports.
+     *
+     * @param string $choiceSlug the slug of the choice we want to know if it was checked
+     * @param array|string $data the data of the field
+     *
+     * @return bool
+     */
+    public function isChecked(CustomField $cf, $choiceSlug, $data)
+    {
+        if (null === $data) {
+            return false;
+        }
+
+        if ($cf->getOptions()[self::MULTIPLE]) {
+            if ($cf->getOptions()[self::ALLOW_OTHER]) {
+                return in_array($choiceSlug, $this->deserialize($data, $cf)['_choices'], true);
+            }
+
+            return in_array($choiceSlug, $this->deserialize($data, $cf), true);
+        }
+
+        if ($cf->getOptions()[self::ALLOW_OTHER]) {
+            return $this->deserialize($data, $cf)['_choices'] === $choiceSlug;
+        }
+
+        return $this->deserialize($data, $cf) === $choiceSlug;
+    }
+
+    public function isEmptyValue($value, CustomField $customField)
+    {
+        if (null === $value) {
+            return true;
+        }
+
+        // if multiple choice OR multiple/single choice with other
+        if (is_array($value)) {
+            // if allow other
+            if (array_key_exists('_choices', $value)) {
+                if (null === $value['_choices']) {
+                    return true;
+                }
+
+                return empty($value['_choices']);
+            }   // we do not have 'allow other'
+
+            if (count($value) === 1) {
+                return empty($value[0]);
+            }
+
+            return empty($value);
+        }
+
+        return empty($value);
+
+        throw LogicException('This case is not expected.');
+    }
+
+    public function isMultiple(CustomField $cf)
+    {
+        return $cf->getOptions()[self::MULTIPLE];
+    }
+
+    /**
+     * @internal this function is able to receive data whichever is the value of "other", "multiple"
+     *
+     * @param mixed $value
+     * @param mixed $documentType
+     *
+     * @return string html representation
+     */
+    public function render($value, CustomField $customField, $documentType = 'html')
+    {
+        //extract the data. They are under a _choice key if they are stored with allow_other
+        $data = (isset($value['_choices'])) ? $value['_choices'] : $value;
+        $selected = (is_array($data)) ? $data : [$data];
+        $choices = $customField->getOptions()[self::CHOICES];
+
+        if (in_array('_other', $selected, true)) {
+            $choices[] = ['name' => $value['_other'], 'slug' => '_other'];
+        }
+
+        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.html.twig';
+
+        if ('csv' === $documentType) {
+            $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.csv.twig';
+        }
+
+        return $this->templating
+            ->render(
+                $template,
+                [
+                    'choices' => $choices,
+                    'selected' => $selected,
+                    'multiple' => $customField->getOptions()[self::MULTIPLE],
+                    'expanded' => $customField->getOptions()[self::EXPANDED],
+                    'locales' => $this->defaultLocales,
+                ]
+            );
+    }
+
+    public function serialize($value, CustomField $customField)
+    {
+        return $value;
+    }
+
+    /**
+     * deserialized the data from the database to a multiple
+     * field.
+     *
+     * @param mixed $serialized
+     * @param bool $allowOther
+     */
+    private function deserializeToMultiple($serialized, $allowOther)
+    {
+        $value = $this->guessValue($serialized);
+
+        // set in an array : we want a multiple
+        $fixedValue = is_array($value) ? $value : [$value];
+
+        if ($allowOther) {
+            return $this->deserializeWithAllowOther($serialized, $fixedValue);
+        }
+
+        return $fixedValue;
+    }
+
     private function deserializeToUnique($serialized, $allowOther)
     {
         $value = $this->guessValue($serialized);
@@ -194,40 +359,19 @@ class CustomFieldChoice extends AbstractCustomField
 
         if ($allowOther) {
             return $this->deserializeWithAllowOther($serialized, $fixedValue);
-        } else {
-            return $fixedValue;
         }
-    }
 
-    /**
-     * deserialized the data from the database to a multiple
-     * field
-     *
-     * @param mixed $serialized
-     * @param boolean $allowOther
-     */
-    private function deserializeToMultiple($serialized, $allowOther)
-    {
-        $value = $this->guessValue($serialized);
-
-        // set in an array : we want a multiple
-        $fixedValue = is_array($value) ? $value : array($value);
-
-        if ($allowOther) {
-            return $this->deserializeWithAllowOther($serialized, $fixedValue);
-        } else {
-            return $fixedValue;
-        }
+        return $fixedValue;
     }
 
     private function deserializeWithAllowOther($serialized, $value)
     {
-        $existingOther = isset($serialized['_other']) ? $serialized['_other'] : '';
+        $existingOther = $serialized['_other'] ?? '';
 
-        return array(
+        return [
             '_other' => $existingOther,
-            '_choices' => $value
-        );
+            '_choices' => $value,
+        ];
     }
 
     /**
@@ -237,177 +381,27 @@ class CustomFieldChoice extends AbstractCustomField
      * **is not** the content of the _other field, but the `_other` string.
      *
      * @param array|string $value
+     *
+     * @throws LogicException if the case is not covered by this
+     *
      * @return mixed
-     * @throws \LogicException if the case is not covered by this
      */
     private function guessValue($value)
     {
-        if ($value === NULL) {
-            return NULL;
+        if (null === $value) {
+            return null;
         }
 
         if (!is_array($value)) {
             return $value;
-        } else {
-            // we have a field with "allow other"
-            if (array_key_exists('_choices', $value)) {
-                return $value['_choices'];
-            } else {
-                // we have a field with "multiple"
-                return $value;
-            }
         }
-
-        throw \LogicException("This case is not expected.");
-    }
-
-    public function getName()
-    {
-        return 'Choices';
-    }
-
-    public function isEmptyValue($value, CustomField $customField)
-    {
-        if ($value === NULL) {
-            return true;
+        // we have a field with "allow other"
+        if (array_key_exists('_choices', $value)) {
+            return $value['_choices'];
         }
-
-        // if multiple choice OR multiple/single choice with other
-        if (is_array($value))
-        {
-            // if allow other
-            if (array_key_exists('_choices', $value)) {
-                if ($value['_choices'] === NULL) {
-                    return true;
-                }
-                return empty($value['_choices']);
-            } else { // we do not have 'allow other'
-                if (count($value) === 1){
-                    return empty($value[0]);
-                } else {
-                    return empty($value);
-                }
-            }
-        } else {
-            return empty($value);
-        }
-
-        throw \LogicException("This case is not expected.");
-    }
-
-    /**
-     *
-     * @internal this function is able to receive data whichever is the value of "other", "multiple"
-     * @param mixed $value
-     * @param CustomField $customField
-     * @return string html representation
-     */
-    public function render($value, CustomField $customField, $documentType = 'html')
-    {
-        //extract the data. They are under a _choice key if they are stored with allow_other
-        $data = (isset($value['_choices'])) ? $value['_choices'] : $value;
-        $selected = (is_array($data)) ? $data : array($data);
-        $choices = $customField->getOptions()[self::CHOICES];
-
-        if (in_array('_other', $selected)){
-            $choices[] = array('name' => $value['_other'], 'slug' => '_other');
-        }
-
-        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.html.twig';
-        if($documentType == 'csv') {
-            $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.csv.twig';
-        }
-
-        return $this->templating
-            ->render($template,
-                array(
-                    'choices' => $choices,
-                    'selected' => $selected,
-                    'multiple' => $customField->getOptions()[self::MULTIPLE],
-                    'expanded' => $customField->getOptions()[self::EXPANDED],
-                    'locales' => $this->defaultLocales
-                )
-            );
-    }
-
-    public function serialize($value, CustomField $customField)
-    {
+        // we have a field with "multiple"
         return $value;
-    }
-    
-    public function getChoices(CustomField $cf) 
-    {
-        if ($cf->getOptions()[self::MULTIPLE]) {
-            $choices = array();
-            
-            foreach ($cf->getOptions()[self::CHOICES] as $choice) {
-                if ($choices['active'] === false) {
-                    continue;
-                }
-                $choices[$choice["slug"]] = $this->translatableStringHelper
-                    ->localize($choice["name"]);
-            }
-            
-            if ($this->allowOtherChoice($cf)) {
-                $labels = $cf->getOptions()[self::OTHER_VALUE_LABEL];
-                if (!is_array($labels) or count($labels) === 0) {
-                    $labels['back'] = 'other value';
-                }
-                $choices['_other'] = $this->translatableStringHelper
-                    ->localize($labels);
-            }
-            
-            return $choices;
-        } else {
-            return [
-                $cf->getSlug() => $this->translatableStringHelper->localize($cf->getName())
-                ]; 
-        }
-    }
-    
-    /**
-     * Return true if the choice given in $choiceSlug is checked inside $data.
-     * 
-     * Used in list exports.
-     * 
-     * @param CustomField $cf
-     * @param string $choiceSlug the slug of the choice we want to know if it was checked
-     * @param array|string $data the data of the field
-     * @return boolean
-     */
-    public function isChecked(CustomField $cf, $choiceSlug, $data) 
-    {
-        if ($data === null) {
-            return false;
-        }
-        
-        if ($cf->getOptions()[self::MULTIPLE]) {
-            if ($cf->getOptions()[self::ALLOW_OTHER]) {
-                return \in_array($choiceSlug, $this->deserialize($data, $cf)['_choices']);
-            } else {
-                return \in_array($choiceSlug, $this->deserialize($data, $cf));
-            }
-        } else {
-            if ($cf->getOptions()[self::ALLOW_OTHER]) {
-                return $this->deserialize($data, $cf)['_choices'] === $choiceSlug;
-            } else {
-                return $this->deserialize($data, $cf) === $choiceSlug;
-            }
-        }
-    }
-    
-    public function isMultiple(CustomField $cf)
-    {
-        return $cf->getOptions()[self::MULTIPLE];
-    }
-    
-    public function allowOtherChoice(CustomField $cf)
-    {
-        return $cf->getOptions()[self::ALLOW_OTHER];
-    }
-    
-    public function extractOtherValue(CustomField $cf, array $data = null)
-    {
-        return $data['_other'];
+
+        throw LogicException('This case is not expected.');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
index b5ebf7554..1afa9982a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
@@ -1,196 +1,114 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\GreaterThanOrEqual;
-use Symfony\Component\Validator\Constraints\LessThanOrEqual;
-use Symfony\Bundle\TwigBundle\TwigEngine;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use DateTime;
+use Exception;
+use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
 
 /**
  * Create a custom date number.
- * 
+ *
  * The date may have a min and max value.
- * 
+ *
  * The date is stored as an unix timestamp.
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class CustomFieldDate extends AbstractCustomField
 {
+    public const DATE_FORMAT = DateTime::RFC3339;
+
+    public const FORMAT = 'format';
+
+    public const MAX = 'max';
+
     /**
-     * key for the minimal value of the field
+     * key for the minimal value of the field.
      */
-    const MIN = 'min';
-    const MAX = 'max';
-    const FORMAT = 'format';
-    const DATE_FORMAT = \DateTime::RFC3339;
-    
+    public const MIN = 'min';
+
     /**
-     *
      * @var TwigEngine
      */
-    private $templating = NULL;
-    
+    private $templating;
+
     /**
-     *
      * @var TranslatableStringHelper
      */
-    private $translatableStringHelper = NULL;
-    
+    private $translatableStringHelper;
+
     public function __construct(TwigEngine $templating, TranslatableStringHelper $translatableStringHelper)
     {
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;
     }
-    
+
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
         $fieldOptions = $this->prepareFieldOptions($customField);
-        
+
         $builder->add(
             $builder
                 ->create(
-                    $customField->getSlug(), 
-                    ChillDateType::class, 
-                    $fieldOptions)
+                    $customField->getSlug(),
+                    ChillDateType::class,
+                    $fieldOptions
+                )
                 ->addModelTransformer(
                     new CustomFieldDataTransformer($this, $customField)
-                    )
-            )
-            ;
-    }
-    
-    /**
-     * prepare the options'form field
-     * 
-     * @param CustomField $customField
-     * @param string $type
-     * @return mixed[]
-     */
-    private function prepareFieldOptions(CustomField $customField)
-    {
-        $options = $customField->getOptions();
-        
-        /**
-         * @var mixed[] the formField options
-         */
-        $fieldOptions = array();
-        
-        // add required 
-        $fieldOptions['required'] = False;
-        
-        //add label
-        $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
-        
-        // add constraints if required
-        if ($options[self::MIN] !== NULL) {
-            $fieldOptions['constraints'][] = new Callback(
-                function($timestamp, ExecutionContextInterface $context) use ($options) {
-                    if ($timestamp === null) {
-                        return;
-                    }
-                    
-                    $value = \DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
-                    $after = new \DateTime($options[self::MIN]);
-                    
-                    if ($value < $after) {
-                        $context
-                            ->buildViolation('This date must be after or equal to %date%', [
-                                '%date%' => $after->format('d-m-Y')
-                            ])
-                            ->addViolation();
-                    }
-                }
-            );
-        }
-        if ($options[self::MAX] !== NULL) {
-            $fieldOptions['constraints'][] = new Callback(
-                function($timestamp, ExecutionContextInterface $context) use ($options) {
-                    if ($timestamp === null) {
-                        return;
-                    }
-                    
-                    $value = \DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
-                    $before = new \DateTime($options[self::MAX]);
-                    
-                    if ($value > $before) {
-                        $context
-                            ->buildViolation('This date must be before or equal to %date%', [
-                                '%date%' => $before->format('d-m-Y')
-                            ])
-                            ->addViolation();
-                    }
-                }
-            );
-        }
-        
-        return $fieldOptions;
+                )
+        );
     }
 
     public function buildOptionsForm(FormBuilderInterface $builder)
     {
-        $validatorFunction = function($value, ExecutionContextInterface $context) {
+        $validatorFunction = static function ($value, ExecutionContextInterface $context) {
             try {
-                $date = new \DateTime($value);
-            } catch (\Exception $e) {
+                $date = new DateTime($value);
+            } catch (Exception $e) {
                 $context->buildViolation('The expression "%expression%" is invalid', [
-                    '%expression%' => $value
+                    '%expression%' => $value,
                 ])
-                    ->addViolation()
-                    ;
+                    ->addViolation();
             }
         };
-        
+
         return $builder
-                ->add(self::MIN, TextType::class, array(
-                    'label' => 'Greater or equal than (expression like 1 day ago, 2 years ago, +1 month, today, tomorrow, or date with format YYYY-mm-dd)',
-                    'required' => false,
-                    'constraints' => [ new Callback($validatorFunction) ]
-                ))
-                ->add(self::MAX, TextType::class, array(
-                    'label' => 'Lesser or equal than (expression like 1 day ago, 2 years ago, +1 month, today, tomorrow, or date with format YYYY-mm-dd)',
-                    'required' => false,
-                    'constraints' => [ new Callback($validatorFunction) ]
-                ))
-                ->add(self::FORMAT, ChoiceType::class, [
-                    'label' => 'Format',
-                    'choices' => [
-                        'medium' => 'medium',
-                        'long'   => 'long',
-                        'short'  => 'short'
-                    ]
-                ])
-                ;
-                
+            ->add(self::MIN, TextType::class, [
+                'label' => 'Greater or equal than (expression like 1 day ago, 2 years ago, +1 month, today, tomorrow, or date with format YYYY-mm-dd)',
+                'required' => false,
+                'constraints' => [new Callback($validatorFunction)],
+            ])
+            ->add(self::MAX, TextType::class, [
+                'label' => 'Lesser or equal than (expression like 1 day ago, 2 years ago, +1 month, today, tomorrow, or date with format YYYY-mm-dd)',
+                'required' => false,
+                'constraints' => [new Callback($validatorFunction)],
+            ])
+            ->add(self::FORMAT, ChoiceType::class, [
+                'label' => 'Format',
+                'choices' => [
+                    'medium' => 'medium',
+                    'long' => 'long',
+                    'short' => 'short',
+                ],
+            ]);
     }
 
     public function deserialize($serialized, CustomField $customField)
@@ -198,8 +116,8 @@ class CustomFieldDate extends AbstractCustomField
         if (empty($serialized)) {
             return null;
         }
-        
-        return \DateTime::createFromFormat(self::DATE_FORMAT, $serialized);
+
+        return DateTime::createFromFormat(self::DATE_FORMAT, $serialized);
     }
 
     public function getName()
@@ -212,30 +130,97 @@ class CustomFieldDate extends AbstractCustomField
         switch ($documentType) {
             case 'csv':
                 $date = $this->deserialize($value, $customField);
-                if (NULL === $date) {
+
+                if (null === $date) {
                     return null;
                 }
-                
+
                     return $date->format('Y-m-d');
+
             default:
                 $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:date.'
-                        .$documentType.'.twig';
+                        . $documentType . '.twig';
 
                 return $this->templating
-                    ->render($template, array(
+                    ->render($template, [
                         'value' => $this->deserialize($value, $customField),
-                        'format' => $customField->getOptions()[self::FORMAT]
-                        ));
+                        'format' => $customField->getOptions()[self::FORMAT],
+                    ]);
         }
     }
 
     public function serialize($date, CustomField $customField)
     {
-        if ($date === null) {
+        if (null === $date) {
             return null;
         }
-        
+
         return $date->format(self::DATE_FORMAT);
     }
 
+    /**
+     * prepare the options'form field.
+     *
+     * @return mixed[]
+     */
+    private function prepareFieldOptions(CustomField $customField)
+    {
+        $options = $customField->getOptions();
+
+        /**
+         * @var mixed[] the formField options
+         */
+        $fieldOptions = [];
+
+        // add required
+        $fieldOptions['required'] = false;
+
+        //add label
+        $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
+
+        // add constraints if required
+        if (null !== $options[self::MIN]) {
+            $fieldOptions['constraints'][] = new Callback(
+                static function ($timestamp, ExecutionContextInterface $context) use ($options) {
+                    if (null === $timestamp) {
+                        return;
+                    }
+
+                    $value = DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
+                    $after = new DateTime($options[self::MIN]);
+
+                    if ($value < $after) {
+                        $context
+                            ->buildViolation('This date must be after or equal to %date%', [
+                                '%date%' => $after->format('d-m-Y'),
+                            ])
+                            ->addViolation();
+                    }
+                }
+            );
+        }
+
+        if (null !== $options[self::MAX]) {
+            $fieldOptions['constraints'][] = new Callback(
+                static function ($timestamp, ExecutionContextInterface $context) use ($options) {
+                    if (null === $timestamp) {
+                        return;
+                    }
+
+                    $value = DateTime::createFromFormat(self::DATE_FORMAT, $timestamp);
+                    $before = new DateTime($options[self::MAX]);
+
+                    if ($value > $before) {
+                        $context
+                            ->buildViolation('This date must be before or equal to %date%', [
+                                '%date%' => $before->format('d-m-Y'),
+                            ])
+                            ->addViolation();
+                    }
+                }
+            );
+        }
+
+        return $fieldOptions;
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
index ce341142d..fe0ffb8b9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
@@ -1,69 +1,76 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 interface CustomFieldInterface
 {
-
     /**
-     * Return a form type to edit the custom field. This form is shown to the 
-     * user. 
+     * Return a form type to edit the custom field. This form is shown to the
+     * user.
      *
      * @param \Chill\CustomFieldsBundle\CustomField\FormBuilderInterface $builder
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
+     *
      * @return \Symfony\Component\Form\FormTypeInterface the form type
      */
     public function buildForm(FormBuilderInterface $builder, CustomField $customField);
 
     /**
-     * Transform the value into a format that can be stored in DB
-     * 
-     * @param mixed $value
-     * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
+     * Return a formType which allow to edit option for the custom type.
+     * This FormType is shown in admin.
+     *
+     * @param \Chill\CustomFieldsBundle\CustomField\FormBuilderInterface $builder
+     *
+     * @return \Symfony\Component\Form\FormTypeInterface|null the form type
      */
-    public function serialize($value, CustomField $customField);
+    public function buildOptionsForm(FormBuilderInterface $builder);
 
     /**
      * Transform the representation of the value, stored in db, into the
      * value which may be used in the process.
-     * 
-     * @param mixed $value
+     *
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
+     * @param mixed $serialized
      */
     public function deserialize($serialized, CustomField $customField);
 
+    public function getName();
+
+    /**
+     * Return if the value can be considered as empty.
+     *
+     * @param mixed $value the value passed throug the deserialize function
+     */
+    public function isEmptyValue($value, CustomField $customField);
+
     /**
      * Return a repsentation of the value of the CustomField.
-     * 
+     *
      * @param mixed $value the raw value, **not deserialized** (= as stored in the db)
      * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
+     * @param mixed $documentType
+     *
      * @return string an html representation of the value
      */
     public function render($value, CustomField $customField, $documentType = 'html');
-    
-    public function getName();
-    
+
     /**
-     * Return a formType which allow to edit option for the custom type.
-     * This FormType is shown in admin
-     * 
-     * @param \Chill\CustomFieldsBundle\CustomField\FormBuilderInterface $builder
-     * @return \Symfony\Component\Form\FormTypeInterface|null the form type
+     * Transform the value into a format that can be stored in DB.
+     *
+     * @param mixed $value
+     * @param \Chill\CustomFieldsBundle\CustomField\CustomField $customField
      */
-    public function buildOptionsForm(FormBuilderInterface $builder);
-    
-    /**
-     * Return if the value can be considered as empty
-     * 
-     * @param mixed $value the value passed throug the deserialize function
-     * @param CustomField $customField
-     */
-    public function isEmptyValue($value, CustomField $customField);
+    public function serialize($value, CustomField $customField);
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
index feca7e351..311df8fad 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
@@ -1,64 +1,45 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
+use Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository;
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
-use Symfony\Bridge\Twig\TwigEngine;
 use Chill\MainBundle\Form\Type\Select2ChoiceType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use LogicException;
+use Symfony\Bridge\Twig\TwigEngine;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use function get_class;
+use function gettype;
+use function is_object;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CustomFieldLongChoice extends AbstractCustomField
 {
-    /**
-     *
-     * @var OptionRepository
-     */
-    private $optionRepository;
+    public const KEY = 'key';
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
+    private OptionRepository $optionRepository;
 
-    /**
-     * @var TwigEngine
-     */
-    private $templating;
+    private TwigEngine $templating;
 
-    const KEY = 'key';
+    private TranslatableStringHelper $translatableStringHelper;
 
-    public function __construct(OptionRepository $optionRepository,
+    public function __construct(
+        OptionRepository $optionRepository,
         TranslatableStringHelper $translatableStringHelper,
-        TwigEngine $twigEngine)
-    {
+        TwigEngine $twigEngine
+    ) {
         $this->optionRepository = $optionRepository;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->templating = $twigEngine;
@@ -67,62 +48,60 @@ class CustomFieldLongChoice extends AbstractCustomField
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
         $options = $customField->getOptions();
-        $entries = $this->optionRepository->findFilteredByKey($options[self::KEY],
-                false, true);
+        $entries = $this->optionRepository->findFilteredByKey(
+            $options[self::KEY],
+            false,
+            true
+        );
         //create a local copy of translatable string helper
         $translatableStringHelper = $this->translatableStringHelper;
-        $builder->add($customField->getSlug(), Select2ChoiceType::class, array(
+        $builder->add($customField->getSlug(), Select2ChoiceType::class, [
             'choices' => $entries,
-            'choice_label' => function(Option $option) use ($translatableStringHelper) {
+            'choice_label' => static function (Option $option) use ($translatableStringHelper) {
                 return $translatableStringHelper->localize($option->getText());
             },
-            'choice_value' => function ($key) use ($entries) {
-                if ($key === NULL) {
-                    return null;
-                }
-                return $key->getId();
-            },
+            'choice_value' => static fn (Option $key): ?int => null === $key ? null : $key->getId(),
             'multiple' => false,
             'expanded' => false,
             'required' => $customField->isRequired(),
             'placeholder' => 'Choose a value',
-            'group_by' => function(Option $option) use ($translatableStringHelper) {
+            'group_by' => static function (Option $option) use ($translatableStringHelper) {
                 if ($option->hasParent()) {
                     return $translatableStringHelper->localize($option->getParent()->getText());
-                } else {
-                    return $translatableStringHelper->localize($option->getText());
                 }
-            },
-            'label' => $translatableStringHelper->localize($customField->getName())
-        ));
-        $builder->get($customField->getSlug())
-                ->addModelTransformer(new CustomFieldDataTransformer($this, $customField));
 
+                return $translatableStringHelper->localize($option->getText());
+            },
+            'label' => $translatableStringHelper->localize($customField->getName()),
+        ]);
+
+        $builder
+            ->get($customField->getSlug())
+            ->addModelTransformer(new CustomFieldDataTransformer($this, $customField));
     }
 
     public function buildOptionsForm(FormBuilderInterface $builder)
     {
         //create a selector between different keys
         $keys = $this->optionRepository->getKeys();
-        $choices = array();
+        $choices = [];
+
         foreach ($keys as $key) {
             $choices[$key] = $key;
         }
 
-        return $builder->add(self::KEY, ChoiceType::class, array(
-            'choices' => array_combine(array_values($choices),array_keys($choices)),
+        return $builder->add(self::KEY, ChoiceType::class, [
+            'choices' => array_combine(array_values($choices), array_keys($choices)),
             'label' => 'Options key',
-        ));
-
+        ]);
     }
 
-    public function deserialize($serialized, \Chill\CustomFieldsBundle\Entity\CustomField $customField)
+    public function deserialize($serialized, CustomField $customField)
     {
-        if ($serialized === NULL) {
-            return NULL;
+        if (null === $serialized) {
+            return null;
         }
 
-
         return $this->optionRepository->find($serialized);
     }
 
@@ -131,32 +110,31 @@ class CustomFieldLongChoice extends AbstractCustomField
         return 'Long choice field';
     }
 
-    public function render($value, \Chill\CustomFieldsBundle\Entity\CustomField $customField, $documentType = 'html')
+    public function render($value, CustomField $customField, $documentType = 'html')
     {
         $option = $this->deserialize($value, $customField);
         $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice_long.'
-                .$documentType.'.twig';
+                . $documentType . '.twig';
 
         return $this->templating
-            ->render($template, array(
-                'values' => $option === NULL ? array() : array($option)
-                ));
+            ->render($template, [
+                'values' => null === $option ? [] : [$option],
+            ]);
     }
 
-    public function serialize($value, \Chill\CustomFieldsBundle\Entity\CustomField $customField)
+    public function serialize($value, CustomField $customField)
     {
-        if ($value === NULL) {
-            return NULL;
+        if (null === $value) {
+            return null;
         }
 
         if (!$value instanceof Option) {
-            throw new \LogicException('the value should be an instance of '
+            throw new LogicException('the value should be an instance of '
                     . 'Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option, '
-                    . is_object($value) ? get_class($value) : gettype($value).' given');
+                    . is_object($value) ? get_class($value) : gettype($value) . ' given');
         }
 
         // we place the id in array, to allow in the future multiple select
         return $value->getId();
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
index caf892c0e..c7ec62ba2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
@@ -1,69 +1,54 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints\GreaterThanOrEqual;
-use Symfony\Component\Validator\Constraints\LessThanOrEqual;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bundle\TwigBundle\TwigEngine;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bundle\TwigBundle\TwigEngine;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+use Symfony\Component\Validator\Constraints\GreaterThanOrEqual;
+use Symfony\Component\Validator\Constraints\LessThanOrEqual;
 
 /**
  * Create a custom field number.
  *
  * This number may have a min and max value, and a precision.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc@champs-libres.coop>
  */
 class CustomFieldNumber extends AbstractCustomField
 {
-    /**
-     * key for the minimal value of the field
-     */
-    const MIN = 'min';
-    const MAX = 'max';
-    const SCALE = 'scale';
-    const POST_TEXT = 'post_text';
+    public const MAX = 'max';
+
+    /**
+     * key for the minimal value of the field.
+     */
+    public const MIN = 'min';
+
+    public const POST_TEXT = 'post_text';
+
+    public const SCALE = 'scale';
 
     /**
-     *
      * @var TwigEngine
      */
-    private $templating = NULL;
+    private $templating;
 
     /**
-     *
      * @var TranslatableStringHelper
      */
-    private $translatableStringHelper = NULL;
+    private $translatableStringHelper;
 
     public function __construct(TwigEngine $templating, TranslatableStringHelper $translatableStringHelper)
     {
@@ -76,82 +61,38 @@ class CustomFieldNumber extends AbstractCustomField
         $options = $customField->getOptions();
 
         //select the type depending to the SCALE
-        $type = ($options[self::SCALE] === 0 or $options[self::SCALE] === NULL)?
+        $type = (0 === $options[self::SCALE] || null === $options[self::SCALE]) ?
                 IntegerType::class : NumberType::class;
-                //'integer' : 'number';
+        //'integer' : 'number';
 
         $fieldOptions = $this->prepareFieldOptions($customField, $type);
 
         $builder->add($customField->getSlug(), $type, $fieldOptions);
     }
 
-    /**
-     * prepare the options'form field
-     *
-     * @param CustomField $customField
-     * @param string $type
-     * @return mixed[]
-     */
-    private function prepareFieldOptions(CustomField $customField, $type)
-    {
-        $options = $customField->getOptions();
-
-        /**
-         * @var mixed[] the formField options
-         */
-        $fieldOptions = array();
-
-        // add required
-        $fieldOptions['required'] = False;
-
-        //add label
-        $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
-
-        // add constraints if required
-        if ($options[self::MIN] !== NULL) {
-            $fieldOptions['constraints'][] = new GreaterThanOrEqual(array('value' => $options[self::MIN]));
-        }
-        if ($options[self::MAX] !== NULL) {
-            $fieldOptions['constraints'][] = new LessThanOrEqual(array('value' => $options[self::MAX]));
-        }
-
-        // add precision to options if required
-        if ($type === 'number') {
-            $fieldOptions['scale'] = $options[self::SCALE];
-        }
-
-        if (!empty($options[self::POST_TEXT])) {
-            $fieldOptions['post_text'] = $options[self::POST_TEXT];
-        }
-
-        return $fieldOptions;
-    }
-
     public function buildOptionsForm(FormBuilderInterface $builder)
     {
         return $builder
-                ->add(self::MIN, NumberType::class, array(
-                    'scale' => 2,
-                    'label' => 'Greater or equal than',
-                    'required' => false
-                ))
-                ->add(self::MAX, NumberType::class, array(
-                    'scale' => 2,
-                    'label' => 'Lesser or equal than',
-                    'required' => false
-                ))
-                ->add(self::SCALE, IntegerType::class, array(
-                    'scale' => 0,
-                    'label' => 'Precision',
-                    'constraints' => array(
-                        new GreaterThanOrEqual(array('value' => 0))
-                    )
-                ))
-                ->add(self::POST_TEXT, TextType::class, array(
-                    'label' => 'Text after the field'
-                ))
-                ;
-
+            ->add(self::MIN, NumberType::class, [
+                'scale' => 2,
+                'label' => 'Greater or equal than',
+                'required' => false,
+            ])
+            ->add(self::MAX, NumberType::class, [
+                'scale' => 2,
+                'label' => 'Lesser or equal than',
+                'required' => false,
+            ])
+            ->add(self::SCALE, IntegerType::class, [
+                'scale' => 0,
+                'label' => 'Precision',
+                'constraints' => [
+                    new GreaterThanOrEqual(['value' => 0]),
+                ],
+            ])
+            ->add(self::POST_TEXT, TextType::class, [
+                'label' => 'Text after the field',
+            ]);
     }
 
     public function deserialize($serialized, CustomField $customField)
@@ -167,15 +108,15 @@ class CustomFieldNumber extends AbstractCustomField
     public function render($value, CustomField $customField, $documentType = 'html')
     {
         $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:number.'
-                .$documentType.'.twig';
+                . $documentType . '.twig';
         $options = $customField->getOptions();
 
         return $this->templating
-            ->render($template, array(
+            ->render($template, [
                 'number' => $value,
                 'scale' => $options[self::SCALE],
-                'post' => $options[self::POST_TEXT]
-                ));
+                'post' => $options[self::POST_TEXT],
+            ]);
     }
 
     public function serialize($value, CustomField $customField)
@@ -183,4 +124,46 @@ class CustomFieldNumber extends AbstractCustomField
         return $value;
     }
 
+    /**
+     * prepare the options'form field.
+     *
+     * @param string $type
+     *
+     * @return mixed[]
+     */
+    private function prepareFieldOptions(CustomField $customField, $type)
+    {
+        $options = $customField->getOptions();
+
+        /**
+         * @var mixed[] the formField options
+         */
+        $fieldOptions = [];
+
+        // add required
+        $fieldOptions['required'] = false;
+
+        //add label
+        $fieldOptions['label'] = $this->translatableStringHelper->localize($customField->getName());
+
+        // add constraints if required
+        if (null !== $options[self::MIN]) {
+            $fieldOptions['constraints'][] = new GreaterThanOrEqual(['value' => $options[self::MIN]]);
+        }
+
+        if (null !== $options[self::MAX]) {
+            $fieldOptions['constraints'][] = new LessThanOrEqual(['value' => $options[self::MAX]]);
+        }
+
+        // add precision to options if required
+        if ('number' === $type) {
+            $fieldOptions['scale'] = $options[self::SCALE];
+        }
+
+        if (!empty($options[self::POST_TEXT])) {
+            $fieldOptions['post_text'] = $options[self::POST_TEXT];
+        }
+
+        return $fieldOptions;
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
index abd6e7911..62325b797 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
@@ -1,49 +1,36 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bundle\TwigBundle\TwigEngine;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bundle\TwigBundle\TwigEngine;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use function array_key_exists;
 
-/**
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc@champs-libres.coop>
- */
 class CustomFieldText extends AbstractCustomField
 {
+    public const MAX_LENGTH = 'maxLength';
+
+    public const MULTIPLE_CF_INLINE = 'multipleCFInline';
 
     private $requestStack;
 
     /**
-     *
      * @var TwigEngine
      */
     private $templating;
@@ -53,62 +40,55 @@ class CustomFieldText extends AbstractCustomField
      */
     private $translatableStringHelper;
 
-
-    public function __construct(RequestStack $requestStack, TwigEngine $templating,
-        TranslatableStringHelper $translatableStringHelper)
-    {
+    public function __construct(
+        RequestStack $requestStack,
+        TwigEngine $templating,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
         $this->requestStack = $requestStack;
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    const MAX_LENGTH = 'maxLength';
-    const MULTIPLE_CF_INLINE ='multipleCFInline';
-
     /**
-     * Create a form according to the maxLength option
+     * Create a form according to the maxLength option.
      *
      * if maxLength < 256 THEN the form type is 'text'
      * if not, THEN the form type is textarea
-     *
-     * @param FormBuilderInterface $builder
-     * @param CustomField $customField
      */
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
-        $options =  $customField->getOptions();
+        $options = $customField->getOptions();
 
-        $type = ($options[self::MAX_LENGTH] < 256) ? TextType::class
+        $type = (256 > $options[self::MAX_LENGTH]) ? TextType::class
               : TextareaType::class;
 
-        $attrArray = array();
+        $attrArray = [];
 
-        if(array_key_exists(self::MULTIPLE_CF_INLINE, $options) and
-            $options[self::MULTIPLE_CF_INLINE]) {
+        if (array_key_exists(self::MULTIPLE_CF_INLINE, $options)
+            && $options[self::MULTIPLE_CF_INLINE]) {
             $attrArray['class'] = 'multiple-cf-inline';
         }
 
-        $builder->add($customField->getSlug(), $type, array(
+        $builder->add($customField->getSlug(), $type, [
             'label' => $this->translatableStringHelper->localize($customField->getName()),
             'required' => false,
-            'attr' => $attrArray
-        ));
+            'attr' => $attrArray,
+        ]);
     }
 
-    public function render($value, CustomField $customField,  $documentType = 'html')
+    public function buildOptionsForm(FormBuilderInterface $builder)
     {
-        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.html.twig';
-        if($documentType == 'csv') {
-            $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.csv.twig';
-        }
-
-        return $this->templating
-            ->render($template, array('text' => $value));
-    }
-
-    public function serialize($value, CustomField $customField)
-    {
-        return $value;
+        return $builder
+            ->add(self::MAX_LENGTH, IntegerType::class, ['empty_data' => 256])
+            ->add(self::MULTIPLE_CF_INLINE, ChoiceType::class, [
+                'choices' => [
+                    'Multiple boxes on the line' => '1',
+                    'One box on the line' => '0',
+                ],
+                'label' => 'Box appearance',
+                'expanded' => true,
+            ]);
     }
 
     public function deserialize($serialized, CustomField $customField)
@@ -121,18 +101,20 @@ class CustomFieldText extends AbstractCustomField
         return 'Text field';
     }
 
-    public function buildOptionsForm(FormBuilderInterface $builder)
+    public function render($value, CustomField $customField, $documentType = 'html')
     {
-        return $builder
-            ->add(self::MAX_LENGTH, IntegerType::class, array('empty_data' => 256))
-            ->add(self::MULTIPLE_CF_INLINE, ChoiceType::class,  array(
-                'choices'  => array(
-                   'Multiple boxes on the line' => '1',
-                   'One box on the line' => '0'
-                   ),
-                'label' => 'Box appearance',
-                'expanded' => True
-               ))
-        ;
+        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.html.twig';
+
+        if ('csv' === $documentType) {
+            $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.csv.twig';
+        }
+
+        return $this->templating
+            ->render($template, ['text' => $value]);
+    }
+
+    public function serialize($value, CustomField $customField)
+    {
+        return $value;
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
index 64a7fbba8..4b1350499 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
@@ -1,45 +1,35 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\CustomFields;
 
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Form\Type\CustomFieldsTitleType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bundle\TwigBundle\TwigEngine;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bundle\TwigBundle\TwigEngine;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\CustomFieldsBundle\Form\Type\CustomFieldsTitleType;
 
 class CustomFieldTitle extends AbstractCustomField
 {
-    const TYPE = 'type';
-    const TYPE_TITLE = 'title';
-    const TYPE_SUBTITLE = 'subtitle';
+    public const TYPE = 'type';
+
+    public const TYPE_SUBTITLE = 'subtitle';
+
+    public const TYPE_TITLE = 'title';
 
     private $requestStack;
 
     /**
-     *
      * @var TwigEngine
      */
     private $templating;
@@ -49,9 +39,11 @@ class CustomFieldTitle extends AbstractCustomField
      */
     private $translatableStringHelper;
 
-    public function __construct(RequestStack $requestStack, TwigEngine $templating,
-        TranslatableStringHelper $translatableStringHelper)
-    {
+    public function __construct(
+        RequestStack $requestStack,
+        TwigEngine $templating,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
         $this->requestStack = $requestStack;
         $this->templating = $templating;
         $this->translatableStringHelper = $translatableStringHelper;
@@ -59,30 +51,29 @@ class CustomFieldTitle extends AbstractCustomField
 
     public function buildForm(FormBuilderInterface $builder, CustomField $customField)
     {
-        $builder->add($customField->getSlug(), CustomFieldsTitleType::class, array(
+        $builder->add($customField->getSlug(), CustomFieldsTitleType::class, [
             'label' => false,
-            'attr' => array(
+            'attr' => [
                 'class' => 'cf-title',
                 'title' => $this->translatableStringHelper->localize($customField->getName()),
-                self::TYPE => $customField->getOptions()[self::TYPE ]
-            )
-        ));
+                self::TYPE => $customField->getOptions()[self::TYPE],
+            ],
+        ]);
     }
 
-    public function render($value, CustomField $customField, $documentType = 'html')
+    public function buildOptionsForm(FormBuilderInterface $builder)
     {
-        return $this->templating
-            ->render('ChillCustomFieldsBundle:CustomFieldsRendering:title.html.twig',
-                array(
-                    'title' => $customField->getName(),
-                    'type' => $customField->getOptions()[self::TYPE]
-                )
-            );
-    }
-
-    public function serialize($value, CustomField $customField)
-    {
-        return $value;
+        return $builder->add(
+            self::TYPE,
+            ChoiceType::class,
+            [
+                'choices' => [
+                    'Main title' => self::TYPE_TITLE,
+                    'Subtitle' => self::TYPE_SUBTITLE,
+                ],
+                'label' => 'Title level',
+            ]
+        );
     }
 
     public function deserialize($serialized, CustomField $customField)
@@ -100,16 +91,20 @@ class CustomFieldTitle extends AbstractCustomField
         return false;
     }
 
-    public function buildOptionsForm(FormBuilderInterface $builder)
+    public function render($value, CustomField $customField, $documentType = 'html')
     {
-        return $builder->add(self::TYPE, ChoiceType::class,
-            array(
-               'choices' => array(
-                    'Main title' => self::TYPE_TITLE,
-                    'Subtitle' => self::TYPE_SUBTITLE
-                ),
-               'label' => 'Title level',
-            )
-        );
+        return $this->templating
+            ->render(
+                'ChillCustomFieldsBundle:CustomFieldsRendering:title.html.twig',
+                [
+                    'title' => $customField->getName(),
+                    'type' => $customField->getOptions()[self::TYPE],
+                ]
+            );
+    }
+
+    public function serialize($value, CustomField $customField)
+    {
+        return $value;
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
index b859612c5..2777a0da5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php
@@ -1,56 +1,44 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\DataFixtures\ORM;
 
+use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
 use Doctrine\Persistence\ObjectManager;
 
 error_reporting(0);
 /**
- * Load some Options
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Load some Options.
  */
 class LoadOption extends AbstractFixture implements OrderedFixtureInterface
 {
     /**
-     *
-     * @var \Faker\Generator
-     */
-    public $fakerFr;
-
-    /**
-     *
      * @var \Faker\Generator
      */
     public $fakerEn;
 
     /**
-     *
+     * @var \Faker\Generator
+     */
+    public $fakerFr;
+
+    /**
      * @var \Faker\Generator
      */
     public $fakerNl;
 
+    private $counter = 0;
+
     public function __construct()
     {
         $this->fakerFr = \Faker\Factory::create('fr_FR');
@@ -72,110 +60,99 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
         $this->loadingWords($manager);
 
         $manager->flush();
-
     }
 
-    private function loadingWords(\Doctrine\Persistence\ObjectManager $manager)
-    {
-        echo "Loading some words...\n";
-
-        $parents = array(
-            array(
-                'fr' => 'Categorie 1',
-                'nl' => 'Categorie 1',
-                'en' => 'Category 1'
-            ),
-            array(
-                'fr' => 'Categorie 2',
-                'nl' => 'Categorie 2',
-                'en' => 'Category 2'
-            )
-        );
-
-        foreach ($parents as $text) {
-            $parent = (new Option())
-                ->setText($text)
-                ->setKey('word')
-                ;
-            $manager->persist($parent);
-
-            //Load children
-            $expected_nb_children = rand(10, 50);
-            for ($i=0; $i < $expected_nb_children; $i++) {
-                $manager->persist($this->createChildOption($parent, array(
-                    'fr' => $this->fakerFr->word,
-                    'nl' => $this->fakerNl->word,
-                    'en' => $this->fakerEn->word
-                )));
-            }
-        }
-    }
-
-    private function loadingCompanies(\Doctrine\Persistence\ObjectManager $manager)
-    {
-        echo "Loading companies \n";
-        $companiesParents = array(
-            array(
-                'fr' => 'Grandes Entreprises',
-                'nl' => 'Grotes Bedrijven',
-                'en' => 'Big Companies'
-            ),
-            array(
-                'fr' => 'Moyennes Entreprises',
-                'nl' => 'Middelbare Bedrijven',
-                'en' => 'Middle Companies'
-            ),
-            array(
-                'fr' => 'Petites Entreprises',
-                'nl' => 'Kleine Bedrijven',
-                'en' => 'Little Companies'
-            )
-        );
-
-
-        foreach ($companiesParents as $text) {
-
-            $parent = (new Option())
-                ->setText($text)
-                ->setKey('company')
-                ;
-            $manager->persist($parent);
-
-            //Load children
-            $expected_nb_children = rand(10, 50);
-            for ($i=0; $i < $expected_nb_children; $i++) {
-
-                $companyName = $this->fakerFr->company;
-
-                $manager->persist(
-                    $this->createChildOption($parent, array(
-                    'fr' => $companyName,
-                    'nl' => $companyName,
-                    'en' => $companyName
-                )));
-            }
-
-        }
-    }
-
-    private $counter = 0;
-
     /**
-     *
-     * @param Option $parent
-     * @param array $text
      * @return Option
      */
     private function createChildOption(Option $parent, array $text)
     {
-        $this->counter ++;
+        ++$this->counter;
 
         return (new Option())
-                ->setText($text)
-                ->setParent($parent)
-                ->setActive(true)
-                ->setInternalKey($parent->getKey().'-'.$this->counter);
-                ;
+            ->setText($text)
+            ->setParent($parent)
+            ->setActive(true)
+            ->setInternalKey($parent->getKey() . '-' . $this->counter);
     }
 
+    private function loadingCompanies(ObjectManager $manager)
+    {
+        echo "Loading companies \n";
+        $companiesParents = [
+            [
+                'fr' => 'Grandes Entreprises',
+                'nl' => 'Grotes Bedrijven',
+                'en' => 'Big Companies',
+            ],
+            [
+                'fr' => 'Moyennes Entreprises',
+                'nl' => 'Middelbare Bedrijven',
+                'en' => 'Middle Companies',
+            ],
+            [
+                'fr' => 'Petites Entreprises',
+                'nl' => 'Kleine Bedrijven',
+                'en' => 'Little Companies',
+            ],
+        ];
+
+        foreach ($companiesParents as $text) {
+            $parent = (new Option())
+                ->setText($text)
+                ->setKey('company');
+            $manager->persist($parent);
+
+            //Load children
+            $expected_nb_children = mt_rand(10, 50);
+
+            for ($i = 0; $i < $expected_nb_children; ++$i) {
+                $companyName = $this->fakerFr->company;
+
+                $manager->persist(
+                    $this->createChildOption($parent, [
+                        'fr' => $companyName,
+                        'nl' => $companyName,
+                        'en' => $companyName,
+                    ])
+                );
+            }
+        }
+    }
+
+    private function loadingWords(ObjectManager $manager)
+    {
+        echo "Loading some words...\n";
+
+        $parents = [
+            [
+                'fr' => 'Categorie 1',
+                'nl' => 'Categorie 1',
+                'en' => 'Category 1',
+            ],
+            [
+                'fr' => 'Categorie 2',
+                'nl' => 'Categorie 2',
+                'en' => 'Category 2',
+            ],
+        ];
+
+        foreach ($parents as $text) {
+            $parent = (new Option())
+                ->setText($text)
+                ->setKey('word');
+            $manager->persist($parent);
+
+            //Load children
+            $expected_nb_children = mt_rand(10, 50);
+
+            for ($i = 0; $i < $expected_nb_children; ++$i) {
+                $manager->persist($this->createChildOption($parent, [
+                    'fr' => $this->fakerFr->word,
+                    'nl' => $this->fakerNl->word,
+                    'en' => $this->fakerEn->word,
+                ]));
+            }
+        }
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
index f6aabc0f1..98e22d1ef 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
@@ -1,61 +1,75 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillCustomFieldsExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/command.yaml');
-        
+
         //add at least a blank array at 'customizable_entities' options
-        //$customizable_entities = (isset($config['customizables_entities']) 
-        //        && $config['customizables_entities'] !== FALSE) 
+        //$customizable_entities = (isset($config['customizables_entities'])
+        //        && $config['customizables_entities'] !== FALSE)
         //        ? $config['customizables_entities'] : array();
-        
-        $container->setParameter('chill_custom_fields.customizables_entities', 
-                $config['customizables_entities']);
-        $container->setParameter('chill_custom_fields.show_empty_values', 
-                $config['show_empty_values_in_views']);
+
+        $container->setParameter(
+            'chill_custom_fields.customizables_entities',
+            $config['customizables_entities']
+        );
+        $container->setParameter(
+            'chill_custom_fields.show_empty_values',
+            $config['show_empty_values_in_views']
+        );
     }
-    
-     /* (non-PHPdoc)
-      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
-      */
-    public function prepend(ContainerBuilder $container) 
+
+    /** (non-PHPdoc).
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
+     */
+    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
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillCustomFieldsBundle/config/routes.yaml'
-              )
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillCustomFieldsBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
index 5bdd68cd4..453254c4e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
@@ -1,70 +1,75 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from 
- * your app/config files
+ * This is the class that validates and merges configuration from
+ * your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_custom_fields');
         $rootNode = $treeBuilder->getRootNode('chill_custom_fields');
-        
-        $classInfo = "The class which may receive custom fields";
-        $nameInfo = "The name which will appears in the user interface. May be translatable";
-        $optionsInfo = "Options available for custom fields groups referencing this class";
-        $optionsFormType = "The name of the form to append";
-        $optionsFormOptionsInfos = "the arguments to pass the form";
-        $customizableEntitiesInfo = "A list of customizable entities";
+
+        $classInfo = 'The class which may receive custom fields';
+        $nameInfo = 'The name which will appears in the user interface. May be translatable';
+        $optionsInfo = 'Options available for custom fields groups referencing this class';
+        $optionsFormType = 'The name of the form to append';
+        $optionsFormOptionsInfos = 'the arguments to pass the form';
+        $customizableEntitiesInfo = 'A list of customizable entities';
 
         $rootNode
             ->children()
-                ->arrayNode('customizables_entities')
-                    ->info($customizableEntitiesInfo)
-                    ->defaultValue(array())
-                    ->prototype('array')
-                    ->children()
-                        ->scalarNode('class')->isRequired()->info($classInfo)
-                        ->end()
-                        ->scalarNode('name') ->isRequired()->info($nameInfo)
-                        ->end()
-                        ->arrayNode('options')
-                            ->info($optionsInfo)
-                            ->defaultValue(array())
-                            ->useAttributeAsKey('key')
-                            ->prototype('array')
-                                ->children()
-                                    ->scalarNode('form_type')
-                                        ->isRequired()
-                                        ->info($optionsFormType)
-                                    ->end()
-                                    ->variableNode('form_options')
-                                        ->info($optionsFormOptionsInfos)
-                                        ->defaultValue(array())
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
+            ->arrayNode('customizables_entities')
+            ->info($customizableEntitiesInfo)
+            ->defaultValue([])
+            ->prototype('array')
+            ->children()
+            ->scalarNode('class')->isRequired()->info($classInfo)
+            ->end()
+            ->scalarNode('name')->isRequired()->info($nameInfo)
+            ->end()
+            ->arrayNode('options')
+            ->info($optionsInfo)
+            ->defaultValue([])
+            ->useAttributeAsKey('key')
+            ->prototype('array')
+            ->children()
+            ->scalarNode('form_type')
+            ->isRequired()
+            ->info($optionsFormType)
+            ->end()
+            ->variableNode('form_options')
+            ->info($optionsFormOptionsInfos)
+            ->defaultValue([])
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
             ->end()
             ->booleanNode('show_empty_values_in_views')
-                ->info('Show the empty value for custom fields in the views, timeline, ...')
-                ->defaultValue(true)
+            ->info('Show the empty value for custom fields in the views, timeline, ...')
+            ->defaultValue(true)
             ->end()
-        ->end()
-        ;
+            ->end();
 
         return $treeBuilder;
     }
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
index 8ea599a4f..198028360 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/CustomFieldCompilerPass.php
@@ -1,43 +1,45 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\CustomFieldsBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CustomFieldCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.custom_field.provider')) {
-            throw new \LogicException('service chill.custom_field.provider '
+            throw new LogicException('service chill.custom_field.provider '
                     . 'is not defined.');
         }
-        
+
         $definition = $container->getDefinition(
             'chill.custom_field.provider'
         );
 
         $taggedServices = $container->findTaggedServiceIds(
             'chill.custom_field'
-        ); 
-        
+        );
+
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
                 $definition->addMethodCall(
                     'addCustomField',
-                    array(new Reference($id), $attributes["type"])
+                    [new Reference($id), $attributes['type']]
                 );
             }
         }
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
index d7fb1e769..368bf92da 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
@@ -1,46 +1,84 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * CustomField
+ * CustomField.
  *
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="customfield")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class CustomField
 {
+    public const ONE_TO_MANY = 2;
+
+    public const ONE_TO_ONE = 1;
+
     /**
-     * @var integer
+     * @var bool
+     *
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * @var CustomFieldsGroup
+     *
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup",
+     * inversedBy="customFields")
+     */
+    private $customFieldGroup;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-    
+
+    /**
+     * @var array
+     *
+     * @ORM\Column(type="json")
+     */
+    private $name;
+
+    /**
+     * @var array
+     *
+     * @ORM\Column(type="json")
+     */
+    private $options = [];
+
+    /**
+     * @var float
+     *
+     * @ORM\Column(type="float")
+     */
+    private $ordering;
+
+    /**
+     * @var bool
+     *
+     * @ORM\Column(type="boolean")
+     */
+    private $required = false;
+
     /**
      * @var string
      *
@@ -56,94 +94,89 @@ class CustomField
     private $type;
 
     /**
-     * @var boolean
+     * Get customFieldGroup.
      *
-     * @ORM\Column(type="boolean")
+     * @return CustomFieldsGroup
      */
-    private $active = true;
-    
-    /**
-     * @var array
-     *
-     * @ORM\Column(type="json_array")
-     */
-    private $options = array();
-    
-    /**
-     * @var array
-     *
-     * @ORM\Column(type="json_array")
-     */
-    private $name;
+    public function getCustomFieldsGroup()
+    {
+        return $this->customFieldGroup;
+    }
 
     /**
-     * @var float
+     * Get id.
      *
-     * @ORM\Column(type="float")
-     */
-    private $ordering;
-    
-    /**
-     * @var boolean
-     *
-     * @ORM\Column(type="boolean")
-     */
-    private $required = FALSE;
-    
-    const ONE_TO_ONE = 1;
-    const ONE_TO_MANY = 2;
-
-    /**
-     * @var CustomFieldsGroup
-     *
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup",
-     *     inversedBy="customFields")
-     */
-    private $customFieldGroup;
-
-    
-    /**
-     * Get id
-     *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
         return $this->id;
     }
-    
+
     /**
-     * @return string
+     * Get name.
+     *
+     * @param mixed|null $locale
+     *
+     * @return array
      */
-    function getSlug()
+    public function getName($locale = null)
     {
-        return $this->slug;
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            }
+
+            foreach ($this->name as $name) {
+                if (!empty($name)) {
+                    return $name;
+                }
+            }
+
+            return '';
+        }
+
+        return $this->name;
     }
-    
+
     /**
      * @return array
      */
-    function getOptions()
+    public function getOptions()
     {
         return $this->options;
-    } 
-    
-    /**
-     * Set type
-     *
-     * @param string $type
-     * @return CustomField
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-
-        return $this;
     }
 
     /**
-     * Get type
+     * Get order.
+     *
+     * @return float
+     */
+    public function getOrdering()
+    {
+        return $this->ordering;
+    }
+
+    /**
+     * alias for isRequired.
+     *
+     * @return bool
+     */
+    public function getRequired()
+    {
+        return $this->isRequired();
+    }
+
+    /**
+     * @return string
+     */
+    public function getSlug()
+    {
+        return $this->slug;
+    }
+
+    /**
+     * Get type.
      *
      * @return string
      */
@@ -152,11 +185,31 @@ class CustomField
         return $this->type;
     }
 
-    
     /**
-     * Set active
+     * Returns true if the custom field is active.
+     *
+     * @return bool
+     */
+    public function isActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * return true if the field required.
+     *
+     * @return bool
+     */
+    public function isRequired()
+    {
+        return $this->required;
+    }
+
+    /**
+     * Set active.
+     *
+     * @param bool $active
      *
-     * @param boolean $active
      * @return CustomField
      */
     public function setActive($active)
@@ -167,32 +220,13 @@ class CustomField
     }
 
     /**
-     * Returns true if the custom field is active
-     *
-     * @return boolean
-     */
-    public function isActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * Get customFieldGroup
-     *
-     * @return CustomFieldsGroup
-     */
-    public function getCustomFieldsGroup()
-    {
-        return $this->customFieldGroup;
-    }
-
-    /**
-     * Set customFieldGroup
+     * Set customFieldGroup.
      *
      * @param CustomFieldsGroup $customFieldGroup
+     *
      * @return CustomField
      */
-    public function setCustomFieldsGroup(CustomFieldsGroup $customFieldGroup = null)
+    public function setCustomFieldsGroup(?CustomFieldsGroup $customFieldGroup = null)
     {
         $this->customFieldGroup = $customFieldGroup;
 
@@ -200,9 +234,10 @@ class CustomField
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param array $name
+     *
      * @return CustomField
      */
     public function setName($name)
@@ -213,34 +248,22 @@ class CustomField
     }
 
     /**
-     * Get name
+     * Set options.
      *
-     * @return array
+     * @return CustomField
      */
-    public function getName($locale = null)
+    public function setOptions(array $options)
     {
-        if ($locale) {
-          if (isset($this->name[$locale])) {
-             return $this->name[$locale];
-          } else {
-             foreach ($this->name as $name) {
-                if (!empty($name)) {
-                   return $name;
-                }
-             }
-          }
-          
-          return '';
-          
-       } else {
-          return $this->name;
-       };
+        $this->options = $options;
+
+        return $this;
     }
 
     /**
-     * Set order
+     * Set order.
      *
      * @param float $order
+     *
      * @return CustomField
      */
     public function setOrdering($order)
@@ -250,63 +273,36 @@ class CustomField
         return $this;
     }
 
-    /**
-     * Get order
-     *
-     * @return float
-     */
-    public function getOrdering()
+    public function setRequired($required)
     {
-        return $this->ordering;
-    }
-
-    /**
-     * Set options
-     *
-     * @param array $options
-     * @return CustomField
-     */
-    public function setOptions(array $options)
-    {
-        $this->options = $options;
+        $this->required = $required;
 
         return $this;
     }
-    
+
     /**
      * @param $slug
+     *
      * @return $this
      */
     public function setSlug($slug)
     {
         $this->slug = $slug;
+
         return $this;
     }
-    
-    /**
-     * alias for isRequired
-     * 
-     * @return boolean
-     */
-    public function getRequired()
-    {
-        return $this->isRequired();
-    }
-    
-    /**
-     * return true if the field required
-     * 
-     * @return boolean
-     */
-    public function isRequired()
-    {
-        return $this->required;
-    }
 
-    public function setRequired($required)
+    /**
+     * Set type.
+     *
+     * @param string $type
+     *
+     * @return CustomField
+     */
+    public function setType($type)
     {
-        $this->required = $required;
+        $this->type = $type;
+
         return $this;
     }
-    
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
index 06174a9a6..fe4f40149 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
@@ -1,22 +1,14 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice;
 
 use Doctrine\Common\Collections\Collection;
@@ -24,161 +16,63 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity(
- *     repositoryClass="Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository")
+ * repositoryClass="Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice\OptionRepository")
  * @ORM\Table(name="custom_field_long_choice_options")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class Option
 {
     /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * @var Collection
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
+     * mappedBy="parent")
+     */
+    private $children;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-    
-    /**
-     * @var string
-     * @ORM\Column(type="string", length=15)
-     */
-    private $key;
-    
-    /**
-     * A json representation of text (multilingual)
-     *
-     * @var array
-     * @ORM\Column(type="json_array")
-     */
-    private $text;
-    
-    /**
-     * @var Collection
-     * @ORM\OneToMany(
-     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
-     *     mappedBy="parent")
-     */
-    private $children;
-    
-    /**
-     * @var Option
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
-     *     inversedBy="children")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $parent;
-    
+
     /**
      * @var string
      * @ORM\Column(type="string", length=50, name="internal_key")
      */
     private $internalKey = '';
-    
+
     /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
+     * @var string
+     * @ORM\Column(type="string", length=15)
      */
-    private $active = true;
-    
+    private $key;
+
     /**
-     * @return int
+     * @var Option
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option",
+     * inversedBy="children")
+     * @ORM\JoinColumn(nullable=true)
      */
-    public function getId()
-    {
-        return $this->id;
-    }
-    
+    private $parent;
+
     /**
-     * @return string
+     * A json representation of text (multilingual).
+     *
+     * @var array
+     * @ORM\Column(type="json")
      */
-    public function getKey()
-    {
-        return $this->key;
-    }
-    
-    /**
-     * @return array
-     */
-    public function getText()
-    {
-        return $this->text;
-    }
-    
-    /**
-     * @return Collection
-     */
-    public function getChildren()
-    {
-        return $this->children;
-    }
-    
-    /**
-     * @return Option
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-    
-    /**
-     * @param $key
-     * @return $this
-     */
-    public function setKey($key)
-    {
-        $this->key = $key;
-        return $this;
-    }
-    
-    /**
-     * @param array $text
-     * @return $this
-     */
-    public function setText(array $text)
-    {
-        $this->text = $text;
-        return $this;
-    }
-    
-    /**
-     * @param Option|null $parent
-     * @return $this
-     */
-    public function setParent(Option $parent = null)
-    {
-        $this->parent = $parent;
-        $this->key = $parent->getKey();
-        return $this;
-    }
-    
-    /**
-     * 
-     * @return boolean
-     */
-    public function hasParent()
-    {
-        return $this->parent === NULL ? false : true;
-    }
-    
-    /**
-     * @return string
-     */
-    public function getInternalKey()
-    {
-        return $this->internalKey;
-    }
-    
-    /**
-     * @return bool
-     */
-    public function isActive()
-    {
-        return $this->active;
-    }
-    
+    private $text;
+
     /**
      * @return bool
      */
@@ -186,25 +80,125 @@ class Option
     {
         return $this->isActive();
     }
-    
+
     /**
-     * @param $internal_key
-     * @return $this
+     * @return Collection
      */
-    public function setInternalKey($internal_key)
+    public function getChildren()
     {
-        $this->internalKey = $internal_key;
-        return $this;
+        return $this->children;
     }
-    
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalKey()
+    {
+        return $this->internalKey;
+    }
+
+    /**
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @return Option
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @return array
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasParent()
+    {
+        return null === $this->parent ? false : true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive()
+    {
+        return $this->active;
+    }
+
     /**
      * @param $active
+     *
      * @return $this
      */
     public function setActive($active)
     {
         $this->active = $active;
+
+        return $this;
+    }
+
+    /**
+     * @param $internal_key
+     *
+     * @return $this
+     */
+    public function setInternalKey($internal_key)
+    {
+        $this->internalKey = $internal_key;
+
+        return $this;
+    }
+
+    /**
+     * @param $key
+     *
+     * @return $this
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setParent(?Option $parent = null)
+    {
+        $this->parent = $parent;
+        $this->key = $parent->getKey();
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setText(array $text)
+    {
+        $this->text = $text;
+
         return $this;
     }
-    
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
index 28d0afb78..841a71306 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
@@ -1,49 +1,40 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * CustomFieldsDefaultGroup
+ * CustomFieldsDefaultGroup.
  *
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(
  *     name="customfieldsdefaultgroup",
  *     uniqueConstraints={@ORM\UniqueConstraint(
- *          name="unique_entity",
- *          columns={"entity"}
- * )})
+ *         name="unique_entity",
+ *         columns={"entity"}
+ *     )})
  */
 class CustomFieldsDefaultGroup
 {
     /**
-     * @var integer
+     * @var CustomFieldsGroup
      *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\ManyToOne(
+     * targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
+     *
+     *     sf4 check: option inversedBy="customFields" return inconsistent error mapping !!
      */
-    private $id;
+    private $customFieldsGroup;
 
     /**
      * @var string
@@ -53,40 +44,26 @@ class CustomFieldsDefaultGroup
     private $entity;
 
     /**
-     * @var CustomFieldsGroup
+     * @var int
      *
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
-     *
-     *     sf4 check: option inversedBy="customFields" return inconsistent error mapping !!
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $customFieldsGroup;
+    private $id;
 
     /**
-     * Get id
+     * Get customFieldsGroup.
      *
-     * @return integer
+     * @return CustomFieldsGroup
      */
-    public function getId()
+    public function getCustomFieldsGroup()
     {
-        return $this->id;
+        return $this->customFieldsGroup;
     }
 
     /**
-     * Set entity
-     *
-     * @param string $entity
-     * @return CustomFieldsDefaultGroup
-     */
-    public function setEntity($entity)
-    {
-        $this->entity = $entity;
-
-        return $this;
-    }
-
-    /**
-     * Get entity
+     * Get entity.
      *
      * @return string
      */
@@ -96,9 +73,20 @@ class CustomFieldsDefaultGroup
     }
 
     /**
-     * Set customFieldsGroup
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set customFieldsGroup.
      *
      * @param CustomFieldsGroup $customFieldsGroup     *
+     *
      * @return CustomFieldsDefaultGroup
      */
     public function setCustomFieldsGroup($customFieldsGroup)
@@ -109,12 +97,16 @@ class CustomFieldsDefaultGroup
     }
 
     /**
-     * Get customFieldsGroup
+     * Set entity.
      *
-     * @return CustomFieldsGroup
+     * @param string $entity
+     *
+     * @return CustomFieldsDefaultGroup
      */
-    public function getCustomFieldsGroup()
+    public function setEntity($entity)
     {
-        return $this->customFieldsGroup;
+        $this->entity = $entity;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
index f9bb90d6d..e5aa5fbbe 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -1,40 +1,58 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * CustomFieldGroup
+ * CustomFieldGroup.
  *
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="customfieldsgroup")
  */
 class CustomFieldsGroup
 {
     /**
-     * @var integer
+     * The custom fields of the group that are active.
+     * This variable if null, if this informations has not been computed.
+     *
+     * @var array|null
+     */
+    private $activeCustomFields;
+
+    /**
+     * The custom fields of the group.
+     * The custom fields are asc-ordered regarding to their property "ordering".
+     *
+     * @var Collection
+     *
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomField",
+     * mappedBy="customFieldGroup")
+     * @ORM\OrderBy({"ordering": "ASC"})
+     */
+    private $customFields;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255)
+     */
+    private $entity;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -45,46 +63,17 @@ class CustomFieldsGroup
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     */
-    private $entity;
-
-    /**
-     * The custom fields of the group.
-     * The custom fields are asc-ordered regarding to their property "ordering".
-     *
-     * @var Collection $customFields
-     *
-     * @ORM\OneToMany(
-     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomField",
-     *     mappedBy="customFieldGroup")
-     * @ORM\OrderBy({"ordering" = "ASC"})
-     */
-    private $customFields;
-
-    /**
-     * The custom fields of the group that are active.
-     * This variable if null, if this informations has not been computed.
-     *
-     * @var array|null
-     */
-    private $activeCustomFields = null;
-    
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
-    private $options = array();
-    
-    
+    private $options = [];
+
     /**
      * CustomFieldsGroup constructor.
      */
@@ -94,9 +83,8 @@ class CustomFieldsGroup
     }
 
     /**
-     * Add customField
+     * Add customField.
      *
-     * @param CustomField $customField
      * @return CustomFieldsGroup
      */
     public function addCustomField(CustomField $customField)
@@ -107,46 +95,47 @@ class CustomFieldsGroup
     }
 
     /**
-     * Remove customField
-     *
-     * @param CustomField $customField
-     */
-    public function removeCustomField(CustomField $customField)
-    {
-        $this->customFields->removeElement($customField);
-    }
-    
-    /**
-     * @return Collection
-     */
-    public function getCustomFields()
-    {
-       return $this->customFields;
-    }
-
-    /**
-     * Get all the custom
+     * Get all the custom.
      *
      * @return Collection
      */
     public function getActiveCustomFields()
     {
-        if($this->activeCustomFields === null) {
-            $this->activeCustomFields = array();
+        if (null === $this->activeCustomFields) {
+            $this->activeCustomFields = [];
+
             foreach ($this->customFields as $cf) {
-                if($cf->isActive()) {
-                    array_push($this->activeCustomFields, $cf);
+                if ($cf->isActive()) {
+                    $this->activeCustomFields[] = $cf;
                 }
             }
         }
 
         return $this->activeCustomFields;
     }
-    
+
     /**
-     * Get id
+     * @return Collection
+     */
+    public function getCustomFields()
+    {
+        return $this->customFields;
+    }
+
+    /**
+     * Get entity.
      *
-     * @return integer
+     * @return string
+     */
+    public function getEntity()
+    {
+        return $this->entity;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
      */
     public function getId()
     {
@@ -154,48 +143,55 @@ class CustomFieldsGroup
     }
 
     /**
-     * Set name
+     * Get name.
      *
-     * @param array $name
-     * @return CustomFieldsGroup
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
+     * @param mixed|null $language
      *
      * @return array
      */
     public function getName($language = null)
     {
-       //TODO set this in a service, PLUS twig function
-       if ($language) {
-          if (isset($this->name[$language])) {
-             return $this->name[$language];
-          } else {
-             foreach ($this->name as $name) {
+        //TODO set this in a service, PLUS twig function
+        if ($language) {
+            if (isset($this->name[$language])) {
+                return $this->name[$language];
+            }
+
+            foreach ($this->name as $name) {
                 if (!empty($name)) {
-                   return $name;
+                    return $name;
                 }
-             }
-          }
-          
-          return '';
-          
-       } else {
-          return $this->name;
-       }
+            }
+
+            return '';
+        }
+
+        return $this->name;
     }
 
     /**
-     * Set entity
+     * get options array.
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Remove customField.
+     */
+    public function removeCustomField(CustomField $customField)
+    {
+        $this->customFields->removeElement($customField);
+    }
+
+    /**
+     * Set entity.
      *
      * @param string $entity
+     *
      * @return CustomFieldsGroup
      */
     public function setEntity($entity)
@@ -206,34 +202,28 @@ class CustomFieldsGroup
     }
 
     /**
-     * Get entity
+     * Set name.
      *
-     * @return string
+     * @param array $name
+     *
+     * @return CustomFieldsGroup
      */
-    public function getEntity()
+    public function setName($name)
     {
-        return $this->entity;
-    }
-    
-    /**
-     * get options array
-     * 
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->options;
+        $this->name = $name;
+
+        return $this;
     }
 
     /**
-     * set options array
-     * 
-     * @param array $options
+     * set options array.
+     *
      * @return CustomFieldsGroup
      */
     public function setOptions(array $options)
     {
         $this->options = $options;
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
index 58f8ee302..50a4a2c87 100644
--- a/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
+++ b/src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldLongChoice/OptionRepository.php
@@ -1,77 +1,64 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\EntityRepository\CustomFieldLongChoice;
 
-use Doctrine\ORM\EntityRepository;
 use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
+use Doctrine\ORM\EntityRepository;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class OptionRepository extends EntityRepository
 {
     /**
-     * 
      * @param string $key
+     * @param mixed $includeParents
+     * @param mixed $active
+     *
      * @return Option[]
      */
     public function findFilteredByKey($key, $includeParents = true, $active = true)
     {
         $qb = $this->createQueryBuilder('option');
         $qb->where('option.key = :key');
-        
-        if ($active === true){
+
+        if (true === $active) {
             $qb->andWhere('option.active = true');
         }
-        
-        if ($includeParents === false) {
+
+        if (false === $includeParents) {
             $qb->andWhere('option.parent IS NOT NULL');
-            
-            if ($active === TRUE) {
+
+            if (true === $active) {
                 $qb->join('option.parent', 'p');
                 $qb->andWhere('p.active = true');
             }
         }
-        
+
         $qb->setParameter('key', $key);
-        
+
         return $qb->getQuery()->getResult();
     }
-    
+
     /**
-     * 
      * @return string[]
      */
     public function getKeys()
     {
         $keys = $this->createQueryBuilder('option')
-                ->select('option.key')
-                ->distinct()
-                ->getQuery()
-                ->getScalarResult();
-        
-        return array_map(function($r) {
+            ->select('option.key')
+            ->distinct()
+            ->getQuery()
+            ->getScalarResult();
+
+        return array_map(static function ($r) {
             return $r['key'];
         }, $keys);
     }
-    
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
index cd3c7497d..e45cc7837 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
@@ -1,43 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Doctrine\Persistence\ObjectManager;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldsGroupToIdTransformer;
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-
+use Doctrine\Persistence\ObjectManager;
+use LogicException;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CustomFieldType extends AbstractType
 {
     /**
-     *
      * @var CustomFieldProvider
      */
     private $customFieldProvider;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
 
     /**
      * @var ObjectManager
      */
     private $om;
 
+    /**
+     * @var TranslatableStringHelper
+     */
+    private $translatableStringHelper;
 
     public function __construct(
         CustomFieldProvider $compiler,
@@ -48,14 +54,10 @@ class CustomFieldType extends AbstractType
         $this->om = $om;
         $this->translatableStringHelper = $translatableStringHelper;
     }
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
-        $customFieldsList = array();
+        $customFieldsList = [];
 
         foreach ($this->customFieldProvider->getAllFields() as $key => $field) {
             $customFieldsList[$key] = $field->getName();
@@ -63,33 +65,32 @@ class CustomFieldType extends AbstractType
 
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, array('required' => false));
+            ->add('active', CheckboxType::class, ['required' => false]);
 
-        if ($options['group_widget'] === 'entity') {
-            $builder->add('customFieldsGroup', EntityType::class, array(
-               'class' => 'ChillCustomFieldsBundle:CustomFieldsGroup',
-               'choice_label' => function($g) {
+        if ('entity' === $options['group_widget']) {
+            $builder->add('customFieldsGroup', EntityType::class, [
+                'class' => 'ChillCustomFieldsBundle:CustomFieldsGroup',
+                'choice_label' => function ($g) {
                     return $this->translatableStringHelper->localize($g->getName());
-               }
-            ));
-        } elseif ($options['group_widget'] === 'hidden') {
+                },
+            ]);
+        } elseif ('hidden' === $options['group_widget']) {
             $builder->add('customFieldsGroup', HiddenType::class);
             $builder->get('customFieldsGroup')
-                  ->addViewTransformer(new CustomFieldsGroupToIdTransformer($this->om));
+                ->addViewTransformer(new CustomFieldsGroupToIdTransformer($this->om));
         } else {
-            throw new \LogicException('The value of group_widget is not handled');
+            throw new LogicException('The value of group_widget is not handled');
         }
 
         $builder
             ->add('ordering', NumberType::class)
-            ->add('required', CheckboxType::class, array(
+            ->add('required', CheckboxType::class, [
                 'required' => false,
                 //'expanded' => TRUE,
-                'label' => 'Required field'
-            ))
-            ->add('type', HiddenType::class, array('data' => $options['type']))
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event)
-            {
+                'label' => 'Required field',
+            ])
+            ->add('type', HiddenType::class, ['data' => $options['type']])
+            ->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $event) {
                 $customField = $event->getData();
                 $form = $event->getForm();
 
@@ -101,16 +102,15 @@ class CustomFieldType extends AbstractType
                 }
             });
 
-
         $builder->add(
             $this->customFieldProvider
                 ->getCustomFieldByType($options['type'])
                 ->buildOptionsForm(
                     $builder
-                         ->create('options', null, array('compound' => true))
-                         ->setRequired(false)
-                    )
-            );
+                        ->create('options', null, ['compound' => true])
+                        ->setRequired(false)
+                )
+        );
     }
 
     /**
@@ -118,14 +118,14 @@ class CustomFieldType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomField'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomField',
+        ]);
 
-        $resolver->setRequired(array('type', 'group_widget'))
-              ->addAllowedValues('type', array_keys($this->customFieldProvider->getAllFields()))
-              ->addAllowedValues('group_widget', array('hidden', 'entity'))
-              ->setDefault('group_widget', 'entity');
+        $resolver->setRequired(['type', 'group_widget'])
+            ->addAllowedValues('type', array_keys($this->customFieldProvider->getAllFields()))
+            ->addAllowedValues('group_widget', ['hidden', 'entity'])
+            ->setDefault('group_widget', 'entity');
     }
 
     /**
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
index 64e461c95..f9d773f72 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
@@ -1,21 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form;
 
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-
+use function count;
 
 class CustomFieldsGroupType extends AbstractType
 {
-
-    
     private $customizableEntities; //TODO : add comment about this variable
 
     /**
@@ -29,73 +37,68 @@ class CustomFieldsGroupType extends AbstractType
         $this->translator = $translator;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     //TODO : details about the function
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         //prepare translation
-        $entities = array();
-        $customizableEntities = array(); //TODO : change name too close than $this->customizableEntities
+        $entities = [];
+        $customizableEntities = []; //TODO : change name too close than $this->customizableEntities
 
-        foreach($this->customizableEntities as $key => $definition) {
+        foreach ($this->customizableEntities as $key => $definition) {
             $entities[$definition['class']] = $this->translator->trans($definition['name']);
             $customizableEntities[$definition['class']] = $definition;
         }
 
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('entity', ChoiceType::class, array(
-                'choices' => array_combine(array_values($entities),array_keys($entities)),
-            ))
-        ;
+            ->add('entity', ChoiceType::class, [
+                'choices' => array_combine(array_values($entities), array_keys($entities)),
+            ]);
 
-        $builder->addEventListener(FormEvents::POST_SET_DATA,
-                function(FormEvent $event) use ($customizableEntities, $builder){
-                    $form = $event->getForm();
-                    $group = $event->getData();
+        $builder->addEventListener(
+            FormEvents::POST_SET_DATA,
+            static function (FormEvent $event) use ($customizableEntities, $builder) {
+                $form = $event->getForm();
+                $group = $event->getData();
 
-                    //stop the function if entity is not set
-                    if ($group->getEntity() === NULL) {
-                        return;
+                //stop the function if entity is not set
+                if ($group->getEntity() === null) {
+                    return;
+                }
+
+                $optionBuilder = null;
+
+                if (count($customizableEntities[$group->getEntity()]['options']) > 0) {
+                    $optionBuilder = $builder
+                        ->getFormFactory()
+                        ->createBuilderForProperty(CustomFieldsGroup::class, 'options')
+                        ->create(
+                            'options',
+                            null,
+                            [
+                                'compound' => true,
+                                'auto_initialize' => false,
+                                'required' => false,
+                            ]
+                        );
+
+                    foreach ($customizableEntities[$group->getEntity()]['options'] as $key => $option) {
+                        $optionBuilder->add($key, $option['form_type'], $option['form_options']);
                     }
+                }
 
-                    if (count($customizableEntities[$group->getEntity()]['options']) > 0) {
-                        $optionBuilder = $builder
-                                ->getFormFactory()
-                                ->createBuilderForProperty(
-                                        'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup',
-                                        'options'
-                                        )
-                                ->create('options', null, array(
-                                        'compound' => true,
-                                        'auto_initialize' => false,
-                                        'required' => false)
-                                    );
-                    }
-
-                    foreach($customizableEntities[$group->getEntity()]['options'] as $key => $option) {
-                                $optionBuilder
-                                    ->add($key, $option['form_type'], $option['form_options'])
-                            ;
-                    }
-                    if (isset($optionBuilder) && $optionBuilder->count() > 0) {
-                        $form->add($optionBuilder->getForm());
-                    }
-
-                });
+                if ((null !== $optionBuilder) && $optionBuilder->count() > 0) {
+                    $form->add($optionBuilder->getForm());
+                }
+            }
+        );
     }
 
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup'
-        ));
+        $resolver->setDefaults([
+            'data_class' => CustomFieldsGroup::class,
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
index f54c8b818..a82fe52d7 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldDataTransformer.php
@@ -1,43 +1,50 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\DataTransformer;
 
-use Symfony\Component\Form\DataTransformerInterface;
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Symfony\Component\Form\DataTransformerInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CustomFieldDataTransformer implements DataTransformerInterface
 {
-    private $customFieldDefinition;
-    
     /**
-     *
      * @var \Chill\CustomFieldsBundle\Entity\CustomField
      */
     private $customField;
-    
-    public function __construct(CustomFieldInterface $customFieldDefinition,
-            CustomField $customField)
-    {
+
+    private $customFieldDefinition;
+
+    public function __construct(
+        CustomFieldInterface $customFieldDefinition,
+        CustomField $customField
+    ) {
         $this->customFieldDefinition = $customFieldDefinition;
         $this->customField = $customField;
     }
-    
+
     public function reverseTransform($value)
     {
-        return $this->customFieldDefinition->serialize($value, 
-                $this->customField);
+        return $this->customFieldDefinition->serialize(
+            $value,
+            $this->customField
+        );
     }
 
     public function transform($value)
     {
-        return $this->customFieldDefinition->deserialize($value, 
-                $this->customField);
+        return $this->customFieldDefinition->deserialize(
+            $value,
+            $this->customField
+        );
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
index f637281ba..937aaaa9b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
@@ -1,11 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\DataTransformer;
 
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Doctrine\Persistence\ObjectManager;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use function gettype;
 
 class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
 {
@@ -14,69 +24,74 @@ class CustomFieldsGroupToIdTransformer implements DataTransformerInterface
      */
     private $om;
 
-    /**
-     * @param ObjectManager $om
-     */
     public function __construct(ObjectManager $om)
     {
         $this->om = $om;
     }
 
-    /**
-     * Transforms an custom_field_group to a string (id)
-     *
-     * @param  CustomFieldsGroup|null $customFieldsGroup
-     * @return string
-     */
-    public function transform($customFieldsGroup)
-    {
-        if (null === $customFieldsGroup) {
-            return "";
-        }
-        
-        if (!$customFieldsGroup instanceof CustomFieldsGroup) {
-            throw new TransformationFailedException(sprintf('Transformation failed: '
-                  . 'the expected type of the transforme function is an '
-                  . 'object of type Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, '
-                  . '%s given (value : %s)', gettype($customFieldsGroup), 
-                  $customFieldsGroup));
-        }
-
-        return $customFieldsGroup->getId();
-    }
-
     /**
      * Transforms a string (id) to an object (CustomFieldsGroup).
      *
      * @param  string $id
-     * @return CustomFieldsGroup|null
+     *
      * @throws TransformationFailedException if object (report) is not found.
+     *
+     * @return CustomFieldsGroup|null
      */
     public function reverseTransform($id)
     {
         if (!$id) {
             return null;
         }
-        
+
         if ($id instanceof CustomFieldsGroup) {
-            throw new TransformationFailedException(sprintf(
-                  'The transformation failed: the expected argument on '
+            throw new TransformationFailedException(
+                'The transformation failed: the expected argument on '
                   . 'reverseTransform is an object of type int,'
                   . 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, '
-                  . 'given', gettype($id)));
+                  . 'given'
+            );
         }
 
         $customFieldsGroup = $this->om
-            ->getRepository('ChillCustomFieldsBundle:customFieldsGroup')->find($id)
-        ;
+            ->getRepository(CustomFieldsGroup::class)->find($id);
 
         if (null === $customFieldsGroup) {
-            throw new TransformationFailedException(sprintf(
-                'Le group avec le numéro "%s" ne peut pas être trouvé!',
-                $id
-            ));
+            throw new TransformationFailedException(
+                sprintf(
+                    'Le group avec le numéro "%s" ne peut pas être trouvé!',
+                    $id
+                )
+            );
         }
 
         return $customFieldsGroup;
     }
-}
\ No newline at end of file
+
+    /**
+     * Transforms an custom_field_group to a string (id).
+     *
+     * @param  CustomFieldsGroup|null $customFieldsGroup
+     *
+     * @return string
+     */
+    public function transform($customFieldsGroup)
+    {
+        if (null === $customFieldsGroup) {
+            return '';
+        }
+
+        if (!$customFieldsGroup instanceof CustomFieldsGroup) {
+            throw new TransformationFailedException(sprintf(
+                'Transformation failed: '
+                  . 'the expected type of the transforme function is an '
+                  . 'object of type Chill\CustomFieldsBundle\Entity\CustomFieldsGroup, '
+                  . '%s given (value : %s)',
+                gettype($customFieldsGroup),
+                $customFieldsGroup
+            ));
+        }
+
+        return $customFieldsGroup->getId();
+    }
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
index 6b54df801..095c6f463 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
@@ -1,118 +1,80 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\DataTransformer;
 
-use Symfony\Component\Form\DataTransformerInterface;
+use Chill\CustomFieldsBundle\Entity\CustomField;
 use Doctrine\Persistence\ObjectManager;
-use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Form\DataTransformerInterface;
+use function array_key_exists;
+use const JSON_THROW_ON_ERROR;
 
-class JsonCustomFieldToArrayTransformer implements DataTransformerInterface {
-    /**
-     * @var ObjectManager
-     */
-    private $om;
+class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
+{
+    private array $customField;
+
+    private ObjectManager $om;
 
-    /**
-     * @param ObjectManager $om
-     */
     public function __construct(ObjectManager $om)
     {
         $this->om = $om;
 
         $customFields = $this->om
-            ->getRepository('ChillCustomFieldsBundle:CustomField')
+            ->getRepository(CustomField::class)
             ->findAll();
-   
+
+        // @TODO: in the array_map callback, CustomField::getLabel() does not exist. What do we do here?
         $customFieldsLablels = array_map(
-            function($e) { return $e->getLabel(); },
-            $customFields);
+            static function ($e) { return $e->getLabel(); },
+            $customFields
+        );
 
         $customFieldsByLabel = array_combine($customFieldsLablels, $customFields);
 
         $this->customField = $customFieldsByLabel;
     }
 
-    public function transform($customFieldsJSON)
-    {
-        echo $customFieldsJSON;
-
-        if($customFieldsJSON === null) { // lors de la creation
-            $customFieldsArray = array();
-        } else {
-            $customFieldsArray = json_decode($customFieldsJSON,true);
-        }
-
-        /*
-        echo "<br> - 4 - <br>";
-
-        var_dump($customFieldsArray);
-
-        echo "<br> - 5 - <br>";
-        */
-
-        $customFieldsArrayRet = array();
-
-        foreach ($customFieldsArray as $key => $value) {
-            $traited = false;
-            if(array_key_exists($key, $this->customField)) {
-                $type = $this->customField[$key]->getType();
-                if(strpos($type,'ManyToOne') === 0) {
-                    if(strpos($type,'ManyToOnePersist') ===0)  {
-                        $entityClass = substr($type, 17, -1);
-                    } else {
-                        $entityClass = substr($type, 10, -1);
-                    }
-                
-                    $customFieldsArrayRet[$key] = $this->om
-                        ->getRepository('ChillCustomFieldsBundle:' . $entityClass)
-                        ->findOneById($value);
-                    $traited = true;
-                } else if ($type === 'ManyToMany(Adress)') {
-                    $customFieldsArrayRet[$key] = $value;
-                }
-            }
-
-            if(! $traited) {
-                $customFieldsArrayRet[$key] = $value;
-            }
-        }
-
-        var_dump($customFieldsArrayRet);
-
-        return $customFieldsArrayRet;
-    }
-
     public function reverseTransform($customFieldsArray)
     {
         /*
         echo "<br> - - 7 - <br>";
-        
+
 
         var_dump(array_keys($customFieldsArray));
-    
+
         echo "<br> - - 8 - <br>";
 
         var_dump(array_keys($this->customField));
 
         echo "<br> - - 9 - <br>";
-        */
+         */
 
         //var_dump($customFieldsArray);
 
-        $customFieldsArrayRet = array();
+        $customFieldsArrayRet = [];
 
         foreach ($customFieldsArray as $key => $value) {
             $traited = false;
-            if(array_key_exists($key, $this->customField)) {
+
+            if (array_key_exists($key, $this->customField)) {
                 $type = $this->customField[$key]->getType();
-                if(strpos($type,'ManyToOne') === 0) {
+
+                if (strpos($type, 'ManyToOne') === 0) {
                     // pour le manytoone() faire
                     // un update du form en js ? : http://symfony.com/fr/doc/current/cookbook/form/form_collections.html
                     //
                     //$entityClass = substr($type, 10, -1);
                     //echo $entityClasss;
-                    if(strpos($type, 'ManyToOnePersist') === 0) {
-                        // PEUT ETRE A FAIRE SI SEULEMENT $value->getId() ne renvoie rien... 
+                    if (strpos($type, 'ManyToOnePersist') === 0) {
+                        // PEUT ETRE A FAIRE SI SEULEMENT $value->getId() ne renvoie rien...
                         //
                         //
                         $this->om->persist($value); // pas bon ici
@@ -121,7 +83,7 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface {
                         // et faire le persist qd fait sur l'obj parent
                         // regarder : http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
                         // ou : http://symfony.com/doc/current/cookbook/doctrine/event_listeners_subscribers.html
-                        // dans yml : 
+                        // dans yml :
                         //  lifecycleCallbacks:
                         //  prePersist: [ doStuffOnPrePersist, doOtherStuffOnPrePersist ]
                         $this->om->flush(); // sinon l'id pose pbm
@@ -132,14 +94,57 @@ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface {
                 }
             }
 
-            if(! $traited) {
+            if (!$traited) {
                 $customFieldsArrayRet[$key] = $value;
             }
-
         }
 
         //echo json_encode($customFieldsArrayRet);
 
         return json_encode($customFieldsArrayRet);
     }
-}
\ No newline at end of file
+
+    public function transform($customFieldsJSON)
+    {
+        echo $customFieldsJSON;
+
+        if (null === $customFieldsJSON) {
+            $customFieldsArray = [];
+        } else {
+            $customFieldsArray = json_decode($customFieldsJSON, true, 512, JSON_THROW_ON_ERROR);
+        }
+
+        $customFieldsArrayRet = [];
+
+        foreach ($customFieldsArray as $key => $value) {
+            $traited = false;
+
+            if (array_key_exists($key, $this->customField)) {
+                $type = $this->customField[$key]->getType();
+
+                if (strpos($type, 'ManyToOne') === 0) {
+                    if (strpos($type, 'ManyToOnePersist') === 0) {
+                        $entityClass = substr($type, 17, -1);
+                    } else {
+                        $entityClass = substr($type, 10, -1);
+                    }
+
+                    $customFieldsArrayRet[$key] = $this->om
+                        ->getRepository('ChillCustomFieldsBundle:' . $entityClass)
+                        ->findOneById($value);
+                    $traited = true;
+                } elseif ('ManyToMany(Adress)' === $type) {
+                    $customFieldsArrayRet[$key] = $value;
+                }
+            }
+
+            if (!$traited) {
+                $customFieldsArrayRet[$key] = $value;
+            }
+        }
+
+        var_dump($customFieldsArrayRet);
+
+        return $customFieldsArrayRet;
+    }
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
index 24cf4e4f4..6c35097e5 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextExtension.php
@@ -1,47 +1,32 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use function array_key_exists;
 
 /**
  * This extension create the possibility to add some text
- * after the input. 
- * 
- * This can be used to print the units of the field, or some text.
- * 
- * This class must be extended by Extension class specifics to each input.
+ * after the input.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * This can be used to print the units of the field, or some text.
+ *
+ * This class must be extended by Extension class specifics to each input.
  */
 abstract class PostTextExtension extends AbstractTypeExtension
 {
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefined(array('post_text'));
-    }
-    
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if (array_key_exists('post_text', $options)) {
@@ -50,4 +35,8 @@ abstract class PostTextExtension extends AbstractTypeExtension
         }
     }
 
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefined(['post_text']);
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
index 5b42411a5..9208720d8 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextIntegerExtension.php
@@ -1,36 +1,25 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Extension;
 
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 
 /**
- * This class add the PostTextExtension to integer fields
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * This class add the PostTextExtension to integer fields.
  */
 class PostTextIntegerExtension extends PostTextExtension
 {
     public function getExtendedType()
     {
-        return IntegerType::class;  
+        return IntegerType::class;
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
index 7501fbc67..02a42ae67 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Extension/PostTextNumberExtension.php
@@ -1,30 +1,20 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Extension;
 
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 
 /**
- * This class add the PostTextExtension to number fields
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * This class add the PostTextExtension to number fields.
  */
 class PostTextNumberExtension extends PostTextExtension
 {
@@ -32,5 +22,4 @@ class PostTextNumberExtension extends PostTextExtension
     {
         return NumberType::class;
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
index 15a2e4a22..92ef86c4a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php
@@ -1,28 +1,34 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Return a choice widget with an "other" option
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
+ * Return a choice widget with an "other" option.
  */
 class ChoiceWithOtherType extends AbstractType
 {
     private $otherValueLabel = 'Other value';
 
-    /* (non-PHPdoc)
+    /** (non-PHPdoc).
      * @see \Symfony\Component\Form\AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
         //add an 'other' entry in choices array
         $options['choices'][$this->otherValueLabel] = '_other';
         //ChoiceWithOther must always be expanded
@@ -31,23 +37,21 @@ class ChoiceWithOtherType extends AbstractType
         $options['empty_data'] = null;
 
         $builder
-            ->add('_other', TextType::class, array('required' => false))
-            ->add('_choices', ChoiceType::class, $options)
-        ;
+            ->add('_other', TextType::class, ['required' => false])
+            ->add('_choices', ChoiceType::class, $options);
     }
 
-    /* (non-PHPdoc)
+    /** (non-PHPdoc).
      * @see \Symfony\Component\Form\AbstractType::configureOptions()
      */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setRequired(array('choices'))
-            ->setAllowedTypes('choices', array('array'))
-            ->setDefaults(array(
-               'multiple' => false
-               ))
-        ;
+            ->setRequired(['choices'])
+            ->setAllowedTypes('choices', ['array'])
+            ->setDefaults([
+                'multiple' => false,
+            ]);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
index 7d8457783..b2d50b422 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
@@ -1,36 +1,45 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Type;
 
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
 
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\FormEvents;
 
 class ChoicesListType extends AbstractType
 {
-
-    /* (non-PHPdoc)
+    /** (non-PHPdoc).
      * @see \Symfony\Component\Form\AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, array(
-                'required' => false
-            ))
+            ->add('active', CheckboxType::class, [
+                'required' => false,
+            ])
             ->add('slug', HiddenType::class)
-            ->addEventListener(FormEvents::SUBMIT, function(FormEvent $event) {
+            ->addEventListener(FormEvents::SUBMIT, static function (FormEvent $event) {
                 $form = $event->getForm();
                 $data = $event->getData();
 
                 $formData = $form->getData();
 
-                if (NULL === $formData['slug']) {
-                    $slug = uniqid(rand(), true);
+                if (null === $formData['slug']) {
+                    $slug = uniqid(mt_rand(), true);
 
                     $data['slug'] = $slug;
                     $event->setData($data);
@@ -38,18 +47,14 @@ class ChoicesListType extends AbstractType
                     $data['slug'] = $formData['slug'];
                     $event->setData($data);
                 }
-            })
-        ;
+            });
     }
 
-
-    /*
-     *
+    /**
      * @see \Symfony\Component\Form\FormTypeInterface::getName()
      */
     public function getBlockPrefix()
     {
         return 'cf_choices_list';
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php
index 709f3498f..ed7b52fca 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesType.php
@@ -1,15 +1,19 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
- */
 class ChoicesType extends AbstractType
 {
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
index 68a1e15e8..e3ef7c694 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
@@ -1,44 +1,34 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
+/**
+ * Chill is a software for social workers
  *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Type;
 
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Chill\CustomFieldsBundle\Form\DataTransformer\JsonCustomFieldToArrayTransformer;
-use Doctrine\Persistence\ObjectManager;
-use Chill\CustomFieldsBundle\Form\AdressType;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Chill\CustomFieldsBundle\Form\DataTransformer\CustomFieldDataTransformer;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldTitle;
 
 class CustomFieldType extends AbstractType
 {
+    /**
+     * @var CustomFieldCompiler
+     */
+    private $customFieldCompiler;
 
     /**
      * @var ObjectManager
      */
     private $om;
 
-    /**
-     *
-     * @var CustomFieldCompiler
-     */
-    private $customFieldCompiler;
-
-    /**
-     * @param ObjectManager $om
-     */
     public function __construct(ObjectManager $om, CustomFieldProvider $compiler)
     {
         $this->om = $om;
@@ -55,17 +45,15 @@ class CustomFieldType extends AbstractType
         }
     }
 
-    public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-              ->setRequired(array('group'))
-              ->addAllowedTypes('group', array('Chill\CustomFieldsBundle\Entity\CustomFieldsGroup'))
-                ;
+            ->setRequired(['group'])
+            ->addAllowedTypes('group', ['Chill\CustomFieldsBundle\Entity\CustomFieldsGroup']);
     }
 
     public function getBlockPrefix()
     {
         return 'custom_field';
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
index 276d9eaff..95d5a649f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldsTitleType.php
@@ -1,23 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
@@ -27,12 +18,10 @@ class CustomFieldsTitleType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
     }
 
     public function getBlockPrefix()
     {
         return 'custom_field_title';
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
index a5e955fdd..35a7cd305 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php
@@ -1,31 +1,23 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Cooperative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Form\Type;
 
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 /**
  * This type create a Choice field with custom fields as choices.
@@ -33,19 +25,11 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
  * This type can only be associated with a customFieldsGroup type. The field
  * is populated when the data (a customFieldsGroup entity) is associated with
  * the form
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class LinkedCustomFieldsType extends AbstractType
 {
     /**
-     *
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    /**
-     * The name for the choice field
+     * The name for the choice field.
      *
      * Extracted from builder::getName
      *
@@ -57,24 +41,71 @@ class LinkedCustomFieldsType extends AbstractType
      * the option of the form.
      *
      * @internal options are stored at the class level to be reused by appendChoice, after data are setted
+     *
      * @var array
      */
-    private $options = array();
+    private $options = [];
+
+    /**
+     * @var TranslatableStringHelper
+     */
+    private $translatableStringHelper;
 
     public function __construct(TranslatableStringHelper $helper)
     {
         $this->translatableStringHelper = $helper;
     }
 
+    /**
+     * append Choice on POST_SET_DATA event.
+     *
+     * Choices are extracted from custom_field_group (the data associated
+     * with the root form)
+     *
+     * @return void
+     */
+    public function appendChoice(FormEvent $event)
+    {
+        $rootForm = $this->getRootForm($event->getForm());
+        $group = $rootForm->getData();
+
+        if (null === $group) {
+            return;
+        }
+
+        $choices = [];
+
+        foreach ($group->getCustomFields() as $customFields) {
+            $choices[$customFields->getSlug()] =
+                    $this->translatableStringHelper
+                        ->localize($customFields->getName());
+        }
+
+        $options = array_merge($this->options, [
+            'choices' => $choices,
+        ]);
+
+        $event->getForm()->getParent()->add(
+            $this->choiceName,
+            ChoiceType::class,
+            $options
+        );
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $this->choiceName = $builder->getName();
         $this->options = $options;
 
-        $builder->addEventListener(FormEvents::POST_SET_DATA,
-                array($this, 'appendChoice'))
-            ;
+        $builder->addEventListener(
+            FormEvents::POST_SET_DATA,
+            [$this, 'appendChoice']
+        );
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'custom_fields_group_linked_custom_fields';
     }
 
     public function getParent()
@@ -83,56 +114,16 @@ class LinkedCustomFieldsType extends AbstractType
     }
 
     /**
-     * append Choice on POST_SET_DATA event
+     * Return the root form (i.e. produced from CustomFieldsGroupType::getForm).
      *
-     * Choices are extracted from custom_field_group (the data associated
-     * with the root form)
-     *
-     * @param FormEvent $event
-     * @return void
-     */
-    public function appendChoice(FormEvent $event)
-    {
-        $rootForm = $this->getRootForm($event->getForm());
-        $group = $rootForm->getData();
-
-        if ($group === NULL) {
-            return;
-        }
-
-        $choices = array();
-        foreach($group->getCustomFields() as $customFields) {
-            $choices[$customFields->getSlug()] =
-                    $this->translatableStringHelper
-                        ->localize($customFields->getName());
-        }
-
-        $options = array_merge($this->options, array(
-                'choices' => $choices,
-            ));
-
-        $event->getForm()->getParent()->add($this->choiceName, ChoiceType::class,
-                $options);
-    }
-
-    /**
-     * Return the root form (i.e. produced from CustomFieldsGroupType::getForm)
-     *
-     * @param FormInterface $form
      * @return FormInterface
      */
     private function getRootForm(FormInterface $form)
     {
-        if ($form->getParent() === NULL) {
+        if ($form->getParent() === null) {
             return $form;
-        } else {
-            return $this->getRootForm($form->getParent());
         }
-    }
 
-    public function getBlockPrefix()
-    {
-        return 'custom_fields_group_linked_custom_fields';
+        return $this->getRootForm($form->getParent());
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php
index d2e57ab94..901806f8c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -1,39 +1,25 @@
 <?php
 
-use Symfony\Component\HttpKernel\Kernel;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
-    public function registerBundles()
-    {
-        return array(
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
-            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-            new Symfony\Bundle\MonologBundle\MonologBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
-            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new \Chill\MainBundle\ChillMainBundle,
-            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
-            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
-            new Chill\PersonBundle\ChillPersonBundle(),
-            #add here all the required bundle (some bundle are not required)
-        );
-    }
-
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-    }
-
     /**
      * @return string
      */
     public function getCacheDir()
     {
-        return sys_get_temp_dir().'/CustomFieldsBundle/cache';
+        return sys_get_temp_dir() . '/CustomFieldsBundle/cache';
     }
 
     /**
@@ -41,7 +27,29 @@ class AppKernel extends Kernel
      */
     public function getLogDir()
     {
-        return $this->getRootDir().'/../logs';
+        return $this->getRootDir() . '/../logs';
+    }
+
+    public function registerBundles()
+    {
+        return [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new \Chill\MainBundle\ChillMainBundle(),
+            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Chill\PersonBundle\ChillPersonBundle(),
+            //add here all the required bundle (some bundle are not required)
+        ];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
     }
 }
-
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php
index 39dc0e2ba..ea351fb8a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -1,11 +1,20 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
-$loader = require __DIR__.'/../../../../../vendor/autoload.php';
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php
index e0279c2ae..914d09ffd 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php
@@ -1,7 +1,16 @@
 <?php
 
-use Symfony\Component\HttpFoundation\Request;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Debug\Debug;
+use Symfony\Component\HttpFoundation\Request;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
@@ -11,16 +20,17 @@ use Symfony\Component\Debug\Debug;
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
-    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+
+    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
 }
 
-$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
 Debug::enable();
 
-require_once __DIR__.'/../app/AppKernel.php';
+require_once __DIR__ . '/../app/AppKernel.php';
 
 $kernel = new AppKernel('dev', true);
 $kernel->loadClassCache();
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
index d2871560e..6c90f3951 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
@@ -1,103 +1,97 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Service;
 
+use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Receive all the services tagged with 'chill.custom_field'.
- * 
+ *
  * The services tagged with 'chill.custom_field' are services used to declare
  * a new custom field type. The tag must contain a 'type' variable (that must
  * be unique), this type is used to identify this custom field in the form
- * declration 
- * 
+ * declration
+ *
  * For example (in services.yml) :
  *  services:
  *      chill.icp2.type:
  *          tags:
  *              - { name: 'chill.custom_field', type: 'ICPC2' }
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class CustomFieldProvider implements ContainerAwareInterface
 {
-    /** @var array $servicesByType The services indexes by the type */
-    private $servicesByType = array();
-    
-    /** @var Container $container The container */
-    private $container;
-    
     /**
-     * Add a new custom field to the provider
-     * 
+     * @var Container The container
+     */
+    private $container;
+
+    /**
+     * @var array The services indexes by the type
+     */
+    private $servicesByType = [];
+
+    /**
+     * Add a new custom field to the provider.
+     *
      * @param type $serviceName The name of the service (declared in service.yml)
-     * @param type $type The type of the service (that is used in the form to 
+     * @param type $type The type of the service (that is used in the form to
      * add this type)
      */
     public function addCustomField($serviceName, $type)
     {
         $this->servicesByType[$type] = $serviceName;
     }
-    
-    /**
-     * Get a custom field stored in the provider. The custom field is identified
-     * by its type.
-     * 
-     * @param string $type The type of the wanted service
-     * @return CustomFieldInterface 
-     */
-    public function getCustomFieldByType($type)
-    {
-        if (isset($this->servicesByType[$type])) {
-            return $this->servicesByType[$type];
-        } else {
-            throw new \LogicException('the custom field with type '.$type.' '
-                . 'is not found');
-        }
-    }
 
-    /*
-     * (non-PHPdoc)
-     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        if ($container === null) {
-            throw new \LogicException('container should not be null');
-        }
-        
-        $this->container = $container;
-    }
-    
     /**
-     * Get all the custom fields known by the provider
-     * 
+     * Get all the custom fields known by the provider.
+     *
      * @return array Array of the known custom fields indexed by the type.
      */
     public function getAllFields()
     {
         return $this->servicesByType;
     }
+
+    /**
+     * Get a custom field stored in the provider. The custom field is identified
+     * by its type.
+     *
+     * @param string $type The type of the wanted service
+     *
+     * @return CustomFieldInterface
+     */
+    public function getCustomFieldByType($type)
+    {
+        if (isset($this->servicesByType[$type])) {
+            return $this->servicesByType[$type];
+        }
+
+        throw new LogicException('the custom field with type ' . $type . ' '
+                . 'is not found');
+    }
+
+    /**
+     * (non-PHPdoc).
+     *
+     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
+     */
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        if (null === $container) {
+            throw new LogicException('container should not be null');
+        }
+
+        $this->container = $container;
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
index f5bc2cc2e..f89854a14 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
@@ -1,90 +1,79 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Service;
 
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * Helpers for manipulating custom fields.
- * 
+ *
  * Herlpers for getting a certain custom field, for getting the raw value
  * of a custom field and for rendering the value of a custom field.
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
  */
 class CustomFieldsHelper
 {
-    /** @var EntityManagerInterface $em The entity manager */
+    /**
+     * @var EntityManagerInterface The entity manager
+     */
     private $em;
-    
-    /** @var CustomFieldProvider $provider Provider of all the declared custom 
+
+    /** @var CustomFieldProvider Provider of all the declared custom
      * fields */
     private $provider;
-    
+
     /**
-     * Constructor
-     * 
+     * Constructor.
+     *
      * @param EntityManagerInterface $em The entity manager
-     * @param CustomFieldProvider $provider The customfield provider that 
+     * @param CustomFieldProvider $provider The customfield provider that
      * contains all the declared custom fields
      */
-    public function __construct(EntityManagerInterface $em,
-        CustomFieldProvider $provider)
-    {
+    public function __construct(
+        EntityManagerInterface $em,
+        CustomFieldProvider $provider
+    ) {
         $this->em = $em;
         $this->provider = $provider;
     }
-    
+
     public function isEmptyValue(array $fields, CustomField $customField)
     {
         $slug = $customField->getSlug();
         $rawValue = (isset($fields[$slug])) ? $fields[$slug] : null;
-        $customFieldType =  $this->provider->getCustomFieldByType($customField->getType());
-        
+        $customFieldType = $this->provider->getCustomFieldByType($customField->getType());
+
         $deserializedValue = $customFieldType->deserialize($rawValue, $customField);
-        
+
         return $customFieldType->isEmptyValue($deserializedValue, $customField);
     }
-    
+
     /**
-     * Render the value of a custom field
-     * 
+     * Render the value of a custom field.
+     *
      * @param array $fields the **raw** array, as stored in the db
      * @param CustomField $customField the customField entity
      * @param string $documentType The type of document in which the rendered value is displayed ('html' or 'csv').
+     *
      * @throws CustomFieldsHelperException if slug is missing
+     *
      * @return The representation of the value the customField.
      */
-    public function renderCustomField(array $fields, CustomField $customField, $documentType='html')
+    public function renderCustomField(array $fields, CustomField $customField, $documentType = 'html')
     {
         $slug = $customField->getSlug();
         $rawValue = (isset($fields[$slug])) ? $fields[$slug] : null;
-        $customFieldType =  $this->provider->getCustomFieldByType($customField->getType());
-        
+        $customFieldType = $this->provider->getCustomFieldByType($customField->getType());
+
         return $customFieldType->render($rawValue, $customField, $documentType);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
index 497c96720..90c31612f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php
@@ -1,36 +1,27 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Service;
 
-class CustomFieldsHelperException extends \Exception
+use Exception;
+
+class CustomFieldsHelperException extends Exception
 {
-    public static function customFieldsGroupNotFound($entity) 
+    public static function customFieldsGroupNotFound($entity)
     {
-        return new CustomFieldsHelperException("The customFieldsGroups associated with $entity are not found");
+        return new CustomFieldsHelperException("The customFieldsGroups associated with {$entity} are not found");
     }
-    
+
     public static function slugIsMissing()
     {
-        return new CustomFieldsHelperException("The slug is missing");
+        return new CustomFieldsHelperException('The slug is missing');
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
index abbbace5d..2bfe41917 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
@@ -1,146 +1,138 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Templating\Twig;
 
+use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Container;
-use Chill\CustomFieldsBundle\Entity\CustomField;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
  * Add the following Twig Extension :
  * * chill_custom_field_widget : to render the value of the custom field,
- * * chill_custom_field_label : to render the label of the custom field,
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * * chill_custom_field_label : to render the label of the custom field,.
  */
 class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwareInterface
 {
-
-    /** @var Container $container The container */
+    /**
+     * @var Container The container
+     */
     private $container;
-    
-    /** @var array $defaultParams The default parameters */
-    private $defaultParams = array(
-        'label_layout' => 'ChillCustomFieldsBundle:CustomField:render_label.html.twig'
-    );
-    
+
     /**
      * @var CustomFieldsHelper
      */
     private $customFieldsHelper;
-    
+
+    /**
+     * @var array The default parameters
+     */
+    private $defaultParams = [
+        'label_layout' => 'ChillCustomFieldsBundle:CustomField:render_label.html.twig',
+    ];
+
     public function __construct(CustomFieldsHelper $customFieldsHelper)
     {
         $this->customFieldsHelper = $customFieldsHelper;
     }
-    
-    /*
-     * (non-PHPdoc)
-     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-    
-    /*
-     * (non-PHPdoc)
+
+    /**
+     * (non-PHPdoc).
+     *
      * @see Twig_Extension::getFunctions()
      */
     public function getFunctions()
     {
         return [
-            new TwigFunction('chill_custom_field_widget', array(
+            new TwigFunction('chill_custom_field_widget', [
                 $this,
-                'renderWidget'
-            ), array(
-                'is_safe' => array(
-                    'html'
-                )
-            )),
-            new TwigFunction('chill_custom_field_label', array(
+                'renderWidget',
+            ], [
+                'is_safe' => [
+                    'html',
+                ],
+            ]),
+            new TwigFunction('chill_custom_field_label', [
                 $this,
-                'renderLabel'
-            ), array(
-                'is_safe' => array(
-                    'html'
-                )
-            )),
-            new TwigFunction('chill_custom_field_is_empty', array(
+                'renderLabel',
+            ], [
+                'is_safe' => [
+                    'html',
+                ],
+            ]),
+            new TwigFunction('chill_custom_field_is_empty', [
                 $this,
-                'isEmptyValue'
-            ))
+                'isEmptyValue',
+            ]),
         ];
     }
-    
-    
+
+    /** (non-PHPdoc).
+     * @see Twig_ExtensionInterface::getName()
+     */
+    public function getName()
+    {
+        return 'chill_custom_fields_rendering';
+    }
+
     public function isEmptyValue($fields, CustomField $customField)
     {
         return $this->customFieldsHelper
             ->isEmptyValue($fields, $customField);
     }
-    
-    /* (non-PHPdoc)
-     * @see Twig_ExtensionInterface::getName()
-     */
-    public function getName() 
-    {
-        return 'chill_custom_fields_rendering';
-    }
 
     /**
      * Twig Extension that is used to render the label of a custom field.
-     * 
+     *
      * @param CustomField $customField Either a customField OR a customizable_entity OR the FQDN of the entity
      * @param array $params The parameters for rendering. Currently, 'label_layout' allow to choose a different label. Default is 'ChillCustomFieldsBundle:CustomField:render_label.html.twig'
+     *
      * @return string HTML representation of the custom field label.
      */
-    public function renderLabel(CustomField $customField, array $params = array())
+    public function renderLabel(CustomField $customField, array $params = [])
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
-        
+
         return $this->container->get('templating')
-            ->render($resolvedParams['label_layout'], array('customField' => $customField));
+            ->render($resolvedParams['label_layout'], ['customField' => $customField]);
     }
-    
+
     /**
      * Twig extension that is used to render the value of a custom field.
-     * 
+     *
      * The presentation of the value  is influenced by the document type.
-     * 
+     *
      * @param array $fields The array raw, as stored in the db
      * @param CustomField $customField Either a customField OR a customizable_entity OR the FQDN of the entity
      * @param string $documentType The type of the document (csv, html)
-     * @param string $slug The slug of the custom field ONLY necessary if the first argument is NOT a CustomField instance
+     *
      * @return string HTML representation of the custom field value, as described in the CustomFieldInterface. Is HTML safe
      */
-    public function renderWidget(array $fields, CustomField $customField, $documentType='html')
+    public function renderWidget(array $fields, CustomField $customField, $documentType = 'html')
     {
         return $this->customFieldsHelper
             ->renderCustomField($fields, $customField, $documentType);
     }
-}
\ No newline at end of file
+
+    /**
+     * (non-PHPdoc).
+     *
+     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
+     */
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
index 10758d26d..a32d2190d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -1,120 +1,111 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Templating\Twig;
 
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Container;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
  * Add the following Twig Extension :
  * * chill_custom_fields_group_widget : to render the value of a custom field
- * *   group
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc.ducobu@champs-libres.coop>
+ * *   group.
  */
 class CustomFieldsGroupRenderingTwig extends AbstractExtension implements ContainerAwareInterface
 {
-    
-    /** @var Container $container The container */
-    private $container;
-    
-    /** @var array $defaultParams The default parameters */
-    private $defaultParams = array(
-        'layout' => 'ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig',
-        'show_empty' => True
-    );
-    
     /**
-     * 
-     * @param boolean $showEmptyValues whether the empty values must be rendered
+     * @var Container The container
+     */
+    private $container;
+
+    /**
+     * @var array The default parameters
+     */
+    private $defaultParams = [
+        'layout' => 'ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig',
+        'show_empty' => true,
+    ];
+
+    /**
+     * @param bool $showEmptyValues whether the empty values must be rendered
      */
     public function __construct($showEmptyValues)
     {
         $this->defaultParams['show_empty'] = $showEmptyValues;
     }
-    
-    /*
-     * (non-PHPdoc)
-     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-    
-    /*
-     * (non-PHPdoc)
+
+    /**
+     * (non-PHPdoc).
+     *
      * @see Twig_Extension::getFunctions()
      */
     public function getFunctions()
     {
         return [
-            new TwigFunction('chill_custom_fields_group_widget', array(
+            new TwigFunction('chill_custom_fields_group_widget', [
                 $this,
-                'renderWidget'
-            ), array(
-                'is_safe' => array(
-                    'html'
-                )
-            )),
+                'renderWidget',
+            ], [
+                'is_safe' => [
+                    'html',
+                ],
+            ]),
         ];
     }
-    
-    /* (non-PHPdoc)
+
+    /** (non-PHPdoc).
      * @see Twig_ExtensionInterface::getName()
      */
-    public function getName() 
+    public function getName()
     {
         return 'chill_custom_fields_group_rendering';
     }
-    
+
     /**
      * Twig extension that is used to render the value of a custom field group.
-     * 
+     *
      * The presentation of the value  is influenced by the document type.
-     * 
+     *
      * @param array $fields The array raw, as stored in the db
      * @param CustomFieldsGroud $customFielsGroup The custom field group
      * @param string $documentType The type of the document (csv, html)
-     * @param array $params The parameters for rendering : 
+     * @param array $params The parameters for rendering :
      *  - layout : allow to choose a different layout by default :
      *             ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig
      *  - show_empty : force show empty field
-     * @return string HTML representation of the custom field group value, as described in 
+     *
+     * @return string HTML representation of the custom field group value, as described in
      * the CustomFieldInterface. Is HTML safe
      */
-    public function renderWidget(array $fields, $customFielsGroup, $documentType='html', array $params = array())
+    public function renderWidget(array $fields, $customFielsGroup, $documentType = 'html', array $params = [])
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
-        
+
         return $this->container->get('templating')
-            ->render($resolvedParams['layout'], array(
-            	'cFGroup' => $customFielsGroup,
-            	'cFData' => $fields,
-                'show_empty' => $resolvedParams['show_empty']));
+            ->render($resolvedParams['layout'], [
+                'cFGroup' => $customFielsGroup,
+                'cFData' => $fields,
+                'show_empty' => $resolvedParams['show_empty'], ]);
     }
-}
\ No newline at end of file
+
+    /**
+     * (non-PHPdoc).
+     *
+     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
+     */
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
index df66ab56c..6a2809071 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Config/ConfigCustomizablesEntitiesTest.php
@@ -1,70 +1,62 @@
 <?php
 
-/*
- * 
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests\Config;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
- * Test the option Customizables_entities
+ * Test the option Customizables_entities.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ConfigCustomizablesEntitiesTest extends KernelTestCase
+final class ConfigCustomizablesEntitiesTest extends KernelTestCase
 {
-    /**
-     * Test that the config does work if the option 
-     * chill_custom_fields.customizables_entities IS NOT present
-     * 
-     * In this case, parameter 'chill_custom_fields.customizables_entities'
-     * should be an empty array in container
-     */
-    public function testNotPresentInConfig()
-    {
-        self::bootKernel(array('environment' => 'test'));
-        $customizableEntities = static::$kernel->getContainer()
-                ->getParameter('chill_custom_fields.customizables_entities');
-        
-        $this->assertInternalType('array', $customizableEntities);
-        $this->assertCount(1, $customizableEntities);
-    }
-    
     /**
      * Test that the 'chill_custom_fields.customizables_entities' is filled
      * correctly with a minimal configuration.
-     * 
+     *
      * @internal use a custom config environment
      */
     public function testNotEmptyConfig()
     {
-        self::bootKernel(array('environment' => 'test_customizable_entities_test_not_empty_config'));
-        $customizableEntities = static::$kernel->getContainer()
-                ->getParameter('chill_custom_fields.customizables_entities');
-        
+        self::bootKernel(['environment' => 'test_customizable_entities_test_not_empty_config']);
+        $customizableEntities = self::$kernel->getContainer()
+            ->getParameter('chill_custom_fields.customizables_entities');
+
         $this->assertInternalType('array', $customizableEntities);
         $this->assertCount(2, $customizableEntities);
-        
-        foreach($customizableEntities as $key => $config) {
+
+        foreach ($customizableEntities as $key => $config) {
             $this->assertInternalType('array', $config);
             $this->assertArrayHasKey('name', $config);
             $this->assertArrayHasKey('class', $config);
         }
     }
+
+    /**
+     * Test that the config does work if the option
+     * chill_custom_fields.customizables_entities IS NOT present.
+     *
+     * In this case, parameter 'chill_custom_fields.customizables_entities'
+     * should be an empty array in container
+     */
+    public function testNotPresentInConfig()
+    {
+        self::bootKernel(['environment' => 'test']);
+        $customizableEntities = self::$kernel->getContainer()
+            ->getParameter('chill_custom_fields.customizables_entities');
+
+        $this->assertInternalType('array', $customizableEntities);
+        $this->assertCount(1, $customizableEntities);
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
index c41de20e0..32513a837 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldControllerTest_TODO.php
@@ -1,10 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class CustomFieldControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CustomFieldControllerTest_TODO extends WebTestCase
 {
     /*
     public function testCompleteScenario()
@@ -51,5 +64,5 @@ class CustomFieldControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
index 8822aec15..4c3447030 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Controller/CustomFieldsGroupControllerTest.php
@@ -1,21 +1,33 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Bundle\FrameworkBundle\Client;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class CustomFieldsGroupControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CustomFieldsGroupControllerTest extends WebTestCase
 {
-    
     public function testCompleteScenario()
     {
-        self::bootKernel(array('environment' => 'test_customizable_entities_test_not_empty_config'));
+        self::bootKernel(['environment' => 'test_customizable_entities_test_not_empty_config']);
         // Create a new client to browse the application
-        $client = static::createClient(array(), array(
+        $client = self::createClient([], [
             'PHP_AUTH_USER' => 'admin',
-            'PHP_AUTH_PW'   => 'olala',
-        ));
+            'PHP_AUTH_PW' => 'olala',
+        ]);
 
         //create the entity
         $this->createCustomFieldsGroup($client);
@@ -28,47 +40,59 @@ class CustomFieldsGroupControllerTest extends WebTestCase
     {
         // Create a new entry in the database
         $crawler = $client->request('GET', '/fr/admin/customfieldsgroup/');
-        
-        $this->assertEquals(200, $client->getResponse()->getStatusCode(), 
-                "Unexpected HTTP status code for GET /customfieldsgroup/");
+
+        $this->assertEquals(
+            200,
+            $client->getResponse()->getStatusCode(),
+            'Unexpected HTTP status code for GET /customfieldsgroup/'
+        );
 
         $crawler = $client->click($crawler->selectLink('Créer un nouveau groupe')->link());
-        
+
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Créer')->form(array(
-            'custom_fields_group[name][fr]'  => 'Test',
-            'custom_fields_group[entity]'    => 'Chill\PersonBundle\Entity\Person'
-        ));
+        $form = $crawler->selectButton('Créer')->form([
+            'custom_fields_group[name][fr]' => 'Test',
+            'custom_fields_group[entity]' => 'Chill\PersonBundle\Entity\Person',
+        ]);
 
         $crawler = $client->submit($form);
-        
+
         $crawler = $client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test")')->count(), 
-                'Missing element td:contains("Test")');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('td:contains("Test")')->count(),
+            'Missing element td:contains("Test")'
+        );
     }
-    
+
     private function editCustomFieldsGroup(Client $client)
     {
         $crawler = $client->request('GET', '/fr/admin/customfieldsgroup/');
         $links = $crawler->selectLink('Modifier');
-        
-        $this->assertGreaterThan(0, $links->count(), 
-                "We can't find a 'Modifier' link on the index page");
+
+        $this->assertGreaterThan(
+            0,
+            $links->count(),
+            "We can't find a 'Modifier' link on the index page"
+        );
         $crawler = $client->click($links->last()->link());
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        
-        $form = $crawler->selectButton('Mettre à jour')->form(array(
-            'custom_fields_group[name][fr]'  => 'Foo',
-        ));
+
+        $form = $crawler->selectButton('Mettre à jour')->form([
+            'custom_fields_group[name][fr]' => 'Foo',
+        ]);
 
         $client->submit($form);
         $crawler = $client->followRedirect();
 
         // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(0, $crawler->filter('[value="Foo"]')->count(), 
-                'Missing element [value="Foo"]');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('[value="Foo"]')->count(),
+            'Missing element [value="Foo"]'
+        );
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
index 3d4c58fe0..065b32898 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php
@@ -1,86 +1,73 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\DomCrawler\Crawler;
 
 /**
- * Give useful method to prepare tests regarding custom fields
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Give useful method to prepare tests regarding custom fields.
  */
 trait CustomFieldTestHelper
 {
-
     /**
-     * Prepare a crawler containing the rendering of a customField
-     * 
+     * Prepare a crawler containing the rendering of a customField.
+     *
      * @internal This method will mock a customFieldGroup containing $field, and
      * rendering the customfield, using Type\CustomFieldType, to a simple form row
-     * 
-     * @param CustomField $field
-     * @param KernelTestCase $testCase
-     * @param KernelInterface $kernel
+     *
      * @param type $locale
+     *
      * @return Crawler
      */
     public function getCrawlerForField(CustomField $field, $locale = 'en')
     {
         $kernel = static::$kernel;
-        
+
         //check a kernel is accessible
         $customFieldsGroup = $this->createMock('Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
         $customFieldsGroup->expects($this->once())
             ->method('getActiveCustomFields')
-            ->will($this->returnValue(array($field)));
-        
+            ->will($this->returnValue([$field]));
+
         $request = $this->createMock('Symfony\Component\HttpFoundation\Request');
         $request->expects($this->any())
             ->method('getLocale')
             ->will($this->returnValue($locale));
 
         $kernel->getContainer()->get('request_stack')->push($request);
-        
+
         $builder = $kernel->getContainer()->get('form.factory')->createBuilder();
-        $form = $builder->add('tested', 'custom_field', 
-            array('group' => $customFieldsGroup))
+        $form = $builder->add(
+            'tested',
+            'custom_field',
+            ['group' => $customFieldsGroup]
+        )
             ->getForm();
-        
+
         $kernel->getContainer()->get('twig.loader')
-            ->addPath($kernel->getContainer()->getParameter('kernel.root_dir').
+            ->addPath($kernel->getContainer()->getParameter('kernel.root_dir') .
                 '/Resources/views/', $namespace = 'test');
 
         $content = $kernel
             ->getContainer()->get('templating')
-            ->render('@test/CustomField/simple_form_render.html.twig', array(
+            ->render('@test/CustomField/simple_form_render.html.twig', [
                 'form' => $form->createView(),
-                'inputKeys' => array('tested')
-            ));
+                'inputKeys' => ['tested'],
+            ]);
 
         $crawler = new Crawler();
         $crawler->addHtmlContent($content);
-        
+
         return $crawler;
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
index 28351711c..58b15f0c3 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
@@ -1,69 +1,445 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * This class cover the test of CustomFieldChoice.
- * 
- * Function currently covered: 
- * 
+ *
+ * Function currently covered:
+ *
  * - deserialize
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CustomFieldsChoiceTest extends KernelTestCase
+final class CustomFieldsChoiceTest extends KernelTestCase
 {
-    
     /**
-     *
-     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
-     */
-    private $cfProvider;
-    
-    /**
-     *
      * @var \Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice
      */
     private $cfChoice;
-    
+
+    /**
+     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
+     */
+    private $cfProvider;
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->cfProvider = static::$kernel->getContainer()
-                ->get('chill.custom_field.provider');
+        self::bootKernel();
+
+        $this->cfProvider = self::$kernel->getContainer()
+            ->get('chill.custom_field.provider');
         $this->cfChoice = $this->cfProvider->getCustomFieldByType('choice');
     }
-    
+
     public function tearDown()
     {
         parent::tearDown();
     }
-    
+
+    /**
+     * provide empty data in different possible representations.
+     * Those data are supposed to be deserialized.
+     *
+     * @return array
+     */
+    public function emptyDataProvider()
+    {
+        return [
+            // 0
+            [
+                // signle
+                '',
+            ],
+            // 1
+            [
+                // single
+                null,
+            ],
+            // 2
+            [
+                // signle with allow other
+                ['_other' => 'something', '_choices' => ''],
+            ],
+            // 3
+            [
+                // multiple
+                [],
+            ],
+            // 4
+            [
+                // multiple with allow other
+                ['_other' => 'something', '_choices' => []],
+            ],
+            // 5
+            [
+                // multiple with allow other
+                ['_other' => '', '_choices' => []],
+            ],
+            // 6
+            [
+                // empty
+                ['_other' => null, '_choices' => null],
+            ],
+            // 7
+            [
+                // empty
+                [null],
+            ],
+        ];
+    }
+
+    public function serializedRepresentationDataProvider()
+    {
+        return [
+            [
+                // multiple => false, allow_other => false
+                'my-value',
+            ],
+            [
+                // multiple => true, allow_ther => false
+                ['my-value'],
+            ],
+            [
+                // multiple => false, allow_other => true, current value not in other
+                ['_other' => '', '_choices' => 'my-value'],
+            ],
+            [
+                // multiple => true, allow_other => true, current value not in other
+                ['_other' => '', '_choices' => ['my-value']],
+            ],
+        ];
+    }
+
+    /**
+     * Test if the representation of the data is deserialized to an array text
+     * with an "allow_other" field.
+     *
+     * This test does not covers the case when the selected value is `_other`
+     *
+     * @param type $data
+     * @dataProvider serializedRepresentationDataProvider
+     */
+    public function testDeserializeMultipleChoiceWithOther($data)
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => true,
+            CustomFieldChoice::MULTIPLE => true,
+        ]);
+
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(
+            ['_other' => '', '_choices' => ['my-value']],
+            $deserialized
+        );
+    }
+
+    /**
+     * Test if the representation of the data is deserialized to an array text
+     * with an "allow_other" field.
+     *
+     * This test covers :
+     * - the case when the selected value is `_other`
+     * - result is null
+     */
+    public function testDeserializeMultipleChoiceWithOtherOtherCases()
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => true,
+            CustomFieldChoice::MULTIPLE => true,
+        ]);
+
+        // selected value is _other
+        // from single to multiple
+        $data = ['_other' => 'something', '_choices' => '_other'];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(
+            ['_other' => 'something', '_choices' => ['_other']],
+            $deserialized
+        );
+
+        // from multiple to multiple
+        $data = ['_other' => 'something', '_choices' => ['_other', 'something']];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(
+            ['_other' => 'something', '_choices' => ['_other', 'something']],
+            $deserialized
+        );
+
+        // test with null value
+        // from single to multiple
+        $data = ['_other' => '', '_choices' => ''];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(
+            ['_other' => '', '_choices' => ['']],
+            $deserialized
+        );
+
+        // from multiple to multiple
+        $data = ['_other' => '', '_choices' => []];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(
+            ['_other' => '', '_choices' => []],
+            $deserialized
+        );
+
+        $deserialized = $this->cfChoice->deserialize(['_other' => null, '_choices' => null], $customField);
+        $this->assertSame(['_other' => '', '_choices' => [null]], $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize(['_other' => null, '_choices' => ''], $customField);
+        $this->assertSame(['_other' => '', '_choices' => ['']], $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize([null], $customField);
+        $this->assertSame(['_other' => '', '_choices' => [null]], $deserialized);
+    }
+
+    /**
+     * Test if the representation of the data is deserialized to an array text
+     * **without** an "allow_other" field.
+     *
+     * @param type $data
+     * @dataProvider serializedRepresentationDataProvider
+     */
+    public function testDeserializeMultipleChoiceWithoutOther($data)
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => false,
+            CustomFieldChoice::MULTIPLE => true,
+        ]);
+
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(['my-value'], $deserialized);
+    }
+
+    /**
+     * Test if the representation of the data is deserialized to an array text
+     * **without** an "allow_other" field.
+     *
+     * Covered cases :
+     * - NULL values
+     */
+    public function testDeserializeMultipleChoiceWithoutOtherOtherCases()
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => false,
+            CustomFieldChoice::MULTIPLE => true,
+        ]);
+
+        // from single to multiple
+        $data = 'my-value';
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['my-value'], $deserialized);
+
+        // from multiple to multiple
+        $data = ['my-value'];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['my-value'], $deserialized);
+
+        // from multiple
+        $data = [null];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame([null], $deserialized);
+
+        $data = ['_other' => null, '_choices' => [null]];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame([null], $deserialized);
+
+        //from single
+        $data = ['_other' => null, '_choices' => null];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame([null], $deserialized);
+    }
+
+    /**
+     * Test if the representation of the data is deserialized to a single text
+     * with an "allow_other" field.
+     *
+     * If the value is in _other, the _other value should be in the _other field.
+     *
+     * @param type $data
+     * @dataProvider serializedRepresentationDataProvider
+     */
+    public function testDeserializeSingleChoiceWithOther($data)
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => true,
+            CustomFieldChoice::MULTIPLE => false,
+        ]);
+
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame(['_other' => '', '_choices' => 'my-value'], $deserialized);
+    }
+
+    /**
+     * Other cases :.
+     *
+     *  - Test if the selected value is '_other
+     * - Test with null data
+     */
+    public function testDeserializeSingleChoiceWithOtherOtherCases()
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => true,
+            CustomFieldChoice::MULTIPLE => false,
+        ]);
+
+        // from a single to a single
+        $data = ['_other' => 'something', '_choices' => '_other'];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['_other' => 'something', '_choices' => '_other'], $deserialized);
+
+        // from a multiple to a single
+        $data = ['_other' => 'something', '_choices' => ['some', '_other']];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['_other' => 'something', '_choices' => '_other'], $deserialized);
+
+        //test with null data
+        //from a single to a single :
+        $data = ['_other' => 'something', '_choices' => null];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['_other' => 'something', '_choices' => null], $deserialized);
+
+        $data = ['_other' => 'something', '_choices' => ''];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['_other' => 'something', '_choices' => ''], $deserialized);
+
+        // from a multiple to a signle
+        $data = ['_other' => 'something', '_choices' => []];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['_other' => 'something', '_choices' => ''], $deserialized);
+
+        $data = ['_other' => 'something', '_choices' => ['']];
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $this->assertSame(['_other' => 'something', '_choices' => ''], $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize(['_other' => null, '_choices' => null], $customField);
+        $this->assertSame(['_other' => '', '_choices' => null], $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize(['_other' => null, '_choices' => ''], $customField);
+        $this->assertSame(['_other' => '', '_choices' => ''], $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize([null], $customField);
+        $this->assertSame(['_other' => '', '_choices' => null], $deserialized);
+    }
+
+    /////////////////////////////////////////
+    //
+    // test function deserialize
+    //
+    ////////////////////////////////////////
+
+    /**
+     * Test if the representation of the data is deserialized to a single text.
+     *
+     * If the value is in _other, the _other value should not be returned.
+     *
+     * @param type $data
+     * @dataProvider serializedRepresentationDataProvider
+     */
+    public function testDeserializeSingleChoiceWithoutOther($data)
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => false,
+            CustomFieldChoice::MULTIPLE => false,
+        ]);
+
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+
+        $this->assertSame('my-value', $deserialized);
+    }
+
+    public function testDeserializeSingleChoiceWithoutOtherDataIsNull()
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => false,
+            CustomFieldChoice::MULTIPLE => false,
+        ]);
+
+        $deserialized = $this->cfChoice->deserialize(null, $customField);
+        $this->assertSame(null, $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize('', $customField);
+        $this->assertSame('', $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize([null], $customField);
+        $this->assertSame(null, $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize(['_other' => null, '_choices' => null], $customField);
+        $this->assertSame(null, $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize(['_other' => null, '_choices' => ''], $customField);
+        $this->assertSame('', $deserialized);
+
+        $deserialized = $this->cfChoice->deserialize([null], $customField);
+        $this->assertSame(null, $deserialized);
+    }
+
+    /**
+     * @dataProvider emptyDataProvider
+     *
+     * @param mixed $data deserialized data
+     */
+    public function testIsEmptyValueEmpty($data)
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => false,
+            CustomFieldChoice::MULTIPLE => true,
+        ]);
+
+        $isEmpty = $this->cfChoice->isEmptyValue($data, $customField);
+
+        $this->assertTrue($isEmpty);
+    }
+
+    /////////////////////////////////////////
+    //
+    // test function isEmptyValue
+    //
+    ////////////////////////////////////////
+
+    /**
+     * test the not empty with the not-empty data provider.
+     *
+     * @param mixed $data
+     * @dataProvider serializedRepresentationDataProvider
+     */
+    public function testIsEmptyValueNotEmpty($data)
+    {
+        $customField = $this->generateCustomField([
+            CustomFieldChoice::ALLOW_OTHER => false,
+            CustomFieldChoice::MULTIPLE => true,
+        ]);
+
+        $deserialized = $this->cfChoice->deserialize($data, $customField);
+        $isEmpty = $this->cfChoice->isEmptyValue($deserialized, $customField);
+
+        $this->assertFalse($isEmpty);
+    }
+
     /**
-     * 
      * @param array $options
+     *
      * @return CustomField
      */
     private function generateCustomField($options)
@@ -72,397 +448,6 @@ class CustomFieldsChoiceTest extends KernelTestCase
             ->setActive(true)
             ->setSlug('slug')
             ->setOptions($options)
-            ->setType('choice')
-                ;
+            ->setType('choice');
     }
-    
-    /////////////////////////////////////////
-    //
-    // test function deserialize 
-    //
-    ////////////////////////////////////////
-    
-    /**
-     * Test if the representation of the data is deserialized to a single text.
-     * 
-     * If the value is in _other, the _other value should not be returned.
-     * 
-     * @param type $data
-     * @dataProvider serializedRepresentationDataProvider
-     */
-    public function testDeserializeSingleChoiceWithoutOther($data)
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => false,
-            CustomFieldChoice::MULTIPLE => false
-        ));
-        
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame('my-value', $deserialized);
-    }
-    
-    
-    public function testDeserializeSingleChoiceWithoutOtherDataIsNull()
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => false,
-            CustomFieldChoice::MULTIPLE => false
-        ));
-        
-        $deserialized = $this->cfChoice->deserialize(null, $customField);
-        $this->assertSame(null, $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize('', $customField);
-        $this->assertSame('', $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array(null), $customField);
-        $this->assertSame(null, $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array('_other' => null, '_choices' => null), $customField);
-        $this->assertSame(null, $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array('_other' => null, '_choices' => ''), $customField);
-        $this->assertSame('', $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array(null), $customField);
-        $this->assertSame(null, $deserialized);
-    }
-    
-    /**
-     * Test if the representation of the data is deserialized to a single text
-     * with an "allow_other" field.
-     * 
-     * If the value is in _other, the _other value should be in the _other field.
-     * 
-     * @param type $data
-     * @dataProvider serializedRepresentationDataProvider
-     */
-    public function testDeserializeSingleChoiceWithOther($data)
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => true,
-            CustomFieldChoice::MULTIPLE => false
-        ));
-        
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('_other' => '', '_choices' => 'my-value'), $deserialized);
-    }
-    
-    /**
-     * Other cases : 
-     * 
-     *  - Test if the selected value is '_other
-     * - Test with null data
-     * 
-     * @param type $data
-     */
-    public function testDeserializeSingleChoiceWithOtherOtherCases()
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => true,
-            CustomFieldChoice::MULTIPLE => false
-        ));
-        
-        // from a single to a single
-        $data = array('_other' => 'something', '_choices' => '_other');
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array('_other' => 'something', '_choices' => '_other'), $deserialized);
-        
-        
-        // from a multiple to a single
-        $data = array('_other' => 'something', '_choices' => array('some', '_other'));
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array('_other' => 'something', '_choices' => '_other'), $deserialized);
-        
-        //test with null data
-        //from a single to a single :
-        $data = array('_other' => 'something', '_choices' => null);
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array('_other' => 'something', '_choices' => null), $deserialized);
-        
-        $data = array('_other' => 'something', '_choices' => '');
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array('_other' => 'something', '_choices' => ''), $deserialized);
-        
-        // from a multiple to a signle
-        $data = array('_other' => 'something', '_choices' => array());
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array('_other' => 'something', '_choices' => ''), $deserialized);
-        
-        $data = array('_other' => 'something', '_choices' => array(''));
-        $deserialized = $this->cfChoice->deserialize($data, $customField);    
-        $this->assertSame(array('_other' => 'something', '_choices' => ''), $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array('_other' => null, '_choices' => null), $customField);
-        $this->assertSame(array('_other' => '', '_choices' => null), $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array('_other' => null, '_choices' => ''), $customField);
-        $this->assertSame(array('_other' => '', '_choices' => ''), $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array(null), $customField);
-        $this->assertSame(array('_other' => '', '_choices' => null), $deserialized);
-        
-    }
-    
-    /**
-     * Test if the representation of the data is deserialized to an array text
-     * with an "allow_other" field.
-     * 
-     * This test does not covers the case when the selected value is `_other`
-     * 
-     * @param type $data
-     * @dataProvider serializedRepresentationDataProvider
-     */
-    public function testDeserializeMultipleChoiceWithOther($data)
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => true,
-            CustomFieldChoice::MULTIPLE => true
-        ));
-        
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('_other' => '', '_choices' => array('my-value')), 
-                $deserialized);
-    }
-    
-    /**
-     * Test if the representation of the data is deserialized to an array text
-     * with an "allow_other" field.
-     * 
-     * This test covers :
-     * - the case when the selected value is `_other`
-     * - result is null
-     * 
-     * @param type $data
-     */
-    public function testDeserializeMultipleChoiceWithOtherOtherCases()
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => true,
-            CustomFieldChoice::MULTIPLE => true
-        ));
-        
-        // selected value is _other
-        // from single to multiple
-        $data = array('_other' => 'something', '_choices' => '_other');
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('_other' => 'something', '_choices' => array('_other')), 
-                $deserialized);
-        
-        // from multiple to multiple
-        $data = array('_other' => 'something', '_choices' => array('_other', 'something'));
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('_other' => 'something', '_choices' => array('_other', 'something')), 
-                $deserialized);
-        
-        // test with null value
-        // from single to multiple
-        $data = array('_other' => '', '_choices' => '');
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('_other' => '', '_choices' => array('')), 
-                $deserialized);
-        
-        // from multiple to multiple
-        $data = array('_other' => '', '_choices' => array());
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('_other' => '', '_choices' => array()), 
-                $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array('_other' => null, '_choices' => null), $customField);
-        $this->assertSame(array('_other' => '', '_choices' => array(null)), $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array('_other' => null, '_choices' => ''), $customField);
-        $this->assertSame(array('_other' => '', '_choices' => array('')), $deserialized);
-        
-        $deserialized = $this->cfChoice->deserialize(array(null), $customField);
-        $this->assertSame(array('_other' => '', '_choices' => array(null)), $deserialized);
-    }
-    
-    /**
-     * Test if the representation of the data is deserialized to an array text
-     * **without** an "allow_other" field.
-     * 
-     * 
-     * @param type $data
-     * @dataProvider serializedRepresentationDataProvider
-     */
-    public function testDeserializeMultipleChoiceWithoutOther($data)
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => false,
-            CustomFieldChoice::MULTIPLE => true
-        ));
-        
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        
-        $this->assertSame(array('my-value'), $deserialized);
-    }
-    
-    /**
-     * Test if the representation of the data is deserialized to an array text
-     * **without** an "allow_other" field.
-     * 
-     * Covered cases :
-     * - NULL values
-     * 
-     * 
-     * @param type $data
-     */
-    public function testDeserializeMultipleChoiceWithoutOtherOtherCases()
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => false,
-            CustomFieldChoice::MULTIPLE => true
-        ));
-        
-        // from single to multiple
-        $data = 'my-value';
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array('my-value'), $deserialized);
-        
-        // from multiple to multiple
-        $data = array('my-value');
-        $deserialized = $this->cfChoice->deserialize($data, $customField); 
-        $this->assertSame(array('my-value'), $deserialized);
-        
-        // from multiple
-        $data = array(null);
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $this->assertSame(array(null), $deserialized);
-        
-        $data = array('_other' => null, '_choices' => array(null));
-        $deserialized = $this->cfChoice->deserialize($data, $customField); 
-        $this->assertSame(array(null), $deserialized);
-        
-        //from single
-        $data = array('_other' => null, '_choices' => null);
-        $deserialized = $this->cfChoice->deserialize($data, $customField); 
-        $this->assertSame(array(null), $deserialized);
-    }
-    
-    public function serializedRepresentationDataProvider()
-    {
-        return array(
-            array(
-                // multiple => false, allow_other => false
-                'my-value' 
-            ),
-            array(
-                // multiple => true, allow_ther => false
-                array('my-value')
-            ),
-            array(
-                // multiple => false, allow_other => true, current value not in other
-                array('_other' => '', '_choices' => 'my-value')
-            ),
-            array(
-                // multiple => true, allow_other => true, current value not in other
-                array('_other' => '', '_choices'=> array('my-value'))
-            ),
-        );
-    }
-    
-    
-    
-    /////////////////////////////////////////
-    //
-    // test function isEmptyValue 
-    //
-    ////////////////////////////////////////
-    
-    /**
-     * test the not empty with the not-empty data provider
-     * 
-     * @param mixed $data
-     * @dataProvider serializedRepresentationDataProvider
-     */
-    public function testIsEmptyValueNotEmpty($data)
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => false,
-            CustomFieldChoice::MULTIPLE => true
-        ));
-
-        $deserialized = $this->cfChoice->deserialize($data, $customField);
-        $isEmpty = $this->cfChoice->isEmptyValue($deserialized, $customField);
-        
-        $this->assertFalse($isEmpty);
-    }
-    
-    /**
-     * 
-     * @dataProvider emptyDataProvider
-     * @param mixed $data deserialized data
-     */
-    public function testIsEmptyValueEmpty($data)
-    {
-        $customField = $this->generateCustomField(array(
-            CustomFieldChoice::ALLOW_OTHER => false,
-            CustomFieldChoice::MULTIPLE => true
-        ));
-        
-        $isEmpty = $this->cfChoice->isEmptyValue($data, $customField);
-        
-        $this->assertTrue($isEmpty);
-    }
-    
-    /**
-     * provide empty data in different possible representations.
-     * Those data are supposed to be deserialized.
-     * 
-     * @return array
-     */
-    public function emptyDataProvider()
-    {
-        return array(
-            // 0
-            array(
-                // signle
-                ''
-            ),
-            // 1
-            array(
-                // single
-                null
-            ),
-            // 2
-            array(
-                // signle with allow other
-                array('_other' => 'something', '_choices' => '')
-            ),
-            // 3
-            array(
-                // multiple
-                array()
-            ),
-            // 4
-            array(
-                // multiple with allow other
-                array('_other' => 'something', '_choices' => array())
-            ),
-            // 5
-             array(
-                // multiple with allow other
-                array('_other' => '', '_choices' => array())
-            ),
-            // 6
-            array(
-                // empty
-                array('_other' => null, '_choices' => null)
-            ),
-            // 7
-            array(
-                // empty
-                array(null)
-            )
-        );
-    }
-    
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
index a206be5c7..d65577d91 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
@@ -1,45 +1,35 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\CustomFieldsBundle\Form\CustomFieldsGroupType;
+use Symfony\Component\Form\FormBuilderInterface;
+use function count;
 
 /**
- * Test CustomFieldsNumber
+ * Test CustomFieldsNumber.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
+final class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
 {
     /**
-     *
      * @var CustomFieldNumber
      */
     private $customFieldNumber;
 
     /**
-     *
      * @var FormBuilderInterface
      */
     private $formBuilder;
@@ -49,26 +39,135 @@ class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTes
         self::bootKernel();
 
         $this->customFieldNumber = self::$kernel->getContainer()
-                ->get('chill.custom_field.number');
+            ->get('chill.custom_field.number');
 
         $this->formBuilder = self::$kernel->getContainer()
-                ->get('form.factory')
-                ->createBuilder('form', null, array(
-                    'csrf_protection' => false,
-                    'csrf_field_name' => '_token'
-                ));
+            ->get('form.factory')
+            ->createBuilder('form', null, [
+                'csrf_protection' => false,
+                'csrf_field_name' => '_token',
+            ]);
 
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
 
         self::$kernel->getContainer()
-                ->get('request_stack')
-                ->push($request);
+            ->get('request_stack')
+            ->push($request);
+    }
+
+    public function testCreateInvalidFormValueGreaterThanMaximum()
+    {
+        $cf = $this->createCustomFieldNumber([
+            'min' => null,
+            'max' => 10,
+            'scale' => null,
+            'post_text' => null,
+        ]);
+
+        $this->customFieldNumber->buildForm($this->formBuilder, $cf);
+
+        $form = $this->formBuilder->getForm();
+
+        $form->submit(['default' => 100]);
+
+        $this->assertTrue($form->isSynchronized());
+        $this->assertFalse($form->isValid());
+        $this->assertEquals(1, count($form['default']->getErrors()));
+    }
+
+    public function testCreateInvalidFormValueLowerThanMinimum()
+    {
+        $cf = $this->createCustomFieldNumber([
+            'min' => 1000,
+            'max' => null,
+            'scale' => null,
+            'post_text' => null,
+        ]);
+
+        $this->customFieldNumber->buildForm($this->formBuilder, $cf);
+
+        $form = $this->formBuilder->getForm();
+
+        $form->submit(['default' => 100]);
+
+        $this->assertTrue($form->isSynchronized());
+        $this->assertFalse($form->isValid());
+        $this->assertEquals(1, count($form['default']->getErrors()));
+    }
+
+    public function testCreateValidForm()
+    {
+        $cf = $this->createCustomFieldNumber([
+            'min' => null,
+            'max' => null,
+            'scale' => null,
+            'post_text' => null,
+        ]);
+
+        $this->customFieldNumber->buildForm($this->formBuilder, $cf);
+
+        $form = $this->formBuilder->getForm();
+
+        $form->submit(['default' => 10]);
+
+        $this->assertTrue($form->isSynchronized());
+        $this->assertEquals(10, $form['default']->getData());
+    }
+
+    public function testRequiredFieldIsFalse()
+    {
+        $cf = $this->createCustomFieldNumber([
+            'min' => 1000,
+            'max' => null,
+            'scale' => null,
+            'post_text' => null,
+        ]);
+        $cf->setRequired(false);
+
+        $cfGroup = (new \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup())
+            ->addCustomField($cf);
+
+        $form = self::$kernel->getContainer()->get('form.factory')
+            ->createBuilder(\Chill\CustomFieldsBundle\Form\Type\CustomFieldType::class, [], [
+                'group' => $cfGroup,
+            ])
+            ->getForm();
+
+        $this->assertFalse(
+            $form['default']->isRequired(),
+            'The field should not be required'
+        );
+    }
+
+    public function testRequiredFieldIsTrue()
+    {
+        $cf = $this->createCustomFieldNumber([
+            'min' => 1000,
+            'max' => null,
+            'scale' => null,
+            'post_text' => null,
+        ]);
+        $cf->setRequired(true);
+
+        $cfGroup = (new \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup())
+            ->addCustomField($cf);
+
+        $form = self::$kernel->getContainer()->get('form.factory')
+            ->createBuilder(\Chill\CustomFieldsBundle\Form\Type\CustomFieldType::class, [], [
+                'group' => $cfGroup,
+            ])
+            ->getForm();
+
+        $this->assertTrue(
+            $form['default']->isRequired(),
+            'The field should be required'
+        );
     }
 
     /**
-     *
      * @param mixed[] $options
+     *
      * @return CustomField
      */
     private function createCustomFieldNumber($options)
@@ -78,114 +177,7 @@ class CustomFieldsNumberTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTes
             ->setActive(true)
             ->setOrdering(10)
             ->setSlug('default')
-            ->setName(array('fr' => 'default'))
+            ->setName(['fr' => 'default'])
             ->setOptions($options);
     }
-
-    public function testCreateValidForm()
-    {
-        $cf = $this->createCustomFieldNumber(array(
-            'min' => null,
-            'max' => null,
-            'scale' => null,
-            'post_text' => null
-        ));
-
-        $this->customFieldNumber->buildForm($this->formBuilder, $cf);
-
-        $form = $this->formBuilder->getForm();
-
-        $form->submit(array('default' => 10));
-
-        $this->assertTrue($form->isSynchronized());
-        $this->assertEquals(10, $form['default']->getData());
-    }
-
-    public function testCreateInvalidFormValueGreaterThanMaximum()
-    {
-        $cf = $this->createCustomFieldNumber(array(
-            'min' => null,
-            'max' => 10,
-            'scale' => null,
-            'post_text' => null
-        ));
-
-        $this->customFieldNumber->buildForm($this->formBuilder, $cf);
-
-        $form = $this->formBuilder->getForm();
-
-        $form->submit(array('default' => 100));
-
-        $this->assertTrue($form->isSynchronized());
-        $this->assertFalse($form->isValid());
-        $this->assertEquals(1, count($form['default']->getErrors()));
-    }
-
-    public function testCreateInvalidFormValueLowerThanMinimum()
-    {
-        $cf = $this->createCustomFieldNumber(array(
-            'min' => 1000,
-            'max' => null,
-            'scale' => null,
-            'post_text' => null
-        ));
-
-        $this->customFieldNumber->buildForm($this->formBuilder, $cf);
-
-        $form = $this->formBuilder->getForm();
-
-        $form->submit(array('default' => 100));
-
-        $this->assertTrue($form->isSynchronized());
-        $this->assertFalse($form->isValid());
-        $this->assertEquals(1, count($form['default']->getErrors()));
-    }
-
-    public function testRequiredFieldIsFalse()
-    {
-        $cf = $this->createCustomFieldNumber(array(
-            'min' => 1000,
-            'max' => null,
-            'scale' => null,
-            'post_text' => null
-        ));
-        $cf->setRequired(false);
-
-        $cfGroup = (new \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup())
-                ->addCustomField($cf);
-
-        $form = static::$kernel->getContainer()->get('form.factory')
-                ->createBuilder(\Chill\CustomFieldsBundle\Form\Type\CustomFieldType::class, array(), array(
-                    'group' => $cfGroup
-                ))
-            ->getForm();
-
-        $this->assertFalse($form['default']->isRequired(),
-                "The field should not be required");
-    }
-
-    public function testRequiredFieldIsTrue()
-    {
-        $cf = $this->createCustomFieldNumber(array(
-            'min' => 1000,
-            'max' => null,
-            'scale' => null,
-            'post_text' => null
-        ));
-        $cf->setRequired(true);
-
-        $cfGroup = (new \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup())
-                ->addCustomField($cf);
-
-        $form = static::$kernel->getContainer()->get('form.factory')
-                ->createBuilder(\Chill\CustomFieldsBundle\Form\Type\CustomFieldType::class, array(), array(
-                    'group' => $cfGroup
-                ))
-            ->getForm();
-
-        $this->assertTrue($form['default']->isRequired(),
-                "The field should be required");
-    }
-
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
index ad031e4a1..8d84f072e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
@@ -1,106 +1,95 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\DomCrawler\Crawler;
-use Chill\CustomFieldsBundle\Tests\CustomFieldTestHelper;
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CustomFieldsTextTest extends WebTestCase
+final class CustomFieldsTextTest extends WebTestCase
 {
+    use CustomFieldTestHelper;
+
     /**
-     *
-     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider 
+     * @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider
      */
     private $customFieldProvider;
-    
-    use CustomFieldTestHelper;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        $this->customFieldProvider = static::$kernel->getContainer()
+        self::bootKernel();
+        $this->customFieldProvider = self::$kernel->getContainer()
             ->get('chill.custom_field.provider');
     }
-    
+
     public function testCustomFieldsTextExists()
     {
         $customField = $this->customFieldProvider->getCustomFieldByType('text');
-        
-        $this->assertInstanceOf('Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface',
-              $customField);
-        $this->assertInstanceOf('Chill\CustomFieldsBundle\CustomFields\CustomFieldText',
-              $customField);
+
+        $this->assertInstanceOf(
+            'Chill\CustomFieldsBundle\CustomFields\CustomFieldInterface',
+            $customField
+        );
+        $this->assertInstanceOf(
+            'Chill\CustomFieldsBundle\CustomFields\CustomFieldText',
+            $customField
+        );
     }
-    
+
+    public function testFormTextNew()
+    {
+        $client = self::createClient();
+
+        $crawler = $client->request('GET', '/fr/admin/customfield/new?type=text');
+
+        $this->assertTrue($client->getResponse()->isSuccessful());
+
+        $form = $crawler->selectButton('custom_field_choice_submit')->form();
+        $this->assertTrue($form->has('custom_field_choice[options][maxLength]'));
+    }
+
     public function testPublicFormRenderingLengthLessThan256()
     {
         $customField = new CustomField();
         $customField->setType('text')
-            ->setOptions(array(CustomFieldText::MAX_LENGTH => 255))
+            ->setOptions([CustomFieldText::MAX_LENGTH => 255])
             ->setSlug('slug')
             ->setOrdering(10)
             ->setActive(true)
-            ->setName(array('en' => 'my label'));
-        
+            ->setName(['en' => 'my label']);
+
         $crawler = $this->getCrawlerForField($customField);
-        
-        $this->assertCount(1, $crawler->filter("input[type=text]"));
-        $this->assertCount(1, $crawler->filter("label:contains('my label')"));   
+
+        $this->assertCount(1, $crawler->filter('input[type=text]'));
+        $this->assertCount(1, $crawler->filter("label:contains('my label')"));
     }
-    
+
     public function testPublicFormRenderingLengthMoreThan25()
     {
         $customField = new CustomField();
         $customField->setType('text')
-            ->setOptions(array(CustomFieldText::MAX_LENGTH => 256))
+            ->setOptions([CustomFieldText::MAX_LENGTH => 256])
             ->setSlug('slug')
             ->setOrdering(10)
             ->setActive(true)
-            ->setName(array('en' => 'my label'));
-        
+            ->setName(['en' => 'my label']);
+
         $crawler = $this->getCrawlerForField($customField);
-        
-        $this->assertCount(1, $crawler->filter("textarea"));
-        $this->assertCount(1, $crawler->filter("label:contains('my label')"));        
+
+        $this->assertCount(1, $crawler->filter('textarea'));
+        $this->assertCount(1, $crawler->filter("label:contains('my label')"));
     }
-    
-    public function testFormTextNew()
-    {
-        $client = static::createClient();
-        
-        $crawler = $client->request('GET', '/fr/admin/customfield/new?type=text');
-        
-        $this->assertTrue($client->getResponse()->isSuccessful());
-        
-        $form = $crawler->selectButton('custom_field_choice_submit')->form();
-        $this->assertTrue($form->has('custom_field_choice[options][maxLength]'));
-    }
-    
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
index 5f395abe5..8ce7b0cef 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php
@@ -1,36 +1,28 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFields\Tests\Form\Extension;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 
 /**
- * Test the post-text extension
+ * Test the post-text extension.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PostTextIntegerExtensionTest extends KernelTestCase
+final class PostTextIntegerExtensionTest extends KernelTestCase
 {
     /**
-     *
      * @var \Symfony\Component\Form\FormBuilderInterface
      */
     private $formBuilder;
@@ -42,18 +34,17 @@ class PostTextIntegerExtensionTest extends KernelTestCase
         $container = self::$kernel->getContainer();
 
         $this->formBuilder = $container->get('form.factory')
-                ->createBuilder('form', null);
+            ->createBuilder('form', null);
     }
 
     public function testCreateView()
     {
-        $form = $this->formBuilder->add('test', IntegerType::class, array(
-            'post_text' => 'my text'
-        ))->getForm();
+        $form = $this->formBuilder->add('test', IntegerType::class, [
+            'post_text' => 'my text',
+        ])->getForm();
 
         $view = $form->createView();
 
         $this->assertEquals('my text', $view['test']->vars['post_text']);
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
index 86098ac21..a16980be0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php
@@ -1,36 +1,28 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFields\Tests\Form\Extension;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 
 /**
- * Test the post-text extension
+ * Test the post-text extension.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PostTextNumberExtensionTest extends KernelTestCase
+final class PostTextNumberExtensionTest extends KernelTestCase
 {
     /**
-     *
      * @var \Symfony\Component\Form\FormBuilderInterface
      */
     private $formBuilder;
@@ -42,18 +34,17 @@ class PostTextNumberExtensionTest extends KernelTestCase
         $container = self::$kernel->getContainer();
 
         $this->formBuilder = $container->get('form.factory')
-                ->createBuilder('form', null);
+            ->createBuilder('form', null);
     }
 
     public function testCreateView()
     {
-        $form = $this->formBuilder->add('test', NumberType::class, array(
-            'post_text' => 'my text'
-        ))->getForm();
+        $form = $this->formBuilder->add('test', NumberType::class, [
+            'post_text' => 'my text',
+        ])->getForm();
 
         $view = $form->createView();
 
         $this->assertEquals('my text', $view['test']->vars['post_text']);
     }
-
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
index 290cce37b..3cde3890a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
@@ -1,45 +1,36 @@
 <?php
 
-/*
- * 
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFieldsBundle\Tests;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Test that routes are correctly loaded
+ * Test that routes are correctly loaded.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class RoutingLoaderTest extends WebTestCase
+final class RoutingLoaderTest extends WebTestCase
 {
     public function testRoutesAreLoaded()
     {
-        $client = static::createClient();
-        
-        $client->request('GET','/fr/admin/customfield/');
-        
+        $client = self::createClient();
+
+        $client->request('GET', '/fr/admin/customfield/');
+
         $this->assertEquals(
             Response::HTTP_OK,
             $client->getResponse()->getStatusCode()
         );
-        
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
index fc7276cf7..594e55e34 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php
@@ -1,92 +1,79 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFields\Tests\Service;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
- * Tests for custom fields helper
+ * Tests for custom fields helper.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CustomFieldsHelperTest extends KernelTestCase
+final class CustomFieldsHelperTest extends KernelTestCase
 {
     /**
-     *
      * @var CustomFieldsHelper
      */
     private $cfHelper;
-    
+
     /**
-     *
      * @var CustomField
      */
     private $randomCFText;
-    
+
     public function setUp()
     {
         self::bootKernel();
-        
+
         $container = self::$kernel->getContainer();
-        
+
         $this->cfHelper = $container->get('chill.custom_field.helper');
-        
+
         $this->randomCFText = (new CustomField())
-                ->setSlug('my-slug')
-                ->setActive(true)
-                ->setName(array('fr' => 'my cf'))
-                ->setOptions(array('maxLength' => 1000))
-                ->setType('text')
-                ;
+            ->setSlug('my-slug')
+            ->setActive(true)
+            ->setName(['fr' => 'my cf'])
+            ->setOptions(['maxLength' => 1000])
+            ->setType('text');
     }
-    
-    public function testRenderCustomField()
-    {
-        $data = array(
-           $this->randomCFText->getSlug() => 'Sample text'
-        );
-        
-        $text = $this->cfHelper->renderCustomField($data, $this->randomCFText);
-        
-        $this->assertContains('Sample text', $text);
-    }
-    
+
     public function testIsEmptyValue()
     {
         // not empty value
-        $data = array(
-           $this->randomCFText->getSlug() => 'Sample text'
-        );
-        
+        $data = [
+            $this->randomCFText->getSlug() => 'Sample text',
+        ];
+
         $this->assertFalse($this->cfHelper->isEmptyValue($data, $this->randomCFText));
-        
+
         //empty value
-        $data = array(
-           $this->randomCFText->getSlug() => ''
-        );
-        
+        $data = [
+            $this->randomCFText->getSlug() => '',
+        ];
+
         $this->assertTrue($this->cfHelper->isEmptyValue($data, $this->randomCFText));
     }
-    
+
+    public function testRenderCustomField()
+    {
+        $data = [
+            $this->randomCFText->getSlug() => 'Sample text',
+        ];
+
+        $text = $this->cfHelper->renderCustomField($data, $this->randomCFText);
+
+        $this->assertContains('Sample text', $text);
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
index 2f6f51df7..425e79537 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php
@@ -1,128 +1,120 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFields\Tests\Templating\Twig;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldRenderingTwig;
 use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldRenderingTwig;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
- * Test the rendering of twig function which renders custom fields
+ * Test the rendering of twig function which renders custom fields.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CustomFieldRenderingTwigTest extends KernelTestCase
+final class CustomFieldRenderingTwigTest extends KernelTestCase
 {
     /**
-     *
-     * @var CustomFieldRenderingTwig
-     */
-    private $cfRendering;
-    
-    /**
-     *
      * @var CustomFieldProvider
      */
     private $cfProvider;
-    
+
+    /**
+     * @var CustomFieldRenderingTwig
+     */
+    private $cfRendering;
+
     public function setUp()
     {
         self::bootKernel();
         $this->cfRendering = self::$kernel->getContainer()
-              ->get('chill.custom_field.twig.custom_fields_rendering')
-              ;
-        
+            ->get('chill.custom_field.twig.custom_fields_rendering');
+
         $this->cfProvider = self::$kernel->getContainer()
-              ->get('chill.custom_field.provider');
-        
+            ->get('chill.custom_field.provider');
+
         // set locale to fr
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend('Symfony\Component\HttpFoundation\Request');
         $request->getLocale()->willReturn('fr');
         self::$kernel->getContainer()->get('request_stack')
-              ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
+
+    public function testIsEmpty()
+    {
+        $cf = $this->getSimpleCustomFieldText();
+
+        // value is not empty
+        $fields = [
+            'test' => 'My tailor is rich',
+        ];
+
+        $result = $this->cfRendering->isEmptyValue($fields, $cf);
+
+        $this->assertFalse($result);
+
+        // value is empty
+        $fields = [
+            'text' => '',
+        ];
+
+        $result = $this->cfRendering->isEmptyValue($fields, $cf);
+
+        $this->assertTrue($result);
+    }
+
+    public function testLabelRendering()
+    {
+        $cf = $this->getSimpleCustomFieldText();
+
+        $text = $this->cfRendering->renderLabel($cf);
+
+        $this->assertContains(
+            'Test',
+            $text,
+            "The rendering text should contains the 'test' text"
+        );
+    }
+
+    public function testWidgetRendering()
+    {
+        $cf = $this->getSimpleCustomFieldText();
+        $fields = [
+            'test' => 'My tailor is rich',
+        ];
+
+        $text = $this->cfRendering->renderWidget($fields, $cf);
+
+        $this->assertContains(
+            'My tailor is rich',
+            $text,
+            "The rendering text should contains the 'test' text"
+        );
+    }
+
     /**
-     * 
      * @return CustomField
      */
     private function getSimpleCustomFieldText()
     {
         return (new CustomField())
             ->setSlug('test')
-              ->setName(array('fr' => 'Test'))
-              ->setType('text')
-              ->setOrdering(10)
-              ->setOptions(array("maxLength" => 255))
-              ->setActive(true)
-              ;
-    }
-    
-    public function testLabelRendering()
-    {
-        $cf = $this->getSimpleCustomFieldText();
-        
-        $text = $this->cfRendering->renderLabel($cf);
-        
-        $this->assertContains('Test', $text,
-              "The rendering text should contains the 'test' text");
-    }
-    
-    public function testWidgetRendering()
-    {
-        $cf = $this->getSimpleCustomFieldText();
-        $fields = array(
-           'test' => "My tailor is rich"
-        );
-        
-        $text = $this->cfRendering->renderWidget($fields, $cf);
-        
-        $this->assertContains('My tailor is rich', $text,
-              "The rendering text should contains the 'test' text");
-    }
-    
-    public function testIsEmpty()
-    {
-        $cf = $this->getSimpleCustomFieldText();
-        
-        // value is not empty
-        $fields = array(
-           'test' => "My tailor is rich"
-        );
-        
-        $result = $this->cfRendering->isEmptyValue($fields, $cf);
-        
-        $this->assertFalse($result);
-        
-        // value is empty
-        $fields = array(
-           'text' => ''
-        );
-        
-        $result = $this->cfRendering->isEmptyValue($fields, $cf);
-        
-        $this->assertTrue($result);
+            ->setName(['fr' => 'Test'])
+            ->setType('text')
+            ->setOrdering(10)
+            ->setOptions(['maxLength' => 255])
+            ->setActive(true);
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
index d1cbe0209..aa52e3efd 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php
@@ -1,130 +1,117 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\CustomFields\Tests\Templating\Twig;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldsGroupRenderingTwig;
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Chill\CustomFieldsBundle\Templating\Twig\CustomFieldsGroupRenderingTwig;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * Test the rendering of a custom fields group through
- * the `chill_custom_fields_group_widget`
+ * the `chill_custom_fields_group_widget`.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
+final class CustomFieldsGroupRenderingTwigTest extends KernelTestCase
 {
     /**
-     *
-     * @var CustomFieldsGroupRenderingTwig
-     */
-    private $cfRendering;
-    
-    /**
-     *
      * @var CustomFieldProvider
      */
     private $cfProvider;
-    
+
+    /**
+     * @var CustomFieldsGroupRenderingTwig
+     */
+    private $cfRendering;
+
     public function setUp()
     {
         self::bootKernel();
         $this->cfRendering = self::$kernel->getContainer()
-              ->get('chill.custom_field.twig.custom_fields_group_rendering')
-              ;
-        
+            ->get('chill.custom_field.twig.custom_fields_group_rendering');
+
         $this->cfProvider = self::$kernel->getContainer()
-              ->get('chill.custom_field.provider');
-        
+            ->get('chill.custom_field.provider');
+
         // set locale to fr
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend('Symfony\Component\HttpFoundation\Request');
         $request->getLocale()->willReturn('fr');
         self::$kernel->getContainer()->get('request_stack')
-              ->push($request->reveal());
+            ->push($request->reveal());
     }
-    
-    /**
-     * 
-     * @return CustomField
-     */
-    private function getSimpleCustomFieldText($slug, $name)
-    {
-        return (new CustomField())
-            ->setSlug($slug)
-              ->setName(array('fr' => $name))
-              ->setType('text')
-              ->setOrdering(10)
-              ->setOptions(array("maxLength" => 255))
-              ->setActive(true)
-              ;
-    }
-    
-    /**
-     * 
-     * @return CustomFieldsGroup
-     */
-    private function getCustomFieldsGroup()
-    {
-        return (new CustomFieldsGroup())
-              ->setEntity('\Dummy')
-              ->setName(array("fr" => "A cf group"))
-              ->addCustomField($this->getSimpleCustomFieldText("horses", "Do you like horses ?."))
-              ->addCustomField($this->getSimpleCustomFieldText("sure", "Are you sure ?"))
-              ;
-    }
-    
+
     public function testRenderingWidget()
     {
         $cfGroup = $this->getCustomFieldsGroup();
-        
-        $text = $this->cfRendering->renderWidget(array(
-           'horses' => 'I like horses',
-           'sure' => 'Yes !'
-        ), $cfGroup);
-        
+
+        $text = $this->cfRendering->renderWidget([
+            'horses' => 'I like horses',
+            'sure' => 'Yes !',
+        ], $cfGroup);
+
         $this->assertContains('Do you like horses', $text);
         $this->assertContains('I like horses', $text);
         $this->assertContains('Are you sure', $text);
         $this->assertContains('Yes', $text);
     }
-    
+
     public function testRenderingWidgetDoNotShowEmpty()
     {
         $cfGroup = $this->getCustomFieldsGroup();
         $cfGroup->addCustomField($this->getSimpleCustomFieldText('empty', 'Do not answer'));
-        
-        $text = $this->cfRendering->renderWidget(array(
-           'horses' => 'I like horses',
-           'sure' => 'Yes !'
-        ), $cfGroup, 'html', array('show_empty' => false));
-        
+
+        $text = $this->cfRendering->renderWidget([
+            'horses' => 'I like horses',
+            'sure' => 'Yes !',
+        ], $cfGroup, 'html', ['show_empty' => false]);
+
         $this->assertContains('Do you like horses', $text);
         $this->assertContains('I like horses', $text);
         $this->assertContains('Are you sure', $text);
         $this->assertContains('Yes', $text);
         $this->assertNotContains('Do not answer', $text);
     }
+
+    /**
+     * @return CustomFieldsGroup
+     */
+    private function getCustomFieldsGroup()
+    {
+        return (new CustomFieldsGroup())
+            ->setEntity('\Dummy')
+            ->setName(['fr' => 'A cf group'])
+            ->addCustomField($this->getSimpleCustomFieldText('horses', 'Do you like horses ?.'))
+            ->addCustomField($this->getSimpleCustomFieldText('sure', 'Are you sure ?'));
+    }
+
+    /**
+     * @param mixed $slug
+     * @param mixed $name
+     *
+     * @return CustomField
+     */
+    private function getSimpleCustomFieldText($slug, $name)
+    {
+        return (new CustomField())
+            ->setSlug($slug)
+            ->setName(['fr' => $name])
+            ->setType('text')
+            ->setOrdering(10)
+            ->setOptions(['maxLength' => 255])
+            ->setActive(true);
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/bootstrap.php b/src/Bundle/ChillCustomFieldsBundle/Tests/bootstrap.php
index 9211155e5..d4e1e46fa 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/bootstrap.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/bootstrap.php
@@ -1,8 +1,16 @@
 <?php
 
-if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
     throw new \LogicException('Could not find autoload.php in vendor/. Did you run "composer install --dev"?');
 }
 
 require $autoloadFile;
-
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php
index bf4800827..5a93f65d9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20141128195430.php
@@ -1,34 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\CustomFields;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20141128195430 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("CREATE SEQUENCE CustomField_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE CustomFieldsDefaultGroup_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE CustomFieldsGroup_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE TABLE CustomField (id INT NOT NULL, name JSON NOT NULL, slug VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, active BOOLEAN NOT NULL, ordering DOUBLE PRECISION NOT NULL, options JSON NOT NULL, customFieldGroup_id INT DEFAULT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_40FB5D6DFEC418B ON CustomField (customFieldGroup_id);");
-        $this->addSql("CREATE TABLE CustomFieldsDefaultGroup (id INT NOT NULL, entity VARCHAR(255) NOT NULL, customFieldsGroup_id INT DEFAULT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_286DC95DF53B66 ON CustomFieldsDefaultGroup (customFieldsGroup_id);");
-        $this->addSql("CREATE UNIQUE INDEX unique_entity ON CustomFieldsDefaultGroup (entity);");
-        $this->addSql("CREATE TABLE CustomFieldsGroup (id INT NOT NULL, name JSON NOT NULL, entity VARCHAR(255) NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("ALTER TABLE CustomField ADD CONSTRAINT FK_40FB5D6DFEC418B FOREIGN KEY (customFieldGroup_id) REFERENCES CustomFieldsGroup (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE CustomFieldsDefaultGroup ADD CONSTRAINT FK_286DC95DF53B66 FOREIGN KEY (customFieldsGroup_id) REFERENCES CustomFieldsGroup (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
+    }
 
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE CustomField_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE CustomFieldsDefaultGroup_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE CustomFieldsGroup_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE TABLE CustomField (id INT NOT NULL, name JSON NOT NULL, slug VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, active BOOLEAN NOT NULL, ordering DOUBLE PRECISION NOT NULL, options JSON NOT NULL, customFieldGroup_id INT DEFAULT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_40FB5D6DFEC418B ON CustomField (customFieldGroup_id);');
+        $this->addSql('CREATE TABLE CustomFieldsDefaultGroup (id INT NOT NULL, entity VARCHAR(255) NOT NULL, customFieldsGroup_id INT DEFAULT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_286DC95DF53B66 ON CustomFieldsDefaultGroup (customFieldsGroup_id);');
+        $this->addSql('CREATE UNIQUE INDEX unique_entity ON CustomFieldsDefaultGroup (entity);');
+        $this->addSql('CREATE TABLE CustomFieldsGroup (id INT NOT NULL, name JSON NOT NULL, entity VARCHAR(255) NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('ALTER TABLE CustomField ADD CONSTRAINT FK_40FB5D6DFEC418B FOREIGN KEY (customFieldGroup_id) REFERENCES CustomFieldsGroup (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE CustomFieldsDefaultGroup ADD CONSTRAINT FK_286DC95DF53B66 FOREIGN KEY (customFieldsGroup_id) REFERENCES CustomFieldsGroup (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php
index 4034dba80..41b0dc0e0 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20150224164531.php
@@ -1,22 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\CustomFields;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add an option column to customfieldsgroup
+ * Add an option column to customfieldsgroup.
  */
 class Version20150224164531 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE customfieldsgroup ADD options JSON DEFAULT \'{}\'::json');
-    }
-
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE CustomFieldsGroup DROP options');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE customfieldsgroup ADD options JSON DEFAULT \'{}\'::json');
+    }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
index 9bcd83cbc..ba1ce6e1c 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210155904.php
@@ -1,35 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\CustomFields;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20151210155904 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE customfield ADD required BOOLEAN DEFAULT FALSE');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE CustomField DROP required');
+    }
 
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE customfield ADD required BOOLEAN DEFAULT FALSE');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
index b2f332da4..69a6e9032 100644
--- a/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
+++ b/src/Bundle/ChillCustomFieldsBundle/migrations/Version20151210205610.php
@@ -1,21 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\CustomFields;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20151210205610 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE custom_field_long_choice_options DROP CONSTRAINT cf_long_choice_self_referencing');
+        $this->addSql('DROP SEQUENCE custom_field_long_choice_options_id_seq CASCADE');
+        $this->addSql('DROP TABLE custom_field_long_choice_options');
+    }
+
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE custom_field_long_choice_options_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE custom_field_long_choice_options (id INT NOT NULL, '
@@ -29,19 +45,5 @@ class Version20151210205610 extends AbstractMigration
         $this->addSql('ALTER TABLE custom_field_long_choice_options ADD CONSTRAINT cf_long_choice_self_referencing '
                 . 'FOREIGN KEY (parent_id) REFERENCES custom_field_long_choice_options (id) '
                 . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-    }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE custom_field_long_choice_options DROP CONSTRAINT cf_long_choice_self_referencing');
-        $this->addSql('DROP SEQUENCE custom_field_long_choice_options_id_seq CASCADE');
-        $this->addSql('DROP TABLE custom_field_long_choice_options');
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php
index 350290b08..aa02a6101 100644
--- a/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php
+++ b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php
@@ -1,9 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle;
 
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillDocGeneratorBundle extends Bundle
 {
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        $container->registerForAutoconfiguration(DocGeneratorContextInterface::class)
+            ->addTag('chill_docgen.context');
+    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
new file mode 100644
index 000000000..8dfecb730
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Context;
+
+use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+
+class ContextManager
+{
+    /**
+     * @var DocGeneratorContextInterface[]|iterable
+     */
+    private iterable $contexts;
+
+    public function __construct(iterable $contexts)
+    {
+        $this->contexts = $contexts;
+    }
+
+    /**
+     * @throw ContextNotFoundException when the context is not  found
+     */
+    public function getContextByDocGeneratorTemplate(DocGeneratorTemplate $docGeneratorTemplate): DocGeneratorContextInterface
+    {
+        foreach ($this->contexts as $key => $context) {
+            if ($docGeneratorTemplate->getContext() === $key) {
+                return $context;
+            }
+        }
+
+        throw new ContextNotFoundException($docGeneratorTemplate->getContext());
+    }
+
+    public function getContextByKey(string $searchedKey): DocGeneratorContextInterface
+    {
+        foreach ($this->contexts as $key => $context) {
+            if ($searchedKey === $key) {
+                return $context;
+            }
+        }
+
+        throw new ContextNotFoundException($searchedKey);
+    }
+
+    public function getContexts(): array
+    {
+        return iterator_to_array($this->contexts);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php
index 5d3cf349b..df148f6e1 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextInterface.php
@@ -1,29 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\Context;
 
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+
 /**
- * Interface for context for for document generation
+ * Interface for context for document generation.
  */
 interface DocGeneratorContextInterface
 {
     /**
-     * has form
+     * Get the data that will be injected to the generated document.
+     *
+     * @param mixed $entity
      */
-    public function hasForm(): bool;
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array;
 
-    /**
-     * Generate the form that display
-     */
-    public function getForm($entity);
+    public function getDescription(): string;
 
-    /**
-     * True of false which entity supports
-     */
-    public function supports(string $entityClass): bool;
+    public function getEntityClass(): string;
 
-    /**
-     * Get the data that will be injected to the generated document
-     */
-    public function getData($entity): array;
+    public static function getKey(): string;
+
+    public function getName(): string;
+
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void;
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
new file mode 100644
index 000000000..3b606ccb5
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithAdminFormInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Context;
+
+use Symfony\Component\Form\FormBuilderInterface;
+
+interface DocGeneratorContextWithAdminFormInterface extends DocGeneratorContextInterface
+{
+    public function adminFormReverseTransform(array $data): array;
+
+    public function adminFormTransform(array $data): array;
+
+    public function buildAdminForm(FormBuilderInterface $builder): void;
+
+    public function hasAdminForm(): bool;
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
new file mode 100644
index 000000000..e207cfb25
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/DocGeneratorContextWithPublicFormInterface.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Context;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Symfony\Component\Form\FormBuilderInterface;
+
+interface DocGeneratorContextWithPublicFormInterface extends DocGeneratorContextInterface
+{
+    /**
+     * Generate the form that display.
+     *
+     * @param mixed $entity
+     */
+    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void;
+
+    public function getFormData(DocGeneratorTemplate $template, $entity): array;
+
+    /**
+     * has form.
+     *
+     * @param mixed $entity
+     */
+    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool;
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
new file mode 100644
index 000000000..d4bbe856a
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/ContextNotFoundException.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Context\Exception;
+
+use RuntimeException;
+
+class ContextNotFoundException extends RuntimeException
+{
+    public function __construct($contextName)
+    {
+        parent::__construct(sprintf('the context with name %s is not found', $contextName));
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
new file mode 100644
index 000000000..617ec537a
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Context/Exception/UnexpectedTypeException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Context\Exception;
+
+use LogicException;
+use function get_class;
+use function gettype;
+use function is_object;
+
+class UnexpectedTypeException extends LogicException
+{
+    public function __construct($value, string $expectedType)
+    {
+        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, is_object($value) ? get_class($value) : gettype($value)));
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/HouseholdMemberSelectionContext.php b/src/Bundle/ChillDocGeneratorBundle/Context/HouseholdMemberSelectionContext.php
deleted file mode 100644
index dde48ff38..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/Context/HouseholdMemberSelectionContext.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Chill\DocGeneratorBundle\Context;
-
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-
-/**
- * Context that display a form to select a member of a houseHold
- */
-class HouseholdMemberSelectionContext implements DocGeneratorContextInterface
-{
-    /**
-     * has form
-     */
-    public function hasForm(): bool {
-        return true;
-    }
-
-    /**
-     * Generate the form that display
-     */
-    public function getForm($entity) {
-        throw new \Exception("No implemented yet", 1);
-
-        $choices = [];
-        if(get_class($entity) == AccompanyingPeriodWorkEvaluation::class) {
-            foreach ($entity->getAccompanyingPeriodWork()->getPersons() as $person) {
-                $choices[$person->getId()] = $person->getName();
-            }
-        }
-
-        $builder->add('members', ChoiceType::class, [
-            'choices' => $choices,
-            'placeholder' => 'Choose a person',
-            'label' => 'Person to add'
-        ]);
-
-        return $builder;
-    }
-
-    /**
-     * True of false which entity supports
-     */
-    public function supports(string $entityClass): bool {
-        return
-            ($entityClass == AccompanyingPeriod::class) ||
-            ($entityClass == SocialAction::class);
-    }
-
-    /**
-     * Get the data that will be injected to the generated document
-     */
-    public function getData($entity): array {
-        $datas = array(
-            'setValues' => array(),
-            'cloneRowAndSetValues' => array()
-        );
-
-        $persons = $entity->getAccompanyingPeriodWork()->getPersons();
-
-        if(sizeof($persons) > 0) {
-            $firstPerson = $persons[0];
-
-            $datas['setValues'][] = array(
-                'firstPersonFirstName' => $firstPerson->getFirstName(),
-                'firstPersonLastName' => $firstPerson->getLastName(),);
-        }
-
-
-        if(get_class($entity) == AccompanyingPeriodWorkEvaluation::class) {
-            $values = array();
-            foreach($entity->getAccompanyingPeriodWork()->getPersons() as $person) {
-                $i = 1;
-                $values[] = array(
-                    'personRowId' => $i,
-                    'personFirstName' => $person->getFirstName(),
-                    'personLastName' => $person->getLastName(),
-                );
-            }
-
-            $datas['cloneRowAndSetValues'][] = array(
-                'personRowId', $values);
-        }
-
-        return $datas;
-    }
-}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index 0b870a34e..c92aff527 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -1,9 +1,87 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\Controller;
 
+use Chill\DocGeneratorBundle\Context\ContextManager;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 
 class AdminDocGeneratorTemplateController extends CRUDController
 {
+    private ContextManager $contextManager;
+
+    public function __construct(ContextManager $contextManager)
+    {
+        $this->contextManager = $contextManager;
+    }
+
+    public function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = [])
+    {
+        switch ($action) {
+            case 'new':
+                $context = $this->contextManager->getContextByKey($request->get('context'));
+                // no break
+            case 'edit':
+                $context = $this->contextManager->getContextByDocGeneratorTemplate($entity);
+
+                return array_merge(
+                    $defaultTemplateParameters,
+                    ['context' => $context]
+                );
+
+            case 'index':
+                return array_merge(
+                    $defaultTemplateParameters,
+                    ['contextManager' => $this->contextManager]
+                );
+
+            default:
+                return parent::generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters); // TODO: Change the autogenerated stub
+        }
+    }
+
+    public function new(Request $request): Response
+    {
+        if (!$request->query->has('context')) {
+            return $this->redirectToRoute('chill_docgen_admin_template_pick-context');
+        }
+
+        return parent::new($request);
+    }
+
+    /**
+     * @Route("{_locale}/admin/docgen/template/pick-context", name="chill_docgen_admin_template_pick-context")
+     */
+    public function pickContext(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_ADMIN');
+
+        return $this->render('ChillDocGeneratorBundle:Admin/DocGeneratorTemplate:pick-context.html.twig', [
+            'contexts' => $this->contextManager->getContexts(),
+        ]);
+    }
+
+    protected function createEntity(string $action, Request $request): object
+    {
+        /** @var DocGeneratorTemplate $entity */
+        $entity = parent::createEntity($action, $request);
+        $key = $request->query->get('context');
+        $context = $this->contextManager->getContextByKey($key);
+
+        $entity->setContext($key)->setEntity($context->getEntityClass());
+
+        return $entity;
+    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php
deleted file mode 100644
index f67e3bbe0..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Chill\DocGeneratorBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\HeaderUtils;
-use Symfony\Component\Routing\Annotation\Route;
-use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlOpenstackGenerator;
-use PhpOffice\PhpWord\TemplateProcessor;
-
-/**
- * Class DocGeneratorController
- *
- * @package Chill\DocGenerator\Controller
- */
-class DocGeneratorController extends AbstractController
-{
-    /**
-     * @Route(
-     *  "{_locale}/doc/gen/test",
-     *  name="chill_docgenerator_test"
-     * )
-     *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function testAction()
-    {
-        return (new Response())
-            ->setContent('Test');
-    }
-
-    /**
-     * @Route(
-     *  "{_locale}/doc/gen/test",
-     *  name="chill_docgenerator_test"
-     * )
-     *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function getDoc(Request $request, TempUrlOpenstackGenerator $tempUrlGenerator)
-    {
-        $p = $tempUrlGenerator->generate(
-                'GET',
-                'FORMULAIRE_AEB.docx',
-                $request->query->has('expires_delay') ? $request->query->getInt('expires_delay', 0) : null
-                );
-
-        $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE');
-        file_put_contents($tmpfname, file_get_contents($p->{"url"}));
-
-        $templateProcessor = new TemplateProcessor($tmpfname);
-        $templateProcessor->setValues(array('firstname' => 'John', 'lastname' => 'Doe'));
-
-        $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED');
-        $templateProcessor->saveAs($tmpfname2);
-
-        unlink($tmpfname);
-
-        $fileContent = fopen($tmpfname2, 'r'); // the generated file content
-        $response = new Response(fread($fileContent, filesize($tmpfname2)));
-
-        $disposition = HeaderUtils::makeDisposition(
-            HeaderUtils::DISPOSITION_ATTACHMENT,
-            'foo.docx'
-        );
-
-        $response->headers->set('Content-Disposition', $disposition);
-        unlink($tmpfname2);
-
-        return $response;
-    }
-}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
index 93068de3f..de71daa6f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -1,56 +1,108 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\Controller;
 
+use Base64Url\Base64Url;
+use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
+use Chill\DocGeneratorBundle\Context\ContextManager;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
+use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
+use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
 use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
-use Chill\PersonBundle\Entity\SocialWork\Evaluation;
-use GuzzleHttp\Exception\TransferException;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\HeaderUtils;
-use Symfony\Component\Routing\Annotation\Route;
-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlOpenstackGenerator;
-use PhpOffice\PhpWord\TemplateProcessor;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Exception;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\TransferException;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 
 // TODO à mettre dans services
-use Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\Annotation\Route;
 
-/**
- * Class DocGeneratorTemplateController
- *
- * @package Chill\DocGeneratorBundle\Controller
- */
-class DocGeneratorTemplateController extends AbstractController
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+final class DocGeneratorTemplateController extends AbstractController
 {
+    private HttpClientInterface $client;
+
+    private ContextManager $contextManager;
+
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private DriverInterface $driver;
+
+    private KernelInterface $kernel;
+
+    private LoggerInterface $logger;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private TempUrlGeneratorInterface $tempUrlGenerator;
+
+    public function __construct(
+        ContextManager $contextManager,
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        DriverInterface $driver,
+        LoggerInterface $logger,
+        PaginatorFactory $paginatorFactory,
+        TempUrlGeneratorInterface $tempUrlGenerator,
+        KernelInterface $kernel,
+        HttpClientInterface $client
+    ) {
+        $this->contextManager = $contextManager;
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->driver = $driver;
+        $this->logger = $logger;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->tempUrlGenerator = $tempUrlGenerator;
+        $this->kernel = $kernel;
+        $this->client = $client;
+    }
+
     /**
      * @Route(
-     *     "{_locale}/doc/gen/templates/for/{entityClassName}",
-     *     name="chill_docgenerator_templates_for_entity_api"
+     *     "{_locale}/admin/doc/gen/generate/test/from/{template}/for/{entityClassName}/{entityId}",
+     *     name="chill_docgenerator_test_generate_from_template"
      * )
      */
-    public function listTemplateApiAction(
-        string $entityClassName, DocGeneratorTemplateRepository $templateRepository): Response
-    {
-        $entities = $templateRepository->findByEntity($entityClassName);
-
-        $ret = array();
-
-        foreach ($entities as $entity) {
-            $ret[] = array(
-                'id' => $entity->getId(),
-                'name' => $entity->getName(),
-                'description' => $entity->getDescription()
-            );
-        }
-
-        return new JsonResponse(["results" => $ret]);
+    public function adminTestGenerateDocFromTemplateAction(
+        DocGeneratorTemplate $template,
+        string $entityClassName,
+        int $entityId,
+        Request $request
+    ): Response {
+        return $this->generateDocFromTemplate(
+            $template,
+            $entityClassName,
+            $entityId,
+            $request,
+            true
+        );
     }
 
     /**
@@ -60,90 +112,248 @@ class DocGeneratorTemplateController extends AbstractController
      * )
      */
     public function generateDocFromTemplateAction(
-        \ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface $tempUrlGenerator,
         DocGeneratorTemplate $template,
         string $entityClassName,
         int $entityId,
         Request $request
     ): Response {
-        $getUrlGen = $tempUrlGenerator->generate(
-            'GET',
-            $template->getFile());
+        return $this->generateDocFromTemplate(
+            $template,
+            $entityClassName,
+            $entityId,
+            $request,
+            false
+        );
+    }
 
-        $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE');
-        file_put_contents($tmpfname, file_get_contents($getUrlGen->{"url"}));
+    /**
+     * @Route(
+     *     "/api/1.0/docgen/templates/by-entity/{entityClassName}",
+     *     name="chill_docgenerator_templates_for_entity_api"
+     * )
+     */
+    public function listTemplateApiAction(string $entityClassName): Response
+    {
+        $nb = $this->docGeneratorTemplateRepository->countByEntity($entityClassName);
+        $paginator = $this->paginatorFactory->create($nb);
+        $entities = $this->docGeneratorTemplateRepository->findByEntity(
+            $entityClassName,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
 
-        $entity = $this->getDoctrine()->getRepository($entityClassName)->find($entityId);
+        return $this->json(
+            new Collection($entities, $paginator),
+            Response::HTTP_OK,
+            [],
+            [AbstractNormalizer::GROUPS => ['read']]
+        );
+    }
 
-        if ($template->getContext() == HouseholdMemberSelectionContext::class) {
-            $context = new HouseholdMemberSelectionContext();
-            $datas = $context->getData($entity);
+    /**
+     * @Route(
+     *     "{_locale}/admin/doc/gen/generate/test/redirect",
+     *     name="chill_docgenerator_test_generate_redirect"
+     * )
+     *
+     * @return void
+     */
+    public function redirectToTestGenerate(Request $request): RedirectResponse
+    {
+        $template = $request->query->getInt('template');
+
+        if (null === $template) {
+            throw new BadRequestHttpException('template parameter is missing');
+        }
+
+        $entityClassName = $request->query->get('entityClassName');
+
+        if (null === $entityClassName) {
+            throw new BadRequestHttpException('entityClassName is missing');
+        }
+
+        $entityId = $request->query->get('entityId');
+
+        if (null === $entityId) {
+            throw new BadRequestHttpException('entityId is missing');
+        }
+
+        return $this->redirectToRoute(
+            'chill_docgenerator_test_generate_from_template',
+            ['template' => $template, 'entityClassName' => $entityClassName, 'entityId' => $entityId,
+                'returnPath' => $request->query->get('returnPath', '/'), ]
+        );
+    }
+
+    private function generateDocFromTemplate(
+        DocGeneratorTemplate $template,
+        string $entityClassName,
+        int $entityId,
+        Request $request,
+        bool $isTest
+    ): Response {
+        try {
+            $context = $this->contextManager->getContextByDocGeneratorTemplate($template);
+        } catch (ContextNotFoundException $e) {
+            throw new NotFoundHttpException($e->getMessage(), $e);
+        }
+
+        $entity = $this->getDoctrine()->getRepository($context->getEntityClass())->find($entityId);
+
+        if (null === $entity) {
+            throw new NotFoundHttpException("Entity with classname {$entityClassName} and id {$entityId} is not found");
+        }
+
+        $contextGenerationData = [];
+
+        if ($context instanceof DocGeneratorContextWithPublicFormInterface
+            && $context->hasPublicForm($template, $entity) || $isTest) {
+            if ($context instanceof DocGeneratorContextWithPublicFormInterface) {
+                $builder = $this->createFormBuilder(
+                    array_merge(
+                        $context->getFormData($template, $entity),
+                        $isTest ? ['test_file' => null] : []
+                    )
+                );
+            } else {
+                $builder = $this->createFormBuilder(
+                    ['test_file' => null]
+                );
+            }
+
+            $context->buildPublicForm($builder, $template, $entity);
+
+            if ($isTest) {
+                $builder->add('test_file', FileType::class, [
+                    'label' => 'Template file',
+                    'required' => false,
+                ]);
+            }
+
+            $form = $builder->getForm()->handleRequest($request);
+
+            if ($form->isSubmitted() && $form->isValid()) {
+                $contextGenerationData = $form->getData();
+            } elseif (!$form->isSubmitted() || ($form->isSubmitted() && !$form->isValid())) {
+                $templatePath = '@ChillDocGenerator/Generator/basic_form.html.twig';
+                $templateOptions = ['entity' => $entity, 'form' => $form->createView(),
+                    'template' => $template, 'context' => $context, ];
+
+                return $this->render($templatePath, $templateOptions);
+            }
+        }
+
+        if ($isTest && null !== $contextGenerationData['test_file']) {
+            /** @var File $file */
+            $file = $contextGenerationData['test_file'];
+            $templateResource = fopen($file->getPathname(), 'rb');
         } else {
-            throw new \Exception("Not implemented", 1);
+            $getUrlGen = $this->tempUrlGenerator->generate(
+                'GET',
+                $template->getFile()->getFilename()
+            );
+
+            $data = $this->client->request('GET', $getUrlGen->url);
+
+            $iv = $template->getFile()->getIv(); // iv as an Array
+            $ivGoodFormat = pack('C*', ...$iv);  // iv as a String (ok for openssl_decrypt)
+
+            $method = 'AES-256-CBC';
+
+            $key = $template->getFile()->getKeyInfos()['k'];
+            $keyGoodFormat = Base64Url::decode($key);
+
+            $dataDecrypted = openssl_decrypt($data->getContent(), $method, $keyGoodFormat, 1, $ivGoodFormat);
+
+            if (false === $dataDecrypted) {
+                throw new Exception('Error during Decrypt ', 1);
+            }
+
+            if (false === $templateResource = fopen('php://memory', 'r+b')) {
+                $this->logger->error('Could not write data to memory');
+
+                throw new HttpException(500);
+            }
+            fwrite($templateResource, $dataDecrypted);
+            rewind($templateResource);
         }
 
-        $templateProcessor = new TemplateProcessor($tmpfname);
+        $datas = $context->getData($template, $entity, $contextGenerationData);
 
-        foreach ($datas['setValues'] as $setValuesConf) {
-            $templateProcessor->setValues($setValuesConf);
+        try {
+            $generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename());
+        } catch (TemplateException $e) {
+            $msg = implode("\n", $e->getErrors());
+
+            return new Response($msg, 400, [
+                'Content-Type' => 'text/plain',
+            ]);
         }
 
-        foreach ($datas['cloneRowAndSetValues'] as $cloneRowAndSetValues) {
-            $templateProcessor->cloneRowAndSetValues($cloneRowAndSetValues[0], $cloneRowAndSetValues[1]);
+        fclose($templateResource);
+
+        if ($isTest) {
+            return new StreamedResponse(
+                static function () use ($generatedResource) {
+                    fpassthru($generatedResource);
+                    fclose($generatedResource);
+                },
+                Response::HTTP_OK,
+                [
+                    'Content-Transfer-Encoding', 'binary',
+                    'Content-Type' => 'application/vnd.oasis.opendocument.text',
+                    'Content-Disposition' => sprintf('attachment; filename="%s.odt"', 'generated'),
+                    'Content-Length' => fstat($generatedResource)['size'],
+                ],
+            );
         }
 
-        $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED');
-        $templateProcessor->saveAs($tmpfname2);
+        $genDocName = 'doc_' . sprintf('%010d', mt_rand()) . 'odt';
 
-        unlink($tmpfname);
-
-        $fileContent = fopen($tmpfname2, 'r'); // the generated file content
-
-        $genDocName = 'doc_' . sprintf('%010d', rand()) . '.docx';
-
-        $getUrlGen = $tempUrlGenerator->generate(
+        $getUrlGen = $this->tempUrlGenerator->generate(
             'PUT',
-            $genDocName);
-
-        unlink($tmpfname2);
+            $genDocName
+        );
 
         $client = new Client();
 
         try {
-            $putResponse = $client->request('PUT', $getUrlGen->{'url'}, [
-                'body' => $fileContent
+            $putResponse = $client->request('PUT', $getUrlGen->url, [
+                'body' => $generatedResource,
             ]);
 
-            if ($putResponse->getStatusCode() == 201) {
+            if ($putResponse->getStatusCode() === 201) {
                 $em = $this->getDoctrine()->getManager();
                 $storedObject = new StoredObject();
                 $storedObject
-                    // currently, only docx is supported
-                    ->setType('application/vnd.openxmlformats-officedocument.wordprocessingml.document')
+                    ->setType($template->getFile()->getType())
                     ->setFilename($genDocName);
 
                 $em->persist($storedObject);
 
-                // Only for evaluation
-                if ($entity instanceof AccompanyingPeriodWorkEvaluation) {
-                    $doc = new AccompanyingPeriodWorkEvaluationDocument();
-                    $doc
-                        ->setStoredObject($storedObject)
-                        ->setTemplate($template)
-                        ;
-                    $entity->addDocument($doc);
-                    $em->persist($doc);
+                try {
+                    $context->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
+                } catch (Exception $e) {
+                    $this->logger->error('Could not store the associated document to entity', [
+                        'entityClassName' => $entityClassName,
+                        'entityId' => $entityId,
+                        'contextKey' => $context->getName(),
+                    ]);
+
+                    throw $e;
                 }
 
                 $em->flush();
 
                 return $this->redirectToRoute('chill_wopi_file_edit', [
                     'fileId' => $storedObject->getUuid(),
-                    'returnPath' => $request->query->get('returnPath', "/")
+                    'returnPath' => $request->query->get('returnPath', '/'),
                 ]);
             }
         } catch (TransferException $e) {
             throw $e;
         }
+
+        throw new Exception('Unable to generate document.');
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
index 06d26a446..86cedfb3e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
@@ -1,56 +1,81 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\DataFixtures\ORM;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
+use DateTime;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Persistence\ObjectManager;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-
-
-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 
 /**
- * Load DocGeneratorTemplate
- *
- * @author Champs-Libres Coop
+ * Load DocGeneratorTemplate.
  */
-class LoadDocGeneratorTemplate  extends AbstractFixture
+class LoadDocGeneratorTemplate extends AbstractFixture
 {
-
     public function load(ObjectManager $manager)
     {
         $templates = [
             [
                 'name' => ['fr' => 'FORMULAIRE AEB'],
                 'desc' => 'stocké sur openstack comedienbe',
-                'file' => 'FORMULAIRE_AEB_WITH_DATA_INJ.docx',
-                'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext',
-                'entities' => [AccompanyingPeriodWorkEvaluation::class],
+                'file' => [
+                    'filename' => 'pKNlhCrQDCRsAuC8vYHDKa',
+                    'key' => '{"alg":"A256CBC","ext":true,"k":"_VihnD41-VDHlpS-ouwtbMPnu-OXVdtA7ENQWWtAQYM","key_ops":["encrypt","decrypt"],"kty":"oct"}',
+                    'iv' => '[86,231,83,148,117,107,149,173,130,19,105,194,224,145,8,48]',
+                    'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                ],
+                'context' => AccompanyingPeriodContext::class,
+                'entity' => AccompanyingPeriod::class,
+                'options' => ['mainPerson' => false, 'person1' => false, 'person2' => false],
             ], [
                 'name' => ['fr' => 'AIDE ALIMENTAIRE'],
                 'desc' => 'stocké sur openstack comedienbe',
-                'file' => 'AIDE_ALIMENTAIRE.docx',
-                'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext',
-                'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction', AccompanyingPeriodWorkEvaluation::class],
+                'file' => [
+                    'filename' => 'pKNlhCrQDCRsAuC8vYHDKa',
+                    'key' => '{"alg":"A256CBC","ext":true,"k":"_VihnD41-VDHlpS-ouwtbMPnu-OXVdtA7ENQWWtAQYM","key_ops":["encrypt","decrypt"],"kty":"oct"}',
+                    'iv' => '[86,231,83,148,117,107,149,173,130,19,105,194,224,145,8,48]',
+                    'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                ],
+                'context' => AccompanyingPeriodContext::class,
+                'entity' => AccompanyingPeriod::class,
+                'options' => ['mainPerson' => false, 'person1' => false, 'person2' => false],
             ],
         ];
 
         foreach ($templates as $template) {
+            echo 'Adding doc generator templates  ' . $template['file'] . ")\n";
 
-            print('Adding doc generator templates  '.$template['file'].")\n");
+            $newStoredObj = (new StoredObject())
+                ->setFilename($template['file']['filename'])
+                ->setKeyInfos(json_decode($template['file']['key'], true))
+                ->setIv(json_decode($template['file']['iv'], true))
+                ->setCreationDate(new DateTime('today'))
+                ->setType($template['file']['type']);
+
+            $manager->persist($newStoredObj);
 
             $newTemplate = (new DocGeneratorTemplate())
                 ->setName($template['name'])
                 ->setDescription($template['desc'])
-                ->setFile($template['file'])
+                ->setFile($newStoredObj)
                 ->setContext($template['context'])
-                ->setEntities($template['entities'])
-            ;
+                ->setEntity($template['entity'])
+                ->setOptions($template['options']);
 
             $manager->persist($newTemplate);
-
-            $manager->flush();
         }
+        $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
index dfa604d9e..9712ffac8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
@@ -1,26 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillDocGeneratorExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+        $container->setParameter('chill_doc_generator', $config);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/fixtures.yaml');
@@ -31,22 +41,9 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
     {
         $this->preprendRoutes($container);
         $this->prependCruds($container);
+        $this->prependClientConfig($container);
     }
 
-    protected function preprendRoutes(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('chill_main', array(
-            'routing' => array(
-                'resources' => array(
-                    '@ChillDocGeneratorBundle/config/routes.yaml'
-                )
-            )
-        ));
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     */
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
@@ -60,19 +57,49 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
                     'actions' => [
                         'index' => [
                             'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/edit.html.twig',
-                        ]
-                    ]
-                ]
-            ]
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+    protected function preprendRoutes(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillDocGeneratorBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
+    }
+
+    private function prependClientConfig(ContainerBuilder $container)
+    {
+        $configs = $container->getExtensionConfig($this->getAlias());
+        $resolvingBag = $container->getParameterBag();
+        $configs = $resolvingBag->resolveValue($configs);
+
+        $config = $this->processConfiguration(new Configuration(), $configs);
+
+        $container->prependExtensionConfig('framework', [
+            'http_client' => [
+                'scoped_clients' => [
+                    'relatorio.client' => [
+                        'scope' => $config['driver']['relatorio']['url'],
+                    ],
+                ],
+            ],
         ]);
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
index def8043a4..1117a5fc0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
@@ -1,28 +1,48 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
-/**
- * This is the class that validates and merges configuration from your app/config files.
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
- */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder('chill_calendar');
-        $rootNode = $treeBuilder->getRootNode('chill_calendar');
+        $treeBuilder = new TreeBuilder('chill_doc_generator');
+        $rootNode = $treeBuilder->getRootNode();
 
-        // Here you should define the parameters that are allowed to
-        // configure your bundle. See the documentation linked above for
-        // more information on that topic.
+        $rootNode
+            ->children()
+            ->arrayNode('driver')
+            ->addDefaultsIfNotSet()
+            ->children()
+            ->enumNode('type')
+            ->isRequired()
+            ->values(['relatorio'])
+            ->defaultValue('relatorio')
+            ->end()
+            ->arrayNode('relatorio')
+            ->addDefaultsIfNotSet()
+            ->children()
+            ->scalarNode('url')
+            ->isRequired()
+            ->defaultValue('http://relatorio:8888/')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end();
 
         return $treeBuilder;
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
index ad8d62056..ee93f74fb 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
@@ -1,17 +1,62 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\Entity;
 
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocStoreBundle\Entity\StoredObject;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_docgen_template")
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "docgen_template": DocGeneratorTemplate::class
+ * })
  */
 class DocGeneratorTemplate
 {
+    /**
+     * @ORM\Column(type="boolean", options={"default": true})
+     */
+    private bool $active = true;
+
+    /**
+     * Class name of the context to use.
+     *
+     * so if $context = ''
+     * this template will use '' as context
+     *
+     * @ORM\Column(type="string", length=255)
+     */
+    private string $context;
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private ?string $description = null;
+
+    /**
+     * Class name of the entity for which this template can be used.
+     *
+     * @ORM\Column(type="string", options={"default": ""})
+     */
+    private string $entity = '';
+
+    /**
+     * @ORM\ManyToOne(targetEntity=StoredObject::class, cascade={"persist"}))
+     */
+    private ?StoredObject $file = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -21,42 +66,37 @@ class DocGeneratorTemplate
     private int $id;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      * @Serializer\Groups({"read"})
      */
     private array $name = [];
 
     /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private string $description;
-
-
-    /**
-     * @ORM\Column(type="simple_array")
+     * Options for the template.
      *
-     * Class name of the entities for which this template can be used
-     *
-     * so if $entities = ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction']
-     * this template can be selected for an AccompanyingPeriod or a SocialAction
+     * @ORM\Column(type="json", name="template_options", options={"default":"[]"})
      */
-    private array $entities = [];
+    private array $options = [];
 
+    public function getContext(): ?string
+    {
+        return $this->context;
+    }
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     *
-     * Class name of the context to use
-     *
-     * so if $context = ''
-     * this template will use '' as context
-     */
-   private string $context;
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    private string $file;
+    public function getEntity(): string
+    {
+        return $this->entity;
+    }
+
+    public function getFile(): ?StoredObject
+    {
+        return $this->file;
+    }
 
     public function getId(): ?int
     {
@@ -68,16 +108,28 @@ class DocGeneratorTemplate
         return $this->name;
     }
 
-    public function setName(array $name): self
+    public function getOptions(): array
     {
-        $this->name = $name;
+        return $this->options;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $active): DocGeneratorTemplate
+    {
+        $this->active = $active;
 
         return $this;
     }
 
-    public function getDescription(): ?string
+    public function setContext(string $context): self
     {
-        return $this->description;
+        $this->context = $context;
+
+        return $this;
     }
 
     public function setDescription(?string $description): self
@@ -87,38 +139,30 @@ class DocGeneratorTemplate
         return $this;
     }
 
-    public function getFile(): ?string
+    public function setEntity(string $entity): self
     {
-        return $this->file;
+        $this->entity = $entity;
+
+        return $this;
     }
 
-    public function setFile(string $file): self
+    public function setFile(StoredObject $file): self
     {
         $this->file = $file;
 
         return $this;
     }
 
-    public function getEntities(): ?array
+    public function setName(array $name): self
     {
-        return $this->entities;
-    }
-
-    public function setEntities(array $entities): self
-    {
-        $this->entities = $entities;
+        $this->name = $name;
 
         return $this;
     }
 
-    public function getContext(): ?string
+    public function setOptions(array $options): self
     {
-        return $this->context;
-    }
-
-    public function setContext(string $context): self
-    {
-        $this->context = $context;
+        $this->options = $options;
 
         return $this;
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
index a0f36da0a..4275cf53e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php
@@ -1,38 +1,79 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocGeneratorBundle\Form;
 
+use Chill\DocGeneratorBundle\Context\ContextManager;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-
 
 class DocGeneratorTemplateType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    private ContextManager $contextManager;
+
+    public function __construct(ContextManager $contextManager)
     {
-        $builder
-            ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Nom'
-            ])
-            ->add('description')
-            ->add('file')
-            ;
+        $this->contextManager = $contextManager;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        /** @var DocGeneratorTemplate $template */
+        $template = $options['data'];
+        $context = $this->contextManager->getContextByKey($template->getContext());
+
+        $builder
+            ->add('name', TranslatableStringFormType::class, [
+                'label' => 'Nom',
+            ])
+            ->add('description')
+            ->add('file', StoredObjectType::class, [
+                'error_bubbling' => true,
+            ])
+            ->add('active', ChoiceType::class, [
+                'label' => 'Active',
+                'choices' => [
+                    'Yes' => true,
+                    'No' => false,
+                ],
+                'required' => true,
+            ]);
+
+        if ($context instanceof DocGeneratorContextWithAdminFormInterface
+            && $context->hasAdminForm()) {
+            $sub = $builder
+                ->create('options', null, ['compound' => true])
+                ->addModelTransformer(new CallbackTransformer(
+                    static function (array $data) use ($context) {
+                        return $context->adminFormTransform($data);
+                    },
+                    static function (array $data) use ($context) {
+                        return $context->adminFormReverseTransform($data);
+                    }
+                ));
+            $context->buildAdminForm($sub);
+            $builder->add($sub);
+        }
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', DocGeneratorTemplate::class)
-            ;
+            ->setDefault('class', DocGeneratorTemplate::class);
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
new file mode 100644
index 000000000..2572484e1
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\GeneratorDriver;
+
+interface DriverInterface
+{
+    /**
+     * @param resource $template
+     *
+     * @return resource
+     */
+    public function generateFromResource($template, string $resourceType, array $data, ?string $templateName = null);
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
new file mode 100644
index 000000000..214c77621
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/Exception/TemplateException.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\GeneratorDriver\Exception;
+
+use RuntimeException;
+use Throwable;
+
+/**
+ * A exception to throw when there are syntax errors in the
+ * template file.
+ */
+class TemplateException extends RuntimeException
+{
+    private array $errors;
+
+    public function __construct(array $errors, $code = 0, ?Throwable $previous = null)
+    {
+        parent::__construct('Error while generating document from template', $code, $previous);
+        $this->errors = $errors;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
new file mode 100644
index 000000000..7a3e4ac69
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\GeneratorDriver;
+
+use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Mime\Part\Multipart\FormDataPart;
+use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class RelatorioDriver implements DriverInterface
+{
+    private LoggerInterface $logger;
+
+    private HttpClientInterface $relatorioClient;
+
+    private string $url;
+
+    public function __construct(
+        HttpClientInterface $relatorioClient,
+        ParameterBagInterface $parameterBag,
+        LoggerInterface $logger
+    ) {
+        $this->relatorioClient = $relatorioClient;
+        $this->logger = $logger;
+        $this->url = $parameterBag->get('chill_doc_generator')['driver']['relatorio']['url'];
+    }
+
+    public function generateFromResource($template, string $resourceType, array $data, ?string $templateName = null)
+    {
+        $formFields = [
+            'variables' => json_encode($data),
+            'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType),
+        ];
+        $form = new FormDataPart($formFields);
+
+        try {
+            $response = $this->relatorioClient->request('POST', $this->url, [
+                'headers' => $form->getPreparedHeaders()->toArray(),
+                'body' => $form->bodyToIterable(),
+            ]);
+
+            return $response->toStream();
+        } catch (HttpExceptionInterface $e) {
+            $content = $e->getResponse()->getContent(false);
+
+            if (400 === $e->getResponse()->getStatusCode()) {
+                $content = json_decode($content, true);
+                $this->logger->error('relatorio: template error', [
+                    'error' => $content['message'] ?? '_not defined',
+                ]);
+
+                throw new TemplateException([$content['message']]);
+            }
+
+            $this->logger->error('relatorio: error while generating document', [
+                'msg' => $e->getMessage(),
+                'response' => $e->getResponse()->getStatusCode(),
+                'content' => $content,
+            ]);
+
+            throw $e;
+        } catch (TransportExceptionInterface $e) {
+            $this->logger->error('relatorio: transport exception', [
+                'msg' => $e->getMessage(),
+                'e' => $e->getTraceAsString(),
+            ]);
+
+            throw $e;
+        } catch (DecodingExceptionInterface $e) {
+            $this->logger->error('relatorio: could not decode response', [
+                'msg' => $e->getMessage(),
+                'e' => $e->getTraceAsString(),
+            ]);
+
+            throw $e;
+        }
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..39b21ed0e
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
+
+class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    private Security $security;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator, Security $security)
+    {
+        $this->translator = $translator;
+        $this->security = $security;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if ($this->security->isGranted('ROLE_ADMIN')) {
+            if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
+                $menu->addChild($this->translator->trans('docgen.Document generation'), [
+                    'route' => 'chill_crud_docgen_template_index',
+                ])->setExtras([
+                    'order' => 350,
+                    'explain' => 'docgen.Manage templates and document generation',
+                ]);
+            }
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'docgen_admin'];
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
index 1dc4f41f1..5d99efa94 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php
@@ -1,13 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\DocGeneratorBundle\Repository;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Doctrine\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
 final class DocGeneratorTemplateRepository implements ObjectRepository
 {
@@ -18,16 +25,23 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(DocGeneratorTemplate::class);
     }
 
+    public function countByEntity(string $entity): int
+    {
+        $builder = $this->repository->createQueryBuilder('t');
+
+        $builder
+            ->select('count(t)')
+            ->where('t.entity LIKE :entity')
+            ->setParameter('entity', addslashes($entity));
+
+        return $builder->getQuery()->getSingleScalarResult();
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?DocGeneratorTemplate
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?DocGeneratorTemplate
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return DocGeneratorTemplate[]
      */
@@ -37,26 +51,41 @@ final class DocGeneratorTemplateRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return DocGeneratorTemplate[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findByEntity($entity) {
-
+    /**
+     * @return array|DocGeneratorTemplate[]
+     */
+    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array
+    {
         $builder = $this->repository->createQueryBuilder('t');
 
         $builder
-            ->where('t.entities LIKE :entity')
-            ->setParameter('entity', '%'.addslashes($entity).'%')
-        ;
+            ->where('t.entity LIKE :entity')
+            ->setParameter('entity', addslashes($entity));
 
-        return $builder->getQuery()->execute();
+        return $builder
+            ->getQuery()
+            ->setFirstResult($start)
+            ->setMaxResults($limit)
+            ->getResult();
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?DocGeneratorTemplate
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return DocGeneratorTemplate::class;
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/public/api/pickTemplate.js b/src/Bundle/ChillDocGeneratorBundle/Resources/public/api/pickTemplate.js
new file mode 100644
index 000000000..a668fe29d
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/api/pickTemplate.js
@@ -0,0 +1,10 @@
+import { fetchResults } from "ChillMainAssets/lib/api/apiMethods.js";
+
+const fetchTemplates = (entityClass) => {
+    let fqdnEntityClass = encodeURI(entityClass);
+    return fetchResults(`/api/1.0/docgen/templates/by-entity/${fqdnEntityClass}`);
+}
+
+export {
+    fetchTemplates
+};
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/public/module/PickTemplate/index.js b/src/Bundle/ChillDocGeneratorBundle/Resources/public/module/PickTemplate/index.js
new file mode 100644
index 000000000..9d26d1009
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/module/PickTemplate/index.js
@@ -0,0 +1,27 @@
+import {createApp} from 'vue';
+import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
+import {fetchTemplates} from 'ChillDocGeneratorAssets/api/pickTemplate.js';
+import {_createI18n} from 'ChillMainAssets/vuejs/_js/i18n';
+
+const i18n = _createI18n({});
+
+document.querySelectorAll('div[data-docgen-template-picker]').forEach(el => {
+    fetchTemplates(el.dataset.entityClass).then(templates => {
+        let
+            picker = {
+                template: '<pick-template :templates="this.templates" :entityId="this.entityId"></pick-template>',
+                components: {
+                    PickTemplate,
+                },
+                data() {
+                    return {
+                        templates: templates,
+                        entityId: el.dataset.entityId,
+                    }
+                },
+            }
+        ;
+        createApp(picker).use(i18n).mount(el);
+    })
+
+});
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
new file mode 100644
index 000000000..f1fb6c84b
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
@@ -0,0 +1,141 @@
+<template>
+    <div>
+        <template v-if="templates.length > 0">
+            <slot name="title">
+                <h2>{{ $t('generate_document')}}</h2>
+            </slot>
+
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-4">
+                        <slot name="label">
+                            <label>{{ $t('select_a_template') }}</label>
+                        </slot>
+                    </div>
+                    <div class="col-md-8">
+                        <div class="input-group mb-3">
+                            <select class="form-select" v-model="template">
+                                <option disabled selected value="">{{ $t('choose_a_template') }}</option>
+                                <template v-for="t in templates">
+                                    <option  v-bind:value="t.id">{{ t.name.fr }}</option>
+                                </template>
+                            </select>
+                            <button v-if="canGenerate" class="btn btn-update btn-sm change-icon" type="button" @click="generateDocument"><i class="fa fa-fw fa-cog"></i></button>
+                            <button v-else class="btn btn-update btn-sm change-icon" type="button" disabled ><i class="fa fa-fw fa-cog"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <div class="row" v-if="hasDescription">
+                    <div class="col-md-8 align-self-end">
+                        <p>{{ getDescription }}</p>
+                    </div>
+                </div>
+
+            </div>
+        </template>
+    </div>
+
+</template>
+
+<script>
+
+export default {
+    name: "PickTemplate",
+    props: {
+        entityId: [String, Number],
+        entityClass: {
+            type: String,
+            required: true,
+        },
+        templates: {
+            required: true,
+        },
+        // beforeMove execute "something" before
+        beforeMove: {
+            type: Function,
+            required: false,
+        }
+    },
+    data() {
+        return {
+            template: null,
+        }
+    },
+    computed: {
+        canGenerate() {
+            return this.template != null;
+        },
+        hasDescription() {
+            if (this.template == null) {
+                return false;
+            }
+
+            return true;
+        },
+        getDescription() {
+            return this.templates.find(t => t.id === this.template).description || '';
+        },
+    },
+    methods: {
+        generateDocument() {
+            console.log('generateDocument');
+            console.log('beforeMove', this.beforeMove);
+            if (this.beforeMove != null) {
+                console.log('execute before move');
+                let r = this.beforeMove();
+                if (r instanceof Promise) {
+                    r.then((obj) => this.goToGenerate(obj));
+                } else {
+                    this.goToGenerate();
+                }
+            } else {
+                this.goToGenerate();
+            }
+        },
+        goToGenerate(obj) {
+            console.log('goToGenerate');
+            console.log('obj', obj);
+            console.log('entityId', this.entityId);
+            let
+                realId = this.entityId,
+                realEntityClass = this.entityClass
+            ;
+
+            if (obj !== undefined) {
+                if (obj.entityId !== undefined) {
+                    realId = obj.entityId;
+                }
+                if (obj.entityClass !== undefined) {
+                    realEntityClass = obj.entityClass;
+                }
+            }
+
+            console.log('realId', realId);
+            console.log('realEntityClass', realEntityClass);
+
+            const
+                entityId = encodeURI(realId),
+                returnPath = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash),
+                fqdnEntityClass = encodeURI(realEntityClass),
+                url = `/fr/doc/gen/generate/from/${this.template}/for/${fqdnEntityClass}/${entityId}?returnPath=${returnPath}`
+            ;
+
+            console.log('I will generate your doc at', url);
+            window.location.assign(url);
+        },
+    },
+    i18n: {
+        messages: {
+            fr: {
+                generate_document: 'Générer un document',
+                select_a_template: 'Choisir un gabarit',
+                choose_a_template: 'Choisir',
+            }
+        }
+    }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
index 040dea1c0..93b08f688 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
@@ -1,12 +1,25 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
 
-{% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
+{% block title 'docgen.Edit template'|trans %}
 
 {% block layout_wvm_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_header %}
+            <h1>{{ 'docgen.Edit template'|trans }}</h1>
+            <h2>{{ 'docgen.With context %name%'|trans({'%name%': context.name|trans }) }}</h2>
+        {% endblock crud_content_header %}
+
         {% block content_form_actions_view %}{% endblock %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
 {% endblock %}
+
+{% block js %}
+	{{ parent() }}
+	{{ encore_entry_script_tags('mod_async_upload') }}
+{% endblock %}
+
+{% block css %}
+	{{ encore_entry_link_tags('mod_async_upload') }}
+{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
index c601b8836..29050ce02 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
@@ -1,19 +1,40 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
 
 {% block layout_wvm_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th></th>
             <th>{{ 'Title'|trans }}</th>
-            <th>{{ 'File'|trans }}</th>
+            <th>{{ 'docgen.Context'|trans }}</th>
+            <th>{{ 'docgen.test generate'|trans }}</th>
+            <th>{{ 'Edit'|trans }}</th>
         {% endblock %}
 
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
                     <td>{{ entity.id }}</td>
-                    <td>{{ entity.name | localize_translatable_string }}</td>
-                    <td>{{ entity.file }}</td>
+                    <td>{{ entity.name|localize_translatable_string}}</td>
+                    <td>{{ contextManager.getContextByKey(entity.context).name|trans }}</td>
+                    <td>
+                        <form method="get" action="{{ path('chill_docgenerator_test_generate_redirect') }}">
+                            <input type="hidden" name="returnPath" value="{{ app.request.query.get('returnPath', '/')|e('html_attr') }}" />
+                            <input type="hidden" name="template" value="{{ entity.id|e('html_attr') }}" />
+                            <input type="hidden" name="entityClassName" value="{{ contextManager.getContextByKey(entity.context).entityClass|e('html_attr') }}" />
+                            <input type="text" name="entityId" />
+
+                            <ul class="record_actions">
+                                <li>
+                                    <button type="submit" class="btn btn-mini btn-neutral">{{ 'docgen.test generate'|trans }}</button>
+                                </li>
+                            </ul>
+                        </form>
+                    </td>
+                    <td>
+                        <a href="{{ chill_path_add_return_path('chill_crud_docgen_template_edit', { 'id': entity.id }) }}" class="btn btn-edit">
+                            {{ 'Edit'|trans }}
+                        </a>
+                    </td>
                 </tr>
             {% endfor %}
         {% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
index f31ac39c9..fe4991ffa 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
@@ -1,11 +1,25 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
 
-{% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
+{% block title 'docgen.New template'|trans %}
 
 {% block layout_wvm_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+
+        {% block crud_content_header %}
+            <h1>{{ 'docgen.New template'|trans }}</h1>
+            <h2>{{ 'docgen.With context %name%'|trans({'%name%': context.name|trans }) }}</h2>
+        {% endblock crud_content_header %}
+
         {% block content_form_actions_save_and_show %}{% endblock %}
+
     {% endembed %}
 {% endblock %}
+
+{% block js %}
+	{{ parent() }}
+	{{ encore_entry_script_tags('mod_async_upload') }}
+{% endblock %}
+
+{% block css %}
+	{{ encore_entry_link_tags('mod_async_upload') }}
+{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig
new file mode 100644
index 000000000..5e3ff2049
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig
@@ -0,0 +1,27 @@
+{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+
+{% block title 'docgen.Pick template context'|trans %}
+
+{% block layout_wvm_content %}
+<div class="col-md-10 col-xxl">
+
+    <h1>{{ block('title') }}</h1>
+   <div class="container">
+       {% for key, context in contexts %}
+            <div class="row">
+                <div class="col-md-4">
+                    <a
+                        href="{{ path('chill_crud_docgen_template_new', { 'context': key }) }}"
+                        class="btn btn-outline-chill-green-dark">
+                        {{ context.name|trans }}
+                    </a>
+                </div>
+                <div class="col-md-8">
+                   {{ context.description|trans|nl2br }}
+                </div>
+            </div>
+       {% endfor %}
+   </div>
+</div>
+
+{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
new file mode 100644
index 000000000..6e7c9387c
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
@@ -0,0 +1,4 @@
+{% extends '@ChillPerson/Admin/layout.html.twig' %}
+
+{% block vertical_menu_content %}
+{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
new file mode 100644
index 000000000..7b24eae0d
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
@@ -0,0 +1,22 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block title 'docgen.Generate a document'|trans %}
+
+{% block content %}
+<div class="col-md-10 col-xxl">
+    <h1>{{ block('title') }}</h1>
+    <h2>{{ template.name|localize_translatable_string }}</h2>
+
+    {{ form_start(form, { 'attr': { 'id': 'generate_doc_form' }}) }}
+    {{ form(form) }}
+    {{ form_end(form) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <button type="submit" class="btn btn-edit change-icon" form="generate_doc_form">
+                <i class="fa fa-cog"></i> {{ 'docgen.Generate'|trans }}
+            </button>
+        </li>
+    </ul>
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
new file mode 100644
index 000000000..2de46228a
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Encoder/DocGenEncoder.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Serializer\Encoder;
+
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use function array_keys;
+use function is_array;
+
+class DocGenEncoder implements \Symfony\Component\Serializer\Encoder\EncoderInterface
+{
+    public function encode($data, string $format, array $context = [])
+    {
+        if (!$this->isAssociative($data)) {
+            throw new UnexpectedValueException('Only associative arrays are allowed; lists are not allowed');
+        }
+
+        $result = [];
+        $this->recusiveEncoding($data, $result, '');
+
+        return $result;
+    }
+
+    public function supportsEncoding(string $format)
+    {
+        return 'docgen' === $format;
+    }
+
+    private function canonicalizeKey(string $path, string $key): string
+    {
+        return '' === $path ? $key : $path . '_' . $key;
+    }
+
+    private function isAssociative(array $data)
+    {
+        $keys = array_keys($data);
+
+        return array_keys($keys) !== $keys;
+    }
+
+    private function recusiveEncoding(array $data, array &$result, $path)
+    {
+        if ($this->isAssociative($data)) {
+            foreach ($data as $key => $value) {
+                if (is_array($value)) {
+                    $this->recusiveEncoding($value, $result, $this->canonicalizeKey($path, $key));
+                } else {
+                    $result[$this->canonicalizeKey($path, $key)] = $value;
+                }
+            }
+        } else {
+            foreach ($data as $elem) {
+                if (!$this->isAssociative($elem)) {
+                    throw new UnexpectedValueException(sprintf('Embedded loops are not allowed. See data under %s path', $path));
+                }
+
+                $sub = [];
+                $this->recusiveEncoding($elem, $sub, '');
+                $result[$path][] = $sub;
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
new file mode 100644
index 000000000..f6be7bd5a
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Serializer\Helper;
+
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use function array_merge;
+
+class NormalizeNullValueHelper
+{
+    private ?string $discriminatorType = null;
+
+    private ?string $discriminatorValue = null;
+
+    private NormalizerInterface $normalizer;
+
+    public function __construct(NormalizerInterface $normalizer, $discriminatorType = null, $discriminatorValue = null)
+    {
+        $this->normalizer = $normalizer;
+        $this->discriminatorType = $discriminatorType;
+        $this->discriminatorValue = $discriminatorValue;
+    }
+
+    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [])
+    {
+        $data = [];
+        $data['isNull'] = true;
+
+        if (null !== $this->discriminatorType) {
+            $data[$this->discriminatorType] = $this->discriminatorValue;
+        }
+
+        foreach ($attributes as $key => $class) {
+            if (is_numeric($key)) {
+                $data[$class] = '';
+            } else {
+                switch ($class) {
+                    case 'array':
+                    case 'bool':
+                    case 'double':
+                    case 'float':
+                    case 'int':
+                    case 'resource':
+                    case 'string':
+                    case 'null':
+                        $data[$key] = '';
+
+                        break;
+
+                    default:
+                        $data[$key] = $this->normalizer->normalize(null, $format, array_merge(
+                            $context,
+                            ['docgen:expects' => $class]
+                        ));
+
+                        break;
+                }
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
new file mode 100644
index 000000000..35c683138
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Serializer\Normalizer;
+
+use ArrayObject;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+
+/**
+ * Normalize a collection for docgen format.
+ */
+class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    /**
+     * @param Collection $object
+     *
+     * @return array|ArrayObject|bool|float|int|string|void|null
+     */
+    public function normalize($object, ?string $format = null, array $context = [])
+    {
+        $data = [];
+
+        if (null === $object || 0 === $object->count()) {
+            return $data;
+        }
+
+        foreach ($object->getIterator() as $item) {
+            $data[] = $this->normalizer->normalize($item, $format, $context);
+        }
+
+        return $data;
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = [])
+    {
+        if ('docgen' !== $format) {
+            return false;
+        }
+
+        return $data instanceof Collection
+            || (null === $data && Collection::class === ($context['docgen:expects'] ?? null));
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
new file mode 100644
index 000000000..35c4729bb
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
@@ -0,0 +1,295 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Serializer\Normalizer;
+
+use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use ReflectionClass;
+use RuntimeException;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Mapping\AttributeMetadata;
+use Symfony\Component\Serializer\Mapping\ClassMetadata;
+use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use function array_filter;
+use function array_key_exists;
+use function array_merge;
+use function get_class;
+use function implode;
+use function in_array;
+use function is_array;
+use function is_object;
+
+class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInterface
+{
+    use NormalizerAwareTrait;
+
+    private ClassMetadataFactoryInterface $classMetadataFactory;
+
+    private PropertyAccessor $propertyAccess;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ClassMetadataFactoryInterface $classMetadataFactory,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->classMetadataFactory = $classMetadataFactory;
+        $this->propertyAccess = PropertyAccess::createPropertyAccessor();
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function normalize($object, ?string $format = null, array $context = [])
+    {
+        $classMetadataKey = $object ?? $context['docgen:expects'] ?? null;
+
+        if (null === $classMetadataKey) {
+            throw new RuntimeException('Could not determine the metadata for this object. Either provide a non-null object, or a "docgen:expects" key in the context');
+        }
+
+        if (!$this->classMetadataFactory->hasMetadataFor($classMetadataKey)) {
+            throw new LogicException(sprintf(
+                'This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s',
+                is_object($object) ? get_class($object) : '(todo' /*$context['docgen:expects'],*/ ,
+                $format,
+                implode(', ', ($context['groups'] ?? []))
+            ));
+        }
+
+        $metadata = $this->classMetadataFactory->getMetadataFor($classMetadataKey);
+        $expectedGroups = array_key_exists(AbstractNormalizer::GROUPS, $context) ?
+            is_array($context[AbstractNormalizer::GROUPS]) ? $context[AbstractNormalizer::GROUPS] : [$context[AbstractNormalizer::GROUPS]]
+            : [];
+        $attributes = array_filter(
+            $metadata->getAttributesMetadata(),
+            static function (AttributeMetadata $a) use ($expectedGroups) {
+                foreach ($a->getGroups() as $g) {
+                    if (in_array($g, $expectedGroups, true)) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        );
+
+        if (null === $object) {
+            return $this->normalizeNullData($format, $context, $metadata, $attributes);
+        }
+
+        return $this->normalizeObject($object, $format, $context, $expectedGroups, $metadata, $attributes);
+    }
+
+    public function supportsNormalization($data, ?string $format = null): bool
+    {
+        return 'docgen' === $format && (is_object($data) || null === $data);
+    }
+
+    private function getExpectedType(AttributeMetadata $attribute, ReflectionClass $reflection): string
+    {
+        $type = null;
+
+        do {
+            // we have to get the expected content
+            if ($reflection->hasProperty($attribute->getName())) {
+                if (!$reflection->getProperty($attribute->getName())->hasType()) {
+                    throw new \LogicException(sprintf(
+                        'Could not determine how the content is determined for the attribute %s on class %s. Add a type on this property',
+                        $attribute->getName(),
+                        $reflection->getName()
+                    ));
+                }
+
+                $type = $reflection->getProperty($attribute->getName())->getType();
+            } elseif ($reflection->hasMethod($method = 'get' . ucfirst($attribute->getName()))) {
+                if (!$reflection->getMethod($method)->hasReturnType()) {
+                    throw new \LogicException(sprintf(
+                        'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
+                        $attribute->getName(),
+                        $reflection->getName()
+                    ));
+                }
+
+                $type = $reflection->getMethod($method)->getReturnType();
+            } elseif ($reflection->hasMethod($method = 'is' . ucfirst($attribute->getName()))) {
+                if (!$reflection->getMethod($method)->hasReturnType()) {
+                    throw new \LogicException(sprintf(
+                        'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
+                        $attribute->getName(),
+                        $reflection->getName()
+                    ));
+                }
+
+                $type = $reflection->getMethod($method)->getReturnType();
+            } elseif ($reflection->hasMethod($attribute->getName())) {
+                if (!$reflection->getMethod($attribute->getName())->hasReturnType()) {
+                    throw new \LogicException(sprintf(
+                        'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
+                        $attribute->getName(),
+                        $reflection->getName()
+                    ));
+                }
+
+                $type = $reflection->getMethod($attribute->getName())->getReturnType();
+            } else {
+                $reflection = $reflection->getParentClass();
+            }
+        } while (null === $type && $reflection instanceof ReflectionClass);
+
+        if (null === $type ?? null) {
+            throw new \LogicException(sprintf(
+                'Could not determine the type for this attribute: %s. Add a return type to the method or property declaration',
+                $attribute->getName()
+            ));
+        }
+
+        return $type->getName();
+    }
+
+    /**
+     * @param array|AttributeMetadata[] $attributes
+     */
+    private function normalizeNullData(string $format, array $context, ClassMetadata $metadata, array $attributes): array
+    {
+        $keys = [];
+
+        // add a discriminator
+        if (null !== $discriminator = $metadata->getClassDiscriminatorMapping()) {
+            $typeKey = $discriminator->getTypeProperty();
+            $typeValue = null;
+
+            foreach ($discriminator->getTypesMapping() as $type => $typeClass) {
+                if ($typeClass === $context['docgen:expects']) {
+                    $typeValue = $type;
+
+                    break;
+                }
+            }
+
+            if (null === $typeValue) {
+                $typeKey = null;
+            }
+        } else {
+            $typeKey = $typeValue = null;
+        }
+
+        foreach ($attributes as $attribute) {
+            $key = $attribute->getSerializedName() ?? $attribute->getName();
+            $keys[$key] = $this->getExpectedType($attribute, $metadata->getReflectionClass());
+        }
+
+        $normalizer = new NormalizeNullValueHelper($this->normalizer, $typeKey, $typeValue);
+
+        return $normalizer->normalize($keys, $format, $context);
+    }
+
+    /**
+     * @param mixed $format
+     */
+    private function normalizeNullOutputValue($format, array $context, AttributeMetadata $attribute, ReflectionClass $reflection)
+    {
+        $type = $this->getExpectedType($attribute, $reflection);
+
+        switch ($type) {
+            case 'array':
+                if (in_array('is-translatable', $attribute->getNormalizationContextForGroups(['docgen:read']), true)) {
+                    return '';
+                }
+
+                return [];
+
+            case 'bool':
+            case 'double':
+            case 'float':
+            case 'int':
+            case 'resource':
+                return null;
+
+            case 'string':
+                return '';
+
+            default:
+                return $this->normalizer->normalize(
+                    null,
+                    $format,
+                    array_merge(
+                        $context,
+                        ['docgen:expects' => $type]
+                    )
+                );
+        }
+    }
+
+    /**
+     * @param $object
+     * @param $format
+     * @param array|AttributeMetadata[] $attributes
+     *
+     * @throws ExceptionInterface
+     *
+     * @return array
+     */
+    private function normalizeObject($object, $format, array $context, array $expectedGroups, ClassMetadata $metadata, array $attributes)
+    {
+        $data = [];
+        $data['isNull'] = false;
+        $reflection = $metadata->getReflectionClass();
+
+        // add a discriminator
+        if (null !== $discriminator = $metadata->getClassDiscriminatorMapping()) {
+            $data[$discriminator->getTypeProperty()] = $discriminator->getMappedObjectType($object);
+        }
+
+        foreach ($attributes as $attribute) {
+            /** @var AttributeMetadata $attribute */
+            $value = $this->propertyAccess->getValue($object, $attribute->getName());
+            $key = $attribute->getSerializedName() ?? $attribute->getName();
+            $isTranslatable = $attribute->getNormalizationContextForGroups(
+                is_array($context['groups']) ? $context['groups'] : [$context['groups']]
+            )['is-translatable'] ?? false;
+
+            if ($isTranslatable) {
+                $data[$key] = $this->translatableStringHelper
+                    ->localize($value);
+            } elseif (is_iterable($value)) {
+                $arr = [];
+
+                foreach ($value as $k => $v) {
+                    $arr[$k] =
+                        $this->normalizer->normalize($v, $format, array_merge(
+                            $context,
+                            $attribute->getNormalizationContextForGroups($expectedGroups)
+                        ));
+                }
+                $data[$key] = $arr;
+            } elseif (is_object($value)) {
+                $data[$key] =
+                    $this->normalizer->normalize($value, $format, array_merge(
+                        $context,
+                        $attribute->getNormalizationContextForGroups($expectedGroups)
+                    ));
+            } elseif (null === $value) {
+                $data[$key] = $this->normalizeNullOutputValue($format, $context, $attribute, $reflection);
+            } else {
+                $data[$key] = $value;
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js b/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js
index d894be9b0..9017c7e08 100644
--- a/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js
@@ -3,4 +3,6 @@ module.exports = function(encore, entries) {
     encore.addAliases({
         ChillDocGeneratorAssets: __dirname + '/Resources/public'
     });
+
+    encore.addEntry('mod_docgen_picktemplate', __dirname + '/Resources/public/module/PickTemplate/index.js');
 };
diff --git a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
index fb8ec28a1..54bf5a697 100644
--- a/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
+++ b/src/Bundle/ChillDocGeneratorBundle/config/services.yaml
@@ -8,3 +8,39 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Repository/'
+
+    Chill\DocGeneratorBundle\Menu\:
+        autoconfigure: true
+        autowire: true
+        resource: '../Menu/'
+
+    Chill\DocGeneratorBundle\Serializer\Normalizer\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Serializer/Normalizer/'
+        tags:
+            - { name: 'serializer.normalizer', priority: -152 }
+    Chill\DocGeneratorBundle\Serializer\Normalizer\CollectionDocGenNormalizer:
+        tags:
+            - { name: 'serializer.normalizer', priority: -126 }
+
+    Chill\DocGeneratorBundle\Controller\:
+        resource: "../Controller"
+        autowire: true
+        autoconfigure: true
+
+    Chill\DocGeneratorBundle\Form\:
+        resource: "../Form/"
+        autowire: true
+        autoconfigure: true
+
+    Chill\DocGeneratorBundle\GeneratorDriver\:
+        resource: "../GeneratorDriver/"
+        autowire: true
+        autoconfigure: true
+
+    Chill\DocGeneratorBundle\Driver\RelatorioDriver: '@Chill\DocGeneratorBundle\Driver\DriverInterface'
+
+    Chill\DocGeneratorBundle\Context\ContextManager:
+        arguments:
+            $contexts: !tagged_iterator { tag: chill_docgen.context, default_index_method: getKey }
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php
index 26a6c3d56..b11112bad 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\DocGenerator;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Creation of table for storing DocGenTemplate
+ * Creation of table for storing DocGenTemplate.
  */
 final class Version20210805162522 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_docgen_template_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_docgen_template');
+    }
+
     public function getDescription(): string
     {
         return 'Creation of table for storing DocGenTemplate';
@@ -22,10 +35,4 @@ final class Version20210805162522 extends AbstractMigration
         $this->addSql('CREATE SEQUENCE chill_docgen_template_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_docgen_template (id INT NOT NULL, name JSON NOT NULL, description TEXT DEFAULT NULL, file VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_docgen_template_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_docgen_template');
-    }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php
index c055bf428..c6a7223e4 100644
--- a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\DocGenerator;
@@ -8,10 +15,17 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add entities and context fields to DocGenTemplate
+ * Add entities and context fields to DocGenTemplate.
  */
 final class Version20210812214310 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_docgen_template DROP entities');
+        $this->addSql('ALTER TABLE chill_docgen_template DROP context');
+        $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Add entities and context fields to DocGenTemplate';
@@ -22,13 +36,5 @@ final class Version20210812214310 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_docgen_template ADD entities TEXT');
         $this->addSql('ALTER TABLE chill_docgen_template ADD context VARCHAR(255)');
         $this->addSql('COMMENT ON COLUMN chill_docgen_template.entities IS \'(DC2Type:simple_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS \'(DC2Type:json_array)\'');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_docgen_template DROP entities');
-        $this->addSql('ALTER TABLE chill_docgen_template DROP context');
-        $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS NULL');
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php
new file mode 100644
index 000000000..1530fd065
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211103111010.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocGenerator;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Using DocStore objects inside the DocGenTemplate.
+ */
+final class Version20211103111010 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_docgen_template DROP CONSTRAINT FK_49A347E893CB796C');
+        $this->addSql('DROP INDEX IDX_49A347E893CB796C');
+        $this->addSql('ALTER TABLE chill_docgen_template ADD file VARCHAR(255) NOT NULL');
+        $this->addSql('ALTER TABLE chill_docgen_template DROP file_id');
+        $this->addSql('ALTER TABLE chill_docgen_template ALTER entities DROP NOT NULL');
+        $this->addSql('ALTER TABLE chill_docgen_template ALTER context DROP NOT NULL');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Using DocStore objects inside the DocGenTemplate';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_docgen_template ADD file_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_docgen_template DROP file');
+        $this->addSql('ALTER TABLE chill_docgen_template ALTER entities SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_docgen_template ALTER context SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_docgen_template ADD CONSTRAINT FK_49A347E893CB796C FOREIGN KEY (file_id) REFERENCES chill_doc.stored_object (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_49A347E893CB796C ON chill_docgen_template (file_id)');
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php
new file mode 100644
index 000000000..17deb2352
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211119173556.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocGenerator;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211119173556 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+
+    public function getDescription(): string
+    {
+        return 'remove comment on deprecated json_array type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $columns = [
+            'chill_docgen_template.name',
+        ];
+
+        foreach ($columns as $col) {
+            $this->addSql("COMMENT ON COLUMN {$col} IS NULL");
+        }
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php
new file mode 100644
index 000000000..814974d7b
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20211201191757.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocGenerator;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211201191757 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_docgen_template DROP active');
+        $this->addSql('ALTER TABLE chill_docgen_template DROP entity');
+        $this->addSql('ALTER TABLE chill_docgen_template DROP template_options');
+        $this->addSql('ALTER TABLE chill_docgen_template ADD entities TEXT');
+        $this->addSql('COMMENT ON COLUMN chill_docgen_template.entities IS \'(DC2Type:simple_array)\'');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add options, active and link to entity in docgen_template';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_docgen_template ADD active BOOLEAN DEFAULT true NOT NULL');
+        $this->addSql('ALTER TABLE chill_docgen_template ADD entity VARCHAR(255) NOT NULL DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_docgen_template ADD template_options JSONB NOT NULL DEFAULT \'[]\'::jsonb ');
+        $this->addSql('COMMENT ON COLUMN chill_docgen_template.template_options IS \'(DC2Type:json)\'');
+        $this->addSql('ALTER TABLE chill_docgen_template DROP entities');
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
new file mode 100644
index 000000000..35768a28c
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Tests\Serializer\Encoder;
+
+use Chill\DocGeneratorBundle\Serializer\Encoder\DocGenEncoder;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DocGenEncoderTest extends TestCase
+{
+    private DocGenEncoder $encoder;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->encoder = new DocGenEncoder();
+    }
+
+    public function generateEncodeData()
+    {
+        yield [['tests' => 'ok'], ['tests' => 'ok'], 'A simple test with a simple array'];
+
+        yield [
+            // expected:
+            ['item_subitem' => 'value'],
+            // data:
+            ['item' => ['subitem' => 'value']],
+            'A test with multidimensional array',
+        ];
+
+        yield [
+            // expected:
+            ['data' => [['item' => 'one'], ['item' => 'two']]],
+            // data:
+            ['data' => [['item' => 'one'], ['item' => 'two']]],
+            'a list of items',
+        ];
+
+        yield [
+            // expected:
+            ['data' => [['item_subitem' => 'alpha'], ['item' => 'two']]],
+            // data:
+            ['data' => [['item' => ['subitem' => 'alpha']], ['item' => 'two']]],
+            'a list of items with multidimensional array inside item',
+        ];
+
+        yield [
+            // expected:
+            [
+                'persons' => [
+                    [
+                        'firstname' => 'Jonathan',
+                        'lastname' => 'Dupont',
+                        'dateOfBirth_long' => '16 juin 1981',
+                        'dateOfBirth_short' => '16/06/1981',
+                        'father_firstname' => 'Marcel',
+                        'father_lastname' => 'Dupont',
+                        'father_dateOfBirth_long' => '10 novembre 1953',
+                        'father_dateOfBirth_short' => '10/11/1953',
+                    ],
+                ],
+            ],
+            // data:
+            [
+                'persons' => [
+                    [
+                        'firstname' => 'Jonathan',
+                        'lastname' => 'Dupont',
+                        'dateOfBirth' => ['long' => '16 juin 1981', 'short' => '16/06/1981'],
+                        'father' => [
+                            'firstname' => 'Marcel',
+                            'lastname' => 'Dupont',
+                            'dateOfBirth' => ['long' => '10 novembre 1953', 'short' => '10/11/1953'],
+                        ],
+                    ],
+                ],
+            ],
+            'a longer list, with near real data inside and embedded associative arrays',
+        ];
+    }
+
+    public function testEmbeddedLoopsThrowsException()
+    {
+        $this->expectException(UnexpectedValueException::class);
+
+        $data = [
+            'data' => [
+                ['item' => 'one'],
+                [
+                    'embedded' => [
+                        [
+                            ['subitem' => 'two'],
+                            ['subitem' => 'three'],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $this->encoder->encode($data, 'docgen');
+    }
+
+    /**
+     * @dataProvider generateEncodeData
+     *
+     * @param mixed $expected
+     * @param mixed $data
+     */
+    public function testEncode($expected, $data, string $msg)
+    {
+        $generated = $this->encoder->encode($data, 'docgen');
+        $this->assertEquals($expected, $generated, $msg);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
new file mode 100644
index 000000000..8d5213b3d
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\tests\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DocGenObjectNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp()
+    {
+        parent::setUp();
+        self::bootKernel();
+
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalizationBasic()
+    {
+        $scope = new Scope();
+        $scope->setName(['fr' => 'scope']);
+
+        $normalized = $this->normalizer->normalize($scope, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Scope::class]);
+        $expected = [
+            'id' => null,
+            'name' => 'scope',
+            'type' => 'scope',
+            'isNull' => false,
+        ];
+
+        $this->assertEquals($expected, $normalized, 'test normalization fo a scope');
+    }
+
+    public function testNormalizeNull()
+    {
+        $actual = $this->normalizer->normalize(null, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Scope::class]);
+        $expected = [
+            'id' => '',
+            'name' => '',
+            'type' => 'scope',
+            'isNull' => true,
+        ];
+
+        $this->assertEquals($expected, $actual, 'test normalization for a null scope');
+    }
+
+    public function testNormalizeNullObjectWithObjectEmbedded()
+    {
+        $this->markTestIncomplete('test to implement');
+        $normalized = $this->normalizer->normalize(null, 'docgen', [
+            AbstractNormalizer::GROUPS => ['docgen:read'],
+            'docgen:expects' => User::class,
+        ]);
+
+        $expected = [
+            'label' => '',
+            'email' => '',
+            'main_center' => [
+                'name' => '',
+            ],
+        ];
+
+        $this->assertEquals($expected, $normalized, 'test normalization for a null user');
+    }
+
+    public function testNormalizeWithNullValueEmbedded()
+    {
+        $this->markTestIncomplete('test to write');
+        $user = new User();
+        $user->setUsername('User Test');
+
+        $normalized = $this->normalizer->normalize($user, 'docgen', [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class]);
+        $expected = [
+            'label' => 'User Test',
+            'email' => '',
+            'mainCenter' => [
+                'name' => '',
+            ],
+        ];
+
+        $this->assertEquals($expected, $normalized, 'test normalization fo an user with null center');
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index e69de29bb..af08cf1c8 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -0,0 +1,19 @@
+docgen:
+    Generate a document: Génerer un document
+    Generate: Génerer
+    Document generation: Génération de documents
+    Manage templates and document generation: Gestion des documents générés et de leurs gabarits
+    Pick template context: Choisir un contexte
+    Context: Contexte
+    New template: Nouveau gabarit
+    Edit template: Modifier gabarit
+    With context: 'Avec le contexte :'
+
+
+crud:
+    docgen_template:
+        index:
+            title: Génération de documents
+            add_new: Créer
+
+
diff --git a/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php b/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
index 60649a163..c5536d0f1 100644
--- a/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
+++ b/src/Bundle/ChillDocStoreBundle/ChillDocStoreBundle.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
index 3a24dfb99..784fed6c9 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
@@ -1,13 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * Class AdminController
- *
- * @package Chill\DocStoreBundle\Controller
+ * Class AdminController.
  */
 class AdminController extends AbstractController
 {
@@ -18,7 +25,7 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillDocStoreBundle:Admin:layout.html.twig');
     }
-    
+
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -26,5 +33,4 @@ class AdminController extends AbstractController
     {
         return $this->redirectToRoute('chill_main_admin_central');
     }
-    
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
index 512747b01..a5ad5cfa1 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -1,64 +1,122 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Form\AccompanyingCourseDocumentType;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
- * Class DocumentAccompanyingCourseController
- *
- * @package Chill\DocStoreBundle\Controller
  * @Route("/{_locale}/parcours/{course}/document")
- *
- * TODO faire un controller abstrait ?
  */
 class DocumentAccompanyingCourseController extends AbstractController
 {
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    
     /**
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     /**
      * DocumentAccompanyingCourseController constructor.
-
-     * @param TranslatorInterface $translator
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param AuthorizationHelper $authorizationHelper
      */
     public function __construct(
-        TranslatorInterface $translator, 
-        EventDispatcherInterface $eventDispatcher, 
+        TranslatorInterface $translator,
+        EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper
     ) {
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
     }
-    
+
+    /**
+     * @Route("/{id}", name="accompanying_course_document_delete", methods="DELETE")
+     */
+    public function delete(Request $request, AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
+    {
+        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::DELETE, $document);
+
+        if ($this->isCsrfTokenValid('delete' . $document->getId(), $request->request->get('_token'))) {
+            $em = $this->getDoctrine()->getManager();
+            $em->remove($document);
+            $em->flush();
+        }
+
+        return $this->redirectToRoute(
+            'accompanying_course_document_index',
+            ['accompanyingCourse' => $course->getId()]
+        );
+    }
+
+    /**
+     * @Route("/{id}/edit", name="accompanying_course_document_edit", methods="GET|POST")
+     */
+    public function edit(Request $request, AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
+    {
+        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::UPDATE, $document);
+
+        $document->setUser($this->getUser());
+        $document->setDate(new DateTime('Now'));
+
+        $form = $this->createForm(
+            AccompanyingCourseDocumentType::class,
+            $document
+        );
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully updated'));
+
+            return $this->redirectToRoute(
+                'accompanying_course_document_edit',
+                ['id' => $document->getId(), 'course' => $course->getId()]
+            );
+        }
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
+        }
+
+        return $this->render(
+            'ChillDocStoreBundle:AccompanyingCourseDocument:edit.html.twig',
+            [
+                'document' => $document,
+                'form' => $form->createView(),
+                'accompanyingCourse' => $course,
+            ]
+        );
+    }
+
     /**
      * @Route("/", name="accompanying_course_document_index", methods="GET")
      */
@@ -66,25 +124,26 @@ class DocumentAccompanyingCourseController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        if ($course === NULL) {
+        if (null === $course) {
             throw $this->createNotFoundException('Accompanying period not found');
         }
 
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $course);
+        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE, $course);
 
         $documents = $em
-            ->getRepository("ChillDocStoreBundle:AccompanyingCourseDocument")
+            ->getRepository('ChillDocStoreBundle:AccompanyingCourseDocument')
             ->findBy(
                 ['course' => $course],
                 ['date' => 'DESC']
             );
-        
+
         return $this->render(
             'ChillDocStoreBundle:AccompanyingCourseDocument:index.html.twig',
             [
                 'documents' => $documents,
-                'accompanyingCourse' => $course
-            ]);
+                'accompanyingCourse' => $course,
+            ]
+        );
     }
 
     /**
@@ -92,34 +151,38 @@ class DocumentAccompanyingCourseController extends AbstractController
      */
     public function new(Request $request, AccompanyingPeriod $course): Response
     {
-        if ($course === NULL) {
+        if (null === $course) {
             throw $this->createNotFoundException('Accompanying period not found');
         }
 
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $course);
-
         $document = new AccompanyingCourseDocument();
         $document->setUser($this->getUser());
         $document->setCourse($course);
-        $document->setDate(new \DateTime('Now'));
+        $document->setDate(new DateTime('Now'));
+
+        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::CREATE, $document);
 
         $form = $this->createForm(AccompanyingCourseDocumentType::class, $document);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->denyAccessUnlessGranted(
-                'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', $document,
-                'creation of this activity not allowed');
+                'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE',
+                $document,
+                'creation of this activity not allowed'
+            );
 
             $em = $this->getDoctrine()->getManager();
             $em->persist($document);
             $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans("The document is successfully registered"));
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully registered'));
 
             return $this->redirectToRoute('accompanying_course_document_index', ['course' => $course->getId()]);
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans("This form contains errors"));
+        }
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
         return $this->render('ChillDocStoreBundle:AccompanyingCourseDocument:new.html.twig', [
@@ -134,66 +197,11 @@ class DocumentAccompanyingCourseController extends AbstractController
      */
     public function show(AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
     {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', $course);
-        $this->denyAccessUnlessGranted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', $document);
-        
+        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE_DETAILS, $document);
+
         return $this->render(
             'ChillDocStoreBundle:AccompanyingCourseDocument:show.html.twig',
-            ['document' => $document, 'accompanyingCourse' => $course]);
-    }
-
-    /**
-     * @Route("/{id}/edit", name="accompanying_course_document_edit", methods="GET|POST")
-     */
-    public function edit(Request $request, AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
-    {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', $course);
-        $this->denyAccessUnlessGranted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', $document);
-
-        $document->setUser($this->getUser());
-        $document->setDate(new \DateTime('Now'));
-
-        $form = $this->createForm(
-            AccompanyingCourseDocumentType::class, $document);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->getDoctrine()->getManager()->flush();
-            
-            $this->addFlash('success', $this->translator->trans("The document is successfully updated"));
-            
-            return $this->redirectToRoute(
-                'accompanying_course_document_edit',
-                ['id' => $document->getId(), 'course' => $course->getId()]);
-        
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans("This form contains errors"));
-        }
-        
-        return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:edit.html.twig',
-            [
-                'document' => $document,
-                'form' => $form->createView(),
-                'accompanyingCourse' => $course,
-        ]);
-    }
-
-    /**
-     * @Route("/{id}", name="accompanying_course_document_delete", methods="DELETE")
-     */
-    public function delete(Request $request, AccompanyingPeriod $course, AccompanyingCourseDocument $document): Response
-    {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', $course);
-        $this->denyAccessUnlessGranted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', $document);
-
-        if ($this->isCsrfTokenValid('delete'.$document->getId(), $request->request->get('_token'))) {
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($document);
-            $em->flush();
-        }
-
-        return $this->redirectToRoute(
-            'accompanying_course_document_index', ['accompanyingCourse' => $course->getId()]);
+            ['document' => $document, 'accompanyingCourse' => $course]
+        );
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index 4d2d3246e..a6147c4cd 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -1,7 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Controller;
 
+use Chill\DocStoreBundle\ChillDocStoreBundle;
 use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\DocumentCategoryType;
@@ -11,24 +21,79 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * Class DocumentCategoryController
- *
- * @package Chill\DocStoreBundle\Controller
  * @Route("/{_locale}/admin/document/category")
  */
 class DocumentCategoryController extends AbstractController
 {
+    /**
+     * @Route("/{bundleId}/{idInsideBundle}", name="document_category_delete", methods="DELETE")
+     *
+     * @param mixed $bundleId
+     * @param mixed $idInsideBundle
+     */
+    public function delete(Request $request, $bundleId, $idInsideBundle): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+        $documentCategory = $em
+            ->getRepository('ChillDocStoreBundle:DocumentCategory')
+            ->findOneBy(
+                ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]
+            );
+
+        if ($this->isCsrfTokenValid('delete' . $bundleId . $idInsideBundle, $request->request->get('_token'))) {
+            $em->remove($documentCategory);
+            $em->flush();
+        }
+
+        return $this->redirectToRoute('document_category_index');
+    }
+
+    /**
+     * @Route("/{bundleId}/{idInsideBundle}/edit", name="document_category_edit", methods="GET|POST")
+     *
+     * @param mixed $bundleId
+     * @param mixed $idInsideBundle
+     */
+    public function edit(Request $request, $bundleId, $idInsideBundle): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+        $documentCategory = $em
+            ->getRepository('ChillDocStoreBundle:DocumentCategory')
+            ->findOneBy(
+                ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]
+            );
+
+        $form = $this->createForm(DocumentCategoryType::class, $documentCategory);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            return $this->redirectToRoute('document_category_index', [
+                'bundleId' => $documentCategory->getBundleId(),
+                'idInsideBundle' => $documentCategory->getIdInsideBundle(), ]);
+        }
+
+        return $this->render('ChillDocStoreBundle:DocumentCategory:edit.html.twig', [
+            'document_category' => $documentCategory,
+            'form' => $form->createView(),
+        ]);
+    }
+
     /**
      * @Route("/", name="document_category_index", methods="GET")
      */
     public function index(): Response
     {
-        $em  = $this->getDoctrine()->getManager();
-        $categories = $em->getRepository("ChillDocStoreBundle:DocumentCategory")->findAll();
+        $em = $this->getDoctrine()->getManager();
+        $categories = $em->getRepository(DocumentCategory::class)->findAll();
 
         return $this->render(
             'ChillDocStoreBundle:DocumentCategory:index.html.twig',
-            ['document_categories' => $categories]);
+            [
+                'document_categories' => $categories,
+            ]
+        );
     }
 
     /**
@@ -37,13 +102,10 @@ class DocumentCategoryController extends AbstractController
     public function new(Request $request): Response
     {
         $em = $this->getDoctrine()->getManager();
-        $documentCategory = new DocumentCategory();
-        $documentCategory
-            ->setBundleId('Chill\DocStoreBundle\ChillDocStoreBundle');
-        $documentCategory
-            ->setIdInsideBundle(
-                $em->getRepository("ChillDocStoreBundle:DocumentCategory")
-                    ->nextIdInsideBundle());
+        $documentCategory = new DocumentCategory(
+            ChillDocStoreBundle::class,
+            $em->getRepository(DocumentCategory::class)->nextIdInsideBundle()
+        );
         $documentCategory
             ->setDocumentClass(PersonDocument::class);
 
@@ -56,11 +118,10 @@ class DocumentCategoryController extends AbstractController
             $em->flush();
 
             return $this->redirectToRoute('document_category_index');
-        } else {
-            $documentCategory->setBundleId(
-                'Chill\DocStoreBundle\ChillDocStoreBundle');
         }
 
+        $documentCategory->setBundleId(ChillDocStoreBundle::class);
+
         return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
@@ -69,64 +130,22 @@ class DocumentCategoryController extends AbstractController
 
     /**
      * @Route("/{bundleId}/{idInsideBundle}", name="document_category_show", methods="GET")
+     *
+     * @param mixed $bundleId
+     * @param mixed $idInsideBundle
      */
     public function show($bundleId, $idInsideBundle): Response
     {
         $em = $this->getDoctrine()->getManager();
         $documentCategory = $em
-            ->getRepository("ChillDocStoreBundle:DocumentCategory")
+            ->getRepository('ChillDocStoreBundle:DocumentCategory')
             ->findOneBy(
-                ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]);
+                ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]
+            );
 
         return $this->render(
             'ChillDocStoreBundle:DocumentCategory:show.html.twig',
-            ['document_category' => $documentCategory]);
-    }
-
-    /**
-     * @Route("/{bundleId}/{idInsideBundle}/edit", name="document_category_edit", methods="GET|POST")
-     */
-    public function edit(Request $request, $bundleId, $idInsideBundle): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $documentCategory = $em
-            ->getRepository("ChillDocStoreBundle:DocumentCategory")
-            ->findOneBy(
-                ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]);
-
-        $form = $this->createForm(DocumentCategoryType::class, $documentCategory);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->getDoctrine()->getManager()->flush();
-
-            return $this->redirectToRoute('document_category_index', [
-                'bundleId' => $documentCategory->getBundleId(),
-                'idInsideBundle' => $documentCategory->getIdInsideBundle(),]);
-        }
-
-        return $this->render('ChillDocStoreBundle:DocumentCategory:edit.html.twig', [
-            'document_category' => $documentCategory,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * @Route("/{bundleId}/{idInsideBundle}", name="document_category_delete", methods="DELETE")
-     */
-    public function delete(Request $request, $bundleId, $idInsideBundle): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $documentCategory = $em
-            ->getRepository("ChillDocStoreBundle:DocumentCategory")
-            ->findOneBy(
-                ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle]);
-
-        if ($this->isCsrfTokenValid('delete'.$bundleId.$idInsideBundle, $request->request->get('_token'))) {
-            $em->remove($documentCategory);
-            $em->flush();
-        }
-
-        return $this->redirectToRoute('document_category_index');
+            ['document_category' => $documentCategory]
+        );
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index 57ef81cbb..25ac9f1bd 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -1,67 +1,149 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Controller;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
-use Chill\DocStoreBundle\Repository\DocumentRepository;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTime;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class DocumentPersonController
+ * Class DocumentPersonController.
  *
- * @package Chill\DocStoreBundle\Controller
  * @Route("/{_locale}/person/{person}/document")
  *
  * TODO faire un controller abstrait ?
  */
 class DocumentPersonController extends AbstractController
 {
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    
     /**
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     /**
      * DocumentPersonController constructor.
-
-     * @param TranslatorInterface $translator
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param AuthorizationHelper $authorizationHelper
      */
     public function __construct(
-        TranslatorInterface $translator, 
-        EventDispatcherInterface $eventDispatcher, 
+        TranslatorInterface $translator,
+        EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper
     ) {
         $this->translator = $translator;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
     }
-    
+
+    /**
+     * @Route("/{id}", name="person_document_delete", methods="DELETE")
+     */
+    public function delete(Request $request, Person $person, PersonDocument $document): Response
+    {
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_DELETE', $document);
+
+        if ($this->isCsrfTokenValid('delete' . $document->getId(), $request->request->get('_token'))) {
+            $em = $this->getDoctrine()->getManager();
+            $em->remove($document);
+            $em->flush();
+        }
+
+        return $this->redirectToRoute(
+            'person_document_index',
+            ['person' => $person->getId()]
+        );
+    }
+
+    /**
+     * @Route("/{id}/edit", name="person_document_edit", methods="GET|POST")
+     */
+    public function edit(Request $request, Person $person, PersonDocument $document): Response
+    {
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_UPDATE', $document);
+
+        $document->setUser($this->getUser());
+        $document->setDate(new DateTime('Now'));
+
+        $form = $this->createForm(
+            PersonDocumentType::class,
+            $document,
+            [
+                'center' => $document->getCenter(),
+                'role' => new Role('CHILL_PERSON_DOCUMENT_UPDATE'),
+            ]
+        );
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully updated'));
+
+            $event = new PrivacyEvent($person, [
+                'element_class' => PersonDocument::class,
+                'element_id' => $document->getId(),
+                'action' => 'update',
+            ]);
+            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+            return $this->redirectToRoute(
+                'person_document_edit',
+                ['id' => $document->getId(), 'person' => $person->getId()]
+            );
+        }
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
+        }
+
+        $event = new PrivacyEvent($person, [
+            'element_class' => PersonDocument::class,
+            'element_id' => $document->getId(),
+            'action' => 'edit',
+        ]);
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        return $this->render(
+            'ChillDocStoreBundle:PersonDocument:edit.html.twig',
+            [
+                'document' => $document,
+                'form' => $form->createView(),
+                'person' => $person,
+            ]
+        );
+    }
+
     /**
      * @Route("/", name="person_document_index", methods="GET")
      */
@@ -69,7 +151,7 @@ class DocumentPersonController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        if ($person === NULL) {
+        if (null === $person) {
             throw $this->createNotFoundException('Person not found');
         }
 
@@ -77,28 +159,31 @@ class DocumentPersonController extends AbstractController
 
         $reachableScopes = $this->authorizationHelper
             ->getReachableScopes(
-                $this->getUser(), new Role(PersonDocumentVoter::SEE),
-                $person->getCenter());
-
-        $documents = $em
-            ->getRepository("ChillDocStoreBundle:PersonDocument")
-            ->findBy(
-                array('person' => $person, 'scope' => $reachableScopes),
-                array('date' => 'DESC')
+                $this->getUser(),
+                new Role(PersonDocumentVoter::SEE),
+                $person->getCenter()
             );
 
-        $event = new PrivacyEvent($person, array(
+        $documents = $em
+            ->getRepository('ChillDocStoreBundle:PersonDocument')
+            ->findBy(
+                ['person' => $person, 'scope' => $reachableScopes],
+                ['date' => 'DESC']
+            );
+
+        $event = new PrivacyEvent($person, [
             'element_class' => PersonDocument::class,
-            'action' => 'index'
-        ));
+            'action' => 'index',
+        ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
+
         return $this->render(
             'ChillDocStoreBundle:PersonDocument:index.html.twig',
             [
                 'documents' => $documents,
-                'person' => $person
-            ]);
+                'person' => $person,
+            ]
+        );
     }
 
     /**
@@ -106,7 +191,7 @@ class DocumentPersonController extends AbstractController
      */
     public function new(Request $request, Person $person): Response
     {
-        if ($person === NULL) {
+        if (null === $person) {
             throw $this->createNotFoundException('person not found');
         }
 
@@ -115,28 +200,32 @@ class DocumentPersonController extends AbstractController
         $document = new PersonDocument();
         $document->setUser($this->getUser());
         $document->setPerson($person);
-        $document->setDate(new \DateTime('Now'));
+        $document->setDate(new DateTime('Now'));
 
-        $form = $this->createForm(PersonDocumentType::class, $document, array(
+        $form = $this->createForm(PersonDocumentType::class, $document, [
             'center' => $document->getCenter(),
-            'role'   => new Role('CHILL_PERSON_DOCUMENT_CREATE')
-        ));
+            'role' => new Role('CHILL_PERSON_DOCUMENT_CREATE'),
+        ]);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $this->denyAccessUnlessGranted(
-                'CHILL_PERSON_DOCUMENT_CREATE', $document,
-                'creation of this activity not allowed');
+                'CHILL_PERSON_DOCUMENT_CREATE',
+                $document,
+                'creation of this activity not allowed'
+            );
 
             $em = $this->getDoctrine()->getManager();
             $em->persist($document);
             $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans("The document is successfully registered"));
+
+            $this->addFlash('success', $this->translator->trans('The document is successfully registered'));
 
             return $this->redirectToRoute('person_document_index', ['person' => $person->getId()]);
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans("This form contains errors"));
+        }
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
         return $this->render('ChillDocStoreBundle:PersonDocument:new.html.twig', [
@@ -153,88 +242,17 @@ class DocumentPersonController extends AbstractController
     {
         $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_SEE', $document);
-    
-        $event = new PrivacyEvent($person, array(
+
+        $event = new PrivacyEvent($person, [
             'element_class' => PersonDocument::class,
             'element_id' => $document->getId(),
-            'action' => 'show'
-        ));
+            'action' => 'show',
+        ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
+
         return $this->render(
             'ChillDocStoreBundle:PersonDocument:show.html.twig',
-            ['document' => $document, 'person' => $person]);
-    }
-
-    /**
-     * @Route("/{id}/edit", name="person_document_edit", methods="GET|POST")
-     */
-    public function edit(Request $request, Person $person, PersonDocument $document): Response
-    {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_UPDATE', $document);
-
-        $document->setUser($this->getUser());
-        $document->setDate(new \DateTime('Now'));
-
-        $form = $this->createForm(
-            PersonDocumentType::class, $document, array(
-                'center' => $document->getCenter(),
-                'role'   => new Role('CHILL_PERSON_DOCUMENT_UPDATE'),
-            ));
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->getDoctrine()->getManager()->flush();
-            
-            $this->addFlash('success', $this->translator->trans("The document is successfully updated"));
-    
-            $event = new PrivacyEvent($person, array(
-                'element_class' => PersonDocument::class,
-                'element_id' => $document->getId(),
-                'action' => 'update'
-            ));
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-            
-            return $this->redirectToRoute(
-                'person_document_edit',
-                ['id' => $document->getId(), 'person' => $person->getId()]);
-        
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans("This form contains errors"));
-        }
-    
-        $event = new PrivacyEvent($person, array(
-            'element_class' => PersonDocument::class,
-            'element_id' => $document->getId(),
-            'action' => 'edit'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
-        return $this->render(
-            'ChillDocStoreBundle:PersonDocument:edit.html.twig',
-            [
-                'document' => $document,
-                'form' => $form->createView(),
-                'person' => $person,
-        ]);
-    }
-
-    /**
-     * @Route("/{id}", name="person_document_delete", methods="DELETE")
-     */
-    public function delete(Request $request, Person $person, PersonDocument $document): Response
-    {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DOCUMENT_DELETE', $document);
-
-        if ($this->isCsrfTokenValid('delete'.$document->getId(), $request->request->get('_token'))) {
-            $em = $this->getDoctrine()->getManager();
-            $em->remove($document);
-            $em->flush();
-        }
-
-        return $this->redirectToRoute(
-            'person_document_index', ['person' => $person->getId()]);
+            ['document' => $document, 'person' => $person]
+        );
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
index 0f4577ffd..28a35dfb4 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
@@ -1,35 +1,27 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\DataFixtures\ORM;
 
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use function in_array;
 
 /**
- * Adding acl for person document
- *
+ * Adding acl for person document.
  */
 class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -38,13 +30,13 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
         return 35000;
     }
 
-    
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
             printf("processing permission group %s \n", $permissionsGroup->getName());
-            foreach (LoadScopes::$references as $scopeRef){
+
+            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 printf("processing scope %s \n", $scope->getName()['en']);
                 //create permission group
@@ -52,41 +44,47 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
                     case 'social':
                         if ($scope->getName()['en'] === 'administrative') {
                             printf("denying power on administrative \n");
+
                             break 2; // we do not want any power on administrative
                         }
+
                         break;
+
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             printf("denying power on %s\n", $scope->getName()['en']);
+
                             break 2; // we do not want any power on social or administrative
-                        }  
+                        }
+
                         break;
                 }
-                
-                printf("Adding Person report acl to %s "
-                        . "permission group, scope '%s' \n", 
-                        $permissionsGroup->getName(), $scope->getName()['en']);
+
+                printf(
+                    'Adding Person report acl to %s '
+                        . "permission group, scope '%s' \n",
+                    $permissionsGroup->getName(),
+                    $scope->getName()['en']
+                );
                 $roleScopeUpdate = (new RoleScope())
-                            ->setRole(PersonDocumentVoter::CREATE)
-                            ->setScope($scope);
+                    ->setRole(PersonDocumentVoter::CREATE)
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
                 $roleScopeCreate = (new RoleScope())
-                            ->setRole(PersonDocumentVoter::UPDATE)
-                            ->setScope($scope);
+                    ->setRole(PersonDocumentVoter::UPDATE)
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeCreate);
                 $roleScopeDelete = (new RoleScope())
-                            ->setRole(PersonDocumentVoter::DELETE)
-                            ->setScope($scope);
+                    ->setRole(PersonDocumentVoter::DELETE)
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeDelete);
                 $manager->persist($roleScopeUpdate);
                 $manager->persist($roleScopeCreate);
                 $manager->persist($roleScopeDelete);
             }
-            
         }
-        
+
         $manager->flush();
     }
-
 }
diff --git a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php
index 2eb6e7181..3369994bd 100644
--- a/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentCategory.php
@@ -1,60 +1,48 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\DataFixtures\ORM;
 
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\DocStoreBundle\Entity\DocumentCategory;
 
-/**
- * 
- *
- */
 class LoadDocumentCategory extends AbstractFixture implements OrderedFixtureInterface
 {
     public function getOrder()
     {
         return 35010;
     }
-    
+
     public function load(ObjectManager $manager)
     {
         $category = (new DocumentCategory('chill-doc-store', 10))
             ->setDocumentClass(\Chill\DocStoreBundle\Entity\PersonDocument::class)
             ->setName([
                 'fr' => "Document d'identité",
-                'en' => "Identity"
-            ])
-            ;
-        
+                'en' => 'Identity',
+            ]);
+
         $manager->persist($category);
-        
+
         $category = (new DocumentCategory('chill-doc-store', 20))
             ->setDocumentClass(\Chill\DocStoreBundle\Entity\PersonDocument::class)
             ->setName([
-                'fr' => "Courrier reçu",
-                'en' => "Received email"
-            ])
-            ;
-        
+                'fr' => 'Courrier reçu',
+                'en' => 'Received email',
+            ]);
+
         $manager->persist($category);
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
index 63de15f8b..a3fd04ca3 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
@@ -1,30 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillDocStoreExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/media.yaml');
         $loader->load('services/controller.yaml');
@@ -39,37 +46,41 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
         $this->prependAuthorization($container);
         $this->prependTwig($container);
     }
-    
+
+    protected function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                PersonDocumentVoter::UPDATE => [PersonDocumentVoter::SEE_DETAILS],
+                PersonDocumentVoter::CREATE => [PersonDocumentVoter::SEE_DETAILS],
+                PersonDocumentVoter::DELETE => [PersonDocumentVoter::SEE_DETAILS],
+                PersonDocumentVoter::SEE_DETAILS => [PersonDocumentVoter::SEE],
+                AccompanyingCourseDocumentVoter::UPDATE => [AccompanyingCourseDocumentVoter::SEE_DETAILS],
+                AccompanyingCourseDocumentVoter::CREATE => [AccompanyingCourseDocumentVoter::SEE_DETAILS],
+                AccompanyingCourseDocumentVoter::DELETE => [AccompanyingCourseDocumentVoter::SEE_DETAILS],
+                AccompanyingCourseDocumentVoter::SEE_DETAILS => [AccompanyingCourseDocumentVoter::SEE],
+            ],
+        ]);
+    }
+
     protected function prependRoute(ContainerBuilder $container)
     {
         //declare routes for task bundle
-        $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                  '@ChillDocStoreBundle/config/routes.yaml',
-                  '@ChampsLibresAsyncUploaderBundle/config/routes.yaml'
-              )
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillDocStoreBundle/config/routes.yaml',
+                    '@ChampsLibresAsyncUploaderBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
     }
-    
-    protected function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-               PersonDocumentVoter::UPDATE => [PersonDocumentVoter::SEE_DETAILS],
-               PersonDocumentVoter::CREATE => [PersonDocumentVoter::SEE_DETAILS],
-               PersonDocumentVoter::DELETE => [PersonDocumentVoter::SEE_DETAILS],
-               PersonDocumentVoter::SEE_DETAILS => [PersonDocumentVoter::SEE],
-           )
-        ));
-    }
-    
+
     protected function prependTwig(ContainerBuilder $container)
     {
-        $twigConfig = array(
-            'form_themes' => array('@ChillDocStore/Form/fields.html.twig')
-        );
+        $twigConfig = [
+            'form_themes' => ['@ChillDocStore/Form/fields.html.twig'],
+        ];
         $container->prependExtensionConfig('twig', $twigConfig);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
index 6c4fa7477..a0761c074 100644
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
@@ -1,20 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_doc_store');
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
index fd3ba93bc..b013f1a44 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php
@@ -1,13 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Entity;
 
-use Chill\DocStoreBundle\Entity\Document;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table("chill_doc.accompanyingcourse_document")
  */
 class AccompanyingCourseDocument extends Document
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/Document.php b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
index 586d52035..874a60f0b 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -1,33 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Entity;
 
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\User;
-use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * @ORM\MappedSuperclass()
+ * @ORM\MappedSuperclass
  */
 class Document implements HasScopeInterface
 {
     /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
+     * @ORM\ManyToOne(targetEntity="Chill\DocStoreBundle\Entity\DocumentCategory")
+     * @ORM\JoinColumns({
+     *     @ORM\JoinColumn(name="category_bundle_id", referencedColumnName="bundle_id"),
+     *     @ORM\JoinColumn(name="category_id_inside_bundle", referencedColumnName="id_inside_bundle")
+     * })
      */
-    private $id;
+    private $category;
 
     /**
-     * @ORM\Column(type="text")
-     * @Assert\Length(
-     *  min=2, max=250
-     * )
+     * @ORM\Column(type="datetime")
      */
-    private $title;
+    private $date;
 
     /**
      * @ORM\Column(type="text")
@@ -35,72 +42,46 @@ class Document implements HasScopeInterface
     private $description = '';
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\DocStoreBundle\Entity\DocumentCategory")
-     * @ORM\JoinColumns({
-     *   @ORM\JoinColumn(name="category_bundle_id", referencedColumnName="bundle_id"),
-     *   @ORM\JoinColumn(name="category_id_inside_bundle", referencedColumnName="id_inside_bundle")
-     * })
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
      */
-    private $category;
+    private $id;
 
     /**
      * @ORM\ManyToOne(
-     *  targetEntity="Chill\DocStoreBundle\Entity\StoredObject",
-     *  cascade={"persist"}
+     *     targetEntity="Chill\DocStoreBundle\Entity\StoredObject",
+     *     cascade={"persist"}
      * )
-     * @Assert\Valid()
+     * @Assert\Valid
      * @Assert\NotNull(
-     *  message="Upload a document"
+     *     message="Upload a document"
      * )
      */
     private $object;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     *
      * @var \Chill\MainBundle\Entity\Scope The document's center
      */
     private $scope;
 
+    /**
+     * @ORM\Column(type="text")
+     * @Assert\Length(
+     *     min=2, max=250
+     * )
+     */
+    private $title;
+
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     *
      * @var \Chill\PersonBundle\Entity\user The user who encoded the exif_read_data
      */
     private $user;
 
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private $date;
-
-    public function getId()
-    {
-        return $this->id;
-    }
-    
-    public function getTitle(): ?string
-    {
-        return $this->title;
-    }
-
-    public function setTitle(string $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function getDescription(): ?string
-    {
-        return $this->description;
-    }
-
-    public function setDescription($description): self
-    {
-        $this->description = (string) $description;
-
-        return $this;
-    }
-
     /**
      * @return DocumentCategory
      */
@@ -109,6 +90,46 @@ class Document implements HasScopeInterface
         return $this->category;
     }
 
+    public function getDate(): ?DateTimeInterface
+    {
+        return $this->date;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getObject(): ?StoredObject
+    {
+        return $this->object;
+    }
+
+    /**
+     * Get scope.
+     *
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
+
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
+
     public function setCategory(DocumentCategory $category): self
     {
         $this->category = $category;
@@ -116,14 +137,25 @@ class Document implements HasScopeInterface
         return $this;
     }
 
-    /**
-     * Get scope
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    public function getScope()
+    public function setDate(DateTimeInterface $date): self
     {
-        return $this->scope;
+        $this->date = $date;
+
+        return $this;
+    }
+
+    public function setDescription($description): self
+    {
+        $this->description = (string) $description;
+
+        return $this;
+    }
+
+    public function setObject(?StoredObject $object = null)
+    {
+        $this->object = $object;
+
+        return $this;
     }
 
     public function setScope($scope): self
@@ -133,9 +165,11 @@ class Document implements HasScopeInterface
         return $this;
     }
 
-    public function getUser()
+    public function setTitle(string $title): self
     {
-        return $this->user;
+        $this->title = $title;
+
+        return $this;
     }
 
     public function setUser($user): self
@@ -144,28 +178,4 @@ class Document implements HasScopeInterface
 
         return $this;
     }
-
-    public function getDate(): ?\DateTimeInterface
-    {
-        return $this->date;
-    }
-
-    public function setDate(\DateTimeInterface $date): self
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-    
-    public function getObject(): ?StoredObject
-    {
-        return $this->object;
-    }
-    
-    public function setObject(StoredObject $object = null)
-    {
-        $this->object = $object;
-        
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
index a2a8167cc..55850b157 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -1,62 +1,90 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table("chill_doc.document_category")
- * @ORM\Entity(repositoryClass="Chill\DocStoreBundle\EntityRepository\DocumentCategoryRepository")
+ * @ORM\Entity
  */
 class DocumentCategory
 {
     /**
-     * @ORM\Id()
+     * @ORM\Id
      * @ORM\Column(type="string", name="bundle_id")
+     *
      * @var string The id of the bundle that has create the category (i.e. 'person', 'activity', ....)
      */
     private $bundleId;
 
     /**
-     * @ORM\Id()
+     * @ORM\Column(type="string", name="document_class")
+     *
+     * @var string The class of the document (ie Chill\DocStoreBundle\PersonDocument)
+     */
+    private $documentClass;
+
+    /**
+     * @ORM\Id
      * @ORM\Column(type="integer", name="id_inside_bundle")
+     *
      * @var int The id which is unique inside the bundle
      */
     private $idInsideBundle;
 
     /**
-     * @ORM\Column(type="string", name="document_class")
-     * @var string The class of the document (ie Chill\DocStoreBundle\PersonDocument)
-     */
-    private $documentClass;
-
-
-    /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
-    
+
     public function __construct($bundleId, $idInsideBundle)
     {
         $this->bundleId = $bundleId;
         $this->idInsideBundle = $idInsideBundle;
     }
 
-        public function getBundleId() // ::class BundleClass (FQDN)
+    public function getBundleId() // ::class BundleClass (FQDN)
     {
         return $this->bundleId;
     }
 
+    public function getDocumentClass()
+    {
+        return $this->documentClass;
+    }
+
     public function getIdInsideBundle()
     {
         return $this->idInsideBundle;
     }
 
-    public function getDocumentClass()
+    public function getName($locale = null)
     {
-        return $this->documentClass;
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            }
+
+            foreach ($this->name as $name) {
+                if (!empty($name)) {
+                    return $name;
+                }
+            }
+
+            return '';
+        }
+
+        return $this->name;
     }
 
     public function setDocumentClass($documentClass): self
@@ -66,24 +94,6 @@ class DocumentCategory
         return $this;
     }
 
-    public function getName($locale = null)
-    {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            } else {
-                foreach ($this->name as $name) {
-                    if (!empty($name)) {
-                        return $name;
-                    }
-                }
-            }
-            return '';
-        } else {
-            return $this->name;
-        }
-    }
-
     public function setName($name): self
     {
         $this->name = $name;
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
index b38023ddb..8d59384d8 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
@@ -1,29 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\PersonBundle\Entity\Person;
-
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table("chill_doc.person_document")
- * @ORM\Entity()
+ * @ORM\Entity
  */
 class PersonDocument extends Document implements HasCenterInterface, HasScopeInterface
 {
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     *
      * @var Person
      */
     private $person;
 
+    public function getCenter()
+    {
+        return $this->getPerson()->getCenter();
+    }
+
     /**
-     * Get person
+     * Get person.
      *
      * @return \Chill\MainBundle\Entity\Person
      */
@@ -38,9 +50,4 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
 
         return $this;
     }
-
-    public function getCenter()
-    {
-        return $this->getPerson()->getCenter();
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index a0e614025..251a7513d 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -1,36 +1,48 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use ChampsLibres\AsyncUploaderBundle\Validator\Constraints\AsyncFileExists;
 use ChampsLibres\WopiLib\Contract\Entity\Document;
+use DateTime;
 use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
- * Represent a document stored in an object store
+ * Represent a document stored in an object store.
  *
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table("chill_doc.stored_object")
  * @AsyncFileExists(
- *  message="The file is not stored properly"
+ *     message="The file is not stored properly"
  * )
  */
 class StoredObject implements AsyncFileInterface, Document
 {
     /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="datetime", name="creation_date")
      * @Serializer\Groups({"read"})
      */
-    private $id;
+    private DateTimeInterface $creationDate;
+
+    /**
+     * @ORM\Column(type="json", name="datas")
+     * @Serializer\Groups({"read"})
+     */
+    private array $datas = [];
 
     /**
      * @ORM\Column(type="text")
@@ -39,28 +51,23 @@ class StoredObject implements AsyncFileInterface, Document
     private $filename;
 
     /**
-     * @ORM\Column(type="json_array", name="key")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
      */
-    private array $keyInfos = [];
+    private $id;
 
     /**
-     *
      * @var int[]
-     * @ORM\Column(type="json_array", name="iv")
+     * @ORM\Column(type="json", name="iv")
      */
     private array $iv = [];
 
     /**
-     * @ORM\Column(type="uuid", unique=true)
-     * @Serializer\Groups({"read"})
+     * @ORM\Column(type="json", name="key")
      */
-    private UuidInterface $uuid;
-
-    /**
-     * @ORM\Column(type="datetime", name="creation_date")
-     * @Serializer\Groups({"read"})
-     */
-    private DateTimeInterface $creationDate;
+    private array $keyInfos = [];
 
     /**
      * @ORM\Column(type="text", name="type")
@@ -69,68 +76,45 @@ class StoredObject implements AsyncFileInterface, Document
     private string $type = '';
 
     /**
-     * @ORM\Column(type="json_array", name="datas")
+     * @ORM\Column(type="uuid", unique=true)
      * @Serializer\Groups({"read"})
      */
-    private array $datas = [];
+    private UuidInterface $uuid;
 
     public function __construct()
     {
-        $this->creationDate = new \DateTime();
+        $this->creationDate = new DateTime();
         $this->uuid = Uuid::uuid4();
     }
 
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    public function getCreationDate(): \DateTime
+    public function getCreationDate(): DateTime
     {
         return $this->creationDate;
     }
 
-    public function getType()
-    {
-        return $this->type;
-    }
-
     public function getDatas()
     {
         return $this->datas;
     }
 
-    public function setFilename($filename)
+    public function getFilename()
     {
-        $this->filename = $filename;
-
-        return $this;
+        return $this->filename;
     }
 
-    public function setCreationDate(\DateTime $creationDate)
+    public function getId()
     {
-        $this->creationDate = $creationDate;
-
-        return $this;
+        return $this->id;
     }
 
-    public function setType($type)
+    public function getIv()
     {
-        $this->type = $type;
-
-        return $this;
+        return $this->iv;
     }
 
-    public function setDatas(array $datas)
+    public function getKeyInfos()
     {
-        $this->datas = $datas;
-
-        return $this;
+        return $this->keyInfos;
     }
 
     /**
@@ -141,28 +125,9 @@ class StoredObject implements AsyncFileInterface, Document
         return $this->getFilename();
     }
 
-    public function getKeyInfos()
+    public function getType()
     {
-        return $this->keyInfos;
-    }
-
-    public function getIv()
-    {
-        return $this->iv;
-    }
-
-    public function setKeyInfos($keyInfos)
-    {
-        $this->keyInfos = $keyInfos;
-
-        return $this;
-    }
-
-    public function setIv($iv)
-    {
-        $this->iv = $iv;
-
-        return $this;
+        return $this->type;
     }
 
     public function getUuid(): UuidInterface
@@ -174,4 +139,46 @@ class StoredObject implements AsyncFileInterface, Document
     {
         return (string) $this->uuid;
     }
+
+    public function setCreationDate(DateTime $creationDate)
+    {
+        $this->creationDate = $creationDate;
+
+        return $this;
+    }
+
+    public function setDatas(array $datas)
+    {
+        $this->datas = $datas;
+
+        return $this;
+    }
+
+    public function setFilename($filename)
+    {
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    public function setIv($iv)
+    {
+        $this->iv = $iv;
+
+        return $this;
+    }
+
+    public function setKeyInfos($keyInfos)
+    {
+        $this->keyInfos = $keyInfos;
+
+        return $this;
+    }
+
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php b/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
index 383529f52..dfbd533d9 100644
--- a/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
@@ -1,8 +1,17 @@
 <?php
 
-namespace Chill\DocStoreBundle\Repository;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
-use App\Entity\AccompanyingCourseDocument;
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\EntityRepository;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -34,7 +43,7 @@ class AccompanyingCourseDocumentRepository extends ServiceEntityRepository
             ->getResult()
         ;
     }
-    */
+     */
 
     /*
     public function findOneBySomeField($value): ?AccompanyingCourseDocument
@@ -46,5 +55,5 @@ class AccompanyingCourseDocumentRepository extends ServiceEntityRepository
             ->getOneOrNullResult()
         ;
     }
-    */
+     */
 }
diff --git a/src/Bundle/ChillDocStoreBundle/EntityRepository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/EntityRepository/DocumentCategoryRepository.php
deleted file mode 100644
index d803405e4..000000000
--- a/src/Bundle/ChillDocStoreBundle/EntityRepository/DocumentCategoryRepository.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2018 Champs-Libres <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\DocStoreBundle\EntityRepository;
-
-use Doctrine\ORM\EntityRepository;
-use Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option;
-
-/**
- * Get an available idInsideBUndle
- */
-class DocumentCategoryRepository extends EntityRepository
-{
-    public function nextIdInsideBundle()
-    {
-        $array_res = $this->getEntityManager()
-            ->createQuery(
-                'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c')
-            ->getSingleResult();
-
-        return  $array_res[1] ?: 0;
-    }
-}
diff --git a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
index b1a113a0a..64a81e9c7 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php
@@ -1,86 +1,86 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Form;
 
-
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Entity\Document;
-use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
-
 
 class AccompanyingCourseDocumentType extends AbstractType
 {
     /**
-     * the user running this form
-     *
-     * @var User
-     */
-    protected $user;
-
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
     /**
-     *
      * @var ObjectManager
      */
     protected $om;
 
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
+    /**
+     * the user running this form.
+     *
+     * @var User
+     */
+    protected $user;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper
-        )
-    {
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TextType::class)
             ->add('description', ChillTextareaType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('object', StoredObjectType::class, [
-                'error_bubbling' => true
+                'error_bubbling' => true,
             ])
             ->add('date', ChillDateType::class)
             //TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
-            ->add('category', EntityType::class, array(
+            ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
-                'class' => 'ChillDocStoreBundle:DocumentCategory',
-                'query_builder' => function (EntityRepository $er) {
+                'class' => DocumentCategory::class,
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')
-                        ->setParameter('docClass', PersonDocument::class);
+                        ->setParameter('docClass', AccompanyingCourseDocument::class);
                 },
                 'choice_label' => function ($entity = null) {
                     return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
                 },
-            ))
-        ;
-
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -88,7 +88,7 @@ class AccompanyingCourseDocumentType extends AbstractType
         $resolver->setDefaults([
             'data_class' => Document::class,
         ]);
-        
+
         // $resolver->setRequired(['role', 'center'])
         //     ->setAllowedTypes('role', [ \Symfony\Component\Security\Core\Role\Role::class ])
         //     ->setAllowedTypes('center', [ \Chill\MainBundle\Entity\Center::class ])
diff --git a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
index 9a3f75d8f..97265f2dc 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
@@ -1,13 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\DocumentCategory;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DocumentCategoryType extends AbstractType
 {
@@ -17,28 +26,26 @@ class DocumentCategoryType extends AbstractType
     {
         // TODO faire un service dans CHillMain
         foreach ($kernelBundles as $key => $value) {
-            if(substr($key, 0, 5) === 'Chill') {
+            if (substr($key, 0, 5) === 'Chill') {
                 $this->chillBundlesFlipped[$value] = $key;
             }
         }
     }
 
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('bundleId', ChoiceType::class, array(
+            ->add('bundleId', ChoiceType::class, [
                 'choices' => $this->chillBundlesFlipped,
                 'disabled' => true,
-            ))
-            ->add('idInsideBundle', null, array(
+            ])
+            ->add('idInsideBundle', null, [
                 'disabled' => true,
-            ))
-            ->add('documentClass', null, array(
+            ])
+            ->add('documentClass', null, [
                 'disabled' => true,
-            )) // cahcerh par default PersonDocument
-            ->add('name', TranslatableStringFormType::class)
-        ;
+            ]) // cahcerh par default PersonDocument
+            ->add('name', TranslatableStringFormType::class);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index 1629410af..474d9d132 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -1,79 +1,81 @@
 <?php
 
-namespace Chill\DocStoreBundle\Form;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
-
 
 class PersonDocumentType extends AbstractType
 {
     /**
-     * the user running this form
-     *
-     * @var User
-     */
-    protected $user;
-
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
     /**
-     *
      * @var ObjectManager
      */
     protected $om;
 
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
+    /**
+     * the user running this form.
+     *
+     * @var User
+     */
+    protected $user;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper
-        )
-    {
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TextType::class)
             ->add('description', ChillTextareaType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('object', StoredObjectType::class, [
-                'error_bubbling' => true
+                'error_bubbling' => true,
             ])
             ->add('scope', ScopePickerType::class, [
                 'center' => $options['center'],
-                'role' => $options['role']
+                'role' => $options['role'],
             ])
             ->add('date', ChillDateType::class)
-            ->add('category', EntityType::class, array(
+            ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
                 'class' => 'ChillDocStoreBundle:DocumentCategory',
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')
                         ->setParameter('docClass', PersonDocument::class);
@@ -81,9 +83,7 @@ class PersonDocumentType extends AbstractType
                 'choice_label' => function ($entity = null) {
                     return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
                 },
-            ))
-        ;
-
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -91,10 +91,9 @@ class PersonDocumentType extends AbstractType
         $resolver->setDefaults([
             'data_class' => Document::class,
         ]);
-        
+
         $resolver->setRequired(['role', 'center'])
-            ->setAllowedTypes('role', [ \Symfony\Component\Security\Core\Role\Role::class ])
-            ->setAllowedTypes('center', [ \Chill\MainBundle\Entity\Center::class ])
-            ;
+            ->setAllowedTypes('role', [\Symfony\Component\Security\Core\Role\Role::class])
+            ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class]);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
index 64cc32e83..4de5cf48c 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
@@ -1,108 +1,117 @@
 <?php
-/*
- */
-namespace Chill\DocStoreBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use ChampsLibres\AsyncUploaderBundle\Form\Type\AsyncUploaderType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Symfony\Component\Form\CallbackTransformer;
-use Doctrine\ORM\EntityManagerInterface;
 
 /**
- * Form type which allow to join a document 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Form;
+
+use ChampsLibres\AsyncUploaderBundle\Form\Type\AsyncUploaderType;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use function json_decode;
+use function json_encode;
+
+/**
+ * Form type which allow to join a document.
  */
 class StoredObjectType extends AbstractType
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
-    
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('filename', AsyncUploaderType::class)
             ->add('type', HiddenType::class)
             ->add('keyInfos', HiddenType::class)
-            ->add('iv', HiddenType::class)
-            ;
-        
+            ->add('iv', HiddenType::class);
+
         $builder
             ->get('keyInfos')
             ->addModelTransformer(new CallbackTransformer(
-                [$this, 'transform'], [$this, 'reverseTransform']
-        ));
+                [$this, 'transform'],
+                [$this, 'reverseTransform']
+            ));
         $builder
             ->get('iv')
             ->addModelTransformer(new CallbackTransformer(
-                [$this, 'transform'], [$this, 'reverseTransform']
-        ));
-        
+                [$this, 'transform'],
+                [$this, 'reverseTransform']
+            ));
+
         $builder
             ->addModelTransformer(new CallbackTransformer(
-                [ $this, 'transformObject'], [$this, 'reverseTransformObject']
-        ));
+                [$this, 'transformObject'],
+                [$this, 'reverseTransformObject']
+            ));
     }
-    
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('data_class', StoredObject::class);
+    }
+
     public function getBlockPrefix()
     {
         return 'stored_object';
     }
-    
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver
-            ->setDefault('data_class', StoredObject::class)
-            ;
-    }
-    
+
     public function reverseTransform($value)
     {
-        if ($value === null) {
+        if (null === $value) {
             return null;
         }
-        
-        return \json_decode($value, true);
+
+        return json_decode($value, true);
     }
-    
+
+    public function reverseTransformObject($object)
+    {
+        if (null === $object) {
+            return null;
+        }
+
+        if (null === $object->getFilename()) {
+            // remove the original object
+            $this->em->remove($object);
+
+            return null;
+        }
+
+        return $object;
+    }
+
     public function transform($object)
     {
-        if ($object === null) {
+        if (null === $object) {
             return null;
         }
-        
-        return \json_encode($object);
+
+        return json_encode($object);
     }
-    
+
     public function transformObject($object = null)
     {
         return $object;
     }
-    
-    public function reverseTransformObject($object)
-    { 
-        if (NULL === $object) {
-            return null;
-        }
-        
-        if (NULL === $object->getFilename()) {
-            // remove the original object
-            $this->em->remove($object);
-            
-            return null;
-        }
-        
-        return $object;
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
index c48d45833..d579dc162 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php
@@ -1,107 +1,93 @@
 <?php
-/*
- */
-namespace Chill\DocStoreBundle\Menu;
-
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Knp\Menu\MenuItem;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-class MenuBuilder implements LocalMenuBuilderInterface
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Menu;
+
+use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use LogicException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class MenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
+    private Security $security;
+
+    private TranslatorInterface $translator;
+
     public function __construct(
-        TokenStorageInterface $tokenStorage, 
-        AuthorizationHelper $authorizationHelper, 
+        Security $security,
         TranslatorInterface $translator
-    ){
-        $this->tokenStorage = $tokenStorage;
-        $this->authorizationHelper = $authorizationHelper;
+    ) {
+        $this->security = $security;
         $this->translator = $translator;
     }
 
-    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        switch($menuId) {
+        switch ($menuId) {
             case 'accompanyingCourse':
                 $this->buildMenuAccompanyingCourse($menu, $parameters);
+
                 break;
+
             case 'person':
                 $this->buildMenuPerson($menu, $parameters);
+
                 break;
+
             default:
-                throw new \LogicException("this menuid $menuId is not implemented");
+                throw new LogicException("this menuid {$menuId} is not implemented");
         }
     }
 
-    protected function buildMenuPerson(MenuItem $menu, array $parameters)
-    {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
-        $person = $parameters['person'];
-        $user = $this->tokenStorage->getToken()->getUser();
-        
-        if ($this->authorizationHelper->userHasAccess($user, 
-            $person->getCenter(), PersonDocumentVoter::SEE)) {
-            
-            $menu->addChild($this->translator->trans('Documents'),  [
-                    'route' => 'person_document_index',
-                    'routeParameters' => [
-                        'person' => $person->getId()
-                    ]
-                ])
-                ->setExtras([
-                    'order'=> 350
-                ]);
-        }
-        
-    }
-
-    protected function buildMenuAccompanyingCourse(MenuItem $menu, array $parameters){
-        $course = $parameters['accompanyingCourse'];
-        // $user = $this->tokenStorage->getToken()->getUser();
-
-        //TODO : add condition to check user rights?
-
-        $menu->addChild($this->translator->trans('Documents'),  [
-                'route' => 'accompanying_course_document_index',
-                'routeParameters' => [
-                    'course' => $course->getId()
-                ]
-            ])
-            ->setExtras([
-                'order'=> 400
-            ]);
-    }
-
     public static function getMenuIds(): array
     {
-        return [ 'person', 'accompanyingCourse' ];
+        return ['person', 'accompanyingCourse'];
+    }
+
+    private function buildMenuAccompanyingCourse(MenuItem $menu, array $parameters)
+    {
+        $course = $parameters['accompanyingCourse'];
+
+        if ($this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $course)) {
+            $menu->addChild($this->translator->trans('Documents'), [
+                'route' => 'accompanying_course_document_index',
+                'routeParameters' => [
+                    'course' => $course->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 400,
+                ]);
+        }
+    }
+
+    private function buildMenuPerson(MenuItem $menu, array $parameters)
+    {
+        /** @var \Chill\PersonBundle\Entity\Person $person */
+        $person = $parameters['person'];
+
+        if ($this->security->isGranted(PersonDocumentVoter::SEE, $person)) {
+            $menu->addChild($this->translator->trans('Documents'), [
+                'route' => 'person_document_index',
+                'routeParameters' => [
+                    'person' => $person->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 350,
+                ]);
+        }
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php b/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
index c5542d667..7c9054010 100644
--- a/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
+++ b/src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
@@ -1,33 +1,33 @@
 <?php
-/*
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Object;
 
 use ChampsLibres\AsyncUploaderBundle\Form\AsyncFileTransformer\AsyncFileTransformerInterface;
 use ChampsLibres\AsyncUploaderBundle\Model\AsyncFileInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
-use Symfony\Component\Form\Exception\TransformationFailedException;
 use Doctrine\ORM\EntityManagerInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ObjectToAsyncFileTransformer implements AsyncFileTransformerInterface
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
-    
+
     public function toAsyncFile($data)
     {
         if ($data instanceof StoredObject) {
@@ -39,11 +39,9 @@ class ObjectToAsyncFileTransformer implements AsyncFileTransformerInterface
     {
         $object = $this->em
             ->getRepository(StoredObject::class)
-            ->findByFilename($asyncFile->getObjectName())
-            ;
-        
+            ->findByFilename($asyncFile->getObjectName());
+
         return $object ?? (new StoredObject())
-            ->setFilename($asyncFile->getObjectName())
-            ;
+            ->setFilename($asyncFile->getObjectName());
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php b/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php
index 3e0c58189..c0e4f7509 100644
--- a/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php
+++ b/src/Bundle/ChillDocStoreBundle/Object/PersistenceChecker.php
@@ -1,40 +1,40 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Object;
 
 use ChampsLibres\AsyncUploaderBundle\Persistence\PersistenceCheckerInterface;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Doctrine\ORM\EntityManagerInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PersistenceChecker implements PersistenceCheckerInterface
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
 
-    
     public function isPersisted($object_name): bool
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('COUNT(m)')
             ->from(StoredObject::class, 'm')
             ->where($qb->expr()->eq('m.filename', ':object_name'))
-            ->setParameter('object_name', $object_name)
-            ;
-        
+            ->setParameter('object_name', $object_name);
+
         return 1 === $qb->getQuery()->getSingleScalarResult();
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
new file mode 100644
index 000000000..f930e8ece
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Repository;
+
+use Chill\DocStoreBundle\Entity\DocumentCategory;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * Get an available idInsideBUndle.
+ */
+class DocumentCategoryRepository implements ObjectRepository
+{
+    private EntityManagerInterface $em;
+
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->em = $em;
+        $this->repository = $em->getRepository(DocumentCategory::class);
+    }
+
+    /**
+     * @param mixed $id
+     */
+    public function find($id): ?DocumentCategory
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return array|DocumentCategory[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?DocumentCategory
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return DocumentCategory::class;
+    }
+
+    public function nextIdInsideBundle()
+    {
+        $array_res = $this->em
+            ->createQuery(
+                'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c'
+            )
+            ->getSingleResult();
+
+        return reset($array_res);
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
index 4da7b4ca9..118998a9c 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/StoredObjectRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Repository;
@@ -18,6 +25,11 @@ final class StoredObjectRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(StoredObject::class);
     }
 
+    public function find($id, $lockMode = null, $lockVersion = null): ?StoredObject
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
     /**
      * @return array<int, StoredObject>
      */
@@ -27,6 +39,9 @@ final class StoredObjectRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return array<int, StoredObject>
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -43,9 +58,4 @@ final class StoredObjectRepository implements ObjectRepository
     {
         return StoredObject::class;
     }
-
-    public function find($id, $lockMode = null, $lockVersion = null): ?StoredObject
-    {
-        return $this->repository->find($id, $lockMode, $lockVersion);
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
index deeb2828f..b8abcae62 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
@@ -5,7 +5,7 @@ var algo = 'AES-CBC';
 var initializeButtons = (root) => {
     var
         buttons = root.querySelectorAll('a[data-download-button]');
-    
+
     for (let i = 0; i < buttons.length; i ++) {
         initialize(buttons[i]);
     }
@@ -33,9 +33,12 @@ var download = (button) => {
         fetchError = "Error while fetching file",
         key, url
         ;
-    
+
+    console.log('keyData', keyData);
+    console.log('ivData', ivData);
+
     button.textContent = labelPreparing;
-    
+
     window.fetch(urlGenerator)
         .then((r) => {
             if (r.ok) {
@@ -46,26 +49,19 @@ var download = (button) => {
         })
         .then(data => {
             url = data.url;
-    
-            return window.crypto.subtle.importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt']);
-        })
-        .catch(e => {
-            console.error("error while importing key");
-            console.error(e);
-            button.appendChild(document.createTextNode(decryptError));
+
+            if (keyData.length > 0) {
+                return window.crypto.subtle.importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt']);
+            }
+            return Promise.resolve(undefined);
         })
         .then(nKey => {
             key = nKey;
 
             return window.fetch(url);
         })
-        .catch(e => {
-            console.error("error while fetching data");
-            console.error(e);
-            button.textContent = "";
-            button.appendChild(document.createTextNode(fetchError));
-        })
         .then(r => {
+            console.log('r', r);
             if (r.ok) {
                 return r.arrayBuffer();
             } else {
@@ -73,16 +69,16 @@ var download = (button) => {
             }
         })
         .then(buffer => {
-            return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
-        })
-        .catch(e => {
-            console.error("error while importing key");
-            console.error(e);
-            button.textContent = "";
-            button.appendChild(document.createTextNode(decryptError));
+            console.log('buffer', buffer);
+            if (keyData.length > 0) {
+                return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
+            }
+
+            return Promise.resolve(buffer);
         })
         .then(decrypted => {
-            var 
+            console.log('decrypted', decrypted);
+            var
                 blob = new Blob([decrypted], { type: mimeType }),
                 url = window.URL.createObjectURL(blob)
                 ;
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
index 088a351f3..e28611701 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
@@ -41,5 +41,6 @@
 {% endblock %}
 
 {% block css %}
+    {{ parent() }}
 	{{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
index fbea1229a..893f504bc 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
@@ -11,6 +11,13 @@
 {% block js %}
 	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
+  {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+{% endblock %}
+
+{% block css %}
+	{{ parent() }}
+	{{ encore_entry_link_tags('mod_async_upload') }}
+  {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block content %}
@@ -29,7 +36,7 @@
 			{% for document in documents %}
 				<tr>
 					<td>{{ document.title }}</td>
-					<td>{{ document.category.name|localize_translatable_string }}</td>
+					<td>{% if document.category %}{{ document.category.name|localize_translatable_string }}{% endif %}</td>
 					<td>
 						<ul class="record_actions">
 							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
@@ -58,11 +65,13 @@
 		</tbody>
 	</table>
 
+    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
+
 	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) %}
 		<ul class="record_actions">
 			<li class="create">
 				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">
-					{{ 'Create new document' | trans }}
+					{{ 'Create'|trans }}
 				</a>
 			</li>
 		</ul>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig
index 713654739..d76e5a745 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/new.html.twig
@@ -42,5 +42,6 @@
 {% endblock %}
 
 {% block css %}
+    {{ parent() }}
 	{{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
index 3bf9cac43..97299675a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
@@ -14,6 +14,11 @@
 	{{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
+{% endblock %}
+
 {% block content %}
 
 	<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
@@ -22,8 +27,10 @@
 		<dt>{{ 'Title'|trans }}</dt>
 		<dd>{{ document.title }}</dd>
 
-		<dt>{{ 'Category'|trans }}</dt>
-		<dd>{{ document.category.name|localize_translatable_string }}</dd>
+        {% if document.category is not null %}
+            <dt>{{ 'Category'|trans }}</dt>
+            <dd>{{ document.category.name|localize_translatable_string }}</dd>
+        {% endif %}
 
 		<dt>{{ 'Description' | trans }}</dt>
 		<dd>
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
index 944a27b27..18377211c 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
@@ -1,88 +1,112 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Security\Authorization;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Security;
+use function in_array;
 
-/**
- *
- */
 class AccompanyingCourseDocumentVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE';
-    const SEE    = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE';
-    const SEE_DETAILS = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS';
-    const UPDATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE';
-    const DELETE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE';
+    public const CREATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE';
 
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    public const DELETE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE';
 
-    /**
-     * @var AccessDecisionManagerInterface
-     */
-    protected $accessDecisionManager;
+    public const SEE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE';
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    public const SEE_DETAILS = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS';
+
+    public const UPDATE = 'CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE';
+
+    protected LoggerInterface $logger;
+
+    protected Security $security;
+
+    protected VoterHelperInterface $voterHelper;
 
     public function __construct(
-        AccessDecisionManagerInterface $accessDecisionManager,
-        AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger
-    )
-    {
-        $this->accessDecisionManager = $accessDecisionManager;
-        $this->authorizationHelper = $authorizationHelper;
+        LoggerInterface $logger,
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
         $this->logger = $logger;
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory
+            ->generate(self::class)
+            ->addCheckFor(AccompanyingCourseDocument::class, $this->getRoles())
+            ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
+            ->build();
     }
 
-    public function getRoles()
+    public function getRoles(): array
     {
         return [
             self::CREATE,
             self::SEE,
             self::SEE_DETAILS,
             self::UPDATE,
-            self::DELETE
+            self::DELETE,
         ];
     }
 
+    public function getRolesWithHierarchy(): array
+    {
+        return ['accompanyingCourseDocument' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
+    }
+
     protected function supports($attribute, $subject)
     {
-
-        if (\in_array($attribute, $this->getRoles())) {
-            return true;
-        }
-
-        return false;
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        return true;
-    }
+        $this->logger->debug(sprintf('Voting from %s class', self::class));
 
+        if (!$token->getUser() instanceof User) {
+            return false;
+        }
 
-    public function getRolesWithoutScope()
-    {
-        return array();
-    }
+        if ($subject instanceof AccompanyingPeriod) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+                if (self::CREATE === $attribute) {
+                    return false;
+                }
+            }
+        } elseif ($subject instanceof AccompanyingCourseDocument) {
+            if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getCourse())) {
+                return false;
+            }
 
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getCourse()->getStep()
+                && in_array($attribute, [self::CREATE, self::DELETE, self::UPDATE], true)) {
+                return false;
+            }
+        }
 
-    public function getRolesWithHierarchy()
-    {
-        return ['accompanyingCourseDocument' => $this->getRoles() ];
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
index c92971b8f..43d17e420 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
@@ -1,155 +1,105 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs-Libres SCRLFS
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\DocStoreBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\DocStoreBundle\Entity\PersonDocument;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Security;
 
-/**
- *
- */
 class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_PERSON_DOCUMENT_CREATE';
-    const SEE    = 'CHILL_PERSON_DOCUMENT_SEE';
-    const SEE_DETAILS = 'CHILL_PERSON_DOCUMENT_SEE_DETAILS';
-    const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
-    const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
+    public const CREATE = 'CHILL_PERSON_DOCUMENT_CREATE';
 
-    protected AuthorizationHelper $authorizationHelper;
+    public const DELETE = 'CHILL_PERSON_DOCUMENT_DELETE';
 
-    protected AccessDecisionManagerInterface $accessDecisionManager;
+    public const SEE = 'CHILL_PERSON_DOCUMENT_SEE';
+
+    public const SEE_DETAILS = 'CHILL_PERSON_DOCUMENT_SEE_DETAILS';
+
+    public const UPDATE = 'CHILL_PERSON_DOCUMENT_UPDATE';
 
     protected LoggerInterface $logger;
 
-    protected CenterResolverDispatcher $centerResolverDispatcher;
+    protected Security $security;
+
+    protected VoterHelperInterface $voterHelper;
 
     public function __construct(
-        AccessDecisionManagerInterface $accessDecisionManager,
-        AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger//,
-        //CenterResolverDispatcher $centerResolverDispatcher
-    )
-    {
-        $this->accessDecisionManager = $accessDecisionManager;
-        $this->authorizationHelper = $authorizationHelper;
+        LoggerInterface $logger,
+        Security $security,
+        VoterHelperFactoryInterface $voterHelperFactory
+    ) {
         $this->logger = $logger;
-        //$this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->security = $security;
+        $this->voterHelper = $voterHelperFactory
+            ->generate(self::class)
+            ->addCheckFor(PersonDocument::class, $this->getRoles())
+            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+            ->build();
     }
 
-    public function getRoles()
+    public function getRoles(): array
     {
         return [
             self::CREATE,
             self::SEE,
             self::SEE_DETAILS,
             self::UPDATE,
-            self::DELETE
+            self::DELETE,
         ];
     }
 
+    public function getRolesWithHierarchy(): array
+    {
+        return ['PersonDocument' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
+    }
+
     protected function supports($attribute, $subject)
     {
-        if (\in_array($attribute, $this->getRoles()) && $subject instanceof PersonDocument) {
-            return true;
-        }
-
-        if ($subject instanceof Person
-            && \in_array($attribute, [self::CREATE, self::SEE])) {
-            return true;
-        }
-
-        return false;
+        return $this->voterHelper->supports($attribute, $subject);
     }
 
     /**
-     *
      * @param string $attribute
      * @param PersonDocument $subject
-     * @param TokenInterface $token
-     * @return boolean
+     *
+     * @return bool
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $this->logger->debug(sprintf("Voting from %s class", self::class));
+        $this->logger->debug(sprintf('Voting from %s class', self::class));
 
         if (!$token->getUser() instanceof User) {
             return false;
         }
 
-        $center = $this->centerResolverDispatcher->resolveCenter($subject);
-
-        if ($subject instanceof PersonDocument) {
-            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
-
-        } elseif ($subject instanceof Person) {
-            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
-
-        } else {
-
-            // subject is null. We check that at least one center is reachable
-            $centers = $this->authorizationHelper
-                ->getReachableCenters($token->getUser(), new Role($attribute));
-
-            return count($centers) > 0;
-        }
-
-        if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
+        if ($subject instanceof PersonDocument
+            && !$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
             return false;
         }
 
-        return $this->authorizationHelper->userHasAccess(
-            $token->getUser(),
-            $subject,
-            $attribute
-        );
-
-    }
-
-    protected function isGranted($attribute, $report, $user = null)
-    {
-        if (! $user instanceof User){
-            return false;
-        }
-
-        return $this->helper->userHasAccess($user, $report, $attribute);
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return array();
-    }
-
-
-    public function getRolesWithHierarchy()
-    {
-        return ['PersonDocument' => $this->getRoles() ];
+        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml b/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml
index 069cd64d4..db16aef77 100644
--- a/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml
@@ -1,8 +1,4 @@
 services:
     Chill\DocStoreBundle\Menu\MenuBuilder:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
index 8dbc86473..30e008d1f 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php
@@ -1,15 +1,31 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\DocStore;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create schema for chill_doc
+ * Create schema for chill_doc.
  */
 final class Version20180605102533 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP SCHEMA chill_doc CASCADE');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -17,7 +33,6 @@ final class Version20180605102533 extends AbstractMigration
         $this->addSql('CREATE SCHEMA chill_doc');
         $this->addSql('CREATE SEQUENCE chill_doc.person_document_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_doc.document_category (bundle_id VARCHAR(255) NOT NULL, id_inside_bundle INT NOT NULL, document_class VARCHAR(255) NOT NULL, name JSON NOT NULL, PRIMARY KEY(bundle_id, id_inside_bundle))');
-        $this->addSql('COMMENT ON COLUMN chill_doc.document_category.name IS \'(DC2Type:json_array)\'');
         $this->addSql('CREATE TABLE chill_doc.person_document (id INT NOT NULL, category_bundle_id VARCHAR(255) DEFAULT NULL, category_id_inside_bundle INT DEFAULT NULL, scope_id INT DEFAULT NULL, user_id INT DEFAULT NULL, person_id INT DEFAULT NULL, title TEXT NOT NULL, description TEXT NOT NULL, content TEXT NOT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_41DA53C369A0BE36EF62EFC ON chill_doc.person_document (category_bundle_id, category_id_inside_bundle)');
         $this->addSql('CREATE INDEX IDX_41DA53C682B5931 ON chill_doc.person_document (scope_id)');
@@ -28,12 +43,4 @@ final class Version20180605102533 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53CA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP SCHEMA chill_doc CASCADE');
-        
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
index b77debe7b..5a3034280 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php
@@ -1,30 +1,24 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\DocStore;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add schema for stored object
+ * Add schema for stored object.
  */
 final class Version20180606133338 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SEQUENCE chill_doc.stored_object_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_doc.stored_object (id INT NOT NULL, filename TEXT NOT NULL, key JSON NOT NULL, iv JSON NOT NULL, creation_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, type TEXT NOT NULL, datas JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.key IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.iv IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.datas IS \'(DC2Type:json_array)\'');
-        $this->addSql('ALTER TABLE chill_doc.person_document ADD object_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_doc.person_document DROP content');
-        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C232D562B FOREIGN KEY (object_id) REFERENCES chill_doc.stored_object (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_41DA53C232D562B ON chill_doc.person_document (object_id)');
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -35,4 +29,16 @@ final class Version20180606133338 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_doc.person_document ADD content TEXT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_doc.person_document DROP object_id');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('CREATE SEQUENCE chill_doc.stored_object_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_doc.stored_object (id INT NOT NULL, filename TEXT NOT NULL, key JSON NOT NULL, iv JSON NOT NULL, creation_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, type TEXT NOT NULL, datas JSON NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD object_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_doc.person_document DROP content');
+        $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C232D562B FOREIGN KEY (object_id) REFERENCES chill_doc.stored_object (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_41DA53C232D562B ON chill_doc.person_document (object_id)');
+    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php
index fa4182142..caf412f2d 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903091534.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\DocStore;
@@ -12,6 +19,12 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210903091534 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_doc.accompanyingcourse_document_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_doc.accompanyingcourse_document');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -24,10 +37,4 @@ final class Version20210903091534 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_A45098F6591CC992 ON chill_doc.accompanyingcourse_document (course_id)');
         $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document ADD CONSTRAINT FK_A45098F6591CC992 FOREIGN KEY (course_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_doc.accompanyingcourse_document_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_doc.accompanyingcourse_document');
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php
index c91c7e173..d24474bde 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210903123835.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\DocStore;
@@ -12,6 +19,26 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210903123835 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6369A0BE36EF62EFC');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6232D562B');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6682B5931');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6A76ED395');
+        $this->addSql('DROP INDEX IDX_A45098F6369A0BE36EF62EFC');
+        $this->addSql('DROP INDEX IDX_A45098F6232D562B');
+        $this->addSql('DROP INDEX IDX_A45098F6682B5931');
+        $this->addSql('DROP INDEX IDX_A45098F6A76ED395');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP category_bundle_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP category_id_inside_bundle');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP object_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP scope_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP user_id');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP title');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP description');
+        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP date');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -36,24 +63,4 @@ final class Version20210903123835 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_A45098F6682B5931 ON chill_doc.accompanyingcourse_document (scope_id)');
         $this->addSql('CREATE INDEX IDX_A45098F6A76ED395 ON chill_doc.accompanyingcourse_document (user_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6369A0BE36EF62EFC');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6232D562B');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6682B5931');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP CONSTRAINT FK_A45098F6A76ED395');
-        $this->addSql('DROP INDEX IDX_A45098F6369A0BE36EF62EFC');
-        $this->addSql('DROP INDEX IDX_A45098F6232D562B');
-        $this->addSql('DROP INDEX IDX_A45098F6682B5931');
-        $this->addSql('DROP INDEX IDX_A45098F6A76ED395');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP category_bundle_id');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP category_id_inside_bundle');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP object_id');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP scope_id');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP user_id');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP title');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP description');
-        $this->addSql('ALTER TABLE chill_doc.accompanyingcourse_document DROP date');
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
index 20d45ca37..cbafadc02 100644
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20210928182542.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\DocStore;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20210928182542 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_doc.stored_object DROP uuid');
+    }
+
     public function getDescription(): string
     {
         return 'Create UUID column on StoredObject table.';
@@ -22,9 +34,4 @@ final class Version20210928182542 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_doc.stored_object ALTER uuid SET NOT NULL');
         $this->addSql('CREATE UNIQUE INDEX UNIQ_49604E36D17F50A6 ON chill_doc.stored_object (uuid)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_doc.stored_object DROP uuid');
-    }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php
new file mode 100644
index 000000000..7d0b5e3e2
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211119173558 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+
+    public function getDescription(): string
+    {
+        return 'remove comment on deprecated json_array type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $columns = [
+            'chill_doc.document_category.name',
+            'chill_doc.stored_object.key',
+            'chill_doc.stored_object.iv',
+            'chill_doc.stored_object.datas',
+        ];
+
+        foreach ($columns as $col) {
+            $this->addSql("COMMENT ON COLUMN {$col} IS NULL");
+        }
+    }
+}
diff --git a/src/Bundle/ChillEventBundle/ChillEventBundle.php b/src/Bundle/ChillEventBundle/ChillEventBundle.php
index dc040dac6..66438716e 100644
--- a/src/Bundle/ChillEventBundle/ChillEventBundle.php
+++ b/src/Bundle/ChillEventBundle/ChillEventBundle.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillEventBundle/Controller/AdminController.php b/src/Bundle/ChillEventBundle/Controller/AdminController.php
index c55fd172d..aca3b5a04 100644
--- a/src/Bundle/ChillEventBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillEventBundle/Controller/AdminController.php
@@ -1,32 +1,21 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
  * Class AdminController
- * Controller for the event configuration section (in admin section)
- *
- * @package Chill\EventBundle\Controller
+ * Controller for the event configuration section (in admin section).
  */
 class AdminController extends AbstractController
 {
@@ -37,7 +26,7 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillEventBundle:Admin:layout.html.twig');
     }
-    
+
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
@@ -45,4 +34,4 @@ class AdminController extends AbstractController
     {
         return $this->redirectToRoute('chill_main_admin_central');
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 9f4d242d1..c7d98baaa 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -1,97 +1,78 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Controller;
 
+use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Entity\Participation;
+use Chill\EventBundle\Form\EventType;
 use Chill\EventBundle\Form\Type\PickEventType;
+use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\Type\PickPersonType;
+use Chill\PersonBundle\Privacy\PrivacyEvent;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Csv;
 use PhpOffice\PhpSpreadsheet\Writer\Ods;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Chill\EventBundle\Security\Authorization\EventVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\PersonBundle\Form\Type\PickPersonType;
-use Chill\EventBundle\Entity\Event;
-use Chill\EventBundle\Form\EventType;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\MainBundle\Entity\Center;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\Translation\TranslatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
+use function count;
 
 /**
- * Class EventController
- *
- * @package Chill\EventBundle\Controller
+ * Class EventController.
  */
 class EventController extends AbstractController
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    
     /**
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
+
     /**
      * @var FormFactoryInterface
      */
     protected $formFactoryInterface;
-    
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
+
     /**
      * @var PaginatorFactory
      */
     protected $paginator;
-    
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     /**
      * EventController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param AuthorizationHelper $authorizationHelper
-     * @param FormFactoryInterface $formFactoryInterface
-     * @param TranslatorInterface $translator
-     * @param PaginatorFactory $paginator
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
@@ -99,200 +80,70 @@ class EventController extends AbstractController
         FormFactoryInterface $formFactoryInterface,
         TranslatorInterface $translator,
         PaginatorFactory $paginator
-    )
-    {
+    ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->formFactoryInterface = $formFactoryInterface;
         $this->translator = $translator;
         $this->paginator = $paginator;
     }
-    
-    
-    public function mostRecentIndexAction()
-    {
-        return $this->redirectToRoute('chill_main_search', array(
-            'q' => '@event'
-        ));
-    }
 
-   
     /**
-     * First step of new Event form
-     */
-    public function newPickCenterAction()
-    {
-        $role = new Role('CHILL_EVENT_CREATE');
-
-        /**
-         * @var Center $centers
-         */
-        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), $role);
-        
-        if (count($centers) === 1)
-        {
-            return $this->redirectToRoute('chill_event__event_new', array(
-                'center_id' => $centers[0]->getId()
-            ));
-        }
-        
-        $form = $this->formFactoryInterface
-            ->createNamedBuilder(null, FormType::class, null, array(
-                'csrf_protection' => false
-            ))
-            ->setMethod('GET')
-            ->setAction(
-                $this->generateUrl('chill_event__event_new'))
-            ->add('center_id', EntityType::class, array(
-                'class' => Center::class,
-                'choices' => $centers,
-                'placeholder' => '',
-                'label' => 'To which centre should the event be associated ?'
-            ))
-            ->add('submit', SubmitType::class, array(
-                'label' => 'Next step'
-            ))
-            ->getForm();
-
-        return $this->render('ChillEventBundle:Event:newPickCenter.html.twig', array(
-            'form' => $form->createView()
-        ));
-
-    }
-    
-    /**
-     * Creates a form to create a Event entity.
+     * @param $event_id
      *
-     * @param Event $entity The entity
-     * @return \Symfony\Component\Form\FormInterface
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
-    private function createCreateForm(Event $entity)
+    public function deleteAction($event_id, Request $request)
     {
-        $form = $this->createForm(EventType::class, $entity, array(
-            'method' => 'POST',
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_EVENT_CREATE')
-        ));
-        
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-        
-        return $form;
-    }
-    
-    /**
-     * Displays a form to create a new Event entity.
-     * @param Center $center
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function newAction(Center $center = null, Request $request)
-    {
-        if ($center === null)
-        {
-            $center_id = $request->query->get('center_id');
-            $center = $this->getDoctrine()->getRepository(Center::class)->find($center_id);
-        }
-        
-        $entity = new Event();
-        $entity->setCenter($center);
-        
-        $form = $this->createCreateForm($entity);
-        $form->handleRequest($request);
-    
-        if ($form->isSubmitted() && $form->isValid())
-        {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($entity);
-            $em->flush();
-        
-            $this->addFlash('success', $this->get('translator')
-                ->trans('The event was created'));
-        
-            return $this->redirect($this->generateUrl('chill_event__event_show', array('event_id' => $entity->getId())));
-        }
+        $em = $this->getDoctrine()->getManager();
+        $event = $em->getRepository('ChillEventBundle:Event')->findOneBy([
+            'id' => $event_id,
+        ]);
 
-        return $this->render('ChillEventBundle:Event:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-    
-    /**
-     * Finds and displays a Event entity.
-     *
-     * @ParamConverter("event", options={"id" = "event_id"})
-     * @param Event $event
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\Response
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
-     */
-    public function showAction(Event $event, Request $request)
-    {
         if (!$event) {
-            throw $this->createNotFoundException('Unable to find Event entity.');
+            throw $this->createNotFoundException('Unable to find this event.');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_EVENT_SEE_DETAILS', $event,
-              "You are not allowed to see details on this event");
-        
-        $addParticipationByPersonForm = $this->createAddParticipationByPersonForm($event);
-    
-        $exportParticipationsList = $this->exportParticipationsList($event, $request);
-        
-        if ($exportParticipationsList['response']) {
-            return $exportParticipationsList['response'];
+        /** @var array $participations */
+        $participations = $event->getParticipations();
+
+        $form = $this->createDeleteForm($event_id);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                foreach ($participations as $participation) {
+                    $em->remove($participation);
+                }
+
+                $em->remove($event);
+                $em->flush();
+
+                $this->addFlash(
+                    'success',
+                    $this->get('translator')
+                        ->trans('The event has been sucessfully removed')
+                );
+
+                return $this->redirectToRoute('chill_main_search', [
+                    'name' => 'event_regular',
+                    'q' => '@event',
+                ]);
+            }
         }
-        
-        return $this->render('ChillEventBundle:Event:show.html.twig', array(
-            'event'      => $event,
-            'form_add_participation_by_person' => $addParticipationByPersonForm->createView(),
-            'form_export' => $exportParticipationsList['form']->createView()
-        ));
-    }
-    
-    /**
-     * create a form to add a participation with a person
-     *
-     * @param Event $event
-     * @return \Symfony\Component\Form\FormInterface
-     */
-    protected function createAddParticipationByPersonForm(Event $event)
-    {
-        /* @var $builder \Symfony\Component\Form\FormBuilderInterface */
-        $builder = $this
-                ->get('form.factory')
-                ->createNamedBuilder( 
-                    null,
-                    FormType::class, 
-                    null,
-                    array(
-                        'method' => 'GET',
-                        'action' => $this->generateUrl('chill_event_participation_new'),
-                        'csrf_protection' => false
-                    ))
-                ;
-        
-        $builder->add('person_id', PickPersonType::class, array(
-            'role' => new Role('CHILL_EVENT_CREATE'),
-            'centers' => $event->getCenter()
-        ));
-        
-        $builder->add('event_id', HiddenType::class, array(
-            'data' => $event->getId()
-        ));
-        
-        $builder->add('submit', SubmitType::class,
-                array(
-                    'label' => 'Add a participation'
-                ));
-        
-        return $builder->getForm();
+
+        return $this->render('ChillEventBundle:Event:confirm_delete.html.twig', [
+            'event_id' => $event->getId(),
+            'delete_form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing Event entity.
      *
      * @param $event_id
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function editAction($event_id)
@@ -307,39 +158,193 @@ class EventController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillEventBundle:Event:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillEventBundle:Event:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-     * Creates a form to edit a Event entity.
+     * List events subscriptions for a person.
      *
-     * @param Event $entity
-     * @return \Symfony\Component\Form\FormInterface
+     * @param $person_id
+     *
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
      */
-    private function createEditForm(Event $entity)
+    public function listByPersonAction($person_id)
     {
-        $form = $this->createForm(EventType::class, $entity, array(
-            'action' => $this->generateUrl('chill_event__event_update', array('event_id' => $entity->getId())),
-            'method' => 'PUT',
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_EVENT_CREATE')
-        ));
+        $em = $this->getDoctrine()->getManager();
 
-        $form->remove('center');
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        if (null === $person) {
+            throw $this->createNotFoundException('Person not found');
+        }
 
-        return $form;
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $reachablesCircles = $this->authorizationHelper->getReachableCircles(
+            $this->getUser(),
+            new Role(EventVoter::SEE),
+            $person->getCenter()
+        );
+
+        $total = $em->getRepository('ChillEventBundle:Participation')->countByPerson($person_id);
+
+        $paginator = $this->paginator->create($total);
+
+        $participations = $em->getRepository('ChillEventBundle:Participation')->findByPersonInCircle(
+            $person_id,
+            $reachablesCircles,
+            $paginator->getCurrentPage()->getFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+
+        $privacyEvent = new PrivacyEvent($person, [
+            'element_class' => Participation::class,
+            'action' => 'list',
+        ]);
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $privacyEvent);
+
+        $addEventParticipationByPersonForm = $this->createAddEventParticipationByPersonForm($person);
+
+        return $this->render('ChillEventBundle:Event:listByPerson.html.twig', [
+            'participations' => $participations,
+            'person' => $person,
+            'paginator' => $paginator,
+            'form_add_event_participation_by_person' => $addEventParticipationByPersonForm->createView(),
+        ]);
     }
-    
+
+    public function mostRecentIndexAction()
+    {
+        return $this->redirectToRoute('chill_main_search', [
+            'q' => '@event',
+        ]);
+    }
+
+    /**
+     * Displays a form to create a new Event entity.
+     *
+     * @param Center $center
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newAction(?Center $center, Request $request)
+    {
+        if (null === $center) {
+            $center_id = $request->query->get('center_id');
+            $center = $this->getDoctrine()->getRepository(Center::class)->find($center_id);
+        }
+
+        $entity = new Event();
+        $entity->setCenter($center);
+
+        $form = $this->createCreateForm($entity);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($entity);
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')
+                ->trans('The event was created'));
+
+            return $this->redirect($this->generateUrl('chill_event__event_show', ['event_id' => $entity->getId()]));
+        }
+
+        return $this->render('ChillEventBundle:Event:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * First step of new Event form.
+     */
+    public function newPickCenterAction()
+    {
+        $role = new Role('CHILL_EVENT_CREATE');
+
+        /**
+         * @var Center $centers
+         */
+        $centers = $this->authorizationHelper->getReachableCenters($this->getUser(), $role);
+
+        if (count($centers) === 1) {
+            return $this->redirectToRoute('chill_event__event_new', [
+                'center_id' => $centers[0]->getId(),
+            ]);
+        }
+
+        $form = $this->formFactoryInterface
+            ->createNamedBuilder(null, FormType::class, null, [
+                'csrf_protection' => false,
+            ])
+            ->setMethod('GET')
+            ->setAction(
+                $this->generateUrl('chill_event__event_new')
+            )
+            ->add('center_id', EntityType::class, [
+                'class' => Center::class,
+                'choices' => $centers,
+                'placeholder' => '',
+                'label' => 'To which centre should the event be associated ?',
+            ])
+            ->add('submit', SubmitType::class, [
+                'label' => 'Next step',
+            ])
+            ->getForm();
+
+        return $this->render('ChillEventBundle:Event:newPickCenter.html.twig', [
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a Event entity.
+     *
+     * @ParamConverter("event", options={"id": "event_id"})
+     *
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function showAction(Event $event, Request $request)
+    {
+        if (!$event) {
+            throw $this->createNotFoundException('Unable to find Event entity.');
+        }
+
+        $this->denyAccessUnlessGranted(
+            'CHILL_EVENT_SEE_DETAILS',
+            $event,
+            'You are not allowed to see details on this event'
+        );
+
+        $addParticipationByPersonForm = $this->createAddParticipationByPersonForm($event);
+
+        $exportParticipationsList = $this->exportParticipationsList($event, $request);
+
+        if ($exportParticipationsList['response']) {
+            return $exportParticipationsList['response'];
+        }
+
+        return $this->render('ChillEventBundle:Event:show.html.twig', [
+            'event' => $event,
+            'form_add_participation_by_person' => $addParticipationByPersonForm->createView(),
+            'form_export' => $exportParticipationsList['form']->createView(),
+        ]);
+    }
+
     /**
      * Edits an existing Event entity.
      *
-     * @param Request $request
      * @param $event_id
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
      */
     public function updateAction(Request $request, $event_id)
@@ -357,171 +362,107 @@ class EventController extends AbstractController
 
         if ($editForm->isValid()) {
             $em->flush();
-            
+
             $this->addFlash('success', $this->get('translator')
-                    ->trans('The event was updated'));
+                ->trans('The event was updated'));
 
-            return $this->redirect($this->generateUrl('chill_event__event_edit', array('event_id' => $event_id)));
+            return $this->redirect($this->generateUrl('chill_event__event_edit', ['event_id' => $event_id]));
         }
 
-        return $this->render('ChillEventBundle:Event:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('ChillEventBundle:Event:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
-    
-    /**
-     * List events subscriptions for a person
-     *
-     * @param $person_id
-     * @return \Symfony\Component\HttpFoundation\Response
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function listByPersonAction($person_id)
-    {
-        
-        $em = $this->getDoctrine()->getManager();
-    
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-    
-        if ($person === NULL) {
-            throw $this->createNotFoundException('Person not found');
-        }
-    
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        
-        $reachablesCircles = $this->authorizationHelper->getReachableCircles(
-            $this->getUser(),
-            new Role(EventVoter::SEE),
-            $person->getCenter()
-        );
-        
-        $total = $em->getRepository('ChillEventBundle:Participation')->countByPerson($person_id);
-        
-        $paginator = $this->paginator->create($total);
 
-        $participations = $em->getRepository('ChillEventBundle:Participation')->findByPersonInCircle(
-            $person_id,
-            $reachablesCircles,
-            $paginator->getCurrentPage()->getFirstItemNumber(),
-            $paginator->getItemsPerPage()
-        );
-            
-        $privacyEvent = new PrivacyEvent($person, array(
-            'element_class' => Participation::class,
-            'action' => 'list'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $privacyEvent);
-    
-        $addEventParticipationByPersonForm = $this->createAddEventParticipationByPersonForm($person);
-        
-        return $this->render('ChillEventBundle:Event:listByPerson.html.twig', array(
-            'participations' => $participations,
-            'person' => $person,
-            'paginator' => $paginator,
-            'form_add_event_participation_by_person' => $addEventParticipationByPersonForm->createView()
-        ));
-    }
-    
     /**
-     * create a form to add a participation with an event
+     * create a form to add a participation with an event.
      *
-     * @param Person $person
      * @return \Symfony\Component\Form\FormInterface
      */
     protected function createAddEventParticipationByPersonForm(Person $person)
     {
-        /* @var $builder \Symfony\Component\Form\FormBuilderInterface */
+        /** @var \Symfony\Component\Form\FormBuilderInterface $builder */
         $builder = $this
             ->get('form.factory')
             ->createNamedBuilder(
                 null,
                 FormType::class,
                 null,
-                array(
+                [
                     'method' => 'GET',
                     'action' => $this->generateUrl('chill_event_participation_new'),
-                    'csrf_protection' => false
-                ))
-        ;
-        
-        $builder->add('event_id', PickEventType::class, array(
+                    'csrf_protection' => false,
+                ]
+            );
+
+        $builder->add('event_id', PickEventType::class, [
             'role' => new Role('CHILL_EVENT_CREATE'),
-            'centers' => $person->getCenter()
-        ));
-        
-        $builder->add('person_id', HiddenType::class, array(
-            'data' => $person->getId()
-        ));
-    
-        $builder->add('return_path', HiddenType::class, array(
-            'data' => $this->generateUrl('chill_event__list_by_person', array(
-                    'person_id' => $person->getId()
-            ))
-        ));
-    
-    
-        $builder->add('submit', SubmitType::class,
-            array(
-                'label' => 'Subscribe an event'
-            ));
-        
+            'centers' => $person->getCenter(),
+        ]);
+
+        $builder->add('person_id', HiddenType::class, [
+            'data' => $person->getId(),
+        ]);
+
+        $builder->add('return_path', HiddenType::class, [
+            'data' => $this->generateUrl('chill_event__list_by_person', [
+                'person_id' => $person->getId(),
+            ]),
+        ]);
+
+        $builder->add(
+            'submit',
+            SubmitType::class,
+            [
+                'label' => 'Subscribe an event',
+            ]
+        );
+
         return $builder->getForm();
     }
-    
-    
+
     /**
-     * @param Event $event
-     * @param Request $request
-     * @return array
-     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * create a form to add a participation with a person.
+     *
+     * @return \Symfony\Component\Form\FormInterface
      */
-    protected function exportParticipationsList(Event $event, Request $request)
+    protected function createAddParticipationByPersonForm(Event $event)
     {
-        $form = $this->createExportByFormatForm();
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() && $form->isValid())
-        {
-            $data = $form->getData();
-            $format = $data['format'];
-            $filename = 'export_event'. $event->getId() .'_participations.' .$format;
-            
-            $spreadsheet = $this->createExportSpreadsheet($event);
-            
-            switch ($format) {
-                case 'ods':
-                    $contentType = 'application/vnd.oasis.opendocument.spreadsheet';
-                    $writer = new Ods($spreadsheet);
-                    break;
-                case 'xlsx':
-                    $contentType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-                    $writer = new Xlsx($spreadsheet);
-                    break;
-                case 'csv':
-                    $contentType = 'text/csv';
-                    $writer = new Csv($spreadsheet);
-                    break;
-                default:
-                    return [ 'form' => $form, 'response' => null ];
-            }
-        
-            $response = new StreamedResponse();
-            $response->headers->set('Content-Type', $contentType);
-            $response->headers->set('Content-Disposition', 'attachment;filename="'.$filename.'"');
-            $response->setPrivate();
-            $response->headers->addCacheControlDirective('no-cache', true);
-            $response->headers->addCacheControlDirective('must-revalidate', true);
-            $response->setCallback(function() use ($writer) {
-                $writer->save('php://output');
-            });
-        
-            return [ 'form' => $form, 'response' => $response ];
-        }
-        
-        return [ 'form' => $form, 'response' => null ];
+        /** @var \Symfony\Component\Form\FormBuilderInterface $builder */
+        $builder = $this
+            ->get('form.factory')
+            ->createNamedBuilder(
+                null,
+                FormType::class,
+                null,
+                [
+                    'method' => 'GET',
+                    'action' => $this->generateUrl('chill_event_participation_new'),
+                    'csrf_protection' => false,
+                ]
+            );
+
+        $builder->add('person_id', PickPersonType::class, [
+            'role' => new Role('CHILL_EVENT_CREATE'),
+            'centers' => $event->getCenter(),
+        ]);
+
+        $builder->add('event_id', HiddenType::class, [
+            'data' => $event->getId(),
+        ]);
+
+        $builder->add(
+            'submit',
+            SubmitType::class,
+            [
+                'label' => 'Add a participation',
+            ]
+        );
+
+        return $builder->getForm();
     }
-    
+
     /**
      * @return \Symfony\Component\Form\FormInterface
      */
@@ -532,30 +473,30 @@ class EventController extends AbstractController
                 'choices' => [
                     'xlsx' => 'xlsx',
                     'ods' => 'ods',
-                    'csv' => 'csv'
+                    'csv' => 'csv',
                 ],
                 'label' => false,
-                'placeholder' => 'Select a format'
+                'placeholder' => 'Select a format',
             ])
             ->add('submit', SubmitType::class, [
-                'label' => 'Export'
+                'label' => 'Export',
             ]);
-        
+
         return $builder->getForm();
     }
-    
+
     /**
-     * @param Event $event
-     * @return Spreadsheet
      * @throws \PhpOffice\PhpSpreadsheet\Exception
+     *
+     * @return Spreadsheet
      */
     protected function createExportSpreadsheet(Event $event)
     {
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
-    
+
         $trans = $this->translator->getLocale();
-        
+
         $headerValues = [
             'A1' => 'Event',
             'B1' => $event->getId(),
@@ -570,20 +511,22 @@ class EventController extends AbstractController
             'A6' => 'Moderator',
             'B6' => $event->getModerator() ? $event->getModerator()->getUsernameCanonical() : null,
         ];
+
         foreach ($headerValues as $k => $value) {
             $sheet->setCellValue($k, $value);
         }
-        
-        $columnNames = [ 'id', 'firstname', 'lastname', 'role', 'status', 'email', 'phone', 'mobile' ];
+
+        $columnNames = ['id', 'firstname', 'lastname', 'role', 'status', 'email', 'phone', 'mobile'];
         $columnLetter = 'A';
+
         foreach ($columnNames as $columnName) {
-            $sheet->setCellValue($columnLetter.'8', $columnName);
-            $columnLetter++;
+            $sheet->setCellValue($columnLetter . '8', $columnName);
+            ++$columnLetter;
         }
-    
+
         $columnValues = [];
-        foreach ($event->getParticipations() as $participation)
-        {
+
+        foreach ($event->getParticipations() as $participation) {
             /** @var Participation $participation */
             $columnValues[] = [
                 $participation->getPerson()->getId(),
@@ -596,83 +539,132 @@ class EventController extends AbstractController
                 $participation->getPerson()->getMobileNumber(),
             ];
         }
-        
+
         $i = 9;
+
         foreach ($columnValues as $columnValue) {
             $columnLetter = 'A';
+
             foreach ($columnValue as $value) {
-                $sheet->setCellValue($columnLetter.$i, $value);
-                $columnLetter++;
+                $sheet->setCellValue($columnLetter . $i, $value);
+                ++$columnLetter;
             }
-            $i++;
+            ++$i;
         }
-        
+
         return $spreadsheet;
     }
-    
+
     /**
-     * @param $event_id
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     *
+     * @return array
      */
-    public function deleteAction($event_id, Request $request)
+    protected function exportParticipationsList(Event $event, Request $request)
     {
-        $em = $this->getDoctrine()->getManager();
-        $event = $em->getRepository('ChillEventBundle:Event')->findOneBy([
-            'id' => $event_id
-        ]);
-    
-        if  (! $event) {
-            throw $this->createNotFoundException('Unable to find this event.');
-        }
-        
-        /** @var array $participations */
-        $participations = $event->getParticipations();
-        
-        $form = $this->createDeleteForm($event_id);
-    
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-    
-            if ($form->isValid()) {
-        
-                foreach ($participations as $participation) {
-                    $em->remove($participation);
-                }
-                
-                $em->remove($event);
-                $em->flush();
-    
-                $this->addFlash('success', $this->get('translator')
-                    ->trans("The event has been sucessfully removed")
-                );
-    
-                return $this->redirectToRoute('chill_main_search', [
-                    'name' => 'event_regular',
-                    'q' => '@event'
-                ]);
+        $form = $this->createExportByFormatForm();
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $data = $form->getData();
+            $format = $data['format'];
+            $filename = 'export_event' . $event->getId() . '_participations.' . $format;
+
+            $spreadsheet = $this->createExportSpreadsheet($event);
+
+            switch ($format) {
+                case 'ods':
+                    $contentType = 'application/vnd.oasis.opendocument.spreadsheet';
+                    $writer = new Ods($spreadsheet);
+
+                    break;
+
+                case 'xlsx':
+                    $contentType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+                    $writer = new Xlsx($spreadsheet);
+
+                    break;
+
+                case 'csv':
+                    $contentType = 'text/csv';
+                    $writer = new Csv($spreadsheet);
+
+                    break;
+
+                default:
+                    return ['form' => $form, 'response' => null];
             }
+
+            $response = new StreamedResponse();
+            $response->headers->set('Content-Type', $contentType);
+            $response->headers->set('Content-Disposition', 'attachment;filename="' . $filename . '"');
+            $response->setPrivate();
+            $response->headers->addCacheControlDirective('no-cache', true);
+            $response->headers->addCacheControlDirective('must-revalidate', true);
+            $response->setCallback(static function () use ($writer) {
+                $writer->save('php://output');
+            });
+
+            return ['form' => $form, 'response' => $response];
         }
-        return $this->render('ChillEventBundle:Event:confirm_delete.html.twig', [
-            'event_id' => $event->getId(),
-            'delete_form' => $form->createView()
-        ]);
+
+        return ['form' => $form, 'response' => null];
     }
-    
+
+    /**
+     * Creates a form to create a Event entity.
+     *
+     * @param Event $entity The entity
+     *
+     * @return \Symfony\Component\Form\FormInterface
+     */
+    private function createCreateForm(Event $entity)
+    {
+        $form = $this->createForm(EventType::class, $entity, [
+            'method' => 'POST',
+            'center' => $entity->getCenter(),
+            'role' => new Role('CHILL_EVENT_CREATE'),
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
     /**
      * @param $event_id
+     *
      * @return \Symfony\Component\Form\FormInterface
      */
     private function createDeleteForm($event_id)
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_event__event_delete', [
-                'event_id' => $event_id
+                'event_id' => $event_id,
             ]))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm()
-            ;
+            ->getForm();
+    }
+
+    /**
+     * Creates a form to edit a Event entity.
+     *
+     * @return \Symfony\Component\Form\FormInterface
+     */
+    private function createEditForm(Event $entity)
+    {
+        $form = $this->createForm(EventType::class, $entity, [
+            'action' => $this->generateUrl('chill_event__event_update', ['event_id' => $entity->getId()]),
+            'method' => 'PUT',
+            'center' => $entity->getCenter(),
+            'role' => new Role('CHILL_EVENT_CREATE'),
+        ]);
+
+        $form->remove('center');
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
index e151f04cb..b4e19efc7 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
@@ -1,39 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Controller;
 
+use Chill\EventBundle\Entity\EventType;
+use Chill\EventBundle\Form\EventTypeType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 
-use Chill\EventBundle\Entity\EventType;
-use Chill\EventBundle\Form\EventTypeType;
-
 /**
- * Class EventTypeController
- *
- * @package Chill\EventBundle\Controller
+ * Class EventTypeController.
  */
 class EventTypeController extends AbstractController
 {
-
-    /**
-     * Lists all EventType entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillEventBundle:EventType')->findAll();
-
-        return $this->render('ChillEventBundle:EventType:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new EventType entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -46,149 +37,22 @@ class EventTypeController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_eventtype_admin',
-                    array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl(
+                'chill_eventtype_admin',
+                ['id' => $entity->getId()]
+            ));
         }
 
-        return $this->render('ChillEventBundle:EventType:new.html.twig', array(
+        return $this->render('ChillEventBundle:EventType:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
-    /**
-     * Creates a form to create a EventType entity.
-     *
-     * @param EventType $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(EventType $entity)
-    {
-        $form = $this->createForm(EventTypeType::class, $entity, array(
-            'action' => $this->generateUrl('chill_eventtype_admin_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new EventType entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new EventType();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillEventBundle:EventType:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a EventType entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:EventType')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find EventType entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('ChillEventBundle:EventType:show.html.twig', array(
-            'entity'      => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-     * Displays a form to edit an existing EventType entity.
-     *
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:EventType')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find EventType entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('ChillEventBundle:EventType:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-    * Creates a form to edit a EventType entity.
-    *
-    * @param EventType $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(EventType $entity)
-    {
-        $form = $this->createForm(EventTypeType::class, $entity, array(
-            'action' => $this->generateUrl('chill_eventtype_admin_update', 
-                    array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
-
-        return $form;
-    }
-    /**
-     * Edits an existing EventType entity.
-     *
-     */
-    public function updateAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:EventType')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find EventType entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-        $editForm = $this->createEditForm($entity);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('chill_eventtype_admin',
-                    array('id' => $id)));
-        }
-
-        return $this->render('ChillEventBundle:EventType:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
     /**
      * Deletes a EventType entity.
      *
+     * @param mixed $id
      */
     public function deleteAction(Request $request, $id)
     {
@@ -210,6 +74,136 @@ class EventTypeController extends AbstractController
         return $this->redirect($this->generateUrl('chill_eventtype_admin'));
     }
 
+    /**
+     * Displays a form to edit an existing EventType entity.
+     *
+     * @param mixed $id
+     */
+    public function editAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:EventType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find EventType entity.');
+        }
+
+        $editForm = $this->createEditForm($entity);
+        $deleteForm = $this->createDeleteForm($id);
+
+        return $this->render('ChillEventBundle:EventType:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Lists all EventType entities.
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillEventBundle:EventType')->findAll();
+
+        return $this->render('ChillEventBundle:EventType:index.html.twig', [
+            'entities' => $entities,
+        ]);
+    }
+
+    /**
+     * Displays a form to create a new EventType entity.
+     */
+    public function newAction()
+    {
+        $entity = new EventType();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillEventBundle:EventType:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a EventType entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:EventType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find EventType entity.');
+        }
+
+        $deleteForm = $this->createDeleteForm($id);
+
+        return $this->render('ChillEventBundle:EventType:show.html.twig', [
+            'entity' => $entity,
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Edits an existing EventType entity.
+     *
+     * @param mixed $id
+     */
+    public function updateAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:EventType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find EventType entity.');
+        }
+
+        $deleteForm = $this->createDeleteForm($id);
+        $editForm = $this->createEditForm($entity);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            return $this->redirect($this->generateUrl(
+                'chill_eventtype_admin',
+                ['id' => $id]
+            ));
+        }
+
+        return $this->render('ChillEventBundle:EventType:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a EventType entity.
+     *
+     * @param EventType $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(EventType $entity)
+    {
+        $form = $this->createForm(EventTypeType::class, $entity, [
+            'action' => $this->generateUrl('chill_eventtype_admin_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
     /**
      * Creates a form to delete a EventType entity by id.
      *
@@ -220,11 +214,34 @@ class EventTypeController extends AbstractController
     private function createDeleteForm($id)
     {
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_eventtype_admin_delete', 
-                    array('id' => $id)))
+            ->setAction($this->generateUrl(
+                'chill_eventtype_admin_delete',
+                ['id' => $id]
+            ))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+    }
+
+    /**
+     * Creates a form to edit a EventType entity.
+     *
+     * @param EventType $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(EventType $entity)
+    {
+        $form = $this->createForm(EventTypeType::class, $entity, [
+            'action' => $this->generateUrl(
+                'chill_eventtype_admin_update',
+                ['id' => $entity->getId()]
+            ),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 4242eb784..b3294cfc6 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -1,766 +1,784 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Controller;
 
 use ArrayIterator;
 use Chill\EventBundle\Entity\Event;
-use Psr\Log\LoggerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Chill\EventBundle\Entity\Participation;
 use Chill\EventBundle\Form\ParticipationType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Chill\EventBundle\Security\Authorization\ParticipationVoter;
+use LogicException;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use function count;
 
 /**
- * Class ParticipationController
- *
- * @package Chill\EventBundle\Controller
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Class ParticipationController.
  */
 class ParticipationController extends AbstractController
 {
-    
     /**
      * @var \Psr\Log\LoggerInterface
      */
     private $logger;
-    
+
     /**
      * ParticipationController constructor.
-     *
-     * @param LoggerInterface $logger
      */
     public function __construct(LoggerInterface $logger)
     {
         $this->logger = $logger;
     }
-    
-    /**
-     * Show a form to add a participation
-     * 
-     * This function parse the person_id / persons_ids query argument
-     * and decide if it should process a single or multiple participation. Depending
-     * on this, the appropriate layout and form.
-     *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     */
-    public function newAction(Request $request)
-    {
-        
-        // test the request is correct
-        try {
-            $this->testRequest($request);
-        } catch (\RuntimeException $ex) {
-            $this->logger->warning($ex->getMessage());
-            
-            return (new Response())
-                ->setStatusCode(Response::HTTP_BAD_REQUEST)
-                ->setContent($ex->getMessage());
-        }
-        
-        // forward to other action
-        $single = $request->query->has('person_id');
-        $multiple = $request->query->has('persons_ids');
-        
-        if ($single === true) {
-            return $this->newSingle($request);
-        }
-        
-        if ($multiple === true) {
-            
-            return $this->newMultiple($request);
-        }
-        
-        // at this point, we miss the required fields. Throw an error
-        return (new Response())
-            ->setStatusCode(Response::HTTP_BAD_REQUEST)
-                ->setContent("You must provide either 'person_id' or "
-                        . "'persons_ids' argument in query");
-    }
-    
-    /**
-     * 
-     * Test that the query parameters are valid :
-     * 
-     * - an `event_id` is existing ;
-     * - `person_id` and `persons_ids` are **not** both present ;
-     * - `persons_id` is correct (contains only numbers and a ','.
-     * 
-     * @param Request $request
-     * @throws \RuntimeException if an error is detected
-     */
-    protected function testRequest(Request $request)
-    {
-        $single = $request->query->has('person_id');
-        $multiple = $request->query->has('persons_ids');
-        
-        if ($single === true AND $multiple === true) {
-            // we are not allowed to have both person_id and persons_ids
-            throw new \RuntimeException("You are not allow to provide both 'person_id' and "
-                      . "'persons_ids' simulaneously");
-        }
-        
-        if ($multiple === true) {
-            $persons_ids = $request->query->get('persons_ids');
-            
-            if (!preg_match('/^([0-9]{1,},{0,1}){1,}[0-9]{0,}$/', $persons_ids)) {
-                throw new \RuntimeException("The persons_ids value should "
-                        . "contains int separated by ','");
-            }
-        }
-        
-        // check for event_id - this could be removed later
-        if ($request->query->has('event_id') === FALSE) {
-            throw new \RuntimeException("You must provide an event_id");
-        }
-        
-    }
-    
-    /**
-     * Show a form with single participation.
-     * 
-     * @param Request $request
-     * @return Response
-     */
-    protected function newSingle(Request $request)
-    {
-        
-        $returnPath = $request->query->get('return_path') ?
-                $request->query->get('return_path') : null;
-        
-        $participation = $this->handleRequest($request, new Participation(), false);
-        
-        $this->denyAccessUnlessGranted(ParticipationVoter::CREATE, 
-                $participation, 'The user is not allowed to create this participation');
-        
-        $form = $this->createCreateForm($participation, $returnPath);
-        
-        return $this->render('ChillEventBundle:Participation:new.html.twig', array(
-            'form' => $form->createView(),
-            'participation' => $participation,
-            'ignored_participations' => array() // this is required, see self::newMultiple
-        ));
-    }
-    
-    /**
-     * Show a form with multiple participation.
-     * 
-     * If a person is already participating on the event (if a participation with
-     * the same person is associated with the event), the participation is ignored.
-     * 
-     * If all but one participation is ignored, the page show the same response
-     * than the newSingle function. 
-     * 
-     * If all participations must be ignored, an error is shown and the method redirects
-     * to the event 'show' view with an appropriate flash message.
-     *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     */
-    protected function newMultiple(Request $request)
-    {
-        $participations = $this->handleRequest($request, new Participation(), true);
-        
-        
-        foreach ($participations as $i => $participation) {
-            // check for authorization
-            $this->denyAccessUnlessGranted(ParticipationVoter::CREATE, 
-                $participation, 'The user is not allowed to create this participation');
-            
-            // create a collection of person's id participating to the event
-            /* @var $peopleParticipating \Doctrine\Common\Collections\ArrayCollection */
-            $peopleParticipating = isset($peopleParticipating) ? $peopleParticipating :
-                    $participation->getEvent()->getParticipations()->map(
-                            function(Participation $p) { return $p->getPerson()->getId(); }
-                            );
-            // check that the user is not already in the event              
-            if ($peopleParticipating->contains($participation->getPerson()->getId())) {
-                $ignoredParticipations[] = $participation
-                        ->getEvent()->getParticipations()->filter(
-                                function (Participation $p) use ($participation) { 
-                                    return $p->getPerson()->getId() === $participation->getPerson()->getId();
-                                }
-                                )->first();
-            } else {
-                $newParticipations[] = $participation;
-            }
-        }
-        
-        // this is where the function redirect depending on valid participation
-        
-        if (!isset($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 '
-                    . 'the event: they are maybe already participating.'));
-            
-            return $this->redirectToRoute('chill_event__event_show', array(
-                'event_id' => $request->query->getInt('event_id', 0)
-            ));
-        } elseif (count($newParticipations) > 1) {
-            // 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(
-                'form' => $form->createView(),
-                'participations' => $newParticipations,
-                'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
-            ));
-        } 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(
-                'form' => $form->createView(),
-                'participation' => $participation,
-                'ignored_participations' => isset($ignoredParticipations) ? $ignoredParticipations : array()
-            ));
-            
-        }
-    }
-    
     /**
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function createAction(Request $request)
     {
         // test the request is correct
         try {
             $this->testRequest($request);
-        } catch (\RuntimeException $ex) {
+        } catch (RuntimeException $ex) {
             $this->logger->warning($ex->getMessage());
-            
+
             return (new Response())
                 ->setStatusCode(Response::HTTP_BAD_REQUEST)
                 ->setContent($ex->getMessage());
         }
-        
+
         // forward to other action
         $single = $request->query->has('person_id');
         $multiple = $request->query->has('persons_ids');
-        
-        if ($single === true) {
+
+        if (true === $single) {
             return $this->createSingle($request);
         }
-        
-        if ($multiple === true) {
-            
+
+        if (true === $multiple) {
             return $this->createMultiple($request);
         }
-        
+
         // at this point, we miss the required fields. Throw an error
         return (new Response())
             ->setStatusCode(Response::HTTP_BAD_REQUEST)
-                ->setContent("You must provide either 'person_id' or "
+            ->setContent("You must provide either 'person_id' or "
                         . "'persons_ids' argument in query");
     }
-    
+
     /**
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
+     * @param null $return_path
      */
-    public function createSingle(Request $request)
+    public function createCreateForm(Participation $participation, $return_path = null): FormInterface
     {
-        $participation = $this->handleRequest($request, new Participation(), false);
-        
-        $this->denyAccessUnlessGranted(ParticipationVoter::CREATE, 
-                $participation, 'The user is not allowed to create this participation');
-        
-        $form = $this->createCreateForm($participation);
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            
-            $em->persist($participation);
-            $em->flush();
-            
-            $this->addFlash('success', $this->get('translator')->trans(
-                    'The participation was created'
-                    ));
-            
-            if ($request->query->get('return_path'))
-            {
-                return $this->redirect($request->query->get('return_path'));
-                
-            } else {
-                return $this->redirectToRoute('chill_event__event_show', array(
-                    'event_id' => $participation->getEvent()->getId()
-                ));
-            }
-            
-        }
-        
-        return $this->render('ChillEventBundle:Participation:new.html.twig', array(
-            'form' => $form->createView(),
-            'participation' => $participation
-        ));
+        $form = $this->createForm(ParticipationType::class, $participation, [
+            'event_type' => $participation->getEvent()->getType(),
+            'action' => $this->generateUrl('chill_event_participation_create', [
+                'return_path' => $return_path,
+                'event_id' => $participation->getEvent()->getId(),
+                'person_id' => $participation->getPerson()->getId(),
+            ]),
+        ]);
+
+        $form->add('submit', SubmitType::class, [
+            'label' => 'Create',
+        ]);
+
+        return $form;
     }
-    
+
+    public function createCreateFormMultiple(array $participations): FormInterface
+    {
+        $form = $this->createForm(
+            \Symfony\Component\Form\Extension\Core\Type\FormType::class,
+            ['participations' => $participations],
+            [
+                'action' => $this->generateUrl(
+                    'chill_event_participation_create',
+                    [
+                        'event_id' => current($participations)->getEvent()->getId(),
+                        'persons_ids' => implode(',', array_map(
+                            static function (Participation $p) { return $p->getPerson()->getId(); },
+                            $participations
+                        )),
+                    ]
+                ), ]
+        );
+        $form->add(
+            'participations',
+            CollectionType::class,
+            [
+                'entry_type' => ParticipationType::class,
+                'entry_options' => [
+                    'event_type' => current($participations)->getEvent()->getType(),
+                ],
+            ]
+        );
+
+        $form->add('submit', SubmitType::class, [
+            'label' => 'Create',
+        ]);
+
+        return $form;
+    }
+
+    public function createEditForm(Participation $participation): FormInterface
+    {
+        $form = $this->createForm(
+            ParticipationType::class,
+            $participation,
+            [
+                'event_type' => $participation->getEvent()->getType(),
+                'action' => $this->generateUrl(
+                    'chill_event_participation_update',
+                    [
+                        'participation_id' => $participation->getId(),
+                    ]
+                ),
+            ]
+        );
+
+        $form->add(
+            'submit',
+            SubmitType::class,
+            [
+                'label' => 'Edit',
+            ]
+        );
+
+        return $form;
+    }
+
     /**
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function createMultiple(Request $request)
     {
         $participations = $this->handleRequest($request, new Participation(), true);
-        
-        foreach($participations as $participation) {
-            $this->denyAccessUnlessGranted(ParticipationVoter::CREATE, 
-                $participation, 'The user is not allowed to create this participation');
+
+        foreach ($participations as $participation) {
+            $this->denyAccessUnlessGranted(
+                ParticipationVoter::CREATE,
+                $participation,
+                'The user is not allowed to create this participation'
+            );
         }
-        
+
         $form = $this->createCreateFormMultiple($participations);
         $form->handleRequest($request);
-        
+
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $data = $form->getData();
-            
-            foreach($data['participations'] as $participation) {
+
+            foreach ($data['participations'] as $participation) {
                 $em->persist($participation);
             }
-            
+
             $em->flush();
-            
+
             $this->addFlash('success', $this->get('translator')->trans(
-                    'The participations were created'
-                    ));
-            
-            return $this->redirectToRoute('chill_event__event_show', array(
-                'event_id' => $participations[0]->getEvent()->getId()
+                'The participations were created'
             ));
+
+            return $this->redirectToRoute('chill_event__event_show', [
+                'event_id' => $participations[0]->getEvent()->getId(),
+            ]);
         }
-        
-        return $this->render('ChillEventBundle:Participation:new.html.twig', array(
+
+        return $this->render('ChillEventBundle:Participation:new.html.twig', [
             'form' => $form->createView(),
-            'participation' => $participation
-        ));
+            'participation' => $participation,
+        ]);
     }
-    
-    /**
-     * 
-     * Handle the request to adapt $participation.
-     * 
-     * If the request is multiple, the $participation object is cloned. 
-     * Limitations: the $participation should not be persisted.
-     * 
-     * @param Request $request
-     * @param Participation $participation
-     * @param boolean $multiple (default false) 
-     * @return Participation|Participations[] return one single participation if $multiple == false
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the event/person is not found
-     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException if the user does not have access to event/person
-     */
-    protected function handleRequest(
-            Request $request, 
-            Participation $participation,
-            $multiple = false)
-    {
-        $em = $this->getDoctrine()->getManager();
-        if ($em->contains($participation)) {
-            throw new \LogicException("The participation object should not be managed by "
-                    . "the object manager using the method ".__METHOD__);
-        }
-        
-        $event_id = $request->query->getInt('event_id', 0); // sf4 check:
-        // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
-        
-        if ($event_id !== NULL) {
-            $event = $em->getRepository('ChillEventBundle:Event')
-                ->find($event_id);
-            
-            if ($event === NULL) {
-                throw $this->createNotFoundException('The event with id '.$event_id.' is not found');
-            }
-            
-            $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 
-                    'The user is not allowed to see the event');
-            
-            $participation->setEvent($event);
-        }
-        
-        // this script should be able to handle multiple, so we translate 
-        // single person_id in an array
-        $persons_ids = $request->query->has('person_id') ?
-            [$request->query->getInt('person_id', 0)]  // sf4 check:
-               // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
-            : explode(',', $request->query->get('persons_ids'));
-        $participations = array();
-        
-        foreach($persons_ids as $person_id) {
-            
-            // clone if we have to reuse the $participation
-            $participation = count($persons_ids) > 1 ? clone $participation : $participation;
-        
-            if ($person_id !== NULL) {
-                $person = $em->getRepository('ChillPersonBundle:Person')
-                        ->find($person_id);
 
-                if ($person === NULL) {
-                    throw $this->createNotFoundException('The person with id '.$person_id.' is not found');
-                }
-
-                $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person,
-                        'The user is not allowed to see the person');
-
-                $participation->setPerson($person);
-            }
-            
-            $participations[] = $participation;
-        }
-        
-        return $multiple ? $participations : $participations[0];
-    }
-    
     /**
-     * @param Participation $participation
-     * @param null $return_path
-     * @return \Symfony\Component\Form\FormInterface
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      */
-    public function createCreateForm(Participation $participation, $return_path = null)
+    public function createSingle(Request $request)
     {
-       
-        $form = $this->createForm(ParticipationType::class, $participation, array(
-            'event_type' => $participation->getEvent()->getType(),
-            'action' => $this->generateUrl('chill_event_participation_create', array(
-                'return_path' => $return_path,
-                'event_id' => $participation->getEvent()->getId(),
-                'person_id' => $participation->getPerson()->getId()
-            ))
-        ));
-        
-        $form->add('submit', SubmitType::class, array(
-            'label' => 'Create'
-        ));
-        
-        return $form;
-    }
-    
-    /**
-     * @param array $participations
-     * @return \Symfony\Component\Form\FormInterface
-     */
-    public function createCreateFormMultiple(array $participations)
-    {
-        $form = $this->createForm(\Symfony\Component\Form\Extension\Core\Type\FormType::class,
-                array('participations' => $participations), array(
-                    'action' => $this->generateUrl('chill_event_participation_create', array(
-                'event_id' => current($participations)->getEvent()->getId(),
-                'persons_ids' => implode(',', array_map(
-                        function(Participation $p) { return $p->getPerson()->getId(); }, 
-                        $participations))
-            )
-                )));
-        $form->add('participations', CollectionType::class,  array(
-            'entry_type' => ParticipationType::class,
-            'entry_options' => array(
-                  'event_type' => current($participations)->getEvent()->getType()
-                ),
-            )
+        $participation = $this->handleRequest($request, new Participation(), false);
+
+        $this->denyAccessUnlessGranted(
+            ParticipationVoter::CREATE,
+            $participation,
+            'The user is not allowed to create this participation'
         );
-        
-        $form->add('submit', SubmitType::class, array(
-            'label' => 'Create'
-        ));
-        
-        return $form;
-    }
-    
-    /**
-     * show an edit form for the participation with the given id.
-     * 
-     * @param int $participation_id
-     * @return \Symfony\Component\HttpFoundation\Response
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the participation is not found
-     * @throws \Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException if the user is not allowed to edit the participation
-     */
-    public function editAction($participation_id) 
-    {
-        /* @var $participation Participation */
-        $participation = $this->getDoctrine()->getManager()
-                ->getRepository('ChillEventBundle:Participation')
-                ->find($participation_id);
-        
-        if ($participation === NULL) {
-            throw $this->createNotFoundException('The participation is not found');
-        }
-        
-        $this->denyAccessUnlessGranted(ParticipationVoter::UPDATE, $participation, 
-                'You are not allowed to edit this participation');
-        
-        $form = $this->createEditForm($participation);
-        
-        return $this->render('ChillEventBundle:Participation:edit.html.twig', array(
-            'form' => $form->createView(),
-            'participation' => $participation
-        ));
-    }
-    
-    /**
-     * @param $participation_id
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     */
-    public function updateAction($participation_id, Request $request) 
-    {
-        /* @var $participation Participation */
-        $participation = $this->getDoctrine()->getManager()
-                ->getRepository('ChillEventBundle:Participation')
-                ->find($participation_id);
-        
-        if ($participation === NULL) {
-            throw $this->createNotFoundException('The participation is not found');
-        }
-        
-        $this->denyAccessUnlessGranted(ParticipationVoter::UPDATE, $participation, 
-                'You are not allowed to edit this participation');
-        
-        $form = $this->createEditForm($participation);
-        
+
+        $form = $this->createCreateForm($participation);
         $form->handleRequest($request);
-        
+
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
-            
-            $em->flush();
-            
-            $this->addFlash('success', $this->get('translator')->trans(
-                    'The participation was updated'
-                    ));
-            
-            return $this->redirectToRoute('chill_event__event_show', array(
-                'event_id' => $participation->getEvent()->getId()
-            ));
-            
-        }
-        
-        return $this->render('ChillEventBundle:Participation:edit.html.twig', array(
-            'form' => $form->createView(),
-            'participation' => $participation
-        ));
-    }
-    
-    /**
-     * 
-     * @param Participation $participation
-     * @return \Symfony\Component\Form\FormInterface
-     */
-    public function createEditForm(Participation $participation)
-    {
-        $form = $this->createForm(ParticipationType::class, $participation, array(
-            'event_type' => $participation->getEvent()->getType(),
-            'action' => $this->generateUrl('chill_event_participation_update', array(
-                'participation_id' => $participation->getId()
-            ))
-        ));
-        
-        $form->add('submit', SubmitType::class, array(
-            'label' => 'Edit'
-        ));
-        
-        return $form;
-    }
-    
-    /**
-     * show a form to edit multiple participation for the same event.
-     *
-     * @param int $event_id
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     */
-    public function editMultipleAction($event_id)
-    {
-        $event = $this->getDoctrine()->getRepository('ChillEventBundle:Event')
-                ->find($event_id);
-        
-        if ($event === null) {
-            throw $this->createNotFoundException("The event with id $event_id is not found");
-        }
-        
-        // check for ACL, on Event level and on Participation Level
-        $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, "You are not allowed "
-                . "to see this event");
-        foreach ($event->getParticipations() as $participation) {
-            $this->denyAccessUnlessGranted(ParticipationVoter::UPDATE, $participation, 
-                    "You are not allowed to update participation with id ".$participation->getId());
-        }
-        
-        
-        switch ($event->getParticipations()->count()) {
-            
-            case 0:
-                // if there aren't any participation, redirect to the 'show' view with an add flash
-                $this->addFlash('warning', $this->get('translator')
-                        ->trans( "There are no participation to edit for this event"));
 
-                return $this->redirectToRoute('chill_event__event_show', 
-                        array('event_id' => $event->getId()));
-                
-            case 1:
-                // redirect to the form for a single participation
-                return $this->redirectToRoute('chill_event_participation_edit', array(
-                    'participation_id' => $event->getParticipations()->current()->getId()
-                ));
-        } 
-        
-        $form = $this->createEditFormMultiple($event->getParticipations(), $event);
-        
-        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', array(
-            'event' => $event,
-            'participations' => $event->getParticipations(),
-            'form' => $form->createView()
-        ));
+            $em->persist($participation);
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans(
+                'The participation was created'
+            ));
+
+            if ($request->query->get('return_path')) {
+                return $this->redirect($request->query->get('return_path'));
+            }
+
+            return $this->redirectToRoute('chill_event__event_show', [
+                'event_id' => $participation->getEvent()->getId(),
+            ]);
+        }
+
+        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+            'form' => $form->createView(),
+            'participation' => $participation,
+        ]);
     }
-    
-    public function updateMultipleAction($event_id, Request $request)
-    {
-        /* @var $event \Chill\EventBundle\Entity\Event */
-        $event = $this->getDoctrine()->getRepository('ChillEventBundle:Event')
-                ->find($event_id);
-        
-        if ($event === null) {
-            throw $this->createNotFoundException("The event with id $event_id is not found");
-        }
-        
-        $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, "You are not allowed "
-                . "to see this event");
-        foreach ($event->getParticipations() as $participation) {
-            $this->denyAccessUnlessGranted(ParticipationVoter::UPDATE, $participation, 
-                    "You are not allowed to update participation with id ".$participation->getId());
-        }
-        
-        $form = $this->createEditFormMultiple($event->getParticipations(), $event);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->getDoctrine()->getManager()->flush();
-            
-            $this->addFlash('success', $this->get('translator')->trans("The participations "
-                    . "have been successfully updated."));
-            
-            return $this->redirectToRoute('chill_event__event_show', 
-                        array('event_id' => $event->getId()));
-        }
-        
-        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', array(
-            'event' => $event,
-            'participations' => $event->getParticipations(),
-            'form' => $form->createView()
-        ));
-    }
-    
+
     /**
-     * @param ArrayIterator $participations
-     * @param Event $event
-     * @return \Symfony\Component\Form\FormInterface
-     */
-    protected function createEditFormMultiple(ArrayIterator $participations, Event $event)
-    {
-        $form = $this->createForm(\Symfony\Component\Form\Extension\Core\Type\FormType::class, 
-                array('participations' => $participations), array(
-                    'method' => 'POST',
-                    'action' => $this->generateUrl('chill_event_participation_update_multiple', array(
-                        'event_id' => $event->getId()
-                    ))
-                ));
-        
-        $form->add('participations', CollectionType::class,  array(
-            'entry_type' => ParticipationType::class,
-            'entry_options' => array(
-                  'event_type' => $event->getType()
-                ),
-            )
-        );
-        
-        $form->add('submit', SubmitType::class, array(
-            'label' => 'Update'
-        ));
-        
-        return $form;
-    }
-    
-    /**
-     * @param integer $participation_id
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
+     * @param int $participation_id
+     *
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function deleteAction($participation_id, Request $request)
     {
         $em = $this->getDoctrine()->getManager();
         $participation = $em->getRepository('ChillEventBundle:Participation')->findOneBy([
-            'id' => $participation_id
+            'id' => $participation_id,
         ]);
-        
-        if  (! $participation) {
+
+        if (!$participation) {
             throw $this->createNotFoundException('Unable to find participation.');
         }
-        
+
         /** @var Event $event */
         $event = $participation->getEvent();
-        
+
         $form = $this->createDeleteForm($participation_id);
-        
+
         if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
-            
+
             if ($form->isValid()) {
-                
                 $em->remove($participation);
                 $em->flush();
-                
-                $this->addFlash('success', $this->get('translator')
-                    ->trans("The participation has been sucessfully removed")
+
+                $this->addFlash(
+                    'success',
+                    $this->get('translator')
+                        ->trans('The participation has been sucessfully removed')
                 );
-                
+
                 return $this->redirectToRoute('chill_event__event_show', [
-                    'event_id' => $event->getId()
+                    'event_id' => $event->getId(),
                 ]);
             }
         }
+
         return $this->render('ChillEventBundle:Participation:confirm_delete.html.twig', [
             'event_id' => $event->getId(),
-            'delete_form' => $form->createView()
+            'delete_form' => $form->createView(),
         ]);
-        
     }
-    
+
+    /**
+     * Show an edit form for the participation with the given id.
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the participation is not found
+     * @throws \Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException if the user is not allowed to edit the participation
+     */
+    public function editAction(int $participation_id): Response
+    {
+        /** @var Participation $participation */
+        $participation = $this->getDoctrine()->getManager()
+            ->getRepository(Participation::class)
+            ->find($participation_id);
+
+        if (null === $participation) {
+            throw $this->createNotFoundException('The participation is not found');
+        }
+
+        $this->denyAccessUnlessGranted(
+            ParticipationVoter::UPDATE,
+            $participation,
+            'You are not allowed to edit this participation'
+        );
+
+        $form = $this->createEditForm($participation);
+
+        return $this->render('ChillEventBundle:Participation:edit.html.twig', [
+            'form' => $form->createView(),
+            'participation' => $participation,
+        ]);
+    }
+
+    /**
+     * show a form to edit multiple participation for the same event.
+     *
+     * @param int $event_id
+     *
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function editMultipleAction($event_id)
+    {
+        $event = $this->getDoctrine()->getRepository('ChillEventBundle:Event')
+            ->find($event_id);
+
+        if (null === $event) {
+            throw $this->createNotFoundException("The event with id {$event_id} is not found");
+        }
+
+        // check for ACL, on Event level and on Participation Level
+        $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 'You are not allowed '
+                . 'to see this event');
+
+        foreach ($event->getParticipations() as $participation) {
+            $this->denyAccessUnlessGranted(
+                ParticipationVoter::UPDATE,
+                $participation,
+                'You are not allowed to update participation with id ' . $participation->getId()
+            );
+        }
+
+        switch ($event->getParticipations()->count()) {
+            case 0:
+                // if there aren't any participation, redirect to the 'show' view with an add flash
+                $this->addFlash('warning', $this->get('translator')
+                    ->trans('There are no participation to edit for this event'));
+
+                return $this->redirectToRoute(
+                    'chill_event__event_show',
+                    ['event_id' => $event->getId()]
+                );
+
+            case 1:
+                // redirect to the form for a single participation
+                return $this->redirectToRoute('chill_event_participation_edit', [
+                    'participation_id' => $event->getParticipations()->current()->getId(),
+                ]);
+        }
+
+        $form = $this->createEditFormMultiple($event->getParticipations(), $event);
+
+        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
+            'event' => $event,
+            'participations' => $event->getParticipations(),
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Show a form to add a participation.
+     *
+     * This function parse the person_id / persons_ids query argument
+     * and decide if it should process a single or multiple participation. Depending
+     * on this, the appropriate layout and form.
+     *
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function newAction(Request $request)
+    {
+        // test the request is correct
+        try {
+            $this->testRequest($request);
+        } catch (RuntimeException $ex) {
+            $this->logger->warning($ex->getMessage());
+
+            return (new Response())
+                ->setStatusCode(Response::HTTP_BAD_REQUEST)
+                ->setContent($ex->getMessage());
+        }
+
+        // forward to other action
+        $single = $request->query->has('person_id');
+        $multiple = $request->query->has('persons_ids');
+
+        if (true === $single) {
+            return $this->newSingle($request);
+        }
+
+        if (true === $multiple) {
+            return $this->newMultiple($request);
+        }
+
+        // at this point, we miss the required fields. Throw an error
+        return (new Response())
+            ->setStatusCode(Response::HTTP_BAD_REQUEST)
+            ->setContent("You must provide either 'person_id' or "
+                        . "'persons_ids' argument in query");
+    }
+
+    public function updateAction(int $participation_id, Request $request): Response
+    {
+        /** @var Participation $participation */
+        $participation = $this->getDoctrine()->getManager()
+            ->getRepository(Participation::class)
+            ->find($participation_id);
+
+        if (null === $participation) {
+            throw $this->createNotFoundException('The participation is not found');
+        }
+
+        $this->denyAccessUnlessGranted(
+            ParticipationVoter::UPDATE,
+            $participation,
+            'You are not allowed to edit this participation'
+        );
+
+        $form = $this->createEditForm($participation);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+
+            $em->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans(
+                'The participation was updated'
+            ));
+
+            return $this->redirectToRoute('chill_event__event_show', [
+                'event_id' => $participation->getEvent()->getId(),
+            ]);
+        }
+
+        return $this->render('ChillEventBundle:Participation:edit.html.twig', [
+            'form' => $form->createView(),
+            'participation' => $participation,
+        ]);
+    }
+
+    public function updateMultipleAction($event_id, Request $request)
+    {
+        /** @var \Chill\EventBundle\Entity\Event $event */
+        $event = $this->getDoctrine()->getRepository('ChillEventBundle:Event')
+            ->find($event_id);
+
+        if (null === $event) {
+            throw $this->createNotFoundException("The event with id {$event_id} is not found");
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_EVENT_SEE', $event, 'You are not allowed '
+                . 'to see this event');
+
+        foreach ($event->getParticipations() as $participation) {
+            $this->denyAccessUnlessGranted(
+                ParticipationVoter::UPDATE,
+                $participation,
+                'You are not allowed to update participation with id ' . $participation->getId()
+            );
+        }
+
+        $form = $this->createEditFormMultiple($event->getParticipations(), $event);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('The participations '
+                    . 'have been successfully updated.'));
+
+            return $this->redirectToRoute(
+                'chill_event__event_show',
+                ['event_id' => $event->getId()]
+            );
+        }
+
+        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
+            'event' => $event,
+            'participations' => $event->getParticipations(),
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @return \Symfony\Component\Form\FormInterface
+     */
+    protected function createEditFormMultiple(ArrayIterator $participations, Event $event)
+    {
+        $form = $this->createForm(
+            \Symfony\Component\Form\Extension\Core\Type\FormType::class,
+            ['participations' => $participations],
+            [
+                'method' => 'POST',
+                'action' => $this->generateUrl('chill_event_participation_update_multiple', [
+                    'event_id' => $event->getId(),
+                ]),
+            ]
+        );
+
+        $form->add(
+            'participations',
+            CollectionType::class,
+            [
+                'entry_type' => ParticipationType::class,
+                'entry_options' => [
+                    'event_type' => $event->getType(),
+                ],
+            ]
+        );
+
+        $form->add('submit', SubmitType::class, [
+            'label' => 'Update',
+        ]);
+
+        return $form;
+    }
+
+    /**
+     * Handle the request to adapt $participation.
+     *
+     * If the request is multiple, the $participation object is cloned.
+     * Limitations: the $participation should not be persisted.
+     *
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the event/person is not found
+     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException if the user does not have access to event/person
+     *
+     * @return Participation|Participations[] return one single participation if $multiple == false
+     */
+    protected function handleRequest(
+        Request $request,
+        Participation $participation,
+        bool $multiple = false
+    ) {
+        $em = $this->getDoctrine()->getManager();
+
+        if ($em->contains($participation)) {
+            throw new LogicException('The participation object should not be managed by '
+                    . 'the object manager using the method ' . __METHOD__);
+        }
+
+        $event_id = $request->query->getInt('event_id', 0); // sf4 check:
+        // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
+
+        if (null !== $event_id) {
+            $event = $em->getRepository('ChillEventBundle:Event')
+                ->find($event_id);
+
+            if (null === $event) {
+                throw $this->createNotFoundException('The event with id ' . $event_id . ' is not found');
+            }
+
+            $this->denyAccessUnlessGranted(
+                'CHILL_EVENT_SEE',
+                $event,
+                'The user is not allowed to see the event'
+            );
+
+            $participation->setEvent($event);
+        }
+
+        // this script should be able to handle multiple, so we translate
+        // single person_id in an array
+        $persons_ids = $request->query->has('person_id') ?
+            [$request->query->getInt('person_id', 0)]  // sf4 check:
+               // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
+            : explode(',', $request->query->get('persons_ids'));
+        $participations = [];
+
+        foreach ($persons_ids as $person_id) {
+            // clone if we have to reuse the $participation
+            $participation = count($persons_ids) > 1 ? clone $participation : $participation;
+
+            if (null !== $person_id) {
+                $person = $em->getRepository('ChillPersonBundle:Person')
+                    ->find($person_id);
+
+                if (null === $person) {
+                    throw $this->createNotFoundException('The person with id ' . $person_id . ' is not found');
+                }
+
+                $this->denyAccessUnlessGranted(
+                    'CHILL_PERSON_SEE',
+                    $person,
+                    'The user is not allowed to see the person'
+                );
+
+                $participation->setPerson($person);
+            }
+
+            $participations[] = $participation;
+        }
+
+        return $multiple ? $participations : $participations[0];
+    }
+
+    /**
+     * Show a form with multiple participation.
+     *
+     * If a person is already participating on the event (if a participation with
+     * the same person is associated with the event), the participation is ignored.
+     *
+     * If all but one participation is ignored, the page show the same response
+     * than the newSingle function.
+     *
+     * If all participations must be ignored, an error is shown and the method redirects
+     * to the event 'show' view with an appropriate flash message.
+     *
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    protected function newMultiple(Request $request)
+    {
+        $participations = $this->handleRequest($request, new Participation(), true);
+        $ignoredParticipations = $newParticipations = [];
+
+        foreach ($participations as $participation) {
+            // check for authorization
+            $this->denyAccessUnlessGranted(
+                ParticipationVoter::CREATE,
+                $participation,
+                'The user is not allowed to create this participation'
+            );
+
+            // create a collection of person's id participating to the event
+            /** @var \Doctrine\Common\Collections\ArrayCollection $peopleParticipating */
+            $peopleParticipating = $peopleParticipating ??
+                    $participation->getEvent()->getParticipations()->map(
+                        static function (Participation $p) { return $p->getPerson()->getId(); }
+                    );
+            // check that the user is not already in the event
+            if ($peopleParticipating->contains($participation->getPerson()->getId())) {
+                $ignoredParticipations[] = $participation
+                    ->getEvent()->getParticipations()->filter(
+                        static function (Participation $p) use ($participation) {
+                            return $p->getPerson()->getId() === $participation->getPerson()->getId();
+                        }
+                    )->first();
+            } else {
+                $newParticipations[] = $participation;
+            }
+        }
+
+        // this is where the function redirect depending on valid participation
+
+        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 '
+                    . 'the event: they are maybe already participating.'
+            ));
+
+            return $this->redirectToRoute('chill_event__event_show', [
+                'event_id' => $request->query->getInt('event_id', 0),
+            ]);
+        }
+
+        if (count($newParticipations) > 1) {
+            // if we have multiple participations, show a form with multiple participations
+            $form = $this->createCreateFormMultiple($newParticipations);
+
+            return $this->render(
+                'ChillEventBundle:Participation:new-multiple.html.twig',
+                [
+                    'form' => $form->createView(),
+                    'participations' => $newParticipations,
+                    'ignored_participations' => $ignoredParticipations,
+                ]
+            );
+        }
+
+        // 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',
+            [
+                'form' => $form->createView(),
+                'participation' => $participation,
+                'ignored_participations' => $ignoredParticipations,
+            ]
+        );
+    }
+
+    /**
+     * Show a form with single participation.
+     *
+     * @return Response
+     */
+    protected function newSingle(Request $request)
+    {
+        $returnPath = $request->query->get('return_path') ?
+                $request->query->get('return_path') : null;
+
+        $participation = $this->handleRequest($request, new Participation(), false);
+
+        $this->denyAccessUnlessGranted(
+            ParticipationVoter::CREATE,
+            $participation,
+            'The user is not allowed to create this participation'
+        );
+
+        $form = $this->createCreateForm($participation, $returnPath);
+
+        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+            'form' => $form->createView(),
+            'participation' => $participation,
+            'ignored_participations' => [], // this is required, see self::newMultiple
+        ]);
+    }
+
+    /**
+     * Test that the query parameters are valid :.
+     *
+     * - an `event_id` is existing ;
+     * - `person_id` and `persons_ids` are **not** both present ;
+     * - `persons_id` is correct (contains only numbers and a ','.
+     *
+     * @throws RuntimeException if an error is detected
+     */
+    protected function testRequest(Request $request)
+    {
+        $single = $request->query->has('person_id');
+        $multiple = $request->query->has('persons_ids');
+
+        if (true === $single && true === $multiple) {
+            // we are not allowed to have both person_id and persons_ids
+            throw new RuntimeException("You are not allow to provide both 'person_id' and "
+                      . "'persons_ids' simulaneously");
+        }
+
+        if (true === $multiple) {
+            $persons_ids = $request->query->get('persons_ids');
+
+            if (!preg_match('/^([0-9]{1,},{0,1}){1,}[0-9]{0,}$/', $persons_ids)) {
+                throw new RuntimeException('The persons_ids value should '
+                        . "contains int separated by ','");
+            }
+        }
+
+        // check for event_id - this could be removed later
+        if ($request->query->has('event_id') === false) {
+            throw new RuntimeException('You must provide an event_id');
+        }
+    }
+
     /**
      * @param $participation_id
+     *
      * @return \Symfony\Component\Form\FormInterface
      */
     private function createDeleteForm($participation_id)
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_event_participation_delete', [
-                'participation_id' => $participation_id
+                'participation_id' => $participation_id,
             ]))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm()
-            ;
+            ->getForm();
     }
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php
index 103729934..a12a775da 100644
--- a/src/Bundle/ChillEventBundle/Controller/RoleController.php
+++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php
@@ -1,38 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Controller;
 
+use Chill\EventBundle\Entity\Role;
+use Chill\EventBundle\Form\RoleType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
-use Chill\EventBundle\Entity\Role;
-use Chill\EventBundle\Form\RoleType;
 
 /**
- * Class RoleController
- *
- * @package Chill\EventBundle\Controller
+ * Class RoleController.
  */
 class RoleController extends AbstractController
 {
-
-    /**
-     * Lists all Role entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillEventBundle:Role')->findAll();
-
-        return $this->render('ChillEventBundle:Role:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new Role entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -45,149 +36,22 @@ class RoleController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_event_admin_role',
-                    array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl(
+                'chill_event_admin_role',
+                ['id' => $entity->getId()]
+            ));
         }
 
-        return $this->render('ChillEventBundle:Role:new.html.twig', array(
+        return $this->render('ChillEventBundle:Role:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
-    /**
-     * Creates a form to create a Role entity.
-     *
-     * @param Role $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Role $entity)
-    {
-        $form = $this->createForm(RoleType::class, $entity, array(
-            'action' => $this->generateUrl('chill_event_admin_role_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new Role entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new Role();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillEventBundle:Role:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a Role entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:Role')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Role entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('ChillEventBundle:Role:show.html.twig', array(
-            'entity'      => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-     * Displays a form to edit an existing Role entity.
-     *
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:Role')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Role entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('ChillEventBundle:Role:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-    * Creates a form to edit a Role entity.
-    *
-    * @param Role $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(Role $entity)
-    {
-        $form = $this->createForm(RoleType::class, $entity, array(
-            'action' => $this->generateUrl('chill_event_admin_role_update', 
-                    array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
-
-        return $form;
-    }
-    /**
-     * Edits an existing Role entity.
-     *
-     */
-    public function updateAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:Role')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Role entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-        $editForm = $this->createEditForm($entity);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('chill_event_admin_role',
-                    array('id' => $id)));
-        }
-
-        return $this->render('ChillEventBundle:Role:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
     /**
      * Deletes a Role entity.
      *
+     * @param mixed $id
      */
     public function deleteAction(Request $request, $id)
     {
@@ -209,6 +73,136 @@ class RoleController extends AbstractController
         return $this->redirect($this->generateUrl('chill_event_admin_role'));
     }
 
+    /**
+     * Displays a form to edit an existing Role entity.
+     *
+     * @param mixed $id
+     */
+    public function editAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:Role')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Role entity.');
+        }
+
+        $editForm = $this->createEditForm($entity);
+        $deleteForm = $this->createDeleteForm($id);
+
+        return $this->render('ChillEventBundle:Role:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Lists all Role entities.
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillEventBundle:Role')->findAll();
+
+        return $this->render('ChillEventBundle:Role:index.html.twig', [
+            'entities' => $entities,
+        ]);
+    }
+
+    /**
+     * Displays a form to create a new Role entity.
+     */
+    public function newAction()
+    {
+        $entity = new Role();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillEventBundle:Role:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a Role entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:Role')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Role entity.');
+        }
+
+        $deleteForm = $this->createDeleteForm($id);
+
+        return $this->render('ChillEventBundle:Role:show.html.twig', [
+            'entity' => $entity,
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Edits an existing Role entity.
+     *
+     * @param mixed $id
+     */
+    public function updateAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:Role')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Role entity.');
+        }
+
+        $deleteForm = $this->createDeleteForm($id);
+        $editForm = $this->createEditForm($entity);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            return $this->redirect($this->generateUrl(
+                'chill_event_admin_role',
+                ['id' => $id]
+            ));
+        }
+
+        return $this->render('ChillEventBundle:Role:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a Role entity.
+     *
+     * @param Role $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(Role $entity)
+    {
+        $form = $this->createForm(RoleType::class, $entity, [
+            'action' => $this->generateUrl('chill_event_admin_role_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
     /**
      * Creates a form to delete a Role entity by id.
      *
@@ -219,10 +213,31 @@ class RoleController extends AbstractController
     private function createDeleteForm($id)
     {
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_event_admin_role_delete', array('id' => $id)))
+            ->setAction($this->generateUrl('chill_event_admin_role_delete', ['id' => $id]))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+    }
+
+    /**
+     * Creates a form to edit a Role entity.
+     *
+     * @param Role $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(Role $entity)
+    {
+        $form = $this->createForm(RoleType::class, $entity, [
+            'action' => $this->generateUrl(
+                'chill_event_admin_role_update',
+                ['id' => $entity->getId()]
+            ),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php
index e5861aa80..7da8b989f 100644
--- a/src/Bundle/ChillEventBundle/Controller/StatusController.php
+++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php
@@ -1,39 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Controller;
 
+use Chill\EventBundle\Entity\Status;
+use Chill\EventBundle\Form\StatusType;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 
-use Chill\EventBundle\Entity\Status;
-use Chill\EventBundle\Form\StatusType;
-
 /**
- * Class StatusController
- *
- * @package Chill\EventBundle\Controller
+ * Class StatusController.
  */
 class StatusController extends AbstractController
 {
-
-    /**
-     * Lists all Status entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillEventBundle:Status')->findAll();
-
-        return $this->render('ChillEventBundle:Status:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new Status entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -46,146 +37,19 @@ class StatusController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_event_admin_status', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_event_admin_status', ['id' => $entity->getId()]));
         }
 
-        return $this->render('ChillEventBundle:Status:new.html.twig', array(
+        return $this->render('ChillEventBundle:Status:new.html.twig', [
             'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
-    /**
-     * Creates a form to create a Status entity.
-     *
-     * @param Status $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Status $entity)
-    {
-        $form = $this->createForm(StatusType::class, $entity, array(
-            'action' => $this->generateUrl('chill_event_admin_status_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new Status entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new Status();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillEventBundle:Status:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a Status entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:Status')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Status entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('ChillEventBundle:Status:show.html.twig', array(
-            'entity'      => $entity,
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-     * Displays a form to edit an existing Status entity.
-     *
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:Status')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Status entity.');
-        }
-
-        $editForm = $this->createEditForm($entity);
-        $deleteForm = $this->createDeleteForm($id);
-
-        return $this->render('ChillEventBundle:Status:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
-
-    /**
-    * Creates a form to edit a Status entity.
-    *
-    * @param Status $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(Status $entity)
-    {
-        $form = $this->createForm(StatusType::class, $entity, array(
-            'action' => $this->generateUrl('chill_event_admin_status_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
-
-        return $form;
-    }
-    /**
-     * Edits an existing Status entity.
-     *
-     */
-    public function updateAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillEventBundle:Status')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Status entity.');
-        }
-
-        $deleteForm = $this->createDeleteForm($id);
-        $editForm = $this->createEditForm($entity);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('chill_event_admin_status', array('id' => $id)));
-        }
-
-        return $this->render('ChillEventBundle:Status:edit.html.twig', array(
-            'entity'      => $entity,
-            'edit_form'   => $editForm->createView(),
-            'delete_form' => $deleteForm->createView(),
-        ));
-    }
     /**
      * Deletes a Status entity.
      *
+     * @param mixed $id
      */
     public function deleteAction(Request $request, $id)
     {
@@ -207,6 +71,133 @@ class StatusController extends AbstractController
         return $this->redirect($this->generateUrl('chill_event_admin_status'));
     }
 
+    /**
+     * Displays a form to edit an existing Status entity.
+     *
+     * @param mixed $id
+     */
+    public function editAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:Status')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Status entity.');
+        }
+
+        $editForm = $this->createEditForm($entity);
+        $deleteForm = $this->createDeleteForm($id);
+
+        return $this->render('ChillEventBundle:Status:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Lists all Status entities.
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillEventBundle:Status')->findAll();
+
+        return $this->render('ChillEventBundle:Status:index.html.twig', [
+            'entities' => $entities,
+        ]);
+    }
+
+    /**
+     * Displays a form to create a new Status entity.
+     */
+    public function newAction()
+    {
+        $entity = new Status();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillEventBundle:Status:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a Status entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:Status')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Status entity.');
+        }
+
+        $deleteForm = $this->createDeleteForm($id);
+
+        return $this->render('ChillEventBundle:Status:show.html.twig', [
+            'entity' => $entity,
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Edits an existing Status entity.
+     *
+     * @param mixed $id
+     */
+    public function updateAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillEventBundle:Status')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Status entity.');
+        }
+
+        $deleteForm = $this->createDeleteForm($id);
+        $editForm = $this->createEditForm($entity);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            return $this->redirect($this->generateUrl('chill_event_admin_status', ['id' => $id]));
+        }
+
+        return $this->render('ChillEventBundle:Status:edit.html.twig', [
+            'entity' => $entity,
+            'edit_form' => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a Status entity.
+     *
+     * @param Status $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(Status $entity)
+    {
+        $form = $this->createForm(StatusType::class, $entity, [
+            'action' => $this->generateUrl('chill_event_admin_status_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
     /**
      * Creates a form to delete a Status entity by id.
      *
@@ -217,10 +208,28 @@ class StatusController extends AbstractController
     private function createDeleteForm($id)
     {
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_event_admin_status_delete', array('id' => $id)))
+            ->setAction($this->generateUrl('chill_event_admin_status_delete', ['id' => $id]))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+    }
+
+    /**
+     * Creates a form to edit a Status entity.
+     *
+     * @param Status $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(Status $entity)
+    {
+        $form = $this->createForm(StatusType::class, $entity, [
+            'action' => $this->generateUrl('chill_event_admin_status_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php
index 148582ca3..c106d777c 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadEventTypes.php
@@ -1,25 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\EventBundle\DataFixtures\ORM;
 
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
 use Chill\EventBundle\Entity\EventType;
 use Chill\EventBundle\Entity\Role;
 use Chill\EventBundle\Entity\Status;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 
 /**
  * Load a set of `EventType`, their `Role` and `Status`.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
  */
 class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface
 {
-    public static $refs = array();
-    
+    public static $refs = [];
+
     public function getOrder()
     {
         return 30000;
@@ -31,256 +36,224 @@ class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface
          * Echange de savoirs
          */
         $type = (new EventType())
-              ->setActive(true)
-              ->setName(array('fr' => 'Échange de savoirs', 'en' => 'Exchange of knowledge'))
-              ;
+            ->setActive(true)
+            ->setName(['fr' => 'Échange de savoirs', 'en' => 'Exchange of knowledge']);
         $manager->persist($type);
-        
+
         $this->addReference('event_type_knowledge', $type);
         self::$refs[] = 'event_type_knowledge';
-        
+
         $role = (new Role())
-                ->setActive(true)
-                ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'))
-                ->setType($type)
-              ;
+            ->setActive(true)
+            ->setName(['fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'])
+            ->setType($type);
         $manager->persist($role);
-        
+
         $role = (new Role())
-              ->setActive(true)
-              ->setName(array('fr' => 'Animateur'))
-              ->setType($type);
+            ->setActive(true)
+            ->setName(['fr' => 'Animateur'])
+            ->setType($type);
         $manager->persist($role);
-        
+
         $status = (new Status())
-              ->setActive(true)
-              ->setName(array('fr' => 'Inscrit'))
-              ->setType($type);
+            ->setActive(true)
+            ->setName(['fr' => 'Inscrit'])
+            ->setType($type);
         $manager->persist($status);
-        
+
         $status = (new Status())
-              ->setActive(true)
-              ->setName(array('fr' => 'Présent'))
-              ->setType($type)
-              ;
+            ->setActive(true)
+            ->setName(['fr' => 'Présent'])
+            ->setType($type);
         $manager->persist($status);
-        
+
         /*
          * Formation
          */
         $type = (new EventType())
-              ->setActive(true)
-              ->setName(array('fr' => 'Formation', 'en' => 'Course', 'nl' => 'Opleiding'))
-              ;
+            ->setActive(true)
+            ->setName(['fr' => 'Formation', 'en' => 'Course', 'nl' => 'Opleiding']);
         $manager->persist($type);
-        
+
         $this->addReference('event_type_course', $type);
         self::$refs[] = 'event_type_course';
-        
+
         $role = (new Role())
-                ->setActive(true)
-                ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'))
-                ->setType($type)
-              ;
+            ->setActive(true)
+            ->setName(['fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'])
+            ->setType($type);
         $manager->persist($role);
-        
-        $status = (new Status())
-              ->setActive(true)
-              ->setName(array('fr' => 'Inscrit'))
-              ->setType($type)
-              ;
-        $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'En liste d\'attente'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Inscrit'])
+            ->setType($type);
         $manager->persist($status);
-    
+
+        $status = (new Status())
+            ->setActive(true)
+            ->setName(['fr' => 'En liste d\'attente'])
+            ->setType($type);
+        $manager->persist($status);
+
         /*
          * Visite
          */
         $type = (new EventType())
             ->setActive(true)
-            ->setName(array('fr' => 'Visite', 'en' => 'Visit'))
-        ;
+            ->setName(['fr' => 'Visite', 'en' => 'Visit']);
         $manager->persist($type);
-        
+
         $this->addReference('event_type_visit', $type);
         self::$refs[] = 'event_type_visit';
-    
+
         $role = (new Role())
             ->setActive(true)
-            ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'])
+            ->setType($type);
         $manager->persist($role);
-        
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Présent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Présent'])
+            ->setType($type);
         $manager->persist($status);
 
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Absent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Absent'])
+            ->setType($type);
         $manager->persist($status);
 
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Excusé'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Excusé'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Inscrit'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Inscrit'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         /*
          * Réunion
          */
         $type = (new EventType())
             ->setActive(true)
-            ->setName(array('fr' => 'Réunion', 'en' => 'Meeting'))
-        ;
+            ->setName(['fr' => 'Réunion', 'en' => 'Meeting']);
         $manager->persist($type);
-    
+
         $this->addReference('event_type_meeting', $type);
         self::$refs[] = 'event_type_meeting';
-    
+
         $role = (new Role())
             ->setActive(true)
-            ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'])
+            ->setType($type);
         $manager->persist($role);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Présent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Présent'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Absent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Absent'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Excusé'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Excusé'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         /*
          * Atelier
          */
         $type = (new EventType())
             ->setActive(true)
-            ->setName(array('fr' => 'Atelier', 'en' => 'Workshop'))
-        ;
+            ->setName(['fr' => 'Atelier', 'en' => 'Workshop']);
         $manager->persist($type);
-    
+
         $this->addReference('event_type_workshop', $type);
         self::$refs[] = 'event_type_workshop';
-    
+
         $role = (new Role())
             ->setActive(true)
-            ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'])
+            ->setType($type);
         $manager->persist($role);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Présent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Présent'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Absent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Absent'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Excusé'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Excusé'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Inscrit'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Inscrit'])
+            ->setType($type);
         $manager->persist($status);
-    
-    
+
         /*
          * Séance d'info
          */
         $type = (new EventType())
             ->setActive(true)
-            ->setName(array('fr' => "Séance d'info", 'en' => 'Info'))
-        ;
+            ->setName(['fr' => "Séance d'info", 'en' => 'Info']);
         $manager->persist($type);
-    
+
         $this->addReference('event_type_info', $type);
         self::$refs[] = 'event_type_info';
-    
+
         $role = (new Role())
             ->setActive(true)
-            ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant'])
+            ->setType($type);
         $manager->persist($role);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Présent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Présent'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Absent'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Absent'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Excusé'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Excusé'])
+            ->setType($type);
         $manager->persist($status);
-    
+
         $status = (new Status())
             ->setActive(true)
-            ->setName(array('fr' => 'Inscrit'))
-            ->setType($type)
-        ;
+            ->setName(['fr' => 'Inscrit'])
+            ->setType($type);
         $manager->persist($status);
-        
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
index b89937abe..104a12dbb 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php
@@ -1,34 +1,62 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\DataFixtures\ORM;
 
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Persistence\ObjectManager;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Chill\EventBundle\Entity\Participation;
-use Chill\MainBundle\Entity\Center;
 use Chill\EventBundle\Entity\Event;
+use Chill\EventBundle\Entity\Participation;
 use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\Center;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 
 /**
- * Load Events and Participation
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Load Events and Participation.
  */
 class LoadParticipation extends AbstractFixture implements OrderedFixtureInterface
 {
     /**
-     *
      * @var \Faker\Generator
      */
     protected $faker;
-    
+
     public function __construct()
     {
         $this->faker = \Faker\Factory::create('fr_FR');
     }
-    
+
+    public function createEvents(Center $center, ObjectManager $manager)
+    {
+        $expectedNumber = 20;
+        $events = [];
+
+        for ($i = 0; $i < $expectedNumber; ++$i) {
+            $event = (new Event())
+                ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
+                ->setName($this->faker->words(mt_rand(2, 4), true))
+                ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)]))
+                ->setCenter($center)
+                ->setCircle(
+                    $this->getReference(
+                        LoadScopes::$references[array_rand(LoadScopes::$references)]
+                    )
+                );
+            $manager->persist($event);
+            $events[] = $event;
+        }
+
+        return $events;
+    }
+
     public function getOrder()
     {
         return 30010;
@@ -37,62 +65,36 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
     public function load(ObjectManager $manager)
     {
         $centers = $manager->getRepository('ChillMainBundle:Center')
-              ->findAll();
-        
-        foreach($centers as $center) {
-            
+            ->findAll();
+
+        foreach ($centers as $center) {
             $people = $manager->getRepository('ChillPersonBundle:Person')
-              ->findBy(array('center' => $center));
+                ->findBy(['center' => $center]);
             $events = $this->createEvents($center, $manager);
 
-            /* @var $person \Chill\PersonBundle\Entity\Person */
+            /** @var \Chill\PersonBundle\Entity\Person $person */
             foreach ($people as $person) {
-                $nb = rand(0,3);
-                
-                for ($i=0; $i<$nb; $i++) {
+                $nb = mt_rand(0, 3);
+
+                for ($i = 0; $i < $nb; ++$i) {
                     $event = $events[array_rand($events)];
                     $role = $event->getType()->getRoles()->get(
-                          array_rand($event->getType()->getRoles()->toArray()));
+                        array_rand($event->getType()->getRoles()->toArray())
+                    );
                     $status = $event->getType()->getStatuses()->get(
-                          array_rand($event->getType()->getStatuses()->toArray()));
+                        array_rand($event->getType()->getStatuses()->toArray())
+                    );
 
                     $participation = (new Participation())
-                          ->setPerson($person)
-                          ->setRole($role)
-                          ->setStatus($status)
-                          ->setEvent($event)
-                          ;
+                        ->setPerson($person)
+                        ->setRole($role)
+                        ->setStatus($status)
+                        ->setEvent($event);
                     $manager->persist($participation);
                 }
             }
         }
-        
+
         $manager->flush();
-        
-        
-    }
-    
-    public function createEvents(Center $center, ObjectManager $manager)
-    {
-        $expectedNumber = 20;
-        $events = array();
-        
-        for($i=0; $i<$expectedNumber; $i++) {
-            $event = (new Event())
-                  ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
-                  ->setName($this->faker->words(rand(2,4), true))
-                  ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)]))
-                  ->setCenter($center)
-                  ->setCircle(
-                        $this->getReference(
-                            LoadScopes::$references[array_rand(LoadScopes::$references)]
-                              )
-                        )
-                  ;
-            $manager->persist($event);
-            $events[] = $event;
-        }
-        
-        return $events;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
index 7ef753e52..ddcef3422 100644
--- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
+++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadRolesACL.php
@@ -1,45 +1,40 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
 
 namespace Chill\EventBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 use Doctrine\Persistence\ObjectManager;
+use function in_array;
 
 /**
- * Add roles to existing groups
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Add roles to existing groups.
  */
 class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
 {
+    public function getOrder()
+    {
+        return 30011;
+    }
+
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
-            foreach (LoadScopes::$references as $scopeRef){
+
+            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 //create permission group
                 switch ($permissionsGroup->getName()) {
@@ -47,40 +42,46 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
                         if ($scope->getName()['en'] === 'administrative') {
                             break 2; // we do not want any power on administrative
                         }
+
                         break;
+
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
-                        }  
+                        }
+
                         break;
                 }
-                
-                printf("Adding CHILL_EVENT_UPDATE & CHILL_EVENT_CREATE "
-                        . "& CHILL_EVENT_PARTICIPATION_UPDATE & CHILL_EVENT_PARTICIPATION_CREATE "
-                        . "& CHILL_EVENT_SEE & CHILL_EVENT_SEE_DETAILS "
-                        . "to %s "
-                        . "permission group, scope '%s' \n", 
-                        $permissionsGroup->getName(), $scope->getName()['en']);
-                
+
+                printf(
+                    'Adding CHILL_EVENT_UPDATE & CHILL_EVENT_CREATE '
+                        . '& CHILL_EVENT_PARTICIPATION_UPDATE & CHILL_EVENT_PARTICIPATION_CREATE '
+                        . '& CHILL_EVENT_SEE & CHILL_EVENT_SEE_DETAILS '
+                        . 'to %s '
+                        . "permission group, scope '%s' \n",
+                    $permissionsGroup->getName(),
+                    $scope->getName()['en']
+                );
+
                 $roleScopeUpdate = (new RoleScope())
-                            ->setRole('CHILL_EVENT_UPDATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_EVENT_UPDATE')
+                    ->setScope($scope);
                 $roleScopeUpdate2 = (new RoleScope())
-                            ->setRole('CHILL_EVENT_PARTICIPATION_UPDATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_EVENT_PARTICIPATION_UPDATE')
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
                 $permissionsGroup->addRoleScope($roleScopeUpdate2);
-                
+
                 $roleScopeCreate = (new RoleScope())
-                            ->setRole('CHILL_EVENT_CREATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_EVENT_CREATE')
+                    ->setScope($scope);
                 $roleScopeCreate2 = (new RoleScope())
-                            ->setRole('CHILL_EVENT_PARTICIPATION_CREATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_EVENT_PARTICIPATION_CREATE')
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeCreate);
                 $permissionsGroup->addRoleScope($roleScopeCreate2);
-    
+
                 $roleScopeSee = (new RoleScope())
                     ->setRole('CHILL_EVENT_SEE')
                     ->setScope($scope);
@@ -89,7 +90,7 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
                     ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeSee);
                 $permissionsGroup->addRoleScope($roleScopeSee2);
-                
+
                 $manager->persist($roleScopeUpdate);
                 $manager->persist($roleScopeUpdate2);
                 $manager->persist($roleScopeCreate);
@@ -97,15 +98,8 @@ class LoadRolesACL extends AbstractFixture implements OrderedFixtureInterface
                 $manager->persist($roleScopeSee);
                 $manager->persist($roleScopeSee2);
             }
-            
         }
-        
+
         $manager->flush();
     }
-
-    public function getOrder()
-    {
-        return 30011;
-    }
-
 }
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
index 639d3068d..a793469b6 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php
@@ -1,30 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\EventBundle\Security\Authorization\EventVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillEventExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/authorization.yaml');
         $loader->load('services/controller.yaml');
@@ -35,46 +41,42 @@ class ChillEventExtension extends Extension implements PrependExtensionInterface
         $loader->load('services/search.yaml');
         $loader->load('services/timeline.yaml');
     }
-    
-     /* (non-PHPdoc)
-      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
-      */
-    public function prepend(ContainerBuilder $container) 
+
+    /** (non-PHPdoc).
+     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
+     */
+    public function prepend(ContainerBuilder $container)
     {
         $this->prependAuthorization($container);
         $this->prependRoute($container);
     }
-    
+
     /**
-     * add route to route loader for chill
-     * 
-     * @param ContainerBuilder $container
+     * add authorization hierarchy.
+     */
+    protected function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                EventVoter::SEE_DETAILS => [EventVoter::SEE],
+                EventVoter::UPDATE => [EventVoter::SEE_DETAILS],
+                EventVoter::CREATE => [EventVoter::SEE_DETAILS],
+            ],
+        ]);
+    }
+
+    /**
+     * add route to route loader for chill.
      */
     protected function prependRoute(ContainerBuilder $container)
     {
         //add routes for custom bundle
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillEventBundle/config/routes.yaml'
-              )
-           )
-        ));
-    }
-    
-    /**
-     * add authorization hierarchy
-     * 
-     * @param ContainerBuilder $container
-     */
-    protected function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-                EventVoter::SEE_DETAILS => array(EventVoter::SEE),
-                EventVoter::UPDATE => array(EventVoter::SEE_DETAILS),
-                EventVoter::CREATE => array(EventVoter::SEE_DETAILS)
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillEventBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
     }
 }
diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
index 14cbddafe..181ae43db 100644
--- a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
@@ -1,20 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_event');
diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php
index a92bf8b26..3c90967f5 100644
--- a/src/Bundle/ChillEventBundle/Entity/Event.php
+++ b/src/Bundle/ChillEventBundle/Entity/Event.php
@@ -1,47 +1,57 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\User;
+use ArrayIterator;
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\Scope;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use DateTime;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Traversable;
 
 /**
- * Class Event
+ * Class Event.
  *
- * @package Chill\EventBundle\Entity
  * @ORM\Entity(repositoryClass="Chill\EventBundle\Repository\EventRepository")
  * @ORM\Table(name="chill_event_event")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Event implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var integer
+     * @var Center
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
+     */
+    private $center;
+
+    /**
+     * @var Scope
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     */
+    private $circle;
+
+    /**
+     * @var DateTime
+     * @ORM\Column(type="datetime")
+     */
+    private $date;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -49,6 +59,12 @@ class Event implements HasCenterInterface, HasScopeInterface
      */
     private $id;
 
+    /**
+     * @var User
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     */
+    private $moderator;
+
     /**
      * @var string
      * @ORM\Column(type="string", length=150)
@@ -56,48 +72,19 @@ class Event implements HasCenterInterface, HasScopeInterface
     private $name;
 
     /**
-     * @var \DateTime
-     * @ORM\Column(type="datetime")
+     * @var Participation
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\EventBundle\Entity\Participation",
+     * mappedBy="event")
      */
-    private $date;
-    
+    private $participations;
+
     /**
-     *
-     * @var Center
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
-     */
-    private $center;
-    
-    /**
-     *
      * @var EventType
      * @ORM\ManyToOne(targetEntity="Chill\EventBundle\Entity\EventType")
      */
     private $type;
-    
-    /**
-     *
-     * @var Scope
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     */
-    private $circle;
-    
-    /**
-     * @var Participation
-     * @ORM\OneToMany(
-     *     targetEntity="Chill\EventBundle\Entity\Participation",
-     *     mappedBy="event")
-     */
-    private $participations;
-    
-    /**
-     *
-     * @var User
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private $moderator;
-    
-    
+
     /**
      * Event constructor.
      */
@@ -107,130 +94,8 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Get id
+     * Add participation.
      *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     * @return Event
-     */
-    public function setName($label)
-    {
-        $this->name = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Set date
-     *
-     * @param \DateTime $date
-     * @return Event
-     */
-    public function setDate(\DateTime $date)
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    /**
-     * Get date
-     *
-     * @return \DateTime
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-    
-    /**
-     * @param Center $center
-     * @return $this
-     */
-    public function setCenter(Center $center)
-    {
-        $this->center = $center;
-        
-        return $this;
-    }
-    
-    /**
-     * @return EventType
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @param EventType $type
-     * @return $this
-     */
-    public function setType(EventType $type)
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * @return Center
-     */
-    public function getCenter()
-    {
-        return $this->center;
-    }
-    
-    /**
-     * @return Scope
-     */
-    public function getCircle()
-    {
-        return $this->circle;
-    }
-
-    /**
-     * @param Scope $circle
-     * @return $this
-     */
-    public function setCircle(\Chill\MainBundle\Entity\Scope $circle)
-    {
-        $this->circle = $circle;
-        return $this;
-    }
-    
-    /**
-     * @deprecated
-     * @return Scope
-     */
-    public function getScope()
-    {
-        return $this->getCircle();
-    }
-
-    
-    /**
-     * Add participation
-     *
-     * @param Participation $participation
      * @return Event
      */
     public function addParticipation(Participation $participation)
@@ -241,40 +106,41 @@ class Event implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Remove participation
-     *
-     * @param Participation $participation
+     * @return Center
      */
-    public function removeParticipation(Participation $participation)
+    public function getCenter()
     {
-        $this->participations->removeElement($participation);
+        return $this->center;
     }
-    
+
     /**
-     * @return \ArrayIterator|\Traversable|Collection
+     * @return Scope
      */
-    public function getParticipations()
+    public function getCircle()
     {
-        return $this->getParticipationsOrdered();
+        return $this->circle;
     }
-    
+
     /**
-     * Sort Collection of Participations
+     * Get date.
      *
-     * @return \ArrayIterator|\Traversable
+     * @return DateTime
      */
-    public function getParticipationsOrdered() {
-        
-        $iterator = $this->participations->getIterator();
-        
-        $iterator->uasort(function($first, $second)
-        {
-            return strnatcasecmp($first->getPerson()->getFirstName(), $second->getPerson()->getFirstName());
-        });
-        
-        return $iterator;
+    public function getDate()
+    {
+        return $this->date;
     }
-    
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
     /**
      * @return int
      */
@@ -282,14 +148,132 @@ class Event implements HasCenterInterface, HasScopeInterface
     {
         return $this->moderator;
     }
-    
+
+    /**
+     * Get label.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return ArrayIterator|Collection|Traversable
+     */
+    public function getParticipations()
+    {
+        return $this->getParticipationsOrdered();
+    }
+
+    /**
+     * Sort Collection of Participations.
+     *
+     * @return ArrayIterator|Traversable
+     */
+    public function getParticipationsOrdered()
+    {
+        $iterator = $this->participations->getIterator();
+
+        $iterator->uasort(static function ($first, $second) {
+            return strnatcasecmp($first->getPerson()->getFirstName(), $second->getPerson()->getFirstName());
+        });
+
+        return $iterator;
+    }
+
+    /**
+     * @deprecated
+     *
+     * @return Scope
+     */
+    public function getScope()
+    {
+        return $this->getCircle();
+    }
+
+    /**
+     * @return EventType
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Remove participation.
+     */
+    public function removeParticipation(Participation $participation)
+    {
+        $this->participations->removeElement($participation);
+    }
+
+    /**
+     * @return $this
+     */
+    public function setCenter(Center $center)
+    {
+        $this->center = $center;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setCircle(Scope $circle)
+    {
+        $this->circle = $circle;
+
+        return $this;
+    }
+
+    /**
+     * Set date.
+     *
+     * @return Event
+     */
+    public function setDate(DateTime $date)
+    {
+        $this->date = $date;
+
+        return $this;
+    }
+
     /**
      * @param int $moderator
+     *
      * @return Event
      */
     public function setModerator($moderator)
     {
         $this->moderator = $moderator;
+
+        return $this;
+    }
+
+    /**
+     * Set label.
+     *
+     * @param string $label
+     *
+     * @return Event
+     */
+    public function setName($label)
+    {
+        $this->name = $label;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setType(EventType $type)
+    {
+        $this->type = $type;
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Entity/EventType.php b/src/Bundle/ChillEventBundle/Entity/EventType.php
index 8c67d8c81..2a2c932d9 100644
--- a/src/Bundle/ChillEventBundle/Entity/EventType.php
+++ b/src/Bundle/ChillEventBundle/Entity/EventType.php
@@ -1,42 +1,37 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class EventType
+ * Class EventType.
  *
- * @package Chill\EventBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="chill_event_event_type")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class EventType
 {
     /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -46,21 +41,15 @@ class EventType
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
-    /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active;
-    
     /**
      * @var Collection
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Role",
-     *     mappedBy="type")
+     * mappedBy="type")
      */
     private $roles;
 
@@ -68,12 +57,12 @@ class EventType
      * @var Collection
      * @ORM\OneToMany(
      *     targetEntity="Chill\EventBundle\Entity\Status",
-     *     mappedBy="type")
+     * mappedBy="type")
      */
     private $statuses;
 
     /**
-     * Constructor
+     * Constructor.
      */
     public function __construct()
     {
@@ -82,65 +71,8 @@ class EventType
     }
 
     /**
-     * Get id
+     * Add role.
      *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param array $label
-     * @return EventType
-     */
-    public function setName($label)
-    {
-        $this->name = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return array
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Set active
-     *
-     * @param boolean $active
-     * @return EventType
-     */
-    public function setActive($active)
-    {
-        $this->active = $active;
-
-        return $this;
-    }
-
-    /**
-     * Get active
-     *
-     * @return boolean
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * Add role
-     *
-     * @param Role $role
      * @return EventType
      */
     public function addRole(Role $role)
@@ -151,29 +83,8 @@ class EventType
     }
 
     /**
-     * Remove role
+     * Add status.
      *
-     * @param Role $role
-     */
-    public function removeRole(Role $role)
-    {
-        $this->roles->removeElement($role);
-    }
-
-    /**
-     * Get roles
-     *
-     * @return Collection
-     */
-    public function getRoles()
-    {
-        return $this->roles;
-    }
-
-    /**
-     * Add status
-     *
-     * @param Status $status
      * @return EventType
      */
     public function addStatus(Status $status)
@@ -184,17 +95,42 @@ class EventType
     }
 
     /**
-     * Remove status
+     * Get active.
      *
-     * @param Status $status
+     * @return bool
      */
-    public function removeStatus(Status $status)
+    public function getActive()
     {
-        $this->statuses->removeElement($status);
+        return $this->active;
     }
 
     /**
-     * Get statuses
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get label.
+     *
+     * @return array
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getRoles()
+    {
+        return $this->roles;
+    }
+
+    /**
+     * Get statuses.
      *
      * @return Collection
      */
@@ -202,4 +138,48 @@ class EventType
     {
         return $this->statuses;
     }
+
+    /**
+     * Remove role.
+     */
+    public function removeRole(Role $role)
+    {
+        $this->roles->removeElement($role);
+    }
+
+    /**
+     * Remove status.
+     */
+    public function removeStatus(Status $status)
+    {
+        $this->statuses->removeElement($status);
+    }
+
+    /**
+     * Set active.
+     *
+     * @param bool $active
+     *
+     * @return EventType
+     */
+    public function setActive($active)
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    /**
+     * Set label.
+     *
+     * @param array $label
+     *
+     * @return EventType
+     */
+    public function setName($label)
+    {
+        $this->name = $label;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Entity/Participation.php b/src/Bundle/ChillEventBundle/Entity/Participation.php
index d578db863..9ba34d398 100644
--- a/src/Bundle/ChillEventBundle/Entity/Participation.php
+++ b/src/Bundle/ChillEventBundle/Entity/Participation.php
@@ -1,47 +1,48 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
+use ArrayAccess;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\HasScopeInterface;
-use Chill\MainBundle\Entity\HasCenterInterface;
+use DateTime;
+use Doctrine\ORM\Mapping as ORM;
+use RuntimeException;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function in_array;
 
 /**
- * Class Participation
+ * Class Participation.
  *
- * @package Chill\EventBundle\Entity
  * @ORM\Entity(
- *     repositoryClass="Chill\EventBundle\Repository\ParticipationRepository")
+ * repositoryClass="Chill\EventBundle\Repository\ParticipationRepository")
  * @ORM\Table(name="chill_event_participation")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
-class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAccess
+class Participation implements ArrayAccess, HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var integer
+     * @var Event
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\EventBundle\Entity\Event",
+     * inversedBy="participations")
+     */
+    private $event;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -50,18 +51,10 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     private $id;
 
     /**
-     * @var \DateTime
+     * @var DateTime
      * @ORM\Column(type="datetime")
      */
     private $lastUpdate;
-    
-    /**
-     * @var Event
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\EventBundle\Entity\Event",
-     *     inversedBy="participations")
-     */
-    private $event;
 
     /**
      * @var Person
@@ -81,60 +74,21 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
      */
     private $status;
 
-
     /**
-     * Get id
-     *
-     * @return integer
+     * @return Center
      */
-    public function getId()
+    public function getCenter()
     {
-        return $this->id;
-    }
-
-    /**
-     * Set lastUpdate
-     *
-     * @param \DateTime $lastUpdate
-     * @return Participation
-     */
-    protected function update()
-    {
-        $this->lastUpdate = new \DateTime('now');
-
-        return $this;
-    }
-
-    /**
-     * Get lastUpdate
-     *
-     * @return \DateTime
-     */
-    public function getLastUpdate()
-    {
-        return $this->lastUpdate;
-    }
-
-
-    /**
-     * Set event
-     *
-     * @param Event $event
-     * @return Participation
-     */
-    public function setEvent(Event $event = null)
-    {
-        if ($this->event !== $event) {
-            $this->update();
+        if ($this->getEvent() === null) {
+            throw new RuntimeException('The event is not linked with this instance. '
+                    . 'You should initialize the event with a valid center before.');
         }
-        
-        $this->event = $event;
 
-        return $this;
+        return $this->getEvent()->getCenter();
     }
 
     /**
-     * Get event
+     * Get event.
      *
      * @return Event
      */
@@ -144,24 +98,27 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     }
 
     /**
-     * Set person
+     * Get id.
      *
-     * @param Person $person
-     * @return Participation
+     * @return int
      */
-    public function setPerson(Person $person = null)
+    public function getId()
     {
-        if ($person !== $this->person) {
-            $this->update();
-        }
-        
-        $this->person = $person;
-
-        return $this;
+        return $this->id;
     }
 
     /**
-     * Get person
+     * Get lastUpdate.
+     *
+     * @return DateTime
+     */
+    public function getLastUpdate()
+    {
+        return $this->lastUpdate;
+    }
+
+    /**
+     * Get person.
      *
      * @return Person
      */
@@ -171,12 +128,190 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     }
 
     /**
-     * Set role
+     * Get role.
+     *
+     * @return Role
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+
+    /**
+     * @return Scope
+     */
+    public function getScope()
+    {
+        if ($this->getEvent() === null) {
+            throw new RuntimeException('The event is not linked with this instance. '
+                    . 'You should initialize the event with a valid center before.');
+        }
+
+        return $this->getEvent()->getCircle();
+    }
+
+    /**
+     * Get status.
+     *
+     * @return Status
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * Check that :.
+     *
+     * - the role can be associated with this event type
+     * - the status can be associated with this event type
+     */
+    public function isConsistent(ExecutionContextInterface $context)
+    {
+        if ($this->getEvent() === null || $this->getRole() === null || $this->getStatus() === null) {
+            return;
+        }
+
+        if ($this->getRole()->getType()->getId() !==
+                $this->getEvent()->getType()->getId()) {
+            $context->buildViolation('The role is not allowed with this event type')
+                ->atPath('role')
+                ->addViolation();
+        }
+
+        if ($this->getStatus()->getType()->getId() !==
+                $this->getEvent()->getType()->getId()) {
+            $context->buildViolation('The status is not allowed with this event type')
+                ->atPath('status')
+                ->addViolation();
+        }
+    }
+
+    /**
+     * @param mixed $offset
+     *
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return in_array($offset, [
+            'person', 'role', 'status', 'event',
+        ], true);
+    }
+
+    /**
+     * @param mixed $offset
+     *
+     * @return Event|mixed|Person|Role|Status
+     */
+    public function offsetGet($offset)
+    {
+        switch ($offset) {
+            case 'person':
+                return $this->getPerson();
+
+                break;
+
+            case 'role':
+                return $this->getRole();
+
+                break;
+
+            case 'status':
+                return $this->getStatus();
+
+                break;
+
+            case 'event':
+                return $this->getEvent();
+
+                break;
+        }
+    }
+
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     *
+     * @return Participation|void
+     */
+    public function offsetSet($offset, $value)
+    {
+        switch ($offset) {
+            case 'person':
+                return $this->setPerson($value);
+
+                break;
+
+            case 'role':
+                return $this->setRole($value);
+
+                break;
+
+            case 'status':
+                return $this->setStatus($value);
+
+                break;
+
+            case 'event':
+                return $this->setEvent($value);
+
+                break;
+        }
+    }
+
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset)
+    {
+        $this->offsetSet($offset, null);
+    }
+
+    /**
+     * Set event.
+     *
+     * @param Event $event
      *
-     * @param Role $role
      * @return Participation
      */
-    public function setRole(Role $role = null)
+    public function setEvent(?Event $event = null)
+    {
+        if ($this->event !== $event) {
+            $this->update();
+        }
+
+        $this->event = $event;
+
+        return $this;
+    }
+
+    /**
+     * Set person.
+     *
+     * @param Person $person
+     *
+     * @return Participation
+     */
+    public function setPerson(?Person $person = null)
+    {
+        if ($person !== $this->person) {
+            $this->update();
+        }
+
+        $this->person = $person;
+
+        return $this;
+    }
+
+    /**
+     * Set role.
+     *
+     * @param Role $role
+     *
+     * @return Participation
+     */
+    public function setRole(?Role $role = null)
     {
         if ($role !== $this->role) {
             $this->update();
@@ -187,160 +322,32 @@ class Participation implements HasCenterInterface, HasScopeInterface, \ArrayAcce
     }
 
     /**
-     * Get role
-     *
-     * @return Role
-     */
-    public function getRole()
-    {
-        return $this->role;
-    }
-
-    /**
-     * Set status
+     * Set status.
      *
      * @param Status $status
+     *
      * @return Participation
      */
-    public function setStatus(Status $status = null)
+    public function setStatus(?Status $status = null)
     {
         if ($this->status !== $status) {
             $this->update();
         }
-        
+
         $this->status = $status;
 
         return $this;
     }
 
     /**
-     * Get status
+     * Set lastUpdate.
      *
-     * @return Status
+     * @return Participation
      */
-    public function getStatus()
+    protected function update()
     {
-        return $this->status;
-    }
-    
-    /**
-     * @return Center
-     */
-    public function getCenter()
-    {
-        if ($this->getEvent() === NULL) {
-            throw new \RuntimeException('The event is not linked with this instance. '
-                    . 'You should initialize the event with a valid center before.');
-        }
-        
-        return $this->getEvent()->getCenter();
-    }
-    
-    /**
-     * @return Scope
-     */
-    public function getScope()
-    {
-        if ($this->getEvent() === NULL) {
-            throw new \RuntimeException('The event is not linked with this instance. '
-                    . 'You should initialize the event with a valid center before.');
-        }
-        
-        return $this->getEvent()->getCircle();
-    }
-    
-    /**
-     * Check that : 
-     * 
-     * - the role can be associated with this event type
-     * - the status can be associated with this event type
-     * 
-     * @param ExecutionContextInterface $context
-     */
-    public function isConsistent(ExecutionContextInterface $context)
-    {
-        
-        if ($this->getEvent() === NULL || $this->getRole() === NULL || $this->getStatus() === NULL) {
-            return;
-        }
-        
-        if ($this->getRole()->getType()->getId() !== 
-                $this->getEvent()->getType()->getId()) {
-            $context->buildViolation('The role is not allowed with this event type')
-                    ->atPath('role')
-                    ->addViolation();
-        }
-        
-        if ($this->getStatus()->getType()->getId() !==
-                $this->getEvent()->getType()->getId()) {
-            $context->buildViolation('The status is not allowed with this event type')
-                    ->atPath('status')
-                    ->addViolation();
-        }
-    }
-    
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return in_array($offset, array(
-            'person', 'role', 'status', 'event'
-        ));
-    }
-    
-    /**
-     * @param mixed $offset
-     * @return Event|Role|Status|Person|mixed
-     */
-    public function offsetGet($offset)
-    {
-        switch ($offset) {
-            case 'person':
-                return $this->getPerson();
-                break;
-            case 'role':
-                return $this->getRole();
-                break;
-            case 'status':
-                return $this->getStatus();
-                break;
-            case 'event':
-                return $this->getEvent();
-                break;
-        }
-    }
-    
-    /**
-     * @param mixed $offset
-     * @param mixed $value
-     * @return Participation|void
-     */
-    public function offsetSet($offset, $value)
-    {
-        switch($offset) {
-            case 'person':
-                return $this->setPerson($value);
-                break;
-            case 'role':
-                return $this->setRole($value);
-                break;
-            case 'status':
-                return $this->setStatus($value);
-                break;
-            case 'event':
-                return $this->setEvent($value);
-                break;
-        }
-    }
-    
-    /**
-     * @param mixed $offset
-     */
-    public function offsetUnset($offset)
-    {
-        $this->offsetSet($offset, null);
-    }
+        $this->lastUpdate = new DateTime('now');
 
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php
index cf7d3a243..999116700 100644
--- a/src/Bundle/ChillEventBundle/Entity/Role.php
+++ b/src/Bundle/ChillEventBundle/Entity/Role.php
@@ -1,40 +1,35 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class Role
+ * Class Role.
  *
- * @package Chill\EventBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="chill_event_role")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Role
 {
     /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -44,29 +39,32 @@ class Role
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
-    /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active;
-    
     /**
      * @var EventType
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\EventType",
-     *     inversedBy="roles")
+     * inversedBy="roles")
      */
     private $type;
 
+    /**
+     * Get active.
+     *
+     * @return bool
+     */
+    public function getActive()
+    {
+        return $this->active;
+    }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -74,20 +72,7 @@ class Role
     }
 
     /**
-     * Set label
-     *
-     * @param array $label
-     * @return Role
-     */
-    public function setName($label)
-    {
-        $this->name = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
+     * Get label.
      *
      * @return array
      */
@@ -97,9 +82,20 @@ class Role
     }
 
     /**
-     * Set active
+     * Get type.
+     *
+     * @return EventType
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set active.
+     *
+     * @param bool $active
      *
-     * @param boolean $active
      * @return Role
      */
     public function setActive($active)
@@ -110,36 +106,30 @@ class Role
     }
 
     /**
-     * Get active
+     * Set label.
      *
-     * @return boolean
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-
-    /**
-     * Set type
+     * @param array $label
      *
-     * @param EventType $type
      * @return Role
      */
-    public function setType(EventType $type = null)
+    public function setName($label)
     {
-        $this->type = $type;
+        $this->name = $label;
 
         return $this;
     }
 
     /**
-     * Get type
+     * Set type.
      *
-     * @return EventType
+     * @param EventType $type
+     *
+     * @return Role
      */
-    public function getType()
+    public function setType(?EventType $type = null)
     {
-        return $this->type;
+        $this->type = $type;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php
index a88bff5c4..f7d936671 100644
--- a/src/Bundle/ChillEventBundle/Entity/Status.php
+++ b/src/Bundle/ChillEventBundle/Entity/Status.php
@@ -1,72 +1,70 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class Status
+ * Class Status.
  *
- * @package Chill\EventBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="chill_event_status")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Status
 {
     /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
-    
+
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
-    
-    /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active;
-    
+
     /**
      * @var EventType
      * @ORM\ManyToOne(
      *     targetEntity="Chill\EventBundle\Entity\EventType",
-     *     inversedBy="statuses")
+     * inversedBy="statuses")
      */
     private $type;
 
+    /**
+     * Get active.
+     *
+     * @return bool
+     */
+    public function getActive()
+    {
+        return $this->active;
+    }
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -74,20 +72,7 @@ class Status
     }
 
     /**
-     * Set label
-     *
-     * @param array $name
-     * @return Status
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get label
+     * Get label.
      *
      * @return array
      */
@@ -96,11 +81,21 @@ class Status
         return $this->name;
     }
 
+    /**
+     * Get type.
+     *
+     * @return EventType
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
 
     /**
-     * Set active
+     * Set active.
+     *
+     * @param bool $active
      *
-     * @param boolean $active
      * @return Status
      */
     public function setActive($active)
@@ -111,36 +106,30 @@ class Status
     }
 
     /**
-     * Get active
+     * Set label.
      *
-     * @return boolean
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-
-    /**
-     * Set type
+     * @param array $name
      *
-     * @param EventType $type
      * @return Status
      */
-    public function setType(EventType $type = null)
+    public function setName($name)
     {
-        $this->type = $type;
+        $this->name = $name;
 
         return $this;
     }
 
     /**
-     * Get type
+     * Set type.
      *
-     * @return EventType
+     * @param EventType $type
+     *
+     * @return Status
      */
-    public function getType()
+    public function setType(?EventType $type = null)
     {
-        return $this->type;
+        $this->type = $type;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
index c96e541f7..953f1cc82 100644
--- a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+++ b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
@@ -1,68 +1,123 @@
 <?php
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form\ChoiceLoader;
 
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
-use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
-use Doctrine\ORM\EntityRepository;
 use Chill\EventBundle\Entity\Event;
+use Doctrine\ORM\EntityRepository;
+use RuntimeException;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use function call_user_func;
+use function count;
+use function in_array;
 
-/***
- * Class EventChoiceLoader
- *
- * @package Chill\EventBundle\Form\ChoiceLoader
- * @author Mathieu Jaumotte jaum_mathieu@collectifs.net
+/**
+ * Class EventChoiceLoader.
  */
 class EventChoiceLoader implements ChoiceLoaderInterface
 {
-    
-    /**
-     * @var EntityRepository
-     */
-    protected $eventRepository;
-    
-    /**
-     * @var array
-     */
-    protected $lazyLoadedEvents = [];
-    
     /**
      * @var array
      */
     protected $centers = [];
-    
+
+    /**
+     * @var EntityRepository
+     */
+    protected $eventRepository;
+
+    /**
+     * @var array
+     */
+    protected $lazyLoadedEvents = [];
+
     /**
      * EventChoiceLoader constructor.
-     *
-     * @param EntityRepository $eventRepository
-     * @param array|null $centers
      */
     public function __construct(
         EntityRepository $eventRepository,
-        array $centers = null
+        ?array $centers = null
     ) {
         $this->eventRepository = $eventRepository;
-        if (NULL !== $centers) {
+
+        if (null !== $centers) {
             $this->centers = $centers;
         }
     }
-    
+
+    /**
+     * @param null $value
+     */
+    public function loadChoiceList($value = null): ChoiceListInterface
+    {
+        return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
+            $this->lazyLoadedEvents,
+            static function (Event $p) use ($value) {
+                return call_user_func($value, $p);
+            }
+        );
+    }
+
+    /**
+     * @param null $value
+     *
+     * @return array
+     */
+    public function loadChoicesForValues(array $values, $value = null)
+    {
+        $choices = [];
+
+        foreach ($values as $value) {
+            if (empty($value)) {
+                continue;
+            }
+
+            $event = $this->eventRepository->find($value);
+
+            if ($this->hasCenterFilter()
+                && !in_array($event->getCenter(), $this->centers, true)) {
+                throw new RuntimeException('chosen an event not in correct center');
+            }
+
+            $choices[] = $event;
+        }
+
+        return $choices;
+    }
+
+    /**
+     * @param null $value
+     *
+     * @return array|string[]
+     */
+    public function loadValuesForChoices(array $choices, $value = null)
+    {
+        $values = [];
+
+        foreach ($choices as $choice) {
+            if (null === $choice) {
+                $values[] = null;
+
+                continue;
+            }
+
+            $id = call_user_func($value, $choice);
+            $values[] = $id;
+            $this->lazyLoadedEvents[$id] = $choice;
+        }
+
+        return $values;
+    }
+
     /**
      * @return bool
      */
@@ -70,69 +125,4 @@ class EventChoiceLoader implements ChoiceLoaderInterface
     {
         return count($this->centers) > 0;
     }
-    
-    /**
-     * @param null $value
-     * @return ChoiceListInterface
-     */
-    public function loadChoiceList($value = null): ChoiceListInterface
-    {
-        $list = new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
-            $this->lazyLoadedEvents,
-            function(Event $p) use ($value) {
-                return \call_user_func($value, $p);
-            });
-        
-        return $list;
-    }
-    
-    /**
-     * @param array $values
-     * @param null $value
-     * @return array
-     */
-    public function loadChoicesForValues(array $values, $value = null)
-    {
-        $choices = [];
-        
-        foreach($values as $value) {
-            if (empty($value)) {
-                continue;
-            }
-            
-            $event = $this->eventRepository->find($value);
-            
-            if ($this->hasCenterFilter() && 
-                !\in_array($event->getCenter(), $this->centers)) {
-                throw new \RuntimeException("chosen an event not in correct center");
-            }
-            
-            $choices[] = $event;
-        }
-
-        return $choices;
-    }
-    
-    /**
-     * @param array $choices
-     * @param null $value
-     * @return array|string[]
-     */
-    public function loadValuesForChoices(array $choices, $value = null)
-    {
-        $values = [];
-        
-        foreach ($choices as $choice) {
-            if (NULL === $choice) {
-                $values[] = null;
-                continue;
-            }
-            
-            $id = \call_user_func($value, $choice);
-            $values[] = $id;
-            $this->lazyLoadedEvents[$id] = $choice;
-        }
-        return $values;
-    }
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Form/EventType.php b/src/Bundle/ChillEventBundle/Form/EventType.php
index ed1265620..6fe0535b3 100644
--- a/src/Bundle/ChillEventBundle/Form/EventType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventType.php
@@ -1,91 +1,65 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form;
 
 use Chill\EventBundle\Form\Type\PickEventTypeType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
 class EventType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name')
-            ->add('date', ChillDateTimeType::class, array(
-                    'required' => true
-            ))
-            ->add('circle', ScopePickerType::class, [
-              'center' => $options['center'],
-              'role'   => $options['role']
+            ->add('date', ChillDateTimeType::class, [
+                'required' => true,
             ])
-            ->add('type', PickEventTypeType::class, array(
-                'placeholder' => 'Pick a type of event',
-                'attr' => array(
-                    'class' => ''
-                )
-            ))
-            ->add('moderator', UserPickerType::class, array(
+            ->add('circle', ScopePickerType::class, [
                 'center' => $options['center'],
-                'role'   => $options['role'],
+                'role' => $options['role'],
+            ])
+            ->add('type', PickEventTypeType::class, [
+                'placeholder' => 'Pick a type of event',
+                'attr' => [
+                    'class' => '',
+                ],
+            ])
+            ->add('moderator', UserPickerType::class, [
+                'center' => $options['center'],
+                'role' => $options['role'],
                 'placeholder' => 'Pick a moderator',
-                'attr' => array(
-                    'class' => ''
-                ),
-                'required' => false
-            ))
-        ;
+                'attr' => [
+                    'class' => '',
+                ],
+                'required' => false,
+            ]);
     }
-    
-    /**
-     * @param OptionsResolver $resolver
-     */
+
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\EventBundle\Entity\Event'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\EventBundle\Entity\Event',
+        ]);
         $resolver
-            ->setRequired(array('center', 'role'))
+            ->setRequired(['center', 'role'])
             ->setAllowedTypes('center', Center::class)
-            ->setAllowedTypes('role', Role::class)
-        ;
+            ->setAllowedTypes('role', Role::class);
     }
 
     /**
diff --git a/src/Bundle/ChillEventBundle/Form/EventTypeType.php b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
index b72a9f186..dee3fea25 100644
--- a/src/Bundle/ChillEventBundle/Form/EventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/EventTypeType.php
@@ -1,34 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form;
 
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class EventTypeType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active')
-        ;
-    }
-    
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\EventBundle\Entity\EventType'
-        ));
+            ->add('active');
     }
 
     /**
@@ -38,4 +32,11 @@ class EventTypeType extends AbstractType
     {
         return 'chill_eventbundle_eventtype';
     }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => 'Chill\EventBundle\Entity\EventType',
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/ParticipationType.php b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
index d7186ac91..70efcb7b9 100644
--- a/src/Bundle/ChillEventBundle/Form/ParticipationType.php
+++ b/src/Bundle/ChillEventBundle/Form/ParticipationType.php
@@ -1,76 +1,62 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form;
 
+use Chill\EventBundle\Entity\EventType;
+use Chill\EventBundle\Entity\Status;
+use Chill\EventBundle\Form\Type\PickRoleType;
+use Chill\EventBundle\Form\Type\PickStatusType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\EventBundle\Entity\EventType;
-use Chill\EventBundle\Entity\Status;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\EventBundle\Form\Type\PickRoleType;
-use Chill\EventBundle\Form\Type\PickStatusType;
 
 /**
- * A type to create a participation
- * 
- * If the `event` option is defined, the role will be restricted
+ * A type to create a participation.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * If the `event` option is defined, the role will be restricted
  */
 class ParticipationType extends AbstractType
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }
-    
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // local copy of variable for Closure
         $translatableStringHelper = $this->translatableStringHelper;
-        
+
         // add role
-        $builder->add('role', PickRoleType::class, array(
-           'event_type' => $options['event_type']
-        ));
-            
+        $builder->add('role', PickRoleType::class, [
+            'event_type' => $options['event_type'],
+        ]);
+
         // add a status
-        $builder->add('status', PickStatusType::class, array(
-           'event_type' => $options['event_type']
-        ));
-            
+        $builder->add('status', PickStatusType::class, [
+            'event_type' => $options['event_type'],
+        ]);
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefined('event_type')
-                ->setAllowedTypes('event_type', array('null', EventType::class))
-                ->setDefault('event_type', 'null');
+            ->setAllowedTypes('event_type', ['null', EventType::class])
+            ->setDefault('event_type', 'null');
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/RoleType.php b/src/Bundle/ChillEventBundle/Form/RoleType.php
index d3483e917..da91637d8 100644
--- a/src/Bundle/ChillEventBundle/Form/RoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/RoleType.php
@@ -1,53 +1,47 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Chill\EventBundle\Entity\EventType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\EventBundle\Entity\EventType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class RoleType extends AbstractType
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
         $this->translatableStringHelper = $translatableStringHelper;
     }
-    
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
             ->add('active')
-            ->add('type', EntityType::class, array(
+            ->add('type', EntityType::class, [
                 'class' => EventType::class,
-                'choice_label' => function (EventType $e) { 
+                'choice_label' => function (EventType $e) {
                     return $this->translatableStringHelper->localize($e->getName());
-                }
-            ))
-        ;
-    }
-    
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\EventBundle\Entity\Role'
-        ));
+                },
+            ]);
     }
 
     /**
@@ -57,4 +51,11 @@ class RoleType extends AbstractType
     {
         return 'chill_eventbundle_role';
     }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => 'Chill\EventBundle\Entity\Role',
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/StatusType.php b/src/Bundle/ChillEventBundle/Form/StatusType.php
index bee55c8c9..cea82049a 100644
--- a/src/Bundle/ChillEventBundle/Form/StatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/StatusType.php
@@ -1,36 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form;
 
+use Chill\EventBundle\Form\Type\PickEventTypeType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Chill\EventBundle\Form\Type\PickEventTypeType;
 
 class StatusType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
             ->add('active')
-            ->add('type', PickEventTypeType::class)
-        ;
-    }
-    
-    /**
-     * @param OptionsResolverInterface $resolver
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\EventBundle\Entity\Status'
-        ));
+            ->add('type', PickEventTypeType::class);
     }
 
     /**
@@ -40,4 +34,11 @@ class StatusType extends AbstractType
     {
         return 'chill_eventbundle_status';
     }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => 'Chill\EventBundle\Entity\Status',
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
index 9cf8c3f29..bb12e272c 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form\Type;
 
 use Chill\EventBundle\Entity\Event;
@@ -30,6 +19,7 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Finder\Exception\AccessDeniedException;
 use Symfony\Component\Form\AbstractType;
@@ -39,49 +29,41 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Translation\TranslatorInterface;
+use function in_array;
+use function is_array;
 
 /**
- * Class PickEventType
- *
- * @package Chill\EventBundle\Form\Type
- * @author Mathieu Jaumotte jaum_mathieu@collectifs.net
+ * Class PickEventType.
  */
 class PickEventType extends AbstractType
 {
-    
-    /**
-     * @var EventRepository
-     */
-    protected $eventRepository;
-    
-    /**
-     * @var User
-     */
-    protected $user;
-    
     /**
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     /**
-     * @var UrlGeneratorInterface
+     * @var EventRepository
      */
-    protected $urlGenerator;
-    
+    protected $eventRepository;
+
     /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
     /**
      * PickEventType constructor.
-     *
-     * @param EventRepository $eventRepository
-     * @param TokenStorageInterface $tokenStorage
-     * @param AuthorizationHelper $authorizationHelper
-     * @param UrlGeneratorInterface $urlGenerator
-     * @param TranslatorInterface $translator
      */
     public function __construct(
         EventRepository $eventRepository,
@@ -96,82 +78,71 @@ class PickEventType extends AbstractType
         $this->urlGenerator = $urlGenerator;
         $this->translator = $translator;
     }
-    
-    /**
-     * @param OptionsResolver $resolver
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        parent::configureOptions($resolver);
-    
-        // add the possibles options for this type
-        $resolver
-            ->setDefined('centers')
-            ->addAllowedTypes('centers', array('array', Center::class, 'null'))
-            ->setDefault('centers', null)
-        ;
-        $resolver
-            ->setDefined('role')
-            ->addAllowedTypes('role', array(Role::class, 'null'))
-            ->setDefault('role', null)
-        ;
-        
-        // add the default options
-        $resolver->setDefaults(array(
-            'class' => Event::class,
-            'choice_label' => function(Event $e) {
-                return  $e->getDate()->format('d/m/Y, H:i') . ' → ' .
-                        // $e->getType()->getName()['fr'] . ':  ' .    // display the type of event
-                        $e->getName();
-            },
-            'placeholder' => 'Pick an event',
-            'attr' => array('class' => 'select2 '),
-            'choice_attr' => function(Event $e) {
-                return array('data-center' => $e->getCenter()->getId());
-            },
-            'choiceloader' => function(Options $options) {
-                $centers = $this->filterCenters($options);
-                return new EventChoiceLoader($this->eventRepository, $centers);
-            }
-        ));
-        
-    }
-    
-    /**
-     * @return null|string
-     */
-    public function getParent()
-    {
-        return EntityType::class;
-    }
-    
-    /**
-     * @param \Symfony\Component\Form\FormView $view
-     * @param \Symfony\Component\Form\FormInterface $form
-     * @param array $options
-     */
+
     public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options)
     {
         $view->vars['attr']['data-person-picker'] = true;
         $view->vars['attr']['data-select-interactive-loading'] = true;
         $view->vars['attr']['data-search-url'] = $this->urlGenerator
-            ->generate('chill_main_search', [ 'name' => EventSearch::NAME, '_format' => 'json' ]);
+            ->generate('chill_main_search', ['name' => EventSearch::NAME, '_format' => 'json']);
         $view->vars['attr']['data-placeholder'] = $this->translator->trans($options['placeholder']);
         $view->vars['attr']['data-no-results-label'] = $this->translator->trans('select2.no_results');
         $view->vars['attr']['data-error-load-label'] = $this->translator->trans('select2.error_loading');
         $view->vars['attr']['data-searching-label'] = $this->translator->trans('select2.searching');
     }
-    
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        // add the possibles options for this type
+        $resolver
+            ->setDefined('centers')
+            ->addAllowedTypes('centers', ['array', Center::class, 'null'])
+            ->setDefault('centers', null);
+        $resolver
+            ->setDefined('role')
+            ->addAllowedTypes('role', [Role::class, 'null'])
+            ->setDefault('role', null);
+
+        // add the default options
+        $resolver->setDefaults([
+            'class' => Event::class,
+            'choice_label' => static function (Event $e) {
+                return $e->getDate()->format('d/m/Y, H:i') . ' → ' .
+                        // $e->getType()->getName()['fr'] . ':  ' .    // display the type of event
+                        $e->getName();
+            },
+            'placeholder' => 'Pick an event',
+            'attr' => ['class' => 'select2 '],
+            'choice_attr' => static function (Event $e) {
+                return ['data-center' => $e->getCenter()->getId()];
+            },
+            'choiceloader' => function (Options $options) {
+                $centers = $this->filterCenters($options);
+
+                return new EventChoiceLoader($this->eventRepository, $centers);
+            },
+        ]);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+
     /**
-     * @param Options $options
      * @return array
      */
     protected function filterCenters(Options $options)
     {
         // option role
-        if ($options['role'] === NULL) {
+        if (null === $options['role']) {
             $centers = array_map(
-                function (GroupCenter $g) {
+                static function (GroupCenter $g) {
                     return $g->getCenter();
                 },
                 $this->user->getGroupCenters()->toArray()
@@ -184,31 +155,31 @@ class PickEventType extends AbstractType
         }
 
         // option center
-        if ($options['centers'] === NULL)
-        {
+        if (null === $options['centers']) {
             // we select all selected centers
             $selectedCenters = $centers;
-            
         } else {
-            $selectedCenters = array();
+            $selectedCenters = [];
             $optionsCenters = is_array($options['centers']) ?
-                $options['centers'] : array($options['centers']);
-  
+                $options['centers'] : [$options['centers']];
+
             foreach ($optionsCenters as $c) {
                 // check that every member of the array is a center
                 if (!$c instanceof Center) {
-                    throw new \RuntimeException('Every member of the "centers" '
-                        . 'option must be an instance of '.Center::class);
+                    throw new RuntimeException('Every member of the "centers" '
+                        . 'option must be an instance of ' . Center::class);
                 }
+
                 if (!in_array($c->getId(), array_map(
-                    function(Center $c) { return $c->getId();},
-                    $centers))) {
+                    static function (Center $c) { return $c->getId(); },
+                    $centers
+                ), true)) {
                     throw new AccessDeniedException('The given center is not reachable');
                 }
                 $selectedCenters[] = $c;
             }
         }
+
         return $selectedCenters;
     }
-    
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
index 4821296ae..bad43a349 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickEventTypeType.php
@@ -1,38 +1,25 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * 
- * Copyright (C) 2016, 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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form\Type;
 
+use Chill\EventBundle\Entity\EventType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
-use Chill\EventBundle\Entity\EventType;
 
 /**
- * Description of TranslatableEventType
- *
- * @author Champs-Libres Coop
+ * Description of TranslatableEventType.
  */
 class PickEventTypeType extends AbstractType
 {
@@ -40,34 +27,34 @@ class PickEventTypeType extends AbstractType
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     public function __construct(TranslatableStringHelper $helper)
     {
         $this->translatableStringHelper = $helper;
     }
-    
-    public function getParent()
-    {
-        return EntityType::class;
-    }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $helper = $this->translatableStringHelper;
         $resolver->setDefaults(
-            array(
+            [
                 'class' => EventType::class,
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('et')
-                    ->where('et.active = true');
+                        ->where('et.active = true');
                 },
-                'choice_label' => function (EventType $t) use ($helper) {
+                'choice_label' => static function (EventType $t) use ($helper) {
                     return $helper->localize($t->getName());
                 },
-                'choice_attrs' => function (EventType $t) {
-                    return array('data-link-category' => $t->getId());
-                }
-            )
+                'choice_attrs' => static function (EventType $t) {
+                    return ['data-link-category' => $t->getId()];
+                },
+            ]
         );
     }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
index 545892b98..2caf95598 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
@@ -1,149 +1,130 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * 
- * Copyright (C) 2016, 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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form\Type;
 
+use Chill\EventBundle\Entity\EventType;
+use Chill\EventBundle\Entity\Role;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\EventBundle\Entity\Role;
-use Chill\EventBundle\Entity\EventType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Allow to pick a choice amongst different choices
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Allow to pick a choice amongst different choices.
  */
 class PickRoleType extends AbstractType
 {
-    
     /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
      * @var EntityRepository
      */
     protected $roleRepository;
-    
+
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
-          TranslatableStringHelper $translatableStringHelper,
-          TranslatorInterface $translator,
-          EntityRepository $roleRepository
+        TranslatableStringHelper $translatableStringHelper,
+        TranslatorInterface $translator,
+        EntityRepository $roleRepository
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;
         $this->roleRepository = $roleRepository;
     }
-    
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // create copy for easier management
         $qb = $options['query_builder'];
-  
+
         if ($options['event_type'] instanceof EventType) {
             $options['query_builder']->where($qb->expr()->eq('r.type', ':event_type'))
-                    ->setParameter('event_type', $options['event_type']);
-        } 
-
-        if ($options['active_only'] === true) {
-            $options['query_builder']->andWhere($qb->expr()->eq('r.active', ':active'))
-                    ->setParameter('active', true);
+                ->setParameter('event_type', $options['event_type']);
         }
-        
-        if ($options['group_by'] === null) {
+
+        if (true === $options['active_only']) {
+            $options['query_builder']->andWhere($qb->expr()->eq('r.active', ':active'))
+                ->setParameter('active', true);
+        }
+
+        if (null === $options['group_by']) {
             $builder->addEventListener(
-                  FormEvents::PRE_SET_DATA, 
-                  function(FormEvent $event) use ($options) {
-                    if ($options['event_type'] === null) {
+                FormEvents::PRE_SET_DATA,
+                function (FormEvent $event) use ($options) {
+                    if (null === $options['event_type']) {
                         $form = $event->getForm();
                         $name = $form->getName();
                         $config = $form->getConfig();
                         $type = $config->getType()->getName();
                         $options = $config->getOptions();
 
-                        $form->getParent()->add($name, $type,  array_replace($options, array(
-                           'group_by' => function(Role $r) 
-                                { return $this->translatableStringHelper->localize($r->getType()->getName()); }
-                        )));
+                        $form->getParent()->add($name, $type, array_replace($options, [
+                            'group_by' => function (Role $r) {
+                                return $this->translatableStringHelper->localize($r->getType()->getName());
+                            },
+                        ]));
                     }
-                  }
-                  );
+                }
+            );
         }
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         // create copy for use in Closure
         $translatableStringHelper = $this->translatableStringHelper;
         $translator = $this->translator;
-        
+
         $resolver
               // add option "event_type"
             ->setDefined('event_type')
-            ->setAllowedTypes('event_type', array('null', EventType::class))
+            ->setAllowedTypes('event_type', ['null', EventType::class])
             ->setDefault('event_type', null)
             // add option allow unactive
             ->setDefault('active_only', true)
-            ->setAllowedTypes('active_only', array('boolean'))
-            ;
-            
+            ->setAllowedTypes('active_only', ['boolean']);
+
         $qb = $this->roleRepository->createQueryBuilder('r');
-        
-        $resolver->setDefaults(array(
-           'class' => Role::class,
-           'query_builder' => $qb,
-           'group_by' => null,
-           'choice_attr' => function(Role $r) {
-                        return array(
-                            'data-event-type' => $r->getType()->getId(),
-                            'data-link-category' => $r->getType()->getId()
-                        );
-                    },
-            'choice_label' => function(Role $r) 
-                use ($translatableStringHelper, $translator) {
-                    return $translatableStringHelper->localize($r->getName()).
+
+        $resolver->setDefaults([
+            'class' => Role::class,
+            'query_builder' => $qb,
+            'group_by' => null,
+            'choice_attr' => static function (Role $r) {
+                return [
+                    'data-event-type' => $r->getType()->getId(),
+                    'data-link-category' => $r->getType()->getId(),
+                ];
+            },
+            'choice_label' => static function (Role $r) use ($translatableStringHelper, $translator) {
+                return $translatableStringHelper->localize($r->getName()) .
                           ($r->getActive() === true ? '' :
-                                ' ('.$translator->trans('unactive').')');
-                    }
-            ));
+                                ' (' . $translator->trans('unactive') . ')');
+            },
+        ]);
     }
-    
+
     public function getParent()
     {
         return EntityType::class;
diff --git a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
index b4f40b7be..dea302049 100644
--- a/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+++ b/src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
@@ -1,152 +1,131 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * 
- * Copyright (C) 2016, 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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Form\Type;
 
+use Chill\EventBundle\Entity\EventType;
+use Chill\EventBundle\Entity\Status;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\EventBundle\Entity\Status;
-use Chill\EventBundle\Entity\EventType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Allow to pick amongst type
- * 
- * parameters : 
- * 
+ * Allow to pick amongst type.
+ *
+ * parameters :
+ *
  * - event_type : restricts to a certain event type. Default null (= all event types)
  * - active_only: restricts to active type only. Default true
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
  */
 class PickStatusType extends AbstractType
 {
-   
     /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
      * @var EntityRepository
      */
     protected $statusRepository;
-    
+
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
-          TranslatableStringHelper $translatableStringHelper,
-          TranslatorInterface $translator,
-          EntityRepository $statusRepository
+        TranslatableStringHelper $translatableStringHelper,
+        TranslatorInterface $translator,
+        EntityRepository $statusRepository
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;
         $this->statusRepository = $statusRepository;
     }
-    
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $qb = $options['query_builder'];
-  
+
         if ($options['event_type'] instanceof EventType) {
             $options['query_builder']->where($qb->expr()->eq('r.type', ':event_type'))
-                    ->setParameter('event_type', $options['event_type']);
-            
+                ->setParameter('event_type', $options['event_type']);
         }
 
-        if ($options['active_only'] === true) {
+        if (true === $options['active_only']) {
             $options['query_builder']->andWhere($qb->expr()->eq('r.active', ':active'))
-                    ->setParameter('active', true);
+                ->setParameter('active', true);
         }
-           
-        if ($options['group_by'] === null && $options['event_type'] === null) {     
+
+        if (null === $options['group_by'] && null === $options['event_type']) {
             $builder->addEventListener(
-                  FormEvents::PRE_SET_DATA, 
-                  function(FormEvent $event) {
-                        $form = $event->getForm();
-                        $name = $form->getName();
-                        $config = $form->getConfig();
-                        $type = $config->getType()->getName();
-                        $options = $config->getOptions();
-                        $form->getParent()->add($name, $type,  array_replace($options, array(
-                           'group_by' => function(Status $s) 
-                                { return $this->translatableStringHelper->localize($s->getType()->getName()); }
-                        )));
-                    }
+                FormEvents::PRE_SET_DATA,
+                function (FormEvent $event) {
+                    $form = $event->getForm();
+                    $name = $form->getName();
+                    $config = $form->getConfig();
+                    $type = $config->getType()->getName();
+                    $options = $config->getOptions();
+                    $form->getParent()->add($name, $type, array_replace($options, [
+                        'group_by' => function (Status $s) {
+                            return $this->translatableStringHelper->localize($s->getType()->getName());
+                        },
+                    ]));
+                }
             );
         }
-        
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         // create copy for use in Closure
         $translatableStringHelper = $this->translatableStringHelper;
         $translator = $this->translator;
-        
+
         $resolver
               // add option "event_type"
             ->setDefined('event_type')
-            ->setAllowedTypes('event_type', array('null', EventType::class))
+            ->setAllowedTypes('event_type', ['null', EventType::class])
             ->setDefault('event_type', null)
             // add option allow unactive
             ->setDefault('active_only', true)
-            ->setAllowedTypes('active_only', array('boolean'))
-            ;
-            
+            ->setAllowedTypes('active_only', ['boolean']);
+
         $qb = $this->statusRepository->createQueryBuilder('r');
-        
-        $resolver->setDefaults(array(
-           'class' => Status::class,
-           'query_builder' => $qb,
-           'group_by' => null,
-           'choice_attr' => function(Status $s) {
-                        return array(
-                            'data-event-type' => $s->getType()->getId(),
-                            'data-link-category' => $s->getType()->getId()
-                        );
-                    },
-            'choice_label' => function(Status $s) 
-                use ($translatableStringHelper, $translator) {
-                    return $translatableStringHelper->localize($s->getName()).
+
+        $resolver->setDefaults([
+            'class' => Status::class,
+            'query_builder' => $qb,
+            'group_by' => null,
+            'choice_attr' => static function (Status $s) {
+                return [
+                    'data-event-type' => $s->getType()->getId(),
+                    'data-link-category' => $s->getType()->getId(),
+                ];
+            },
+            'choice_label' => static function (Status $s) use ($translatableStringHelper, $translator) {
+                return $translatableStringHelper->localize($s->getName()) .
                           ($s->getActive() === true ? '' :
-                                ' ('.$translator->trans('unactive').')');
-                    }
-            ));
+                                ' (' . $translator->trans('unactive') . ')');
+            },
+        ]);
     }
-    
+
     public function getParent()
     {
         return EntityType::class;
diff --git a/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
index 0133409b8..f96bed266 100644
--- a/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
@@ -1,28 +1,34 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Menu;
 
+use Chill\EventBundle\Security\Authorization\EventVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Knp\Menu\MenuItem;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\EventBundle\Security\Authorization\EventVoter;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    
     /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         TranslatorInterface $translator
@@ -30,29 +36,27 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
     }
-    
-    
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
-        $person  = $parameters['person'] ?? null;
-        
+        /** @var \Chill\PersonBundle\Entity\Person $person */
+        $person = $parameters['person'] ?? null;
+
         if ($this->authorizationChecker->isGranted(EventVoter::SEE, $person)) {
-            
             $menu->addChild($this->translator->trans('Events participation'), [
                 'route' => 'chill_event__list_by_person',
                 'routeParameters' => [
-                    'person_id' => $person->getId()
-                ]
+                    'person_id' => $person->getId(),
+                ],
             ])
-            ->setExtras([
-                'order' => 500
-            ]);
+                ->setExtras([
+                    'order' => 500,
+                ]);
         }
     }
-    
+
     public static function getMenuIds(): array
     {
-        return [ 'person' ];
+        return ['person'];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillEventBundle/Repository/EventRepository.php b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
index a18e664ba..352021120 100644
--- a/src/Bundle/ChillEventBundle/Repository/EventRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/EventRepository.php
@@ -1,35 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 
 /**
- * Class EventRepository
- *
- * @package Chill\EventBundle\Repository
- * @author Mathieu Jaumotte jaum_mathieu@collectifs.net
+ * Class EventRepository.
  */
 class EventRepository extends EntityRepository
 {
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
index 29bd09e9a..673d63df8 100644
--- a/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
+++ b/src/Bundle/ChillEventBundle/Repository/ParticipationRepository.php
@@ -1,43 +1,31 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 
 /**
- * Class ParticipationRepository
- *
- * @package Chill\EventBundle\Repository
- * @author Mathieu Jaumotte jaum_mathieu@collectifs.net
+ * Class ParticipationRepository.
  */
 class ParticipationRepository extends EntityRepository
 {
-    
     /**
-     * Count number of participations per person
+     * Count number of participations per person.
      *
      * @param $person_id
-     * @return mixed
+     *
      * @throws \Doctrine\ORM\NonUniqueResultException
+     *
+     * @return mixed
      */
     public function countByPerson($person_id)
     {
@@ -46,18 +34,17 @@ class ParticipationRepository extends EntityRepository
             ->where('p.id = :person_id')
             ->setParameter(':person_id', $person_id)
             ->getQuery()
-            ->getSingleScalarResult()
-            ;
+            ->getSingleScalarResult();
     }
-    
-    
+
     /**
-     * Return paginated participations for a person and in reachables circles
+     * Return paginated participations for a person and in reachables circles.
      *
      * @param $person_id
      * @param $reachablesCircles
      * @param $first
      * @param $max
+     *
      * @return mixed
      */
     public function findByPersonInCircle($person_id, $reachablesCircles, $first, $max)
@@ -67,17 +54,13 @@ class ParticipationRepository extends EntityRepository
             ->where('p.person = :person_id')
             ->andWhere('e.circle IN (:reachable_circles)')
             ->orderBy('e.date', 'ASC')
-            ->setParameters(array(
+            ->setParameters([
                 ':person_id' => $person_id,
-                ':reachable_circles' => $reachablesCircles
-            ))
+                ':reachable_circles' => $reachablesCircles,
+            ])
             ->setFirstResult($first)
             ->setMaxResults($max)
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
     }
-
-
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php
index 366c1e6a0..5d91c6f5c 100644
--- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php
+++ b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php
@@ -1,13 +1,38 @@
-<?php                                                                                                                                                                                                              
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ChillEventBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ChillEventBundle/logs';
+    }
+
     public function registerBundles()
-    {   
-        return array(
+    {
+        return [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\MainBundle\ChillMainBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -19,28 +44,12 @@ class AppKernel extends Kernel
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Chill\PersonBundle\ChillPersonBundle(),
             new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
-            new \Chill\EventBundle\ChillEventBundle,
-        );
-    }   
+            new \Chill\EventBundle\ChillEventBundle(),
+        ];
+    }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
-    {   
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-    }   
-
-    /** 
-     * @return string
-     */
-    public function getCacheDir()
-    {   
-        return sys_get_temp_dir().'/ChillEventBundle/cache';
-    }   
-
-    /** 
-     * @return string
-     */
-    public function getLogDir()
-    {   
-        return sys_get_temp_dir().'/ChillEventBundle/logs';
-    }   
+    {
+        $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php b/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php
index 0279b4ee6..9d402a12b 100644
--- a/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php
+++ b/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php
@@ -1,8 +1,16 @@
 <?php
 
-if (!is_file($autoloadFile = __DIR__.'/../../vendor/autoload.php')) {
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+if (!is_file($autoloadFile = __DIR__ . '/../../vendor/autoload.php')) {
     throw new \LogicException('Could not find autoload.php in vendor/. Did you run "composer install --dev"?');
 }
 
 require $autoloadFile;
-
diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php
index 8833ed702..2f90b785e 100644
--- a/src/Bundle/ChillEventBundle/Search/EventSearch.php
+++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php
@@ -1,18 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\EventBundle\Search;
 
 use Chill\EventBundle\Entity\Event;
-use Chill\MainBundle\Search\AbstractSearch;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Templating\EngineInterface as TemplatingEngine;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Search\AbstractSearch;
 use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Templating\EngineInterface as TemplatingEngine;
+use function count;
 
 /**
  * Search within Events.
@@ -26,208 +34,205 @@ use Chill\MainBundle\Search\SearchInterface;
  * Default terms search within the name, but the term "name" has precedence. This
  * means that if the search string is `@event xyz name:"abc"`, the searched
  * string will be "abc" and not xyz
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
  */
 class EventSearch extends AbstractSearch
 {
-    
+    public const NAME = 'event_regular';
+
     /**
-     *
      * @var EntityRepository
      */
     private $er;
-    
+
     /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    private $user;
-    
-    /**
-     *
      * @var AuthorizationHelper
      */
     private $helper;
-    
+
     /**
-     *
-     * @var TemplatingEngine
-     */
-    private $templating;
-    
-    /**
-     *
      * @var PaginatorFactory
      */
     private $paginationFactory;
-    
-    const NAME = 'event_regular';
-    
+
+    /**
+     * @var TemplatingEngine
+     */
+    private $templating;
+
+    /**
+     * @var \Chill\MainBundle\Entity\User
+     */
+    private $user;
+
     public function __construct(
-          TokenStorageInterface $tokenStorage,
-          EntityRepository $eventRepository,
-          AuthorizationHelper $authorizationHelper,
-          TemplatingEngine $templating,
-          PaginatorFactory $paginatorFactory
-          )
-    {
+        TokenStorageInterface $tokenStorage,
+        EntityRepository $eventRepository,
+        AuthorizationHelper $authorizationHelper,
+        TemplatingEngine $templating,
+        PaginatorFactory $paginatorFactory
+    ) {
         $this->user = $tokenStorage->getToken()->getUser();
         $this->er = $eventRepository;
         $this->helper = $authorizationHelper;
         $this->templating = $templating;
         $this->paginationFactory = $paginatorFactory;
     }
-    
-    public function supports($domain, $format)
-    {
-        return 'event' === $domain or 'events' === $domain;
-    }
-    
-    public function isActiveByDefault()
-    {
-        return true;
-    }
-    
+
     public function getOrder()
     {
         return 3000;
     }
 
-    public function renderResult(array $terms, $start = 0, $limit = 50,
-          array $options = array(), $format = 'html')
+    public function isActiveByDefault()
     {
+        return true;
+    }
+
+    public function renderResult(
+        array $terms,
+        $start = 0,
+        $limit = 50,
+        array $options = [],
+        $format = 'html'
+    ) {
         $total = $this->count($terms);
         $paginator = $this->paginationFactory->create($total);
-        
-        if ($format === 'html') {
-            return $this->templating->render('ChillEventBundle:Event:list.html.twig',
-                array(
+
+        if ('html' === $format) {
+            return $this->templating->render(
+                'ChillEventBundle:Event:list.html.twig',
+                [
                     'events' => $this->search($terms, $start, $limit, $options),
                     'pattern' => $this->recomposePattern($terms, $this->getAvailableTerms(), $terms['_domain']),
                     'total' => $total,
                     'start' => $start,
                     'preview' => $options[SearchInterface::SEARCH_PREVIEW_OPTION],
                     'paginator' => $paginator,
-                    'search_name' => self::NAME
-                ));
+                    'search_name' => self::NAME,
+                ]
+            );
         }
-        else if ($format === 'json') {
+
+        if ('json' === $format) {
             $results = [];
             $search = $this->search($terms, $start, $limit, $options);
+
             foreach ($search as $item) {
                 $results[] = [
                     'id' => $item->getId(),
                     'text' => $item->getDate()->format('d/m/Y, H:i') . ' → ' .
                               // $item->getType()->getName()['fr'] . ':  ' .    // display the type of event
-                              $item->getName()
+                              $item->getName(),
                 ];
             }
+
             return [
                 'results' => $results,
                 'pagination' => [
-                    'more' => $paginator->hasNextPage()
-                ]
+                    'more' => $paginator->hasNextPage(),
+                ],
             ];
         }
     }
-    
-    protected function getAvailableTerms()
+
+    public function supports($domain, $format)
     {
-        return array('date-from', 'date-to', 'name', 'date');
+        return 'event' === $domain || 'events' === $domain;
     }
-    
-    protected function search(array $terms, $start, $limit, $options)
-    {
-        $qb = $this->er->createQueryBuilder('e');
-        $qb->select('e');
-        $this->composeQuery($qb, $terms)
-              ->setMaxResults($limit)
-              ->setFirstResult($start)
-              ->orderBy('e.date', 'DESC')
-              ;
-        
-        return $qb->getQuery()->getResult();
-    }
-    
-    protected function count(array $terms)
-    {
-        $qb = $this->er->createQueryBuilder('e');
-        $qb->select('COUNT(e)');
-        $this->composeQuery($qb, $terms)
-              ;
-        
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-    
+
     protected function composeQuery(QueryBuilder &$qb, $terms)
     {
-        
         // add security clauses
         $reachableCenters = $this->helper
-              ->getReachableCenters($this->user, new Role('CHILL_EVENT_SEE'));
-        
+            ->getReachableCenters($this->user, 'CHILL_EVENT_SEE');
+
         if (count($reachableCenters) === 0) {
             // add a clause to block all events
             $where = $qb->expr()->isNull('e.center');
             $qb->andWhere($where);
         } else {
-            
             $n = 0;
             $orWhere = $qb->expr()->orX();
+
             foreach ($reachableCenters as $center) {
-                $circles = $this->helper->getReachableScopes($this->user,
-                                  new Role('CHILL_EVENT_SEE'), $center);
+                $circles = $this->helper->getReachableScopes(
+                    $this->user,
+                    'CHILL_EVENT_SEE',
+                    $center
+                );
                 $where = $qb->expr()->andX(
-                      $qb->expr()->eq('e.center', ':center_'.$n),
-                      $qb->expr()->in('e.circle', ':circle_'.$n)
-                      );
-                $qb->setParameter('center_'.$n, $center);
-                $qb->setParameter('circle_'.$n, $circles);
+                    $qb->expr()->eq('e.center', ':center_' . $n),
+                    $qb->expr()->in('e.circle', ':circle_' . $n)
+                );
+                $qb->setParameter('center_' . $n, $center);
+                $qb->setParameter('circle_' . $n, $circles);
                 $orWhere->add($where);
             }
-            
+
             $qb->andWhere($orWhere);
         }
-        
+
         if (
-                (isset($terms['name']) OR isset($terms['_default']))
-                AND
-                (!empty($terms['name']) OR !empty($terms['_default']))) {
+                (isset($terms['name']) || isset($terms['_default']))
+                && (!empty($terms['name']) || !empty($terms['_default']))) {
             // the form with name:"xyz" has precedence
-            $name = isset($terms['name']) ? $terms['name'] : $terms['_default'];
-            
+            $name = $terms['name'] ?? $terms['_default'];
+
             $where = $qb->expr()->like('UNACCENT(LOWER(e.name))', ':name');
-            $qb->setParameter('name', '%'.$name.'%');
+            $qb->setParameter('name', '%' . $name . '%');
             $qb->andWhere($where);
         }
-        
+
         if (isset($terms['date'])) {
             $date = $this->parseDate($terms['date']);
-            
+
             $where = $qb->expr()->eq('e.date', ':date');
             $qb->setParameter('date', $date);
             $qb->andWhere($where);
         }
-        
+
         if (isset($terms['date-from'])) {
             $date = $this->parseDate($terms['date-from']);
-            
+
             $where = $qb->expr()->gte('e.date', ':datefrom');
             $qb->setParameter('datefrom', $date);
             $qb->andWhere($where);
         }
-        
+
         if (isset($terms['date-to'])) {
             $date = $this->parseDate($terms['date-to']);
-            
+
             $where = $qb->expr()->lte('e.date', ':dateto');
             $qb->setParameter('dateto', $date);
             $qb->andWhere($where);
         }
-        
+
         return $qb;
     }
+
+    protected function count(array $terms)
+    {
+        $qb = $this->er->createQueryBuilder('e');
+        $qb->select('COUNT(e)');
+        $this->composeQuery($qb, $terms);
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    protected function getAvailableTerms()
+    {
+        return ['date-from', 'date-to', 'name', 'date'];
+    }
+
+    protected function search(array $terms, $start, $limit, $options)
+    {
+        $qb = $this->er->createQueryBuilder('e');
+        $qb->select('e');
+        $this->composeQuery($qb, $terms)
+            ->setMaxResults($limit)
+            ->setFirstResult($start)
+            ->orderBy('e.date', 'DESC');
+
+        return $qb->getQuery()->getResult();
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
index c62767fa9..b2c201e01 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
@@ -1,149 +1,135 @@
 <?php
-/*
- * Copyright (C) 2020 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\EventBundle\Entity\Event;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Psr\Log\LoggerInterface;
+use function count;
+use function in_array;
 
 /**
- * Description of EventVoter
- *
- * @author Mathieu Jaumotte <jaum_mathieu@collectifs.net>
- * @author Champs Libres <info@champs-libres.coop>
+ * Description of EventVoter.
  */
 class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const SEE = 'CHILL_EVENT_SEE';
-    const SEE_DETAILS = 'CHILL_EVENT_SEE_DETAILS';
-    const CREATE = 'CHILL_EVENT_CREATE';
-    const UPDATE = 'CHILL_EVENT_UPDATE';
-    
-    const ROLES = [
+    public const CREATE = 'CHILL_EVENT_CREATE';
+
+    public const ROLES = [
         self::SEE,
         self::SEE_DETAILS,
         self::CREATE,
-        self::UPDATE
+        self::UPDATE,
     ];
-    
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-    
+
+    public const SEE = 'CHILL_EVENT_SEE';
+
+    public const SEE_DETAILS = 'CHILL_EVENT_SEE_DETAILS';
+
+    public const UPDATE = 'CHILL_EVENT_UPDATE';
+
     /**
      * @var AccessDecisionManagerInterface
      */
     protected $accessDecisionManager;
-    
+
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
     /**
      * @var LoggerInterface
      */
     protected $logger;
-    
+
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger
-    )
-    {
+    ) {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
     }
-    
+
+    public function getRoles(): array
+    {
+        return self::ROLES;
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return [
+            'Event' => self::ROLES,
+        ];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
+    }
+
     public function supports($attribute, $subject)
     {
-        return ($subject instanceof Event && in_array($attribute, self::ROLES))
-            ||
-            ($subject instanceof Person && \in_array($attribute, [ self::CREATE, self::SEE ]))
-            ||
-            (NULL === $subject && $attribute === self::SEE )
-            ;
+        return ($subject instanceof Event && in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && in_array($attribute, [self::CREATE, self::SEE], true))
+            || (null === $subject && self::SEE === $attribute);
     }
-    
+
     /**
-     *
      * @param string $attribute
      * @param Event $subject
-     * @param TokenInterface $token
-     * @return boolean
+     *
+     * @return bool
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $this->logger->debug(sprintf("Voting from %s class", self::class));
-        
+        $this->logger->debug(sprintf('Voting from %s class', self::class));
+
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
+
         if ($subject instanceof Event) {
             return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
-        
-        } elseif ($subject instanceof Person) {
-            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
-        
-        } else {
-            
-            // subject is null. We check that at least one center is reachable
-            $centers = $this->authorizationHelper
-                ->getReachableCenters($token->getUser(), new Role($attribute));
-            
-            return count($centers) > 0;
         }
-    
+
+        if ($subject instanceof Person) {
+            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
+        }
+
+        // subject is null. We check that at least one center is reachable
+        $centers = $this->authorizationHelper
+            ->getReachableCenters($token->getUser(), new Role($attribute));
+
+        return count($centers) > 0;
+
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
             return false;
         }
-    
+
         return $this->authorizationHelper->userHasAccess(
             $token->getUser(),
             $subject,
             $attribute
         );
-
     }
-    
-    
-    public function getRoles()
-    {
-        return self::ROLES;
-    }
-    
-    public function getRolesWithHierarchy()
-    {
-        return [
-            'Event' => self::ROLES
-        ];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return [];
-    }
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
index 50e05e279..3438f71c3 100644
--- a/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
@@ -1,64 +1,57 @@
 <?php
-/*
- * Copyright (C) 2020 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\EventBundle\Entity\Participation;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use function count;
+use function in_array;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const SEE = 'CHILL_EVENT_PARTICIPATION_SEE';
-    const SEE_DETAILS = 'CHILL_EVENT_PARTICIPATION_SEE_DETAILS';
-    const CREATE = 'CHILL_EVENT_PARTICIPATION_CREATE';
-    const UPDATE = 'CHILL_EVENT_PARTICIPATION_UPDATE';
+    public const CREATE = 'CHILL_EVENT_PARTICIPATION_CREATE';
 
-    const ROLES = [
+    public const ROLES = [
         self::SEE,
         self::SEE_DETAILS,
         self::CREATE,
-        self::UPDATE
+        self::UPDATE,
     ];
 
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    public const SEE = 'CHILL_EVENT_PARTICIPATION_SEE';
+
+    public const SEE_DETAILS = 'CHILL_EVENT_PARTICIPATION_SEE_DETAILS';
+
+    public const UPDATE = 'CHILL_EVENT_PARTICIPATION_UPDATE';
 
     /**
      * @var AccessDecisionManagerInterface
      */
     protected $accessDecisionManager;
 
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+
     /**
      * @var LoggerInterface
      */
@@ -68,33 +61,45 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
         AccessDecisionManagerInterface $accessDecisionManager,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger
-    )
-    {
+    ) {
         $this->accessDecisionManager = $accessDecisionManager;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
     }
 
+    public function getRoles(): array
+    {
+        return self::ROLES;
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return [
+            'Event' => self::ROLES,
+        ];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
+    }
+
     public function supports($attribute, $subject)
     {
-        return ($subject instanceof Participation && in_array($attribute, self::ROLES))
-            ||
-            ($subject instanceof Person && \in_array($attribute, [ self::CREATE, self::SEE ]))
-            ||
-            (NULL === $subject && $attribute === self::SEE )
-            ;
+        return ($subject instanceof Participation && in_array($attribute, self::ROLES, true))
+            || ($subject instanceof Person && in_array($attribute, [self::CREATE, self::SEE], true))
+            || (null === $subject && self::SEE === $attribute);
     }
 
     /**
-     *
      * @param string $attribute
      * @param Participation $subject
-     * @param TokenInterface $token
-     * @return boolean
+     *
+     * @return bool
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $this->logger->debug(sprintf("Voting from %s class", self::class));
+        $this->logger->debug(sprintf('Voting from %s class', self::class));
 
         if (!$token->getUser() instanceof User) {
             return false;
@@ -102,19 +107,18 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
 
         if ($subject instanceof Participation) {
             return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
-
-        } elseif ($subject instanceof Person) {
-            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
-
-        } else {
-
-            // subject is null. We check that at least one center is reachable
-            $centers = $this->authorizationHelper
-                ->getReachableCenters($token->getUser(), new Role($attribute));
-
-            return count($centers) > 0;
         }
 
+        if ($subject instanceof Person) {
+            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
+        }
+
+        // subject is null. We check that at least one center is reachable
+        $centers = $this->authorizationHelper
+            ->getReachableCenters($token->getUser(), new Role($attribute));
+
+        return count($centers) > 0;
+
         if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
             return false;
         }
@@ -124,24 +128,5 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
             $subject,
             $attribute
         );
-
     }
-
-    public function getRoles()
-    {
-        return self::ROLES;
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return [
-            'Event' => self::ROLES
-        ];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return [];
-    }
-
 }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
index d955d4a56..8966a45a1 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventControllerTest.php
@@ -1,16 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class EventControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class EventControllerTest extends WebTestCase
 {
-    
     public function testSkipped()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -56,5 +69,5 @@ class EventControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
index 57af95de5..4b69b9849 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/EventTypeControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class EventTypeControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class EventTypeControllerTest extends WebTestCase
 {
     public function testSkipped()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class EventTypeControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
index a51fae197..201cfb183 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php
@@ -1,284 +1,235 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function count;
+use function in_array;
 
 /**
- * Test the creation of participation controller
- * 
+ * Test the creation of participation controller.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ParticipationControllerTest extends WebTestCase
+final class ParticipationControllerTest extends WebTestCase
 {
     /**
-     *
      * @var \Symfony\Component\BrowserKit\Client
      */
     protected $client;
-    
+
     /**
-     *
      * @var \Doctrine\ORM\EntityManagerInterface
      */
     protected $em;
-    
+
     /**
      * Keep a cache for each person id given by the function getRandomPerson.
-     * 
+     *
      * You may ask to ignore some people by adding their id to the array.
-     * 
+     *
      * This is reset by setUp().
      *
-     * @var int[] 
+     * @var int[]
      */
-    private $personsIdsCache = array();
-    
+    private $personsIdsCache = [];
+
     public function setUp()
     {
         self::bootKernel();
-        
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
-        
+
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
+
         $container = self::$kernel->getContainer();
-        
-        $this->em = $container->get('doctrine.orm.entity_manager')
-                ;
-        
-        $this->personsIdsCache = array();
+
+        $this->em = $container->get('doctrine.orm.entity_manager');
+
+        $this->personsIdsCache = [];
     }
-    
-    /**
-     * 
-     * 
-     * @return \Chill\EventBundle\Entity\Event
-     */
-    protected function getRandomEvent($centerName = 'Center A', $circleName = 'social')
-    {
-        $center = $this->em->getRepository('ChillMainBundle:Center')
-                ->findByName($centerName);
-        
-        $circles = $this->em->getRepository('ChillMainBundle:Scope')
-                ->findAll();
-        array_filter($circles, function($circle) use ($circleName) {
-            return in_array($circleName, $circle->getName());
-        });
-        $circle = $circles[0];
-        
-        $events = $this->em->getRepository('ChillEventBundle:Event')
-                ->findBy(array('center' => $center, 'circle' => $circle));
-        
-        return $events[array_rand($events)];
-    }
-    
-    /**
-     * Return a random event only if he has more than one participation.
-     * 
-     * @param string $centerName
-     * @param type $circleName
-     * @return \Chill\EventBundle\Entity\Event
-     */
-    protected function getRandomEventWithMultipleParticipations(
-            $centerName = 'Center A',
-            $circleName = 'social')
-    {
-        $event = $this->getRandomEvent($centerName, $circleName);
-        
-        return $event->getParticipations()->count() > 1 ?
-                $event : 
-                $this->getRandomEventWithMultipleParticipations($centerName, $circleName);
-    }
-    
-    /**
-     * Returns a person randomly.
-     * 
-     * This function does not give the same person twice 
-     * for each test.
-     * 
-     * You may ask to ignore some people by adding their id to the property
-     * `$this->personsIdsCache`
-     * 
-     * @param string $centerName
-     * @return \Chill\PersonBundle\Entity\Person
-     */
-    protected function getRandomPerson($centerName = 'Center A')
-    {
-        $center = $this->em->getRepository('ChillMainBundle:Center')
-                ->findByName($centerName);
-        
-        $persons = $this->em->getRepository('ChillPersonBundle:Person')
-                ->findBy(array('center' => $center));
-        
-        $person = $persons[array_rand($persons)];
-        
-        if (in_array($person->getId(), $this->personsIdsCache)) {
-            return $this->getRandomPerson($centerName); // we try another time
-        } else {
-            $this->personsIdsCache[] = $person->getId();
-            return $person;
-        }
-                
-    }
-    
-    public function testNewActionWrongParameters()
-    {
-        $event = $this->getRandomEvent();
-        $person = $this->getRandomPerson();
-        
-        // missing person_id or persons_ids
-        $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'event_id' => $event->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test that /fr/event/participation/new fail if "
-                . "both person_id and persons_ids are missing");
-        
-        // having both person_id and persons_ids
-        $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'event_id' => $event->getId(),
-                    'persons_ids' => implode(',', array(
-                        $this->getRandomPerson()->getId(),
-                        $this->getRandomPerson()->getId()
-                    )),
-                    'person_id' => $person->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "test that /fr/event/participation/new fail if both person_id and "
-                . "persons_ids are set");
-        
-        // missing event_id
-        $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'person_id' => $person->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test that /fr/event/participation/new fails if event_id is missing");
-        
-        // persons_ids with wrong content
-        $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'persons_ids' => 'a,b,531',
-                    'event_id' => $event->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test that /fr/event/participation/new fails if persons_ids has wrong content");
-    }
-    
+
     /**
      * This method test participation creation with wrong parameters.
-     * 
+     *
      * Those request should fail before any processing.
      */
     public function testCreateActionWrongParameters()
     {
         $event = $this->getRandomEvent();
         $person = $this->getRandomPerson();
-        
+
         // missing person_id or persons_ids
-        $this->client->request('GET', '/fr/event/participation/create', 
-                array(
-                    'event_id' => $event->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test that /fr/event/participation/create fail if "
-                . "both person_id and persons_ids are missing");
-        
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/create',
+            [
+                'event_id' => $event->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test that /fr/event/participation/create fail if '
+                . 'both person_id and persons_ids are missing'
+        );
+
         // having both person_id and persons_ids
-        $this->client->request('GET', '/fr/event/participation/create', 
-                array(
-                    'event_id' => $event->getId(),
-                    'persons_ids' => implode(',', array(
-                        $this->getRandomPerson()->getId(),
-                        $this->getRandomPerson()->getId()
-                    )),
-                    'person_id' => $person->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "test that /fr/event/participation/create fail if both person_id and "
-                . "persons_ids are set");
-        
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/create',
+            [
+                'event_id' => $event->getId(),
+                'persons_ids' => implode(',', [
+                    $this->getRandomPerson()->getId(),
+                    $this->getRandomPerson()->getId(),
+                ]),
+                'person_id' => $person->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'test that /fr/event/participation/create fail if both person_id and '
+                . 'persons_ids are set'
+        );
+
         // missing event_id
-        $this->client->request('GET', '/fr/event/participation/create', 
-                array(
-                    'person_id' => $person->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test that /fr/event/participation/create fails if event_id is missing");
-        
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/create',
+            [
+                'person_id' => $person->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test that /fr/event/participation/create fails if event_id is missing'
+        );
+
         // persons_ids with wrong content
-        $this->client->request('GET', '/fr/event/participation/create', 
-                array(
-                    'persons_ids' => 'a,b,531',
-                    'event_id' => $event->getId()
-                ));
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test that /fr/event/participation/create fails if persons_ids has wrong content");
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/create',
+            [
+                'persons_ids' => 'a,b,531',
+                'event_id' => $event->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test that /fr/event/participation/create fails if persons_ids has wrong content'
+        );
     }
-    
-    public function testNewSingleAction()
+
+    public function testEditMultipleAction()
+    {
+        /** @var \Chill\EventBundle\Entity\Event $event */
+        $event = $this->getRandomEventWithMultipleParticipations();
+
+        $crawler = $this->client->request('GET', '/fr/event/participation/' . $event->getId() .
+                '/edit_multiple');
+
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $button = $crawler->selectButton('Mettre à jour');
+        $this->assertEquals(1, $button->count(), "test the form with button 'mettre à jour' exists ");
+
+        $this->client->submit($button->form(), [
+            'form[participations][0][role]' => $event->getType()->getRoles()->first()->getId(),
+            'form[participations][0][status]' => $event->getType()->getStatuses()->first()->getId(),
+            'form[participations][1][role]' => $event->getType()->getRoles()->last()->getId(),
+            'form[participations][1][status]' => $event->getType()->getStatuses()->last()->getId(),
+        ]);
+
+        $this->assertTrue($this->client->getResponse()
+            ->isRedirect('/fr/event/event/' . $event->getId() . '/show'));
+    }
+
+    public function testNewActionWrongParameters()
     {
         $event = $this->getRandomEvent();
-        // record the number of participation for the event
-        $nbParticipations = $event->getParticipations()->count();
         $person = $this->getRandomPerson();
-        
-        $crawler = $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'person_id' => $person->getId(),
-                    'event_id' => $event->getId()
-                ));
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
-                "test that /fr/event/participation/new is successful");
-        
-        $button = $crawler->selectButton('Créer');
-        
-        $this->assertNotNull($button, "test the form with button 'Créer' exists");
-        
-        $this->client->submit($button->form(), array(
-            'participation[role]' => $event->getType()->getRoles()->first()->getId(),
-            'participation[status]' => $event->getType()->getStatuses()->first()->getId()
-        ));
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect());
-        $crawler = $this->client->followRedirect();
-        
-        $span = $crawler->filter('table td span.entity-person a:contains("'
-                .$person->getFirstName().'"):contains("'.$person->getLastname().'")');
-        
-        $this->assertGreaterThan(0, count($span));  
-        
-        // as the container has reloaded, reload the event
-        $event = $this->em->getRepository('ChillEventBundle:Event')->find($event->getId());
-        $this->em->refresh($event);
-        
-        $this->assertEquals($nbParticipations + 1, $event->getParticipations()->count());
+        // missing person_id or persons_ids
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'event_id' => $event->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test that /fr/event/participation/new fail if '
+                . 'both person_id and persons_ids are missing'
+        );
+
+        // having both person_id and persons_ids
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'event_id' => $event->getId(),
+                'persons_ids' => implode(',', [
+                    $this->getRandomPerson()->getId(),
+                    $this->getRandomPerson()->getId(),
+                ]),
+                'person_id' => $person->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'test that /fr/event/participation/new fail if both person_id and '
+                . 'persons_ids are set'
+        );
+
+        // missing event_id
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'person_id' => $person->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test that /fr/event/participation/new fails if event_id is missing'
+        );
+
+        // persons_ids with wrong content
+        $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'persons_ids' => 'a,b,531',
+                'event_id' => $event->getId(),
+            ]
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test that /fr/event/participation/new fails if persons_ids has wrong content'
+        );
     }
-    
+
     public function testNewMultipleAction()
     {
         $event = $this->getRandomEvent();
@@ -286,79 +237,91 @@ class ParticipationControllerTest extends WebTestCase
         $nbParticipations = $event->getParticipations()->count();
         // make ignore the people already in the event from the function getRandomPerson
         $this->personsIdsCache = array_merge(
-                $this->personsIdsCache, 
-                $event->getParticipations()->map(
-                    function($p) { return $p->getPerson()->getId(); }
-                    )
-                    ->toArray()
-            );
+            $this->personsIdsCache,
+            $event->getParticipations()->map(
+                static function ($p) { return $p->getPerson()->getId(); }
+            )
+                ->toArray()
+        );
         // get some random people
         $person1 = $this->getRandomPerson();
         $person2 = $this->getRandomPerson();
-        
-        $crawler = $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'persons_ids' => implode(',', array($person1->getId(), $person2->getId())),
-                    'event_id' => $event->getId()
-                ));
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
-                "test that /fr/event/participation/new is successful");
-        
+        $crawler = $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'persons_ids' => implode(',', [$person1->getId(), $person2->getId()]),
+                'event_id' => $event->getId(),
+            ]
+        );
+
+        $this->assertEquals(
+            200,
+            $this->client->getResponse()->getStatusCode(),
+            'test that /fr/event/participation/new is successful'
+        );
+
         $button = $crawler->selectButton('Créer');
-        
+
         $this->assertNotNull($button, "test the form with button 'Créer' exists");
-        
-        $this->client->submit($button->form(), array(
-            'form' => array(
-                'participations' => array(
-                    0 => array(
+
+        $this->client->submit($button->form(), [
+            'form' => [
+                'participations' => [
+                    0 => [
                         'role' => $event->getType()->getRoles()->first()->getId(),
-                        'status' => $event->getType()->getStatuses()->first()->getId()
-                    ),
-                    1 => array(
+                        'status' => $event->getType()->getStatuses()->first()->getId(),
+                    ],
+                    1 => [
                         'role' => $event->getType()->getRoles()->first()->getId(),
-                        'status' => $event->getType()->getStatuses()->first()->getId()
-                    ),
-                )
-            )
-        ));
-        
+                        'status' => $event->getType()->getStatuses()->first()->getId(),
+                    ],
+                ],
+            ],
+        ]);
+
         $this->assertTrue($this->client->getResponse()->isRedirect());
         $crawler = $this->client->followRedirect();
 
         $span1 = $crawler->filter('table td span.entity-person a:contains("'
-                .$person1->getFirstName().'"):contains("'.$person1->getLastname().'")');
+                . $person1->getFirstName() . '"):contains("' . $person1->getLastname() . '")');
         $this->assertGreaterThan(0, count($span1));
         $span2 = $crawler->filter('table td span.entity-person a:contains("'
-                .$person2->getFirstName().'"):contains("'.$person2->getLastname().'")');
+                . $person2->getFirstName() . '"):contains("' . $person2->getLastname() . '")');
         $this->assertGreaterThan(0, count($span2));
-        
+
         // as the container has reloaded, reload the event
         $event = $this->em->getRepository('ChillEventBundle:Event')->find($event->getId());
         $this->em->refresh($event);
-        
+
         $this->assertEquals($nbParticipations + 2, $event->getParticipations()->count());
     }
-    
+
     public function testNewMultipleWithAllPeopleParticipating()
     {
         $event = $this->getRandomEventWithMultipleParticipations();
-        
+
         $persons_id = implode(',', $event->getParticipations()->map(
-                function($p) { return $p->getPerson()->getId(); }
-                )->toArray());
-        
-        $crawler = $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'persons_ids' => $persons_id,
-                    'event_id' => $event->getId()
-                ));
-        
-        $this->assertEquals(302, $this->client->getResponse()->getStatusCode(),
-                "test that /fr/event/participation/new is redirecting");
+            static function ($p) { return $p->getPerson()->getId(); }
+        )->toArray());
+
+        $crawler = $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'persons_ids' => $persons_id,
+                'event_id' => $event->getId(),
+            ]
+        );
+
+        $this->assertEquals(
+            302,
+            $this->client->getResponse()->getStatusCode(),
+            'test that /fr/event/participation/new is redirecting'
+        );
     }
-    
+
     public function testNewMultipleWithSomePeopleParticipating()
     {
         $event = $this->getRandomEventWithMultipleParticipations();
@@ -366,83 +329,193 @@ class ParticipationControllerTest extends WebTestCase
         $nbParticipations = $event->getParticipations()->count();
         // get the persons_id participating on this event
         $persons_id = $event->getParticipations()->map(
-                function($p) { return $p->getPerson()->getId(); }
-                )->toArray();
+            static function ($p) { return $p->getPerson()->getId(); }
+        )->toArray();
         // exclude the existing persons_ids from the new person
         $this->personsIdsCache = array_merge($this->personsIdsCache, $persons_id);
-        
+
         // get a random person
         $newPerson = $this->getRandomPerson();
-        
+
         // build the `persons_ids` parameter
-        $persons_ids_string = implode(',', array_merge($persons_id, 
-                array($newPerson->getId())));
-        
-        $crawler = $this->client->request('GET', '/fr/event/participation/new', 
-                array(
-                    'persons_ids' => $persons_ids_string,
-                    'event_id' => $event->getId()
-                ));
-        
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
-                "test that /fr/event/participation/new is successful");
-        
+        $persons_ids_string = implode(',', array_merge(
+            $persons_id,
+            [$newPerson->getId()]
+        ));
+
+        $crawler = $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'persons_ids' => $persons_ids_string,
+                'event_id' => $event->getId(),
+            ]
+        );
+
+        $this->assertEquals(
+            200,
+            $this->client->getResponse()->getStatusCode(),
+            'test that /fr/event/participation/new is successful'
+        );
+
         // count that the one UL contains the new person string
         $firstPerson = $event->getParticipations()->first()->getPerson();
-        $ul = $crawler->filter('ul:contains("'.$firstPerson->getLastName().'")'
-                . ':contains("'.$firstPerson->getFirstName().'")');
-        
-        $this->assertEquals(1, $ul->count(),
-                "assert an ul containing the name of ignored people is present");
-        $this->assertEquals($event->getParticipations()->count(), $ul->children()->count(),
-                "assert the li listing ignored people has the correct number");
-        
+        $ul = $crawler->filter('ul:contains("' . $firstPerson->getLastName() . '")'
+                . ':contains("' . $firstPerson->getFirstName() . '")');
+
+        $this->assertEquals(
+            1,
+            $ul->count(),
+            'assert an ul containing the name of ignored people is present'
+        );
+        $this->assertEquals(
+            $event->getParticipations()->count(),
+            $ul->children()->count(),
+            'assert the li listing ignored people has the correct number'
+        );
+
         // test a form is present on the page
         $button = $crawler->selectButton('Créer');
-        
+
         $this->assertNotNull($button, "test the form with button 'Créer' exists");
-        
+
         // submit the form
-        $this->client->submit($button->form(), array(
+        $this->client->submit($button->form(), [
             'participation[role]' => $event->getType()->getRoles()->first()->getId(),
-            'participation[status]' => $event->getType()->getStatuses()->first()->getId()
-        ));
-        
+            'participation[status]' => $event->getType()->getStatuses()->first()->getId(),
+        ]);
+
         $this->assertTrue($this->client->getResponse()->isRedirect());
-        
+
         // reload the event and test there is a new participation
         $event = $this->em->getRepository('ChillEventBundle:Event')
-                ->find($event->getId());
+            ->find($event->getId());
         $this->em->refresh($event);
-        
-        $this->assertEquals($nbParticipations + 1, $event->getParticipations()->count(),
-                "Test we have persisted a new participation associated to the test");
+
+        $this->assertEquals(
+            $nbParticipations + 1,
+            $event->getParticipations()->count(),
+            'Test we have persisted a new participation associated to the test'
+        );
     }
-    
-    public function testEditMultipleAction()
+
+    public function testNewSingleAction()
     {
-        /* @var $event \Chill\EventBundle\Entity\Event */
-        $event = $this->getRandomEventWithMultipleParticipations();
-        
-        $crawler = $this->client->request('GET', '/fr/event/participation/'.$event->getId().
-                '/edit_multiple');
-        
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-        
-        $button = $crawler->selectButton('Mettre à jour');
-        $this->assertEquals(1, $button->count(), "test the form with button 'mettre à jour' exists ");
-        
-        
-        $this->client->submit($button->form(), array(
-            'form[participations][0][role]' => $event->getType()->getRoles()->first()->getId(),
-            'form[participations][0][status]' => $event->getType()->getStatuses()->first()->getId(),
-            'form[participations][1][role]' => $event->getType()->getRoles()->last()->getId(),
-            'form[participations][1][status]' => $event->getType()->getStatuses()->last()->getId(),
-        ));
-        
-        $this->assertTrue($this->client->getResponse()
-                ->isRedirect('/fr/event/event/'.$event->getId().'/show'));
+        $event = $this->getRandomEvent();
+        // record the number of participation for the event
+        $nbParticipations = $event->getParticipations()->count();
+        $person = $this->getRandomPerson();
+
+        $crawler = $this->client->request(
+            'GET',
+            '/fr/event/participation/new',
+            [
+                'person_id' => $person->getId(),
+                'event_id' => $event->getId(),
+            ]
+        );
+
+        $this->assertEquals(
+            200,
+            $this->client->getResponse()->getStatusCode(),
+            'test that /fr/event/participation/new is successful'
+        );
+
+        $button = $crawler->selectButton('Créer');
+
+        $this->assertNotNull($button, "test the form with button 'Créer' exists");
+
+        $this->client->submit($button->form(), [
+            'participation[role]' => $event->getType()->getRoles()->first()->getId(),
+            'participation[status]' => $event->getType()->getStatuses()->first()->getId(),
+        ]);
+
+        $this->assertTrue($this->client->getResponse()->isRedirect());
+        $crawler = $this->client->followRedirect();
+
+        $span = $crawler->filter('table td span.entity-person a:contains("'
+                . $person->getFirstName() . '"):contains("' . $person->getLastname() . '")');
+
+        $this->assertGreaterThan(0, count($span));
+
+        // as the container has reloaded, reload the event
+        $event = $this->em->getRepository('ChillEventBundle:Event')->find($event->getId());
+        $this->em->refresh($event);
+
+        $this->assertEquals($nbParticipations + 1, $event->getParticipations()->count());
+    }
+
+    /**
+     * @param mixed $centerName
+     * @param mixed $circleName
+     *
+     * @return \Chill\EventBundle\Entity\Event
+     */
+    protected function getRandomEvent($centerName = 'Center A', $circleName = 'social')
+    {
+        $center = $this->em->getRepository('ChillMainBundle:Center')
+            ->findByName($centerName);
+
+        $circles = $this->em->getRepository('ChillMainBundle:Scope')
+            ->findAll();
+        array_filter($circles, static function ($circle) use ($circleName) {
+            return in_array($circleName, $circle->getName(), true);
+        });
+        $circle = $circles[0];
+
+        $events = $this->em->getRepository('ChillEventBundle:Event')
+            ->findBy(['center' => $center, 'circle' => $circle]);
+
+        return $events[array_rand($events)];
+    }
+
+    /**
+     * Return a random event only if he has more than one participation.
+     *
+     * @param string $centerName
+     * @param type $circleName
+     *
+     * @return \Chill\EventBundle\Entity\Event
+     */
+    protected function getRandomEventWithMultipleParticipations(
+        $centerName = 'Center A',
+        $circleName = 'social'
+    ) {
+        $event = $this->getRandomEvent($centerName, $circleName);
+
+        return $event->getParticipations()->count() > 1 ?
+                $event :
+                $this->getRandomEventWithMultipleParticipations($centerName, $circleName);
+    }
+
+    /**
+     * Returns a person randomly.
+     *
+     * This function does not give the same person twice
+     * for each test.
+     *
+     * You may ask to ignore some people by adding their id to the property
+     * `$this->personsIdsCache`
+     *
+     * @param string $centerName
+     *
+     * @return \Chill\PersonBundle\Entity\Person
+     */
+    protected function getRandomPerson($centerName = 'Center A')
+    {
+        $center = $this->em->getRepository('ChillMainBundle:Center')
+            ->findByName($centerName);
+
+        $persons = $this->em->getRepository('ChillPersonBundle:Person')
+            ->findBy(['center' => $center]);
+
+        $person = $persons[array_rand($persons)];
+
+        if (in_array($person->getId(), $this->personsIdsCache, true)) {
+            return $this->getRandomPerson($centerName); // we try another time
+        }
+        $this->personsIdsCache[] = $person->getId();
+
+        return $person;
     }
-    
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
index f2286f208..d24b10a40 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/RoleControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class RoleControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class RoleControllerTest extends WebTestCase
 {
     public function testSkipped()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class RoleControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
index 99e297575..d07909032 100644
--- a/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Controller/StatusControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class StatusControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class StatusControllerTest extends WebTestCase
 {
     public function testSkipped()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class StatusControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
index bb31a7bfa..3e93c0dbf 100644
--- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
+++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php
@@ -1,398 +1,388 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Tests\Search;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\EventBundle\Entity\Event;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Chill\EventBundle\Search\EventSearch;
-
+use DateTime;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function in_array;
 
 /**
- * Test the EventSearch class
+ * Test the EventSearch class.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class EventSearchTest extends WebTestCase
+final class EventSearchTest extends WebTestCase
 {
     /**
-     * The eventSearch service, which is used to search events
+     * The center A.
+     *
+     * @var \Chill\MainBundle\Entity\Center
+     */
+    protected $centerA;
+
+    /**
+     * @var \Symfony\Component\BrowserKit\Client
+     */
+    protected $client;
+
+    /**
+     * @var \Doctrine\ORM\EntityManagerInterface
+     */
+    protected $entityManager;
+
+    /**
+     * Events created during this test.
+     *
+     * @var Event[]
+     */
+    protected $events = [];
+
+    /**
+     * The eventSearch service, which is used to search events.
      *
      * @var \Chill\EventBundle\Search\EventSearch
      */
     protected $eventSearch;
-    
+
     /**
-     *
-     * @var \Doctrine\ORM\EntityManagerInterface
-     */
-    protected $entityManager;
-    
-    /**
-     * The center A
-     * 
-     * @var \Chill\MainBundle\Entity\Center
-     */
-    protected $centerA;
-    
-    /**
-     * a random event type
+     * a random event type.
      *
      * @var \Chill\EventBundle\Entity\EventType
      */
     protected $eventType;
-    
+
     /**
-     * Events created during this test
-     *
-     * @var Event[]
-     */
-    protected $events = array();
-    
-    /**
-     *
      * @var \Prophecy\Prophet
      */
     protected $prophet;
-    
-    /**
-     *
-     * @var \Symfony\Component\BrowserKit\Client
-     */
-    protected $client;
-    
+
     public function setUp()
     {
         self::bootKernel();
-        /* @var $kernel \Symfony\Component\HttpKernel\KernelInterface */
+        /** @var \Symfony\Component\HttpKernel\KernelInterface $kernel */
         $kernel = self::$kernel;
-        
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
-        
-        $this->prophet = new \Prophecy\Prophet;
-        
+
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
+
+        $this->prophet = new \Prophecy\Prophet();
+
         $this->entityManager = self::$kernel->getContainer()
-                ->get('doctrine.orm.entity_manager')
-                ;
-        
+            ->get('doctrine.orm.entity_manager');
+
         $this->centerA = $this->entityManager
-                ->getRepository('ChillMainBundle:Center')
-                ->findOneBy(array('name' => 'Center A'));
-        
+            ->getRepository('ChillMainBundle:Center')
+            ->findOneBy(['name' => 'Center A']);
+
         $this->eventType = $this->entityManager
-                ->getRepository('ChillEventBundle:EventType')
-                ->findAll()[0];
-        
+            ->getRepository('ChillEventBundle:EventType')
+            ->findAll()[0];
+
         $this->createEvents();
     }
-    
+
     public function tearDown()
     {
         foreach ($this->events as $event) {
             $this->entityManager->createQuery('DELETE FROM ChillEventBundle:Event e WHERE e.id = :event_id')
-                    ->setParameter('event_id', $event->getId())
-                    ->execute();
+                ->setParameter('event_id', $event->getId())
+                ->execute();
         }
-        
-        $this->events = array();
+
+        $this->events = [];
     }
-    
+
+    public function testDisplayAll()
+    {
+        $crawler = $this->client->request('GET', '/fr/search', [
+            'q' => '@events',
+        ]);
+
+        $this->assertGreaterThanOrEqual(
+            2,
+            $crawler->filter('table.events tr')->count(),
+            'assert than more than 2 tr are present'
+        );
+    }
+
+    /**
+     * Test that a user connected with an user with the wrong center does not
+     * see the events.
+     */
+    public function testDisplayAllWrongUser()
+    {
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center b_social',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
+
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@events printemps',
+        ]);
+
+        $this->assertEquals(
+            0,
+            $crawler->filter('tr:contains("Printemps")')->count(),
+            'assert that the word "printemps" is present'
+        );
+    }
+
+    public function testSearchByDateDateBetween()
+    {
+        // serach with date from **and** date-to
+        $crawler = $this->client->request('GET', '/fr/search', [
+            'q' => '@events date-from:2016-05-30 date-to:2016-06-20',
+        ]);
+
+        /** @var DateTime $dateFrom the date from in DateTime */
+        $dateFrom = DateTime::createFromFormat('Y-m-d', '2016-05-30');
+        $dateTo = DateTime::createFromFormat('Y-m-d', '2016-06-20');
+
+        $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
+
+        foreach ($dates as $date) {
+            $this->assertGreaterThanOrEqual($dateFrom, $date);
+            $this->assertLessThanOrEqual($dateTo, $date);
+        }
+
+        // there should not have any other results, but if any other bundle
+        // add some other event, we go on next pages
+
+        if ($crawler->selectLink('Voir tous les résultats')->count() === 0) {
+            return;
+        }
+
+        // click on link "Voir tous les résultats"
+        $crawlerAllResults = $this->client->click($crawler
+            ->selectLink('Voir tous les résultats')->link());
+        $dates = $this->iterateOnRowsToFindDate($crawlerAllResults->filter('tr'));
+
+        foreach ($dates as $date) {
+            $this->assertGreaterThanOrEqual($dateFrom, $date);
+            $this->assertLessThanOrEqual($dateTo, $date);
+        }
+
+        //iterate on pagination
+        $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) use ($dateFrom) {
+            $page = $this->client->click($a->link());
+            $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
+
+            foreach ($dates as $date) {
+                $this->assertGreaterThanOrEqual($dateFrom, $date);
+                $this->assertLessThanOrEqual($dateTo, $date);
+            }
+        });
+    }
+
+    public function testSearchByDateDateFromOnly()
+    {
+        // search with date from
+        $crawler = $this->client->request('GET', '/fr/search', [
+            'q' => '@events date-from:2016-05-30',
+        ]);
+        /** @var DateTime $dateFrom the date from in DateTime */
+        $dateFrom = DateTime::createFromFormat('Y-m-d', '2016-05-30');
+
+        $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
+
+        foreach ($dates as $date) {
+            $this->assertGreaterThanOrEqual($dateFrom, $date);
+        }
+
+        // click on link "Voir tous les résultats"
+        $crawlerAllResults = $this->client->click($crawler
+            ->selectLink('Voir tous les résultats')->link());
+        $dates = $this->iterateOnRowsToFindDate($crawlerAllResults->filter('tr'));
+
+        foreach ($dates as $date) {
+            $this->assertGreaterThanOrEqual($dateFrom, $date);
+        }
+
+        //iterate on pagination
+        $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) use ($dateFrom) {
+            $page = $this->client->click($a->link());
+            $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
+
+            foreach ($dates as $date) {
+                $this->assertGreaterThanOrEqual($dateFrom, $date);
+            }
+        });
+    }
+
+    public function testSearchByDateDateTo()
+    {
+        // serach with date from **and** date-to
+        $crawler = $this->client->request('GET', '/fr/search', [
+            'q' => '@events date:2016-05-30',
+        ]);
+
+        /** @var DateTime $dateFrom the date from in DateTime */
+        $dateTo = DateTime::createFromFormat('Y-m-d', '2016-05-30');
+
+        $dates = $this->iterateOnRowsToFindDate($crawler->filter('tr'));
+
+        foreach ($dates as $date) {
+            $this->assertLessThanOrEqual($dateTo, $date);
+        }
+
+        if ($crawler->selectLink('Voir tous les résultats')->count() === 0) {
+            return;
+        }
+
+        // click on link "Voir tous les résultats"
+        $crawlerAllResults = $this->client->click($crawler
+            ->selectLink('Voir tous les résultats')->link());
+        $dates = $this->iterateOnRowsToFindDate($crawlerAllResults->filter('tr'));
+
+        foreach ($dates as $date) {
+            $this->assertLessThanOrEqual($dateTo, $date);
+        }
+
+        //iterate on pagination
+        $crawlerAllResults->filter('.pagination a')->each(function ($a, $i) {
+            $page = $this->client->click($a->link());
+            $dates = $this->iterateOnRowsToFindDate($page->filter('tr'));
+
+            foreach ($dates as $date) {
+                $this->assertLessThanOrEqual($dateTo, $date);
+            }
+        });
+    }
+
+    public function testSearchByDefault()
+    {
+        $crawler = $this->client->request('GET', '/fr/search', [
+            'q' => '@events printemps',
+        ]);
+
+        $this->assertEquals(
+            1,
+            $crawler->filter('table.events tr')->count() - 1 /* as the header is a th */ ,
+            'assert than more than 2 tr are present'
+        );
+
+        $this->assertEquals(
+            1,
+            $crawler->filter('tr:contains("Printemps")')->count(),
+            'assert that the word "printemps" is present'
+        );
+    }
+
+    public function testSearchByName()
+    {
+        $crawler = $this->client->request('GET', '/fr/search', [
+            'q' => '@events name:printemps',
+        ]);
+
+        $this->assertEquals(
+            1,
+            $crawler->filter('table.events tr')->count() - 1 /* as the header is a th */ ,
+            'assert than more than 2 tr are present'
+        );
+
+        $this->assertEquals(
+            1,
+            $crawler->filter('tr:contains("Printemps")')->count(),
+            'assert that the word "printemps" is present'
+        );
+    }
+
     protected function createEvents()
     {
         $event1 = (new Event())
-                ->setCenter($this->centerA)
-                ->setDate(new \DateTime('2016-05-30'))
-                ->setName('Printemps européen')
-                ->setType($this->eventType)
-                ->setCircle($this->getCircle())
-                ;
+            ->setCenter($this->centerA)
+            ->setDate(new DateTime('2016-05-30'))
+            ->setName('Printemps européen')
+            ->setType($this->eventType)
+            ->setCircle($this->getCircle());
         $this->entityManager->persist($event1);
         $this->events[] = $event1;
-        
+
         $event2 = (new Event())
-                ->setCenter($this->centerA)
-                ->setDate(new \DateTime('2016-06-24'))
-                ->setName('Hiver de la droite')
-                ->setType($this->eventType)
-                ->setCircle($this->getCircle())
-                ;
+            ->setCenter($this->centerA)
+            ->setDate(new DateTime('2016-06-24'))
+            ->setName('Hiver de la droite')
+            ->setType($this->eventType)
+            ->setCircle($this->getCircle());
         $this->entityManager->persist($event2);
         $this->events[] = $event2;
-        
+
         $this->entityManager->flush();
     }
-    
+
     /**
-     * 
      * @param string $name the name of the circle
+     *
      * @return \Chill\MainBundle\Entity\Scope
      */
     protected function getCircle($name = 'social')
     {
         $circles = $this->entityManager->getRepository('ChillMainBundle:Scope')
-                ->findAll();
-        
-        /* @var $circle \Chill\MainBundle\Entity\Scope */
-        foreach($circles as $circle) {
-            if (in_array($name, $circle->getName())) {
+            ->findAll();
+
+        /** @var \Chill\MainBundle\Entity\Scope $circle */
+        foreach ($circles as $circle) {
+            if (in_array($name, $circle->getName(), true)) {
                 return $circle;
             }
         }
     }
-    
-    public function testDisplayAll()
-    {
-        $crawler = $this->client->request('GET', '/fr/search', array(
-                'q' => '@events'
-            ));
-        
-        $this->assertGreaterThanOrEqual(2, $crawler->filter('table.events tr')->count(),
-                'assert than more than 2 tr are present');
-    }
-    
-    public function testSearchByDefault()
-    {
-        $crawler = $this->client->request('GET', '/fr/search', array(
-                'q' => '@events printemps'
-            ));
 
-        $this->assertEquals(
-                1, 
-                $crawler->filter('table.events tr')->count() - 1 /* as the header is a th */,
-                'assert than more than 2 tr are present');
-        
-        $this->assertEquals(
-                1, 
-                $crawler->filter('tr:contains("Printemps")')->count(),
-                'assert that the word "printemps" is present');
-    }
-    
-    public function testSearchByName()
-    {
-        $crawler = $this->client->request('GET', '/fr/search', array(
-                'q' => '@events name:printemps'
-            ));
-
-        $this->assertEquals(
-                1, 
-                $crawler->filter('table.events tr')->count() - 1 /* as the header is a th */,
-                'assert than more than 2 tr are present');
-        
-        $this->assertEquals(
-                1, 
-                $crawler->filter('tr:contains("Printemps")')->count(),
-                'assert that the word "printemps" is present');
-    }
-    
-    public function testSearchByDateDateFromOnly()
-    {
-        // search with date from
-        $crawler = $this->client->request('GET', '/fr/search', array(
-                'q' => '@events date-from:2016-05-30'
-            ));
-        /* @var $dateFrom \DateTime the date from in DateTime */
-        $dateFrom = \DateTime::createFromFormat("Y-m-d", "2016-05-30");
-        
-        $dates = $this->iterateOnRowsToFindDate($crawler->filter("tr"));
-        
-        foreach($dates as $date) {
-            $this->assertGreaterThanOrEqual($dateFrom, $date);
-        }
-        
-        // click on link "Voir tous les résultats"
-        $crawlerAllResults = $this->client->click($crawler
-                ->selectLink("Voir tous les résultats")->link());
-        $dates = $this->iterateOnRowsToFindDate($crawlerAllResults->filter("tr"));
-        
-        foreach ($dates as $date) {
-            $this->assertGreaterThanOrEqual($dateFrom, $date);
-        }
-        
-        //iterate on pagination
-        $crawlerAllResults->filter(".pagination a")->each(function($a, $i) use ($dateFrom) {
-            $page = $this->client->click($a->link());
-            $dates = $this->iterateOnRowsToFindDate($page->filter("tr"));
-            
-            foreach($dates as $date) {
-                $this->assertGreaterThanOrEqual($dateFrom, $date);
-            }
-        });
-    }
-        
-    public function testSearchByDateDateBetween()
-    {
-        // serach with date from **and** date-to
-        $crawler = $this->client->request('GET', '/fr/search', array(
-                'q' => '@events date-from:2016-05-30 date-to:2016-06-20'
-            ));
-        
-        /* @var $dateFrom \DateTime the date from in DateTime */
-        $dateFrom = \DateTime::createFromFormat("Y-m-d", "2016-05-30");
-        $dateTo   = \DateTime::createFromFormat("Y-m-d", "2016-06-20");
-        
-        $dates = $this->iterateOnRowsToFindDate($crawler->filter("tr"));
-        
-        foreach($dates as $date) {
-            $this->assertGreaterThanOrEqual($dateFrom, $date);
-            $this->assertLessThanOrEqual($dateTo, $date);
-        }
-        
-        // there should not have any other results, but if any other bundle 
-        // add some other event, we go on next pages
-        
-        if ($crawler->selectLink("Voir tous les résultats")->count() == 0) {
-            return ;
-        }
-        
-        // click on link "Voir tous les résultats"
-        $crawlerAllResults = $this->client->click($crawler
-                ->selectLink("Voir tous les résultats")->link());
-        $dates = $this->iterateOnRowsToFindDate($crawlerAllResults->filter("tr"));
-        
-        foreach ($dates as $date) {
-            $this->assertGreaterThanOrEqual($dateFrom, $date);
-            $this->assertLessThanOrEqual($dateTo, $date);
-        }
-        
-        //iterate on pagination
-        $crawlerAllResults->filter(".pagination a")->each(function($a, $i) use ($dateFrom) {
-            $page = $this->client->click($a->link());
-            $dates = $this->iterateOnRowsToFindDate($page->filter("tr"));
-            
-            foreach($dates as $date) {
-                $this->assertGreaterThanOrEqual($dateFrom, $date);
-                $this->assertLessThanOrEqual($dateTo, $date);
-            }
-        });
-    }
-    
-    public function testSearchByDateDateTo()
-    {
-        
-        // serach with date from **and** date-to
-        $crawler = $this->client->request('GET', '/fr/search', array(
-                'q' => '@events date:2016-05-30'
-            ));
-
-        /* @var $dateFrom \DateTime the date from in DateTime */
-        $dateTo   = \DateTime::createFromFormat("Y-m-d", "2016-05-30");
-        
-        $dates = $this->iterateOnRowsToFindDate($crawler->filter("tr"));
-        
-        foreach($dates as $date) {
-            $this->assertLessThanOrEqual($dateTo, $date);
-        }
-        
-        if ($crawler->selectLink("Voir tous les résultats")->count() == 0) {
-            return ;
-        }
-        
-        // click on link "Voir tous les résultats"
-        $crawlerAllResults = $this->client->click($crawler
-                ->selectLink("Voir tous les résultats")->link());
-        $dates = $this->iterateOnRowsToFindDate($crawlerAllResults->filter("tr"));
-        
-        foreach ($dates as $date) {
-            $this->assertLessThanOrEqual($dateTo, $date);
-        }
-        
-        //iterate on pagination
-        $crawlerAllResults->filter(".pagination a")->each(function($a, $i) use ($dateFrom) {
-            $page = $this->client->click($a->link());
-            $dates = $this->iterateOnRowsToFindDate($page->filter("tr"));
-            
-            foreach($dates as $date) {
-                $this->assertLessThanOrEqual($dateTo, $date);
-            }
-        });
-        
-    }
-    
     /**
      * this function iterate on row from results of events and return the content
-     * of the second column (which should contains the date) in DateTime objects
-     * 
-     * @param \Symfony\Component\DomCrawler\Crawler $trs
-     * @return \DateTime[]
+     * of the second column (which should contains the date) in DateTime objects.
+     *
+     * @return DateTime[]
      */
     private function iterateOnRowsToFindDate(\Symfony\Component\DomCrawler\Crawler $trs)
     {
-        $months = array(
-            "janvier" => 1,
-            "février" => 2,
-            "mars"    => 3,
-            "avril"   => 4,
-            "mai"     => 5,
-            "juin"    => 6,
-            "juillet" => 7,
-            "août"    => 8,
-            "septembre" => 9,
-            "octobre"   => 10,
-            "novembre"  => 11,
-            "décembre"  => 12
-        );
-        
-        
-        $results = $trs->each(function($tr, $i) use ($months) {
+        $months = [
+            'janvier' => 1,
+            'février' => 2,
+            'mars' => 3,
+            'avril' => 4,
+            'mai' => 5,
+            'juin' => 6,
+            'juillet' => 7,
+            'août' => 8,
+            'septembre' => 9,
+            'octobre' => 10,
+            'novembre' => 11,
+            'décembre' => 12,
+        ];
+
+        $results = $trs->each(static function ($tr, $i) use ($months) {
             // we skip the first row
-            if ($i > 0) {
+            if (0 < $i) {
                 // get the second node, which should contains a date
-                $tdDate = $tr->filter("td")->eq(1);
+                $tdDate = $tr->filter('td')->eq(1);
                 // transform the date, which should be in french, into a DateTime object
-                $parts = explode(" ", $tdDate->text());
-                return \DateTime::createFromFormat("Y-m-d", $parts[2].
-                        "-".$months[$parts[1]]."-".$parts[0]);
+                $parts = explode(' ', $tdDate->text());
+
+                return DateTime::createFromFormat('Y-m-d', $parts[2] .
+                        '-' . $months[$parts[1]] . '-' . $parts[0]);
             }
         });
-        
+
         // remove the first row
         unset($results[0]);
-        
+
         return $results;
     }
-    
-    /**
-     * Test that a user connected with an user with the wrong center does not
-     * see the events
-     */
-    public function testDisplayAllWrongUser()
-    {
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center b_social',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
-        
-        $crawler = $client->request('GET', '/fr/search', array(
-                'q' => '@events printemps'
-            ));
-        
-        $this->assertEquals(0, $crawler->filter('tr:contains("Printemps")')->count(),
-                'assert that the word "printemps" is present');
-        
-    }
-    
-    
-    
 }
diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
index ffb068d70..c8747a2c4 100644
--- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
@@ -1,42 +1,32 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2019 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\EventBundle\Timeline;
 
 use Chill\EventBundle\Entity\Event;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Chill\MainBundle\Timeline\TimelineSingleQuery;
-use Doctrine\ORM\EntityManager;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use LogicException;
+use RuntimeException;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use function count;
 
 /**
- * Class TimelineEventProvider
- *
- * @package Chill\EventBundle\Timeline
- * @author  Mathieu Jaumotte jaum_mathieu@collectifs.net
+ * Class TimelineEventProvider.
  */
 class TimelineEventProvider implements TimelineProviderInterface
 {
@@ -44,23 +34,19 @@ class TimelineEventProvider implements TimelineProviderInterface
      * @var EntityManager
      */
     protected $em;
-    
+
     /**
      * @var AuthorizationHelper
      */
     protected $helper;
-    
+
     /**
      * @var User
      */
     protected $user;
-    
+
     /**
      * TimelineEventProvider constructor.
-     *
-     * @param EntityManager $em
-     * @param AuthorizationHelper $helper
-     * @param TokenStorageInterface $storage
      */
     public function __construct(
         EntityManager $em,
@@ -69,44 +55,104 @@ class TimelineEventProvider implements TimelineProviderInterface
     ) {
         $this->em = $em;
         $this->helper = $helper;
+
         if (!$storage->getToken()->getUser() instanceof User) {
-            throw new \RuntimeException('A user should be authenticated !');
+            throw new RuntimeException('A user should be authenticated !');
         }
         $this->user = $storage->getToken()->getUser();
     }
-    
+
     /**
      * @param string $context
-     * @param array $args
-     * @return array|string[]
+     *
      * @throws \Doctrine\ORM\Mapping\MappingException
+     *
+     * @return array|string[]
      */
     public function fetchQuery($context, array $args)
     {
         $this->checkContext($context);
-        
+
         $metadataEvent = $this->em->getClassMetadata('ChillEventBundle:Event');
         $metadataParticipation = $this->em->getClassMetadata('ChillEventBundle:Participation');
         $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
-        
-        $query = TimelineSingleQuery::fromArray([
-            'id' => $metadataEvent->getTableName().'.'.$metadataEvent->getColumnName('id'),
+
+        return TimelineSingleQuery::fromArray([
+            'id' => $metadataEvent->getTableName() . '.' . $metadataEvent->getColumnName('id'),
             'type' => 'event',
-            'date' => $metadataEvent->getTableName().'.'.$metadataEvent->getColumnName('date'),
+            'date' => $metadataEvent->getTableName() . '.' . $metadataEvent->getColumnName('date'),
             'FROM' => $this->getFromClause($metadataEvent, $metadataParticipation, $metadataPerson),
             'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person']),
-            'parameters' => []
+            'parameters' => [],
         ]);
-        
-        return $query;
     }
-    
+
+    /**
+     * @return array|mixed[]
+     */
+    public function getEntities(array $ids)
+    {
+        $events = $this->em->getRepository(Event::class)
+            ->findBy(['id' => $ids]);
+
+        $result = [];
+
+        foreach ($events as $event) {
+            $result[$event->getId()] = $event;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Event $entity
+     * @param string $context
+     *
+     * @return array|mixed[]
+     */
+    public function getEntityTemplate($entity, $context, array $args)
+    {
+        $this->checkContext($context);
+
+        return [
+            'template' => 'ChillEventBundle:Timeline:event_person_context.html.twig',
+            'template_data' => [
+                'event' => $entity,
+                'person' => $args['person'],
+                'user' => $this->user,
+            ],
+        ];
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return bool
+     */
+    public function supportsType($type)
+    {
+        return 'event' === $type;
+    }
+
+    /**
+     * check if the context is supported.
+     *
+     * @param string $context
+     *
+     * @throws LogicException if the context is not supported
+     */
+    private function checkContext($context)
+    {
+        if ('person' !== $context) {
+            throw new LogicException("The context '{$context}' is not "
+                . "supported. Currently only 'person' is supported");
+        }
+    }
+
     /**
-     * @param ClassMetadata $metadataEvent
-     * @param ClassMetadata $metadataParticipation
-     * @param ClassMetadata $metadataPerson
-     * @return string
      * @throws \Doctrine\ORM\Mapping\MappingException
+     *
+     * @return string
      */
     private function getFromClause(
         ClassMetadata $metadataEvent,
@@ -115,30 +161,25 @@ class TimelineEventProvider implements TimelineProviderInterface
     ) {
         $eventParticipationMapping = $metadataParticipation->getAssociationMapping('event');
         $participationPersonMapping = $metadataParticipation->getAssociationMapping('person');
-        
+
         return $metadataEvent->getTableName()
+            . ' JOIN ' . $metadataParticipation->getTableName()
+            . ' ON ' . $metadataParticipation->getTableName()
+            . '.' . $eventParticipationMapping['joinColumns'][0]['name']
+            . ' = ' . $metadataEvent->getTableName()
+            . '.' . $eventParticipationMapping['joinColumns'][0]['referencedColumnName']
 
-            .' JOIN '.$metadataParticipation->getTableName()
-            .' ON '  .$metadataParticipation->getTableName()
-            .'.'     .$eventParticipationMapping['joinColumns'][0]['name']
-            .' = '   .$metadataEvent->getTableName()
-            .'.'     .$eventParticipationMapping['joinColumns'][0]['referencedColumnName']
-
-            .' JOIN '.$metadataPerson->getTableName()
-            .' ON '  .$metadataPerson->getTableName()
-            .'.'     .$participationPersonMapping['joinColumns'][0]['referencedColumnName']
-            .' = '   .$metadataParticipation->getTableName()
-            .'.'     .$participationPersonMapping['joinColumns'][0]['name']
-            ;
+            . ' JOIN ' . $metadataPerson->getTableName()
+            . ' ON ' . $metadataPerson->getTableName()
+            . '.' . $participationPersonMapping['joinColumns'][0]['referencedColumnName']
+            . ' = ' . $metadataParticipation->getTableName()
+            . '.' . $participationPersonMapping['joinColumns'][0]['name'];
     }
-    
+
     /**
-     * @param ClassMetadata $metadataEvent
-     * @param ClassMetadata $metadataParticipation
-     * @param ClassMetadata $metadataPerson
-     * @param Person $person
-     * @return string
      * @throws \Doctrine\ORM\Mapping\MappingException
+     *
+     * @return string
      */
     private function getWhereClause(
         ClassMetadata $metadataEvent,
@@ -146,24 +187,27 @@ class TimelineEventProvider implements TimelineProviderInterface
         ClassMetadata $metadataPerson,
         Person $person
     ) {
-        $role = new Role('CHILL_EVENT_SEE');
-        
+        $role = 'CHILL_EVENT_SEE';
+
         $reachableCenters = $this->helper->getReachableCenters($this->user, $role);
         $associationMapping = $metadataParticipation->getAssociationMapping('person');
-        
+
         if (count($reachableCenters) === 0) {
             return 'FALSE = TRUE';
         }
-    
-        $whereClause = sprintf( '%s = %d',
+
+        $whereClause = sprintf(
+            '%s = %d',
             $associationMapping['joinColumns'][0]['name'],
-            $person->getId());
-        
+            $person->getId()
+        );
+
         // and
-        $centerAndScopeLines = array();
+        $centerAndScopeLines = [];
+
         foreach ($reachableCenters as $center) {
             $reachableCircleId = array_map(
-                function (Scope $scope) { return $scope->getId(); },
+                static function (Scope $scope) { return $scope->getId(); },
                 $this->helper->getReachableCircles($this->user, $role, $person->getCenter())
             );
             $centerAndScopeLines[] = sprintf(
@@ -176,68 +220,8 @@ class TimelineEventProvider implements TimelineProviderInterface
                 implode(',', $reachableCircleId)
             );
         }
-        $whereClause .= ' AND ('. implode(' OR ', $centerAndScopeLines) .')';
-        
+        $whereClause .= ' AND (' . implode(' OR ', $centerAndScopeLines) . ')';
+
         return $whereClause;
     }
-    
-    /**
-     * check if the context is supported
-     *
-     * @param string $context
-     * @throws \LogicException if the context is not supported
-     */
-    private function checkContext($context)
-    {
-        if ($context !== 'person') {
-            throw new \LogicException("The context '$context' is not "
-                . "supported. Currently only 'person' is supported");
-        }
-    }
-    
-    /**
-     * @param string $type
-     * @return bool
-     */
-    public function supportsType($type)
-    {
-        return $type === 'event';
-    }
-    
-    /**
-     * @param array $ids
-     * @return array|mixed[]
-     */
-    public function getEntities(array $ids) {
-    
-        $events = $this->em->getRepository(Event::class)
-            ->findBy(array('id' => $ids));
-        
-        $result = array();
-        foreach ($events as $event) {
-            $result[$event->getId()] = $event;
-        }
-        return $result;
-    }
-    
-    /**
-     * @param Event $entity
-     * @param string $context
-     * @param array $args
-     * @return array|mixed[]
-     */
-    public function getEntityTemplate($entity, $context, array $args) {
-    
-        $this->checkContext($context);
-        
-        return array(
-            'template' => 'ChillEventBundle:Timeline:event_person_context.html.twig',
-            'template_data' => array(
-                'event' => $entity,
-                'person' => $args['person'],
-                'user' => $this->user
-            )
-        );
-    }
-    
 }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
index 50671534e..241003abf 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20160318111334.php
@@ -1,22 +1,57 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Event;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Initialize the bundle chill_event
+ * Initialize the bundle chill_event.
  */
 class Version20160318111334 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_event_role DROP CONSTRAINT FK_AA714E54C54C8C93');
+        $this->addSql('ALTER TABLE chill_event_status DROP CONSTRAINT FK_A6CC85D0C54C8C93');
+        $this->addSql('ALTER TABLE chill_event_participation DROP CONSTRAINT FK_4E7768ACD60322AC');
+        $this->addSql('ALTER TABLE chill_event_participation DROP CONSTRAINT FK_4E7768AC6BF700BD');
+        $this->addSql('ALTER TABLE chill_event_participation DROP CONSTRAINT FK_4E7768AC71F7E88B');
+        // drop center_id constraint
+        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC85932F377');
+        // drop type_id constraint
+        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC8C54C8C93');
+        // drop circle_id constraint
+        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC870EE2FF6');
+
+        $this->addSql('DROP SEQUENCE chill_event_event_type_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_event_role_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_event_status_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_event_event_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_event_participation_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_event_event_type');
+        $this->addSql('DROP TABLE chill_event_role');
+        $this->addSql('DROP TABLE chill_event_status');
+        $this->addSql('DROP TABLE chill_event_event');
+        $this->addSql('DROP TABLE chill_event_participation');
+    }
+
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_event_event_type_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_event_role_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -62,7 +97,7 @@ class Version20160318111334 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_FA320FC85932F377 ON chill_event_event (center_id)');
         $this->addSql('CREATE INDEX IDX_FA320FC8C54C8C93 ON chill_event_event (type_id)');
         $this->addSql('CREATE INDEX IDX_FA320FC870EE2FF6 ON chill_event_event (circle_id)');
-        
+
         $this->addSql('ALTER TABLE chill_event_event '
               . 'ADD CONSTRAINT FK_FA320FC85932F377 FOREIGN KEY (center_id) '
               . 'REFERENCES centers (id) '
@@ -103,39 +138,5 @@ class Version20160318111334 extends AbstractMigration
                 . 'FOREIGN KEY (status_id) '
                 . 'REFERENCES chill_event_status (id) '
                 . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-    }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_event_role DROP CONSTRAINT FK_AA714E54C54C8C93');
-        $this->addSql('ALTER TABLE chill_event_status DROP CONSTRAINT FK_A6CC85D0C54C8C93');
-        $this->addSql('ALTER TABLE chill_event_participation DROP CONSTRAINT FK_4E7768ACD60322AC');
-        $this->addSql('ALTER TABLE chill_event_participation DROP CONSTRAINT FK_4E7768AC6BF700BD');
-        $this->addSql('ALTER TABLE chill_event_participation DROP CONSTRAINT FK_4E7768AC71F7E88B');
-        // drop center_id constraint
-        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC85932F377');
-        // drop type_id constraint
-        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC8C54C8C93');
-        // drop circle_id constraint
-        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC870EE2FF6');
-        
-        $this->addSql('DROP SEQUENCE chill_event_event_type_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_event_role_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_event_status_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_event_event_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_event_participation_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_event_event_type');
-        $this->addSql('DROP TABLE chill_event_role');
-        $this->addSql('DROP TABLE chill_event_status');
-        $this->addSql('DROP TABLE chill_event_event');
-        $this->addSql('DROP TABLE chill_event_participation');
-        
     }
 }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
index 5018c9f1a..b0b676362 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190110140538.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Event;
 
@@ -6,24 +15,23 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Switch event date to datetime
+ * Switch event date to datetime.
  */
 final class Version20190110140538 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-        
-        $this->addSql('ALTER TABLE chill_event_event ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_event_event ALTER date DROP DEFAULT');
-        
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-        
+
         $this->addSql('ALTER TABLE chill_event_event ALTER date TYPE DATE');
         $this->addSql('ALTER TABLE chill_event_event ALTER date DROP DEFAULT');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_event_event ALTER date TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_event_event ALTER date DROP DEFAULT');
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
index 21e476948..35b586907 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190115140042.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Event;
 
@@ -6,20 +15,10 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a moderator field
+ * Add a moderator field.
  */
 final class Version20190115140042 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_event_event ADD moderator_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT FK_FA320FC8D0AFA354 FOREIGN KEY (moderator_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_FA320FC8D0AFA354 ON chill_event_event (moderator_id)');
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
@@ -29,4 +28,14 @@ final class Version20190115140042 extends AbstractMigration
         $this->addSql('DROP INDEX IDX_FA320FC8D0AFA354');
         $this->addSql('ALTER TABLE chill_event_event DROP moderator_id');
     }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_event_event ADD moderator_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT FK_FA320FC8D0AFA354 FOREIGN KEY (moderator_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_FA320FC8D0AFA354 ON chill_event_event (moderator_id)');
+    }
 }
diff --git a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
index 7edbb4d52..7c6d0abc8 100644
--- a/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
+++ b/src/Bundle/ChillEventBundle/migrations/Version20190201143121.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Event;
 
@@ -6,10 +15,19 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- *  Moderator, relation with User (not Person)
+ *  Moderator, relation with User (not Person).
  */
 final class Version20190201143121 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT fk_fa320fc8d0afa354');
+        $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT fk_fa320fc8d0afa354 FOREIGN KEY (moderator_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
@@ -18,14 +36,4 @@ final class Version20190201143121 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT FK_FA320FC8D0AFA354');
         $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT FK_FA320FC8D0AFA354 FOREIGN KEY (moderator_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_event_event DROP CONSTRAINT fk_fa320fc8d0afa354');
-        $this->addSql('ALTER TABLE chill_event_event ADD CONSTRAINT fk_fa320fc8d0afa354 FOREIGN KEY (moderator_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-
-    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php b/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
index da512a9aa..68007ff1d 100644
--- a/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
+++ b/src/Bundle/ChillFamilyMembersBundle/ChillAMLIFamilyMembersBundle.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php b/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
index 82e99cce4..de159eadd 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Config/ConfigRepository.php
@@ -1,89 +1,89 @@
 <?php
-/*
- */
-namespace Chill\AMLI\FamilyMembersBundle\Config;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\FamilyMembersBundle\Config;
+
+use function count;
+
 class ConfigRepository
 {
     /**
-     *
-     * @var array
-     */
-    protected $links;
-    
-    /**
-     *
-     * @var array
-     */
-    protected $professionalSituations;
-    
-    /**
-     *
      * @var array
      */
     protected $familialSituations;
-    
+
+    /**
+     * @var array
+     */
+    protected $links;
+
+    /**
+     * @var array
+     */
+    protected $professionalSituations;
+
     public function __construct($links, $professionnalSituations, $familialSituations)
     {
         $this->links = $links;
         $this->professionalSituations = $professionnalSituations ?? [];
         $this->familialSituations = $familialSituations ?? [];
     }
-    
+
+    public function getFamilialSituationsLabels()
+    {
+        return $this->normalizeConfig($this->familialSituations);
+    }
+
     /**
-     * 
      * @return array where keys are the link's keys and label the links label
      */
     public function getLinksLabels()
     {
         return $this->normalizeConfig($this->links);
     }
-    
+
     public function getProfessionalSituationsLabels()
     {
         return $this->normalizeConfig($this->professionalSituations);
     }
-    
-    public function hasProfessionalSituation(): bool
-    {
-        return count($this->professionalSituations) > 0;
-    }
-    
-    public function getFamilialSituationsLabels()
-    {
-        return $this->normalizeConfig($this->familialSituations);
-    }
-    
+
     public function hasFamilialSituation(): bool
     {
         return count($this->familialSituations) > 0;
     }
-    
+
+    public function hasProfessionalSituation(): bool
+    {
+        return count($this->professionalSituations) > 0;
+    }
+
     private function normalizeConfig($config)
     {
-        $els = array();
-        
+        $els = [];
+
         foreach ($config as $definition) {
             $els[$definition['key']] = $this->normalizeLabel($definition['labels']);
         }
-        
+
         return $els;
     }
-    
-    private function normalizeLabel($labels) 
+
+    private function normalizeLabel($labels)
     {
-        $normalizedLabels = array();
-        
+        $normalizedLabels = [];
+
         foreach ($labels as $labelDefinition) {
             $normalizedLabels[$labelDefinition['lang']] = $labelDefinition['label'];
         }
-        
+
         return $normalizedLabels;
     }
-
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php b/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
index 8c534d838..51dd0cd73 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
@@ -1,218 +1,203 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
-use Doctrine\ORM\EntityManagerInterface;
 use Chill\AMLI\FamilyMembersBundle\Entity\FamilyMember;
-use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
 use Chill\AMLI\FamilyMembersBundle\Form\FamilyMemberType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Translation\TranslatorInterface;
+use Chill\AMLI\FamilyMembersBundle\Repository\FamilyMemberRepository;
+use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Translation\TranslatorInterface;
 
-class FamilyMemberController extends Controller
+class FamilyMemberController extends AbstractController
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
-    
+    protected LoggerInterface $chillMainLogger;
+
+    protected TranslatorInterface $translator;
+
+    private EntityManagerInterface $em;
+
+    private FamilyMemberRepository $familyMemberRepository;
+
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface $entityManager,
         TranslatorInterface $translator,
-        LoggerInterface $chillMainLogger
+        LoggerInterface $chillMainLogger,
+        FamilyMemberRepository $familyMemberRepository
     ) {
-        $this->em = $em;
+        $this->em = $entityManager;
         $this->translator = $translator;
         $this->chillMainLogger = $chillMainLogger;
-    }
-
-    
-    /**
-     * @Route(
-     *  "{_locale}/family-members/family-members/by-person/{id}",
-     *  name="chill_family_members_family_members_index"
-     * )
-     */
-    public function indexAction(Person $person)
-    {
-        $this->denyAccessUnlessGranted(FamilyMemberVoter::SHOW, $person);
-        
-        $familyMembers = $this->em
-            ->getRepository(FamilyMember::class)
-            ->findByPerson($person);
-        
-        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:index.html.twig', array(
-            'person' => $person,
-            'familyMembers' => $familyMembers
-        ));
+        $this->familyMemberRepository = $familyMemberRepository;
     }
 
     /**
      * @Route(
-     *  "{_locale}/family-members/family-members/by-person/{id}/new",
-     *  name="chill_family_members_family_members_new"
+     *     "{_locale}/family-members/family-members/{id}/delete",
+     *     name="chill_family_members_family_members_delete"
      * )
      */
-    public function newAction(Person $person, Request $request)
-    {
-        $familyMember = (new FamilyMember())
-            ->setPerson($person)
-            ;
-        
-        $this->denyAccessUnlessGranted(FamilyMemberVoter::CREATE, $familyMember);
-        
-        $form = $this->createForm(FamilyMemberType::class, $familyMember);
-        $form->add('submit', SubmitType::class);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() and $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->persist($familyMember);
-            $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans('Family member created'));
-            
-            return $this->redirectToRoute('chill_family_members_family_members_index', [
-                'id' => $person->getId()
-            ]);
-        }
-        
-        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:new.html.twig', array(
-            'form' => $form->createView(),
-            'person' => $person
-        ));
-    }
-
-    /**
-     * @Route(
-     *  "{_locale}/family-members/family-members/{id}/edit",
-     *  name="chill_family_members_family_members_edit"
-     * )
-     */
-    public function editAction(FamilyMember $familyMember, Request $request)
-    {
-        $this->denyAccessUnlessGranted(FamilyMemberVoter::UPDATE, $familyMember);
-        
-        $form = $this->createForm(FamilyMemberType::class, $familyMember);
-        $form->add('submit', SubmitType::class);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() and $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
-            $em->flush();
-            
-            $this->addFlash('success', $this->translator->trans('Family member updated'));
-            
-            return $this->redirectToRoute('chill_family_members_family_members_index', [
-                'id' => $familyMember->getPerson()->getId()
-            ]);
-        }
-        
-        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:edit.html.twig', array(
-            'familyMember' => $familyMember,
-            'form' => $form->createView(),
-            'person' => $familyMember->getPerson()
-        ));
-    }
-    
-    /**
-     * 
-     * @Route(
-     *  "{_locale}/family-members/family-members/{id}/delete",
-     *  name="chill_family_members_family_members_delete"
-     * )
-     * 
-     * @param FamilyMember $familyMember
-     * @param Request $request
-     * @return \Symfony\Component\BrowserKit\Response
-     */
-    public function deleteAction(FamilyMember $familyMember, Request $request)
+    public function deleteAction(FamilyMember $familyMember, Request $request): Response
     {
         $this->denyAccessUnlessGranted(FamilyMemberVoter::DELETE, $familyMember, 'You are not '
              . 'allowed to delete this family membership');
 
-        $form = $this->createDeleteForm($id);
+        $form = $this->createDeleteForm();
 
         if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
-                $this->chillMainLogger->notice("A family member has been removed", array(
-                   'by_user' => $this->getUser()->getUsername(),
-                   'family_member_id' => $familyMember->getId(),
-                   'name' => $familyMember->getFirstname()." ".$familyMember->getLastname(),
-                   'link' => $familyMember->getLink()
-                ));
+                $this->chillMainLogger->notice('A family member has been removed', [
+                    'by_user' => $this->getUser()->getUsername(),
+                    'family_member_id' => $familyMember->getId(),
+                    'name' => $familyMember->getFirstname() . ' ' . $familyMember->getLastname(),
+                    'link' => $familyMember->getLink(),
+                ]);
 
-                $em = $this->getDoctrine()->getManager();
-                $em->remove($familyMember);
-                $em->flush();
+                $this->em->remove($familyMember);
+                $this->em->flush();
 
                 $this->addFlash('success', $this->translator
-                        ->trans("The family member has been successfully removed."));
+                    ->trans('The family member has been successfully removed.'));
 
-                return $this->redirectToRoute('chill_family_members_family_members_index', array(
-                     'id' => $familyMember->getPerson()->getId()
-                  ));
+                return $this->redirectToRoute('chill_family_members_family_members_index', [
+                    'id' => $familyMember->getPerson()->getId(),
+                ]);
             }
         }
 
-
-        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:confirm_delete.html.twig', array(
-           'familyMember' => $familyMember,
-           'delete_form' => $form->createView()
-        ));
+        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:confirm_delete.html.twig', [
+            'familyMember' => $familyMember,
+            'delete_form' => $form->createView(),
+        ]);
     }
-    
+
     /**
      * @Route(
-     *  "{_locale}/family-members/family-members/{id}/view",
-     *  name="chill_family_members_family_members_view"
+     *     "{_locale}/family-members/family-members/{id}/edit",
+     *     name="chill_family_members_family_members_edit"
+     * )
+     */
+    public function editAction(FamilyMember $familyMember, Request $request)
+    {
+        $this->denyAccessUnlessGranted(FamilyMemberVoter::UPDATE, $familyMember);
+
+        $form = $this->createForm(FamilyMemberType::class, $familyMember);
+        $form->add('submit', SubmitType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('Family member updated'));
+
+            return $this->redirectToRoute('chill_family_members_family_members_index', [
+                'id' => $familyMember->getPerson()->getId(),
+            ]);
+        }
+
+        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:edit.html.twig', [
+            'familyMember' => $familyMember,
+            'form' => $form->createView(),
+            'person' => $familyMember->getPerson(),
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/family-members/family-members/by-person/{id}",
+     *     name="chill_family_members_family_members_index"
+     * )
+     */
+    public function indexAction(Person $person)
+    {
+        $this->denyAccessUnlessGranted(FamilyMemberVoter::SHOW, $person);
+
+        $familyMembers = $this->familyMemberRepository->findByPerson($person);
+
+        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:index.html.twig', [
+            'person' => $person,
+            'familyMembers' => $familyMembers,
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/family-members/family-members/by-person/{id}/new",
+     *     name="chill_family_members_family_members_new"
+     * )
+     */
+    public function newAction(Person $person, Request $request)
+    {
+        $familyMember = (new FamilyMember())->setPerson($person);
+
+        $this->denyAccessUnlessGranted(FamilyMemberVoter::CREATE, $familyMember);
+
+        $form = $this->createForm(FamilyMemberType::class, $familyMember);
+        $form->add('submit', SubmitType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->em->persist($familyMember);
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('Family member created'));
+
+            return $this->redirectToRoute('chill_family_members_family_members_index', [
+                'id' => $person->getId(),
+            ]);
+        }
+
+        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:new.html.twig', [
+            'form' => $form->createView(),
+            'person' => $person,
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/family-members/family-members/{id}/view",
+     *     name="chill_family_members_family_members_view"
      * )
      */
     public function viewAction(FamilyMember $familyMember)
     {
         $this->denyAccessUnlessGranted(FamilyMemberVoter::SHOW, $familyMember);
-        
-        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:view.html.twig', array(
-            'familyMember' => $familyMember
-        ));
-    }
-    
-    /**
-     * Creates a form to delete a help request entity by id.
-     *
-     * @param mixed $id The entity id
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createDeleteForm($id)
-    {
-        return $this->createFormBuilder()
-            ->setMethod(Request::METHOD_DELETE)
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+
+        return $this->render('ChillAMLIFamilyMembersBundle:FamilyMember:view.html.twig', [
+            'familyMember' => $familyMember,
+        ]);
     }
 
+    /**
+     * Creates a form to delete a help request entity by id.
+     */
+    private function createDeleteForm(): FormInterface
+    {
+        return $this
+            ->createFormBuilder()
+            ->setMethod(Request::METHOD_DELETE)
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
index 58d994d66..3407138c2 100644
--- a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
+++ b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/ChillAMLIFamilyMembersExtension.php
@@ -1,32 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillAMLIFamilyMembersExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
-        
+
         $this->storeConfig($container, $config);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services/config.yml');
         $loader->load('services/form.yml');
         $loader->load('services/controller.yml');
@@ -34,45 +40,48 @@ class ChillAMLIFamilyMembersExtension extends Extension implements PrependExtens
         $loader->load('services/menu.yml');
         $loader->load('services/templating.yml');
     }
-    
-    private function storeConfig(ContainerBuilder $container, array $config)
-    {
-        $container->setParameter('chill_family_members.links', $config['links']);
-        $container->setParameter('chill_family_members.professionnal_situations', 
-            $config['professionnal_situations']);
-                $container->setParameter('chill_family_members.familial_situations', 
-            $config['familial_situations']);
-    }
-    
+
     public function prepend(ContainerBuilder $container)
     {
         $this->prependAuthorization($container);
         $this->prependRoutes($container);
     }
-    
-    protected function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-               FamilyMemberVoter::UPDATE => [FamilyMemberVoter::SHOW],
-               FamilyMemberVoter::CREATE => [FamilyMemberVoter::SHOW]
-           )
-        ));
-    }
-    
-    /* (non-PHPdoc)
+
+    /** (non-PHPdoc).
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
-    public function prependRoutes(ContainerBuilder $container) 
+    public function prependRoutes(ContainerBuilder $container)
     {
         //add routes for custom bundle
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillAMLIFamilyMembersBundle/Resources/config/routing.yml'
-              )
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillAMLIFamilyMembersBundle/Resources/config/routing.yml',
+                ],
+            ],
+        ]);
     }
 
+    protected function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                FamilyMemberVoter::UPDATE => [FamilyMemberVoter::SHOW],
+                FamilyMemberVoter::CREATE => [FamilyMemberVoter::SHOW],
+            ],
+        ]);
+    }
+
+    private function storeConfig(ContainerBuilder $container, array $config)
+    {
+        $container->setParameter('chill_family_members.links', $config['links']);
+        $container->setParameter(
+            'chill_family_members.professionnal_situations',
+            $config['professionnal_situations']
+        );
+        $container->setParameter(
+            'chill_family_members.familial_situations',
+            $config['familial_situations']
+        );
+    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
index 90ab9ba3e..28057507a 100644
--- a/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -12,9 +21,6 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_amli_family_members');
@@ -22,74 +28,73 @@ class Configuration implements ConfigurationInterface
 
         $rootNode
             ->children()
-                ->arrayNode('links')->isRequired()->requiresAtLeastOneElement()
-                    ->arrayPrototype()
-                        ->children()
-                        ->scalarNode('key')->isRequired()->cannotBeEmpty()
-                            ->info('the key stored in database')
-                                ->example('grandson')
-                            ->end()
-                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-                                        ->example('fr')
-                                    ->end()
-                                    ->scalarNode('label')->isRequired()->cannotBeEmpty()
-                                         ->example('Petit-fils')
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                        ->end()
-                    ->end()
-                ->end()
-                ->arrayNode('professionnal_situations')->isRequired()
-                    ->info("the list of professional situations. If empty, the field will not be shown")
-                    ->arrayPrototype()
-                        ->children()
-->scalarNode('key')->isRequired()->cannotBeEmpty()
-                            ->info('the key stored in database')
-                                ->example('student')
-                            ->end()
-                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-                                        ->example('fr')
-                                    ->end()
-                                    ->scalarNode('label')->isRequired()->cannotBeEmpty()
-                                         ->example('Étudiant')
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-                ->end()
-                ->arrayNode('familial_situations')->isRequired()
-                    ->info("the list of familial situations. If empty, the field will not be shown")
-                    ->arrayPrototype()
-                        ->children()
-->scalarNode('key')->isRequired()->cannotBeEmpty()
-                            ->info('the key stored in database')
-                                ->example('half_time_keeping')
-                            ->end()
-                            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-                                        ->example('fr')
-                                    ->end()
-                                    ->scalarNode('label')->isRequired()->cannotBeEmpty()
-                                         ->example('En garde alternée')
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ;
+            ->arrayNode('links')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+            ->info('the key stored in database')
+            ->example('grandson')
+            ->end()
+            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+            ->example('fr')
+            ->end()
+            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+            ->example('Petit-fils')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('professionnal_situations')->isRequired()
+            ->info('the list of professional situations. If empty, the field will not be shown')
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+            ->info('the key stored in database')
+            ->example('student')
+            ->end()
+            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+            ->example('fr')
+            ->end()
+            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+            ->example('Étudiant')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('familial_situations')->isRequired()
+            ->info('the list of familial situations. If empty, the field will not be shown')
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')->isRequired()->cannotBeEmpty()
+            ->info('the key stored in database')
+            ->example('half_time_keeping')
+            ->end()
+            ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+            ->example('fr')
+            ->end()
+            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+            ->example('En garde alternée')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end();
 
         return $treeBuilder;
     }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
index 36da186d0..ac8743af2 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
@@ -1,53 +1,62 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
- * 
- * @ORM\MappedSuperclass()
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @ORM\MappedSuperclass
  */
 abstract class AbstractFamilyMember implements HasCenterInterface
 {
-    const FAMILIAL_SITUATION = [
-         'a_charge'=> 'A charge',
-         'garde_alternee'=> 'Garde alternée',
-         'droit_de_visite'=> 'Droit de visite et d\'hébergement',
-         'non_a_charge' => 'Non à charge',
-       ];
+    public const FAMILIAL_SITUATION = [
+        'a_charge' => 'A charge',
+        'garde_alternee' => 'Garde alternée',
+        'droit_de_visite' => 'Droit de visite et d\'hébergement',
+        'non_a_charge' => 'Non à charge',
+    ];
 
-/**
-     *
-     * @var Person
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Person"
-     * )
-     */
-    private $person;
-    
     /**
+     * @var date_immutable|null
      *
-     * @var MaritalStatus
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\MaritalStatus"
+     * @ORM\Column(name="birthdate", type="date_immutable", nullable=true)
+     * @Assert\Date
+     */
+    private $birthdate;
+
+    /**
+     * @var DateTimeImmutable|null
+     *
+     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
+     * @Assert\Date
+     * @Assert\GreaterThan(
+     *     propertyPath="startDate",
+     *     message="The membership's end date should be after the start date"
      * )
      */
-    private $maritalStatus;
+    private $endDate;
 
     /**
      * @var string
-     *
-     * @ORM\Column(name="lastname", type="string", length=255)
+     * @ORM\Column(name="familial_situation", type="string", length=200, nullable=true)
      */
-    private $lastname = '';
+    private $familialSituation;
 
     /**
      * @var string
@@ -64,12 +73,34 @@ abstract class AbstractFamilyMember implements HasCenterInterface
     private $gender = '';
 
     /**
-     * @var date_immutable|null
+     * @var string
      *
-     * @ORM\Column(name="birthdate", type="date_immutable", nullable=true)
-     * @Assert\Date()
+     * @ORM\Column(name="lastname", type="string", length=255)
      */
-    private $birthdate;
+    private $lastname = '';
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="link", type="string", length=255)
+     */
+    private $link = '';
+
+    /**
+     * @var MaritalStatus
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\MaritalStatus"
+     * )
+     */
+    private $maritalStatus;
+
+    /**
+     * @var Person
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Person"
+     * )
+     */
+    private $person;
 
     /**
      * @var string
@@ -79,57 +110,67 @@ abstract class AbstractFamilyMember implements HasCenterInterface
     private $professionnalSituation = '';
 
     /**
-     * @var string
-     *
-     * @ORM\Column(name="link", type="string", length=255)
-     */
-    private $link = '';
-    
-    /**
-     *
-     * @var string
-     * @ORM\Column(name="familial_situation", type="string", length=200, nullable=true)
-     */
-    private $familialSituation;
-
-    /**
-     * @var \DateTimeImmutable
+     * @var DateTimeImmutable
      *
      * @ORM\Column(name="startDate", type="datetime_immutable")
-     * @Assert\NotNull()
-     * @Assert\Date()
+     * @Assert\NotNull
+     * @Assert\Date
      */
     private $startDate;
 
-    /**
-     * @var \DateTimeImmutable|null
-     *
-     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
-     * @Assert\Date()
-     * @Assert\GreaterThan(
-     *  propertyPath="startDate",
-     *  message="The membership's end date should be after the start date"
-     * )
-     */
-    private $endDate;
-    
     public function __construct()
     {
-        $this->setStartDate(new \DateTimeImmutable('now'));
+        $this->setStartDate(new DateTimeImmutable('now'));
     }
-    
-    /**
-     * Set lastname.
-     *
-     * @param string $lastname
-     *
-     * @return FamilyMember
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = (string) $lastname;
 
-        return $this;
+    /**
+     * Get birthdate.
+     *
+     * @return date_immutable|null
+     */
+    public function getBirthdate()
+    {
+        return $this->birthdate;
+    }
+
+    public function getCenter(): \Chill\MainBundle\Entity\Center
+    {
+        return $this->getPerson()->getCenter();
+    }
+
+    /**
+     * Get endDate.
+     *
+     * @return DateTimeImmutable|null
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+
+    public function getFamilialSituation()
+    {
+        return $this->familialSituation;
+    }
+
+    /**
+     * Get firstname.
+     *
+     * @return string
+     */
+    public function getFirstname()
+    {
+        return $this->firstname;
+    }
+
+    /**
+     * Get gender.
+     *
+     * @return string
+     */
+    public function getGender()
+    {
+        return $this->gender;
     }
 
     /**
@@ -142,6 +183,91 @@ abstract class AbstractFamilyMember implements HasCenterInterface
         return $this->lastname;
     }
 
+    /**
+     * Get link.
+     *
+     * @return string
+     */
+    public function getLink()
+    {
+        return $this->link;
+    }
+
+    /**
+     * @return MaritalStatus
+     */
+    public function getMaritalStatus()
+    {
+        return $this->maritalStatus;
+    }
+
+    /**
+     * @return Person
+     */
+    public function getPerson()
+    {
+        return $this->person;
+    }
+
+    /**
+     * Get professionnalSituation.
+     *
+     * @return string
+     */
+    public function getProfessionnalSituation()
+    {
+        return $this->professionnalSituation;
+    }
+
+    /**
+     * Get startDate.
+     *
+     * @return DateTimeImmutable
+     */
+    public function getStartDate()
+    {
+        return $this->startDate;
+    }
+
+    /**
+     * Set birthdate.
+     *
+     * @return FamilyMember
+     */
+    public function setBirthdate(?DateTimeInterface $birthdate = null)
+    {
+        if ($birthdate instanceof DateTime) {
+            $this->birthdate = DateTimeImmutable::createFromMutable($birthdate);
+        } elseif (null === $birthdate || $birthdate instanceof DateTimeImmutable) {
+            $this->birthdate = $birthdate;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set endDate.
+     *
+     * @return FamilyMember
+     */
+    public function setEndDate(?DateTimeInterface $endDate = null)
+    {
+        if ($endDate instanceof DateTime) {
+            $this->endDate = DateTimeImmutable::createFromMutable($endDate);
+        } elseif ($endDate instanceof DateTimeImmutable || null === $endDate) {
+            $this->endDate = $endDate;
+        }
+
+        return $this;
+    }
+
+    public function setFamilialSituation($familialSituation)
+    {
+        $this->familialSituation = $familialSituation;
+
+        return $this;
+    }
+
     /**
      * Set firstname.
      *
@@ -156,16 +282,6 @@ abstract class AbstractFamilyMember implements HasCenterInterface
         return $this;
     }
 
-    /**
-     * Get firstname.
-     *
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->firstname;
-    }
-
     /**
      * Set gender.
      *
@@ -181,67 +297,19 @@ abstract class AbstractFamilyMember implements HasCenterInterface
     }
 
     /**
-     * Get gender.
+     * Set lastname.
      *
-     * @return string
-     */
-    public function getGender()
-    {
-        return $this->gender;
-    }
-
-    /**
-     * Set birthdate.
-     *
-     * @param \DateTimeInterface|null $birthdate
+     * @param string $lastname
      *
      * @return FamilyMember
      */
-    public function setBirthdate(\DateTimeInterface $birthdate = null)
+    public function setLastname($lastname)
     {
-        if ($birthdate instanceof \DateTime) {
-            $this->birthdate = \DateTimeImmutable::createFromMutable($birthdate);
-        } elseif ($birthdate === null || $birthdate instanceof \DateTimeImmutable) {
-            $this->birthdate = $birthdate;
-        }
+        $this->lastname = (string) $lastname;
 
         return $this;
     }
 
-    /**
-     * Get birthdate.
-     *
-     * @return date_immutable|null
-     */
-    public function getBirthdate()
-    {
-        return $this->birthdate;
-    }
-
-    /**
-     * Set professionnalSituation.
-     *
-     * @param string $professionnalSituation
-     *
-     * @return FamilyMember
-     */
-    public function setProfessionnalSituation($professionnalSituation)
-    {
-        $this->professionnalSituation = (string) $professionnalSituation;
-
-        return $this;
-    }
-
-    /**
-     * Get professionnalSituation.
-     *
-     * @return string
-     */
-    public function getProfessionnalSituation()
-    {
-        return $this->professionnalSituation;
-    }
-
     /**
      * Set link.
      *
@@ -257,127 +325,56 @@ abstract class AbstractFamilyMember implements HasCenterInterface
     }
 
     /**
-     * Get link.
+     * @param MaritalStatus $maritalStatus
      *
-     * @return string
+     * @return $this
      */
-    public function getLink()
+    public function setMaritalStatus(?MaritalStatus $maritalStatus = null)
     {
-        return $this->link;
-    }
-    
-    public function getFamilialSituation()
-    {
-        return $this->familialSituation;
-    }
-
-    public function setFamilialSituation($familialSituation)
-    {
-        $this->familialSituation = $familialSituation;
-        
-        return $this;
-    }
-    
-    /**
-     * Set startDate.
-     *
-     * @param \DateTimeImmutable $startDate
-     *
-     * @return FamilyMember
-     */
-    public function setStartDate(\DateTimeInterface $startDate)
-    {
-        if ($startDate instanceof \DateTime) {
-            $this->startDate = \DateTimeImmutable::createFromMutable($startDate);
-        } elseif (NULL === $startDate || $startDate instanceof \DateTimeImmutable) {
-            $this->startDate = $startDate;
-        }
+        $this->maritalStatus = $maritalStatus;
 
         return $this;
     }
 
     /**
-     * Get startDate.
-     *
-     * @return \DateTimeImmutable
-     */
-    public function getStartDate()
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * Set endDate.
-     *
-     * @param \DateTimeInterface|null $endDate
-     *
-     * @return FamilyMember
-     */
-    public function setEndDate(\DateTimeInterface $endDate = null)
-    {
-        if ($endDate instanceof \DateTime) {
-            $this->endDate = \DateTimeImmutable::createFromMutable($endDate);
-        } elseif ($endDate instanceof \DateTimeImmutable || $endDate === null) {
-            $this->endDate = $endDate;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get endDate.
-     *
-     * @return \DateTimeImmutable|null
-     */
-    public function getEndDate()
-    {
-        return $this->endDate;
-    }
-    
-    /**
-     * 
-     * @return Person
-     */
-    public function getPerson()
-    {
-        return $this->person;
-    }
-
-    /**
-     * 
-     * @return MaritalStatus
-     */
-    public function getMaritalStatus()
-    {
-        return $this->maritalStatus;
-    }
-
-    /**
-     * 
-     * @param Person $person
      * @return $this
      */
     public function setPerson(Person $person)
     {
         $this->person = $person;
-        
+
         return $this;
     }
 
     /**
-     * 
-     * @param MaritalStatus $maritalStatus
-     * @return $this
+     * Set professionnalSituation.
+     *
+     * @param string $professionnalSituation
+     *
+     * @return FamilyMember
      */
-    public function setMaritalStatus(MaritalStatus $maritalStatus = null)
+    public function setProfessionnalSituation($professionnalSituation)
     {
-        $this->maritalStatus = $maritalStatus;
-        
+        $this->professionnalSituation = (string) $professionnalSituation;
+
         return $this;
     }
 
-    public function getCenter(): \Chill\MainBundle\Entity\Center
+    /**
+     * Set startDate.
+     *
+     * @param DateTimeImmutable $startDate
+     *
+     * @return FamilyMember
+     */
+    public function setStartDate(DateTimeInterface $startDate)
     {
-        return $this->getPerson()->getCenter();
+        if ($startDate instanceof DateTime) {
+            $this->startDate = DateTimeImmutable::createFromMutable($startDate);
+        } elseif (null === $startDate || $startDate instanceof DateTimeImmutable) {
+            $this->startDate = $startDate;
+        }
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php b/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
index ca2d4af92..9e679454b 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
@@ -1,11 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * FamilyMember
+ * FamilyMember.
  *
  * @ORM\Table(name="chill_family.family_member")
  * @ORM\Entity(repositoryClass="Chill\AMLI\FamilyMembersBundle\Repository\FamilyMemberRepository")
diff --git a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
index b47818127..939999d48 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
@@ -1,144 +1,135 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Form;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\PersonBundle\Form\Type\GenderType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
 use Chill\AMLI\FamilyMembersBundle\Config\ConfigRepository;
 use Chill\AMLI\FamilyMembersBundle\Entity\FamilyMember;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\AMLI\AssignmentBundle\Entity\AbstractDiagnosticNIAssignment;
-use Chill\AMLI\FamilyMembersBundle\Entity\AbstractFamilyMember;
+use Chill\PersonBundle\Form\Type\GenderType;
+use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FamilyMemberType extends AbstractType
 {
     /**
-     *
      * @var ConfigRepository
      */
     private $configRepository;
-    
+
     /**
-     *
      * @var TranslatableStringHelper
      */
     private $translatableStringHelper;
-    
+
     public function __construct(
-        ConfigRepository $configRepository, 
+        ConfigRepository $configRepository,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-      
         $builder
             ->add('lastname', TextType::class, [
-                'label' => 'Last name' 
+                'label' => 'Last name',
             ])
             ->add('firstname', TextType::class, [
-                'label' => 'First name'
+                'label' => 'First name',
             ])
             ->add('gender', GenderType::class)
             ->add('birthdate', ChillDateType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('link', ChoiceType::class, [
                 'choices' => $this->buildChoices($this->configRepository->getLinksLabels()),
                 'placeholder' => 'Choose a link',
-                'label' => 'Relationship'
+                'label' => 'Relationship',
             ])
             ->add('maritalStatus', Select2MaritalStatusType::class, [
-                'required' => false
-            ])
-            ;
-        
+                'required' => false,
+            ]);
+
         if ($this->configRepository->hasProfessionalSituation()) {
             $builder
-                    ->add('professionnalSituation', ChoiceType::class, [
-                        'required' => false,
-                        'choices' => $this->buildChoices(
-                            $this->configRepository->getProfessionalSituationsLabels()
-                            )
-                    ]);
+                ->add('professionnalSituation', ChoiceType::class, [
+                    'required' => false,
+                    'choices' => $this->buildChoices(
+                        $this->configRepository->getProfessionalSituationsLabels()
+                    ),
+                ]);
         }
-        
+
         if ($this->configRepository->hasProfessionalSituation()) {
             $builder
-                    ->add('familialSituation', ChoiceType::class, [
-                        'required' => false,
-                        'choices' => $this->buildChoices(
-                            $this->configRepository->getFamilialSituationsLabels()
-                            )
-                    ]);
+                ->add('familialSituation', ChoiceType::class, [
+                    'required' => false,
+                    'choices' => $this->buildChoices(
+                        $this->configRepository->getFamilialSituationsLabels()
+                    ),
+                ]);
         }
-        
+
         if ($options['show_start_date']) {
             $builder
                 ->add('startDate', ChillDateType::class, [
-                    'label' => 'Arrival date in the family'
+                    'label' => 'Arrival date in the family',
                 ]);
         }
-        
+
         if ($options['show_end_date']) {
             $builder
                 ->add('endDate', ChillDateType::class, [
                     'required' => false,
-                    'label' => 'Departure date of the family'
+                    'label' => 'Departure date of the family',
                 ]);
         }
+    }
 
-    }/**
-     * {@inheritdoc}
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => FamilyMember::class,
             'show_start_date' => true,
             'show_end_date' => true,
-        ));
-        
+        ]);
+
         $resolver
             ->setAllowedTypes('show_start_date', 'boolean')
-            ->setAllowedTypes('show_end_date', 'boolean')
-            ;
-    }
-    
-    private function buildChoices($els)
-    {
-        $links = $this->configRepository
-            ->getLinksLabels();
-        $choices = [];
-        
-        // rewrite labels to filter in language
-        foreach ($els as $key => $labels) {
-            $choices[$this->translatableStringHelper->localize($labels)] = $key;
-        }
-        
-        return $choices;
+            ->setAllowedTypes('show_end_date', 'boolean');
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'chill_amli_familymembersbundle_familymember';
     }
 
+    private function buildChoices($els)
+    {
+        $links = $this->configRepository
+            ->getLinksLabels();
+        $choices = [];
 
+        // rewrite labels to filter in language
+        foreach ($els as $key => $labels) {
+            $choices[$this->translatableStringHelper->localize($labels)] = $key;
+        }
+
+        return $choices;
+    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
index b8561b633..9ea1f2fa9 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Form/FamilyMembersType.php
@@ -1,18 +1,20 @@
 <?php
-/*
- */
-namespace Chill\AMLI\FamilyMembersBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\MainBundle\Form\Type\ChillCollectionType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\FamilyMembersBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 class FamilyMembersType extends AbstractType
 {
     public function configureOptions(OptionsResolver $resolver)
@@ -21,15 +23,15 @@ class FamilyMembersType extends AbstractType
             'entry_type' => FamilyMemberType::class,
             'entry_options' => [
                 'show_start_date' => true,
-                'show_end_date' => true
+                'show_end_date' => true,
             ],
             'allow_add' => true,
             'allow_delete' => true,
             'button_add_label' => 'Ajouter un membre',
-            'button_remove_label' => 'Enlever ce membre'
+            'button_remove_label' => 'Enlever ce membre',
         ]);
     }
-    
+
     public function getParent()
     {
         return ChillCollectionType::class;
diff --git a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
index fb226cf5f..17976b6ef 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
@@ -1,61 +1,61 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Menu;
 
+use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker, 
+        AuthorizationCheckerInterface $authorizationChecker,
         TranslatorInterface $translator
     ) {
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
     }
 
-    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
         $person = $parameters['person'];
-        
+
         if ($this->authorizationChecker->isGranted(FamilyMemberVoter::SHOW, $person)) {
             $menu->addChild(
-                $this->translator->trans('Family memberships'), [
+                $this->translator->trans('Family memberships'),
+                [
                     'route' => 'chill_family_members_family_members_index',
-                    'routeParameters' => [ 'id' => $person->getId() ],
-                ])
-                ->setExtra('order', 450)
-                ;
+                    'routeParameters' => ['id' => $person->getId()],
+                ]
+            )
+                ->setExtra('order', 450);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'person' ];
+        return ['person'];
     }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
index 618128c96..571e94161 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php
@@ -1,17 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Repository;
 
+use Chill\AMLI\FamilyMembersBundle\Entity\FamilyMember;
 use Chill\PersonBundle\Entity\Person;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * FamilyMemberRepository
- *
+ * @method FamilyMember|null find($id, $lockMode = null, $lockVersion = null)
+ * @method FamilyMember|null findOneBy(array $criteria, array $orderBy = null)
+ * @method FamilyMember[]    findAll()
+ * @method FamilyMember[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class FamilyMemberRepository extends \Doctrine\ORM\EntityRepository
+class FamilyMemberRepository extends ServiceEntityRepository
 {
-    public function findActiveByPerson(Person $person)
+    public function __construct(ManagerRegistry $registry)
     {
-        return $this->findBy([ 'person' => $person ]);
+        parent::__construct($registry, FamilyMember::class);
+    }
+
+    /**
+     * @return FamilyMember[]
+     */
+    public function findByPerson(Person $person): array
+    {
+        return $this->findBy(['person' => $person]);
     }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php b/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
index 90ac49a32..47cf5df6a 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Application\Migrations;
 
@@ -6,11 +15,18 @@ use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 
 /**
- * create schema for chill_family
+ * create schema for chill_family.
  */
 final class Version20180522142023 extends AbstractMigration
 {
-    public function up(Schema $schema) : void
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP SCHEMA chill_family CASCADE');
+    }
+
+    public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
@@ -25,12 +41,4 @@ final class Version20180522142023 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_family.family_member ADD CONSTRAINT FK_A61F4A49217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_family.family_member ADD CONSTRAINT FK_A61F4A49D7D03CE3 FOREIGN KEY (maritalStatus_id) REFERENCES chill_person_marital_status (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP SCHEMA chill_family CASCADE');
-        
-    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php b/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
index 5e218657c..73c320720 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
@@ -1,79 +1,82 @@
 <?php
-/*
- */
-namespace Chill\AMLI\FamilyMembersBundle\Security\Voter;
-
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\AMLI\FamilyMembersBundle\Entity\FamilyMember;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\AMLI\FamilyMembersBundle\Security\Voter;
+
+use Chill\AMLI\FamilyMembersBundle\Entity\FamilyMember;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Security\Core\Role\Role;
+use function in_array;
+
 class FamilyMemberVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_CREATE';
-    const DELETE = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_DELETE';
-    const UPDATE = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_UPDATE';
-    const SHOW   = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_SHOW';
-    
-    const ROLES = [
+    public const CREATE = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_CREATE';
+
+    public const DELETE = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_DELETE';
+
+    public const ROLES = [
         self::CREATE,
         self::DELETE,
         self::SHOW,
-        self::UPDATE
+        self::UPDATE,
     ];
-    
+
+    public const SHOW = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_SHOW';
+
+    public const UPDATE = 'CHILL_FAMILY_MEMBERS_FAMILY_MEMBERS_UPDATE';
+
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     public function __construct(AuthorizationHelper $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
 
-    
-    protected function supports($attribute, $subject)
-    {
-        return (\in_array($attribute, self::ROLES) && $subject instanceof FamilyMember)
-            or
-                ($subject instanceof Person && \in_array($attribute, [ self::SHOW, self::CREATE ]));
-    }
-    
-    protected function voteOnAttribute($attribute, $subject, \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $token)
-    {
-        $user = $token->getUser();
-        
-        if (FALSE === $user instanceof User) {
-            return false;
-        }
-        
-        return $this->authorizationHelper
-            ->userHasAccess($user, $subject, new Role($attribute));
-    }
-    
-    public function getRoles()
-    {
-        return self::ROLES;
-    } 
-    
-    public function getRolesWithHierarchy(): array
-    {
-        return [ 'Family Members' => self::ROLES ];
-    } 
-    
-    public function getRolesWithoutScope()
+    public function getRoles(): array
     {
         return self::ROLES;
     }
 
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Family Members' => self::ROLES];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return self::ROLES;
+    }
+
+    protected function supports($attribute, $subject)
+    {
+        return (in_array($attribute, self::ROLES, true) && $subject instanceof FamilyMember)
+                || ($subject instanceof Person && in_array($attribute, [self::SHOW, self::CREATE], true));
+    }
+
+    protected function voteOnAttribute($attribute, $subject, \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $token)
+    {
+        $user = $token->getUser();
+
+        if (false === $user instanceof User) {
+            return false;
+        }
+
+        return $this->authorizationHelper
+            ->userHasAccess($user, $subject, new Role($attribute));
+    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php b/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
index e02d7e024..c2c060b79 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Templating/Twig.php
@@ -1,102 +1,99 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Templating;
 
-use Twig\Extension\AbstractExtension;
 use Chill\AMLI\FamilyMembersBundle\Config\ConfigRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class Twig extends AbstractExtension
 {
     /**
-     *
      * @var ConfigRepository
      */
     protected $configRepository;
-    
+
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     public function __construct(
-        ConfigRepository $configRepository, 
+        ConfigRepository $configRepository,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->configRepository = $configRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
+    public function displayFamilialSituation($situation)
+    {
+        if (null === $situation) {
+            return null;
+        }
+
+        return $this->translatableStringHelper->localize(
+            $this->configRepository->getFamilialSituationsLabels()[$situation]
+        );
+    }
+
+    public function displayLink($link)
+    {
+        if (null === $link) {
+            return null;
+        }
+
+        return $this->translatableStringHelper->localize(
+            $this->configRepository->getLinksLabels()[$link]
+        );
+    }
+
+    public function displayProfessionalSituation($situation)
+    {
+        if (null === $situation) {
+            return null;
+        }
+
+        return $this->translatableStringHelper->localize(
+            $this->configRepository->getProfessionalSituationsLabels()[$situation]
+        );
+    }
+
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_family_member_link_display', [ $this, 'displayLink' ], [ 'is_safe' => [ 'html' ]]),
-            new TwigFilter('chill_family_member_professional_situation_display', [ $this, 'displayProfessionalSituation' ], [ 'is_safe' => [ 'html' ]]),
-            new TwigFilter('chill_family_member_familial_situation_display', [ $this, 'displayFamilialSituation' ], [ 'is_safe' => [ 'html' ]]),
-
+            new TwigFilter('chill_family_member_link_display', [$this, 'displayLink'], ['is_safe' => ['html']]),
+            new TwigFilter('chill_family_member_professional_situation_display', [$this, 'displayProfessionalSituation'], ['is_safe' => ['html']]),
+            new TwigFilter('chill_family_member_familial_situation_display', [$this, 'displayFamilialSituation'], ['is_safe' => ['html']]),
         ];
     }
-    
+
     public function getFunctions()
     {
         return [
-            new TwigFunction('chill_family_members_has_professionnal_situation', [ $this, 'hasProfessionnalSituation' ]),
-            new TwigFunction('chill_family_members_has_familial_situation', [ $this, 'hasFamilialSituation' ]),
-
+            new TwigFunction('chill_family_members_has_professionnal_situation', [$this, 'hasProfessionnalSituation']),
+            new TwigFunction('chill_family_members_has_familial_situation', [$this, 'hasFamilialSituation']),
         ];
     }
-    
-    public function displayLink($link)
-    {
-        if (NULL === $link) {
-            return null;
-        }
-        
-        return $this->translatableStringHelper->localize(
-            $this->configRepository->getLinksLabels()[$link]
-            );
-    }
-    
-    public function displayProfessionalSituation($situation)
-    {
-        if (NULL === $situation) {
-            return null;
-        }
-        
-        return $this->translatableStringHelper->localize(
-            $this->configRepository->getProfessionalSituationsLabels()[$situation]
-            );
-    }
-    
-    public function hasProfessionnalSituation()
-    {
-        return $this->configRepository->hasProfessionalSituation();
-    }
-    
-    public function displayFamilialSituation($situation)
-    {
-        if (NULL === $situation) {
-            return null;
-        }
-        
-        return $this->translatableStringHelper->localize(
-            $this->configRepository->getFamilialSituationsLabels()[$situation]
-            );
-    }
-    
+
     public function hasFamilialSituation()
     {
         return $this->configRepository->hasFamilialSituation();
     }
+
+    public function hasProfessionnalSituation()
+    {
+        return $this->configRepository->hasProfessionalSituation();
+    }
 }
diff --git a/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php b/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
index 01e8d52df..7a10a6158 100644
--- a/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
+++ b/src/Bundle/ChillFamilyMembersBundle/Tests/Controller/FamilyMemberControllerTest.php
@@ -1,30 +1,42 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\AMLI\FamilyMembersBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class FamilyMemberControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class FamilyMemberControllerTest extends WebTestCase
 {
+    public function testEdit()
+    {
+        $client = self::createClient();
+
+        $crawler = $client->request('GET', '/edit');
+    }
+
     public function testIndex()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         $crawler = $client->request('GET', '/index');
     }
 
     public function testNew()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         $crawler = $client->request('GET', '/new');
     }
-
-    public function testEdit()
-    {
-        $client = static::createClient();
-
-        $crawler = $client->request('GET', '/edit');
-    }
-
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
index 11b3c34fd..86ed8a4fa 100644
--- a/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php
@@ -1,33 +1,21 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\CRUD\CompilerPass;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Chill\MainBundle\Routing\MenuComposer;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Alias;
 
 /**
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\CRUD\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
 class CRUDControllerCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
@@ -45,15 +33,15 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
     }
 
     /**
-     * Add a controller for each definition, and add a methodCall to inject crud configuration to controller
+     * Add a controller for each definition, and add a methodCall to inject crud configuration to controller.
      */
     private function configureCrudController(ContainerBuilder $container, array $crudEntry, string $apiOrCrud): void
     {
         $controllerClass = $crudEntry['controller'];
-        $controllerServiceName = 'cs'.$apiOrCrud.'_'.$crudEntry['name'].'_controller';
+        $controllerServiceName = 'cs' . $apiOrCrud . '_' . $crudEntry['name'] . '_controller';
 
         // create config parameter in container
-        $param = 'chill_main_'.$apiOrCrud.'_config_'.$crudEntry['name'];
+        $param = 'chill_main_' . $apiOrCrud . '_config_' . $crudEntry['name'];
         $container->setParameter($param, $crudEntry);
 
         if ($container->hasDefinition($controllerClass)) {
@@ -63,8 +51,7 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
 
             // add the "addMethodCall"
             $container->getDefinition($controllerClass)
-                ->addMethodCall('setCrudConfig', ['%'.$param.'%']);
-
+                ->addMethodCall('setCrudConfig', ['%' . $param . '%']);
         } else {
             $controller = new Definition($controllerClass);
 
@@ -72,10 +59,9 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
             $controller->setAutoconfigured(true);
             $controller->setPublic(true);
 
-            $controller->addMethodCall('setCrudConfig', ['%'.$param.'%']);
+            $controller->addMethodCall('setCrudConfig', ['%' . $param . '%']);
 
             $container->setDefinition($controllerServiceName, $controller);
         }
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
index a1d28483d..cd458e222 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -1,265 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Chill\MainBundle\CRUD\Resolver\Resolver;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\CRUD\Resolver\Resolver;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use function array_merge;
 
-class AbstractCRUDController extends AbstractController
+abstract class AbstractCRUDController extends AbstractController
 {
     /**
-     * The crud configuration 
+     * The crud configuration.
      *
      * This configuration si defined by `chill_main['crud']` or `chill_main['apis']`
-     *
-     * @var array
      */
     protected array $crudConfig = [];
 
-    /**
-     * get the instance of the entity with the given id
-     * 
-     * @param string $id
-     * @return object
-     * @throw Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the object is not found
-     */
-    protected function getEntity($action, $id, Request $request): object
-    {
-        $e = $this->getDoctrine()
-            ->getRepository($this->getEntityClass())
-            ->find($id);
-
-        if (NULL === $e) {
-            throw $this->createNotFoundException(sprintf("The object %s for id %s is not found", $this->getEntityClass(), $id));
-        }
-
-        return $e;
-    }
-
-    /**
-     * Create an entity.
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return object
-     */
-    protected function createEntity(string $action, Request $request): object
-    {
-        $type = $this->getEntityClass();
-        
-        return new $type;
-    }
-
-    /**
-     * Count the number of entities
-     *
-     * By default, count all entities. You can customize the query by 
-     * using the method `customizeQuery`.
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return int
-     */
-    protected function countEntities(string $action, Request $request, $_format): int
-    {
-        return $this->buildQueryEntities($action, $request)
-            ->select('COUNT(e)')
-            ->getQuery()
-            ->getSingleScalarResult()
-            ;
-    }
-
-    /**
-     * Query the entity.
-     * 
-     * By default, get all entities. You can customize the query by using the
-     * method `customizeQuery`.
-     * 
-     * The method `orderEntity` is called internally to order entities.
-     * 
-     * It returns, by default, a query builder.
-     * 
-     */
-    protected function queryEntities(string $action, Request $request, string $_format, PaginatorInterface $paginator)
-    {
-        $query = $this->buildQueryEntities($action, $request)
-            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
-            ->setMaxResults($paginator->getItemsPerPage());
-        
-        // allow to order queries and return the new query
-        return $this->orderQuery($action, $query, $request, $paginator, $_format);
-    }
-
-    /**
-     * Add ordering fields in the query build by self::queryEntities
-     * 
-     */
-    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
-    {
-        return $query;
-    }
-
-    /**
-     * Build the base query for listing all entities.
-     *
-     * This method is used internally by `countEntities` `queryEntities`
-     * 
-     * This base query does not contains any `WHERE` or `SELECT` clauses. You
-     * can add some by using the method `customizeQuery`.
-     *
-     * The alias for the entity is "e".
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return QueryBuilder
-     */
-    protected function buildQueryEntities(string $action, Request $request)
-    {
-        $qb = $this->getDoctrine()->getManager()
-            ->createQueryBuilder()
-            ->select('e')
-            ->from($this->getEntityClass(), 'e')
-            ;
-
-        $this->customizeQuery($action, $request, $qb);
-
-        return $qb;
-    }
-
-    protected function customizeQuery(string $action, Request $request, $query): void {}
-
-    /**
-     * Get the result of the query
-     */
-    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query) 
-    {
-        return $query->getQuery()->getResult();
-    }
-
-    protected function onPreIndex(string $action, Request $request, string $_format): ?Response
-    { 
-        return null; 
-    }
-    
-    /**
-     * method used by indexAction
-     */
-    protected function onPreIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator): ?Response
-    { 
-        return null;
-    }
-
-    /**
-     * method used by indexAction
-     */
-    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
-    {
-        return null;
-    }
-    
-    /**
-     * method used by indexAction
-     */
-    protected function onPostIndexFetchQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $entities): ?Response
-    {
-        return null;
-    }
-    
-
-    /**
-     * Get the complete FQDN of the class
-     * 
-     * @return string the complete fqdn of the class
-     */
-    protected function getEntityClass(): string
-    {
-        return $this->crudConfig['class'];
-    }
-    
-    /**
-     * called on post fetch entity 
-     */
-    protected function onPostFetchEntity(string $action, Request $request, $entity, $_format): ?Response
-    {
-        return null;
-    }
-
-    /**
-     * Called on post check ACL
-     */
-    protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response
-    {
-        return null;
-    }
-
-    /**
-     * check the acl. Called by every action.
-     * 
-     * By default, check the role given by `getRoleFor` for the value given in 
-     * $entity.
-     * 
-     * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
-     * if not accessible.
-     * 
-     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
-     */
-    protected function checkACL(string $action, Request $request, string $_format, $entity = null)
-    {
-        $this->denyAccessUnlessGranted($this->getRoleFor($action, $request, $entity, $_format), $entity);
-    }
-
-    /**
-     * 
-     * @return string the crud name
-     */
-    protected function getCrudName(): string
-    {
-        return $this->crudConfig['name'];
-    }
-
-    protected function getActionConfig(string $action)
-    {
-        return $this->crudConfig['actions'][$action];
-    }
-    
-    /**
-     * Set the crud configuration
-     *
-     * Used by the container to inject configuration for this crud.
-     */
-    public function setCrudConfig(array $config): void
-    {
-        $this->crudConfig = $config;
-    }
-
-    /**
-     * @return PaginatorFactory
-     */
-    protected function getPaginatorFactory(): PaginatorFactory
-    {
-        return $this->container->get('chill_main.paginator_factory');
-    }
-
-    protected function getValidator(): ValidatorInterface
-    {
-        return $this->get('validator');
-    }
-
-    /**
-     * @return array
-     */
     public static function getSubscribedServices(): array
     {
-        return \array_merge(
+        return array_merge(
             parent::getSubscribedServices(),
             [
                 'chill_main.paginator_factory' => PaginatorFactory::class,
@@ -273,4 +49,233 @@ class AbstractCRUDController extends AbstractController
             ]
         );
     }
+
+    /**
+     * Set the crud configuration.
+     *
+     * Used by the container to inject configuration for this crud.
+     */
+    public function setCrudConfig(array $config): void
+    {
+        $this->crudConfig = $config;
+    }
+
+    /**
+     * Build the base query for listing all entities.
+     *
+     * This method is used internally by `countEntities` `queryEntities`
+     *
+     * This base query does not contains any `WHERE` or `SELECT` clauses. You
+     * can add some by using the method `customizeQuery`.
+     *
+     * The alias for the entity is "e".
+     *
+     * @return QueryBuilder
+     */
+    protected function buildQueryEntities(string $action, Request $request)
+    {
+        $qb = $this->getDoctrine()->getManager()
+            ->createQueryBuilder()
+            ->select('e')
+            ->from($this->getEntityClass(), 'e');
+
+        $this->customizeQuery($action, $request, $qb);
+
+        return $qb;
+    }
+
+    /**
+     * check the acl. Called by every action.
+     *
+     * By default, check the role given by `getRoleFor` for the value given in
+     * $entity.
+     *
+     * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
+     * if not accessible.
+     *
+     * @param mixed|null $entity
+     *
+     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
+     */
+    protected function checkACL(string $action, Request $request, string $_format, $entity = null)
+    {
+        // @TODO: Implements abstract getRoleFor method or do it in the interface.
+        $this->denyAccessUnlessGranted($this->getRoleFor($action, $request, $entity, $_format), $entity);
+    }
+
+    /**
+     * Count the number of entities.
+     *
+     * By default, count all entities. You can customize the query by
+     * using the method `customizeQuery`.
+     *
+     * @param mixed $_format
+     */
+    protected function countEntities(string $action, Request $request, $_format): int
+    {
+        return $this->buildQueryEntities($action, $request)
+            ->select('COUNT(e)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    protected function createEntity(string $action, Request $request): object
+    {
+        $class = $this->getEntityClass();
+
+        return new $class();
+    }
+
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+    }
+
+    protected function getActionConfig(string $action)
+    {
+        return $this->crudConfig['actions'][$action];
+    }
+
+    /**
+     * @return string The crud name.
+     */
+    protected function getCrudName(): string
+    {
+        return $this->crudConfig['name'];
+    }
+
+    /**
+     * get the instance of the entity with the given id.
+     *
+     * @throw Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the object is not found
+     *
+     * @param mixed $action
+     */
+    protected function getEntity($action, string $id, Request $request): object
+    {
+        $e = $this
+            ->getDoctrine()
+            ->getRepository($this->getEntityClass())
+            ->find($id);
+
+        if (null === $e) {
+            throw $this->createNotFoundException(sprintf('The object %s for id %s is not found', $this->getEntityClass(), $id));
+        }
+
+        return $e;
+    }
+
+    /**
+     * Get the FQDN of the class.
+     *
+     * @return class-string The FQDN of the class
+     */
+    protected function getEntityClass(): string
+    {
+        return $this->crudConfig['class'];
+    }
+
+    protected function getPaginatorFactory(): PaginatorFactory
+    {
+        return $this->container->get('chill_main.paginator_factory');
+    }
+
+    /**
+     * Get the result of the query.
+     *
+     * @param mixed $query
+     */
+    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query)
+    {
+        return $query->getQuery()->getResult();
+    }
+
+    protected function getValidator(): ValidatorInterface
+    {
+        return $this->get('validator');
+    }
+
+    /**
+     * Called on post check ACL.
+     *
+     * @param mixed $entity
+     */
+    protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Called on post fetch entity.
+     *
+     * @param mixed $entity
+     * @param mixed $_format
+     */
+    protected function onPostFetchEntity(string $action, Request $request, $entity, $_format): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Method used by indexAction.
+     *
+     * @param mixed $query
+     */
+    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Method used by indexAction.
+     *
+     * @param mixed $entities
+     */
+    protected function onPostIndexFetchQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $entities): ?Response
+    {
+        return null;
+    }
+
+    protected function onPreIndex(string $action, Request $request, string $_format): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Method used by indexAction.
+     */
+    protected function onPreIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Add ordering fields in the query build by self::queryEntities.
+     *
+     * @param mixed $query
+     * @param mixed $_format
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        return $query;
+    }
+
+    /**
+     * Query the entity.
+     *
+     * By default, get all entities. You can customize the query by using the
+     * method `customizeQuery`.
+     *
+     * The method `orderEntity` is called internally to order entities.
+     *
+     * It returns, by default, a query builder.
+     */
+    protected function queryEntities(string $action, Request $request, string $_format, PaginatorInterface $paginator)
+    {
+        $query = $this->buildQueryEntities($action, $request)
+            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
+            ->setMaxResults($paginator->getItemsPerPage());
+
+        // allow to order queries and return the new query
+        return $this->orderQuery($action, $query, $request, $paginator, $_format);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index 359ff0384..15d8dbcc3 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -1,78 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Controller;
 
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Exception;
+use LogicException;
+use RuntimeException;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Serializer\SerializerInterface;
-use Chill\MainBundle\Serializer\Model\Collection;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use function array_merge;
+use function ucfirst;
 
 class ApiController extends AbstractCRUDController
 {
     /**
-     * The view action.
-     * 
-     * Some steps may be overriden during this process of rendering:
-     * 
-     * This method:
-     * 
-     * 1.  fetch the entity, using `getEntity`
-     * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
-     *     this response is returned.
-     * 2.  throw an HttpNotFoundException if entity is null
-     * 3.  check ACL using `checkACL` ;
-     * 4.  launch `onPostCheckACL`. If the result is an instance of Response, 
-     *     this response is returned ;
-     * 5.  Serialize the entity and return the result. The serialization context is given by `getSerializationContext`
-     * 
-     */
-    protected function entityGet(string $action, Request $request, $id, $_format = 'html'): Response
-    {
-        $entity = $this->getEntity($action, $id, $request, $_format);
-        
-        $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
-        
-        if ($postFetch instanceof Response) {
-            return $postFetch;
-        }
-        
-        $response = $this->checkACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        if ($_format === 'json') {
-            $context = $this->getContextForSerialization($action, $request, $_format, $entity);
-
-            return $this->json($entity, Response::HTTP_OK, [], $context);
-        } else {
-            throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException("This format is not implemented");
-        }
-    }
-
-    public function onBeforeSerialize(string $action, Request $request, $_format, $entity): ?Response
-    {
-        return null;
-    }
-
-    /**
-     * Base method for handling api action
+     * Base method for handling api action.
+     *
+     * @param mixed $id
+     * @param mixed $_format
      *
      * @return void
      */
@@ -82,163 +42,45 @@ class ApiController extends AbstractCRUDController
             case Request::METHOD_GET:
             case Request::METHOD_HEAD:
                 return $this->entityGet('_entity', $request, $id, $_format);
+
             case Request::METHOD_PUT:
             case Request::METHOD_PATCH:
                 return $this->entityPut('_entity', $request, $id, $_format);
+
             case Request::METHOD_POST:
-                return $this->entityPostAction('_entity', $request, $id, $_format);
+                return $this->entityPostAction('_entity', $request, $id);
+
             case Request::METHOD_DELETE:
                 return $this->entityDelete('_entity', $request, $id, $_format);
+
             default:
-                throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException("This method is not implemented");
-        }
-    }
-    public function entityPost(Request $request, $_format): Response
-    {
-        switch($request->getMethod()) {
-            case Request::METHOD_POST:
-                return $this->entityPostAction('_entity', $request, $_format);
-            default:
-                throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException("This method is not implemented");
+                throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This method is not implemented');
         }
     }
 
-    protected function entityPostAction($action, Request $request, string $_format): Response
-    {
-        $entity = $this->createEntity($action, $request);
-
-        try {
-            $entity = $this->deserialize($action, $request, $_format, $entity);
-        } catch (NotEncodableValueException $e) {
-            throw new BadRequestException("invalid json", 400, $e);
-        }
-        
-        $errors = $this->validate($action, $request, $_format, $entity);
-        
-        $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        if ($errors->count() > 0) {
-            $response = $this->json($errors);
-            $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
-
-            return $response;
-        }
-        
-        $response = $this->checkACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $this->getDoctrine()->getManager()->persist($entity);
-        $this->getDoctrine()->getManager()->flush();
-
-        $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        return $this->json(
-            $entity,
-            Response::HTTP_OK,
-            [], 
-            $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
-        );
-    }
-    public function entityPut($action, Request $request, $id, string $_format): Response
-    {
-        $entity = $this->getEntity($action, $id, $request, $_format);
-        
-        $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
-        if ($postFetch instanceof Response) {
-            return $postFetch;
-        }
-        
-        if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found", $this->getCrudName(), $id));
-        }
-        
-        $response = $this->checkACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        try {
-            $entity = $this->deserialize($action, $request, $_format, $entity);
-        } catch (NotEncodableValueException $e) {
-            throw new BadRequestException("invalid json", 400, $e);
-        }
-
-        $errors = $this->validate($action, $request, $_format, $entity);
-
-        $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        if ($errors->count() > 0) {
-            $response = $this->json($errors);
-            $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
-
-            return $response;
-        }
-
-        $this->getDoctrine()->getManager()->flush();
-
-        $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        return $this->json(
-            $entity,
-            Response::HTTP_OK,
-            [], 
-            $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
-        );
-    }
     public function entityDelete($action, Request $request, $id, string $_format): Response
     {
-        $entity = $this->getEntity($action, $id, $request, $_format);
+        $entity = $this->getEntity($action, $id, $request);
 
-        if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found", $this->getCrudName(), $id));
+        if (null === $entity) {
+            throw $this->createNotFoundException(sprintf('The %s with id %s '
+                . 'is not found', $this->getCrudName(), $id));
         }
 
         $response = $this->checkACL($action, $request, $_format, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
 
         $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
 
         $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -246,6 +88,7 @@ class ApiController extends AbstractCRUDController
         $errors = $this->validate($action, $request, $_format, $entity);
 
         $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -261,6 +104,7 @@ class ApiController extends AbstractCRUDController
         $this->getDoctrine()->getManager()->flush();
 
         $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -268,51 +112,89 @@ class ApiController extends AbstractCRUDController
         return $this->json(Response::HTTP_OK);
     }
 
-    protected function onAfterValidation(string $action, Request $request, string $_format, $entity, ConstraintViolationListInterface $errors, array $more = []): ?Response
+    public function entityPost(Request $request, $_format): Response
     {
-        return null;
+        switch ($request->getMethod()) {
+            case Request::METHOD_POST:
+                return $this->entityPostAction('_entity', $request, $_format);
+
+            default:
+                throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This method is not implemented');
+        }
     }
 
-
-    protected function onAfterFlush(string $action, Request $request, string $_format, $entity, ConstraintViolationListInterface $errors, array $more = []): ?Response
+    public function entityPut($action, Request $request, $id, string $_format): Response
     {
-        return null;
-    }
+        $entity = $this->getEntity($action, $id, $request);
 
-    protected function getValidationGroups(string $action, Request $request, string $_format, $entity): ?array
-    {
-        return null;
-    }
+        $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
 
-    protected function validate(string $action, Request $request, string $_format, $entity, array $more = []): ConstraintViolationListInterface
-    {
-        $validationGroups = $this->getValidationGroups($action, $request, $_format, $entity);
-        
-        return $this->getValidator()->validate($entity, null, $validationGroups);
-    }
-
-    /**
-     * Deserialize the content of the request into the class associated with the curd
-     */
-    protected function deserialize(string $action, Request $request, string $_format, $entity = null): object
-    {
-        $default = [];
-
-        if (NULL !== $entity) {
-            $default[AbstractNormalizer::OBJECT_TO_POPULATE] = $entity;
+        if ($postFetch instanceof Response) {
+            return $postFetch;
         }
 
-        $context = \array_merge(
-            $default,
-            $this->getContextForSerialization($action, $request, $_format, $entity)
-        );
+        if (null === $entity) {
+            throw $this->createNotFoundException(sprintf('The %s with id %s '
+                . 'is not found', $this->getCrudName(), $id));
+        }
 
-        return $this->getSerializer()->deserialize($request->getContent(), $this->getEntityClass(), $_format, $context);
+        $response = $this->checkACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        try {
+            $entity = $this->deserialize($action, $request, $_format, $entity);
+        } catch (NotEncodableValueException $e) {
+            throw new BadRequestException('invalid json', 400, $e);
+        }
+
+        $errors = $this->validate($action, $request, $_format, $entity);
+
+        $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        if ($errors->count() > 0) {
+            $response = $this->json($errors);
+            $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
+
+            return $response;
+        }
+
+        $this->getDoctrine()->getManager()->flush();
+
+        $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        return $this->json(
+            $entity,
+            Response::HTTP_OK,
+            [],
+            $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
+        );
     }
-    
 
     /**
-     * Base action for indexing entities
+     * Base action for indexing entities.
      */
     public function indexApi(Request $request, string $_format)
     {
@@ -320,80 +202,15 @@ class ApiController extends AbstractCRUDController
             case Request::METHOD_GET:
             case REQUEST::METHOD_HEAD:
                 return $this->indexApiAction('_index', $request, $_format);
+
             default:
-                throw $this->createNotFoundException("This method is not supported");
+                throw $this->createNotFoundException('This method is not supported');
         }
     }
 
-    /**
-     * Build an index page.
-     * 
-     * Some steps may be overriden during this process of rendering.
-     * 
-     * This method:
-     * 
-     * 1.  Launch `onPreIndex`
-     * x.  check acl. If it does return a response instance, return it
-     * x.  launch `onPostCheckACL`. If it does return a response instance, return it
-     * 1.  count the items, using `countEntities`
-     * 2.  build a paginator element from the the number of entities ;
-     * 3.  Launch `onPreIndexQuery`. If it does return a response instance, return it
-     * 3.  build a query, using `queryEntities`
-     * x.  fetch the results, using `getQueryResult`
-     * x.  Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
-     * 4.  Serialize the entities in a Collection, using `SerializeCollection`
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return type
-     */
-    protected function indexApiAction($action, Request $request, $_format)
+    public function onBeforeSerialize(string $action, Request $request, $_format, $entity): ?Response
     {
-        $this->onPreIndex($action, $request, $_format);
-        
-        $response = $this->checkACL($action, $request, $_format);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        if (!isset($entity)) {
-            $entity = '';
-        }
-        
-        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        $totalItems = $this->countEntities($action, $request, $_format);
-        $paginator = $this->getPaginatorFactory()->create($totalItems);
-        
-        $response = $this->onPreIndexBuildQuery($action, $request, $_format, $totalItems, 
-            $paginator);
-        
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        $query = $this->queryEntities($action, $request, $_format, $paginator);
-        
-        $response = $this->onPostIndexBuildQuery($action, $request, $_format, $totalItems, 
-            $paginator, $query);
-        
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        $entities = $this->getQueryResult($action, $request, $_format, $totalItems, $paginator, $query);
-        
-        $response = $this->onPostIndexFetchQuery($action, $request, $_format, $totalItems, 
-            $paginator, $entities);
-        
-        if ($response instanceof Response) {
-            return $response;
-        }
-        
-        return $this->serializeCollection($action, $request, $_format, $paginator, $entities);    
+        return null;
     }
 
     /**
@@ -402,7 +219,7 @@ class ApiController extends AbstractCRUDController
      * This method:
      *
      * 1. Fetch the base entity (throw 404 if not found)
-     * 2. checkACL, 
+     * 2. checkACL,
      * 3. run onPostCheckACL, return response if any,
      * 4. deserialize posted data into the entity given by $postedDataType, with the context in $postedDataContext
      * 5. run 'add+$property' for POST method, or 'remove+$property' for DELETE method
@@ -410,42 +227,44 @@ class ApiController extends AbstractCRUDController
      * 7. run onAfterValidation
      * 8. if errors, return a 422 response with errors
      * 9. if $forcePersist === true, persist the entity
-     * 10. flush the data 
+     * 10. flush the data
      * 11. run onAfterFlush
      * 12. return a 202 response for DELETE with empty body, or HTTP 200 for post with serialized posted entity
      *
      * @param string action
      * @param mixed id
-     * @param Request $request
-     * @param string $_format
      * @param string $property the name of the property. This will be used to make a `add+$property` and `remove+$property` method
      * @param string $postedDataType the type of the posted data (the content)
      * @param string $postedDataContext a context to deserialize posted data (the content)
      * @param bool $forcePersist force to persist the created element (only for POST request)
+     * @param mixed $id
      * @throw BadRequestException if unable to deserialize the posted data
      * @throw BadRequestException if the method is not POST or DELETE
-     *
-     */ 
+     */
     protected function addRemoveSomething(string $action, $id, Request $request, string $_format, string $property, string $postedDataType, array $postedDataContext = [], bool $forcePersist = false): Response
     {
         $entity = $this->getEntity($action, $id, $request);
 
         $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
+
         if ($postFetch instanceof Response) {
             return $postFetch;
         }
 
         $response = $this->checkACL($action, $request, $_format, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
 
         $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
 
         $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -453,25 +272,30 @@ class ApiController extends AbstractCRUDController
         try {
             $postedData = $this->getSerializer()->deserialize($request->getContent(), $postedDataType, $_format, $postedDataContext);
         } catch (\Symfony\Component\Serializer\Exception\UnexpectedValueException $e) {
-            throw new BadRequestException(sprintf("Unable to deserialize posted ".
-                "data: %s", $e->getMessage()), 0, $e);
+            throw new BadRequestException(sprintf('Unable to deserialize posted ' .
+                'data: %s', $e->getMessage()), 0, $e);
         }
 
         switch ($request->getMethod()) {
             case Request::METHOD_DELETE:
                 // oups... how to use property accessor to remove element ?
-                $entity->{'remove'.\ucfirst($property)}($postedData);
+                $entity->{'remove' . ucfirst($property)}($postedData);
+
                 break;
+
             case Request::METHOD_POST:
-                $entity->{'add'.\ucfirst($property)}($postedData);
+                $entity->{'add' . ucfirst($property)}($postedData);
+
                 break;
+
             default:
-                throw new BadRequestException("this method is not supported");
+                throw new BadRequestException('this method is not supported');
         }
 
         $errors = $this->validate($action, $request, $_format, $entity, [$postedData]);
 
         $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors, [$postedData]);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -487,8 +311,8 @@ class ApiController extends AbstractCRUDController
 
         $this->getDoctrine()->getManager()->flush();
 
-
         $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors, [$postedData]);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -496,19 +320,318 @@ class ApiController extends AbstractCRUDController
         switch ($request->getMethod()) {
             case Request::METHOD_DELETE:
                 return $this->json('', Response::HTTP_OK);
+
             case Request::METHOD_POST:
                 return $this->json(
                     $postedData,
                     Response::HTTP_OK,
-                    [], 
+                    [],
                     $this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
                 );
         }
+
+        throw new Exception('Unable to handle such request method.');
     }
-    
+
     /**
-     * Serialize collections
+     * Deserialize the content of the request into the class associated with the curd.
      *
+     * @param mixed|null $entity
+     */
+    protected function deserialize(string $action, Request $request, string $_format, $entity = null): object
+    {
+        $default = [];
+
+        if (null !== $entity) {
+            $default[AbstractNormalizer::OBJECT_TO_POPULATE] = $entity;
+        }
+
+        $context = array_merge(
+            $default,
+            $this->getContextForSerialization($action, $request, $_format, $entity)
+        );
+
+        return $this->getSerializer()->deserialize($request->getContent(), $this->getEntityClass(), $_format, $context);
+    }
+
+    /**
+     * The view action.
+     *
+     * Some steps may be overriden during this process of rendering:
+     *
+     * This method:
+     *
+     * 1.  fetch the entity, using `getEntity`
+     * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
+     *     this response is returned.
+     * 2.  throw an HttpNotFoundException if entity is null
+     * 3.  check ACL using `checkACL` ;
+     * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
+     *     this response is returned ;
+     * 5.  Serialize the entity and return the result. The serialization context is given by `getSerializationContext`
+     *
+     * @param mixed $id
+     * @param mixed $_format
+     */
+    protected function entityGet(string $action, Request $request, $id, $_format = 'html'): Response
+    {
+        $entity = $this->getEntity($action, $id, $request);
+
+        $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
+
+        if ($postFetch instanceof Response) {
+            return $postFetch;
+        }
+
+        $response = $this->checkACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        if ('json' === $_format) {
+            $context = $this->getContextForSerialization($action, $request, $_format, $entity);
+
+            return $this->json($entity, Response::HTTP_OK, [], $context);
+        }
+
+        throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This format is not implemented');
+    }
+
+    protected function entityPostAction($action, Request $request, string $_format): Response
+    {
+        $entity = $this->createEntity($action, $request);
+
+        try {
+            $entity = $this->deserialize($action, $request, $_format, $entity);
+        } catch (NotEncodableValueException $e) {
+            throw new BadRequestException('invalid json', 400, $e);
+        }
+
+        $errors = $this->validate($action, $request, $_format, $entity);
+
+        $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        if ($errors->count() > 0) {
+            $response = $this->json($errors);
+            $response->setStatusCode(Response::HTTP_UNPROCESSABLE_ENTITY);
+
+            return $response;
+        }
+
+        $response = $this->checkACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $this->getDoctrine()->getManager()->persist($entity);
+        $this->getDoctrine()->getManager()->flush();
+
+        $response = $this->onAfterFlush($action, $request, $_format, $entity, $errors);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+        $response = $this->onBeforeSerialize($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        return $this->json(
+            $entity,
+            Response::HTTP_OK,
+            [],
+            $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
+        );
+    }
+
+    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
+    {
+        switch ($request->getMethod()) {
+            case Request::METHOD_GET:
+                return ['groups' => ['read']];
+
+            case Request::METHOD_PUT:
+            case Request::METHOD_PATCH:
+            case Request::METHOD_POST:
+                return ['groups' => ['write']];
+
+            default:
+                throw new LogicException('get context for serialization is not implemented for this method');
+        }
+    }
+
+    /**
+     * Get the context for serialization post alter query (in case of
+     * PATCH, PUT, or POST method).
+     *
+     * This is called **after** the entity was altered.
+     *
+     * @param mixed $entity
+     */
+    protected function getContextForSerializationPostAlter(string $action, Request $request, string $_format, $entity, array $more = []): array
+    {
+        return ['groups' => ['read']];
+    }
+
+    /**
+     * get the role given from the config.
+     *
+     * @param mixed $entity
+     * @param mixed $_format
+     */
+    protected function getRoleFor(string $action, Request $request, $entity, $_format): string
+    {
+        $actionConfig = $this->getActionConfig($action);
+
+        if (null !== $actionConfig['roles'][$request->getMethod()]) {
+            return $actionConfig['roles'][$request->getMethod()];
+        }
+
+        if ($this->crudConfig['base_role']) {
+            return $this->crudConfig['base_role'];
+        }
+
+        throw new RuntimeException(sprintf('the config does not have any role for the ' .
+            'method %s nor a global role for the whole action. Add those to your ' .
+            'configuration or override the required method', $request->getMethod()));
+    }
+
+    protected function getSerializer(): SerializerInterface
+    {
+        return $this->get('serializer');
+    }
+
+    protected function getValidationGroups(string $action, Request $request, string $_format, $entity): ?array
+    {
+        return null;
+    }
+
+    /**
+     * Build an index page.
+     *
+     * Some steps may be overriden during this process of rendering.
+     *
+     * This method:
+     *
+     * 1.  Launch `onPreIndex`
+     * x.  check acl. If it does return a response instance, return it
+     * x.  launch `onPostCheckACL`. If it does return a response instance, return it
+     * 1.  count the items, using `countEntities`
+     * 2.  build a paginator element from the the number of entities ;
+     * 3.  Launch `onPreIndexQuery`. If it does return a response instance, return it
+     * 3.  build a query, using `queryEntities`
+     * x.  fetch the results, using `getQueryResult`
+     * x.  Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
+     * 4.  Serialize the entities in a Collection, using `SerializeCollection`
+     *
+     * @param string $action
+     * @param mixed $_format
+     */
+    protected function indexApiAction($action, Request $request, $_format)
+    {
+        $this->onPreIndex($action, $request, $_format);
+
+        $response = $this->checkACL($action, $request, $_format);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $entity = '';
+
+        $response = $this->onPostCheckACL($action, $request, $_format, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $totalItems = $this->countEntities($action, $request, $_format);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
+
+        $response = $this->onPreIndexBuildQuery(
+            $action,
+            $request,
+            $_format,
+            $totalItems,
+            $paginator
+        );
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $query = $this->queryEntities($action, $request, $_format, $paginator);
+
+        $response = $this->onPostIndexBuildQuery(
+            $action,
+            $request,
+            $_format,
+            $totalItems,
+            $paginator,
+            $query
+        );
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $entities = $this->getQueryResult($action, $request, $_format, $totalItems, $paginator, $query);
+
+        $response = $this->onPostIndexFetchQuery(
+            $action,
+            $request,
+            $_format,
+            $totalItems,
+            $paginator,
+            $entities
+        );
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        return $this->serializeCollection($action, $request, $_format, $paginator, $entities);
+    }
+
+    protected function onAfterFlush(string $action, Request $request, string $_format, $entity, ConstraintViolationListInterface $errors, array $more = []): ?Response
+    {
+        return null;
+    }
+
+    protected function onAfterValidation(string $action, Request $request, string $_format, $entity, ConstraintViolationListInterface $errors, array $more = []): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Serialize collections.
+     *
+     * @param mixed $entities
      */
     protected function serializeCollection(string $action, Request $request, string $_format, PaginatorInterface $paginator, $entities): Response
     {
@@ -518,56 +641,11 @@ class ApiController extends AbstractCRUDController
 
         return $this->json($model, Response::HTTP_OK, [], $context);
     }
-    
 
-    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
+    protected function validate(string $action, Request $request, string $_format, $entity, array $more = []): ConstraintViolationListInterface
     {
-        switch ($request->getMethod()) {
-            case Request::METHOD_GET:
-                return [ 'groups' => [ 'read' ]];
-            case Request::METHOD_PUT:
-            case Request::METHOD_PATCH:
-            case Request::METHOD_POST:
-                return [ 'groups' => [ 'write' ]];
-            default:
-                throw new \LogicException("get context for serialization is not implemented for this method");
-        }
-    }
+        $validationGroups = $this->getValidationGroups($action, $request, $_format, $entity);
 
-    /**
-     * Get the context for serialization post alter query (in case of 
-     * PATCH, PUT, or POST method)
-     *
-     * This is called **after** the entity was altered.
-     */
-    protected function getContextForSerializationPostAlter(string $action, Request $request, string $_format, $entity, array $more = []): array
-    {
-        return [ 'groups' => [ 'read' ]];
-    }
-
-    /**
-     * get the role given from the config.
-     */
-    protected function getRoleFor(string $action, Request $request, $entity, $_format): string
-    {
-        $actionConfig = $this->getActionConfig($action);
-
-        if (NULL !== $actionConfig['roles'][$request->getMethod()]) {
-            return $actionConfig['roles'][$request->getMethod()];
-        }
-
-        if ($this->crudConfig['base_role']) {
-            return $this->crudConfig['base_role'];
-        }
-
-        throw new \RuntimeException(sprintf("the config does not have any role for the ".
-            "method %s nor a global role for the whole action. Add those to your ".
-            "configuration or override the required method", $request->getMethod()));
-        
-    }
-
-    protected function getSerializer(): SerializerInterface
-    {
-        return $this->get('serializer');
+        return $this->getValidator()->validate($entity, null, $validationGroups);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index d3112fd97..0e2881b54 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -1,96 +1,260 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2019, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Controller;
 
-use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Chill\MainBundle\CRUD\Resolver\Resolver;
 use Chill\MainBundle\CRUD\Form\CRUDDeleteEntityForm;
+use Chill\MainBundle\CRUD\Resolver\Resolver;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_key_exists;
+use function array_merge;
 
-/**
- * Class CRUDController
- *
- * @package Chill\MainBundle\CRUD\Controller
- */
 class CRUDController extends AbstractController
 {
-
     /**
-     * The crud configuration
+     * The crud configuration.
      *
      * This configuration si defined by `chill_main['crud']`.
-     *
-     * @var array
      */
-    protected $crudConfig;
+    protected array $crudConfig;
 
-    /**
-     * @param array $config
-     */
-    public function setCrudConfig(array $config)
-    {
-        $this->crudConfig = $config;
-    }
-
-    /**
-     * @param $parameter
-     * @return Response
-     */
-    public function CRUD($parameter)
+    public function CRUD(?string $parameter): Response
     {
         return new Response($parameter);
     }
 
     /**
-     * @param Request $request
      * @param $id
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
-    public function delete(Request $request, $id)
+    public function delete(Request $request, $id): Response
     {
         return $this->deleteAction('delete', $request, $id);
     }
 
     /**
+     * BAse method for edit action.
+     *
+     * IMplemented by the method formEditAction, with action as 'edit'
+     *
+     * @param mixed $id
+     */
+    public function edit(Request $request, $id): Response
+    {
+        return $this->formEditAction('edit', $request, $id);
+    }
+
+    /**
+     * Get the context for the serialization.
+     *
+     * @param mixed $entity
+     */
+    public function getContextForSerialization(string $action, Request $request, $entity, string $_format): array
+    {
+        return [];
+    }
+
+    public static function getSubscribedServices(): array
+    {
+        return array_merge(
+            parent::getSubscribedServices(),
+            [
+                'chill_main.paginator_factory' => PaginatorFactory::class,
+                'translator' => TranslatorInterface::class,
+                AuthorizationHelper::class => AuthorizationHelper::class,
+                EventDispatcherInterface::class => EventDispatcherInterface::class,
+                Resolver::class => Resolver::class,
+                SerializerInterface::class => SerializerInterface::class,
+                FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
+            ]
+        );
+    }
+
+    /**
+     * Base method called by index action.
+     *
+     * @return type
+     */
+    public function index(Request $request)
+    {
+        return $this->indexEntityAction('index', $request);
+    }
+
+    /**
+     * Base method for new action.
+     *
+     * Implemented by the method formNewAction, with action as 'new'
+     */
+    public function new(Request $request): Response
+    {
+        return $this->formCreateAction('new', $request);
+    }
+
+    public function setCrudConfig(array $config): void
+    {
+        $this->crudConfig = $config;
+    }
+
+    /**
+     * Base method for the view action.
+     *
+     * Implemented by the method viewAction, with action as 'view'
+     *
+     * @param mixed $id
+     */
+    public function view(Request $request, $id): Response
+    {
+        return $this->viewAction('view', $request, $id);
+    }
+
+    /**
+     * build a default role name, using the crud resolver.
+     *
+     * This method should not be overriden. Override `getRoleFor` instead.
+     *
      * @param string $action
-     * @param Request $request
+     *
+     * @return string
+     */
+    protected function buildDefaultRole($action)
+    {
+        return $this->getCrudResolver()->buildDefaultRole(
+            $this->getCrudName(),
+            $action
+        );
+    }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return null;
+    }
+
+    /**
+     * Build the base query for listing all entities, normally use in a listing
+     * page.
+     *
+     * This base query does not contains any `WHERE` or `SELECT` clauses. Those
+     * are added by other methods, like `queryEntities` and `countQueries`.
+     *
+     * @return QueryBuilder
+     */
+    protected function buildQueryEntities(string $action, Request $request)
+    {
+        $query = $this
+            ->getDoctrine()
+            ->getManager()
+            ->createQueryBuilder()
+            ->select('e')
+            ->from($this->getEntityClass(), 'e');
+
+        $this->customizeQuery($action, $request, $query);
+
+        return $query;
+    }
+
+    /**
+     * check the acl. Called by every action.
+     *
+     * By default, check the role given by `getRoleFor` for the value given in
+     * $entity.
+     *
+     * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
+     * if not accessible.
+     *
+     * @param mixed $entity
+     *
+     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
+     */
+    protected function checkACL(string $action, $entity)
+    {
+        $this->denyAccessUnlessGranted($this->getRoleFor($action), $entity);
+    }
+
+    /**
+     * Count the number of entities.
+     */
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        return $this->buildQueryEntities($action, $request)
+            ->select('COUNT(e)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    /**
+     * Create an entity.
+     */
+    protected function createEntity(string $action, Request $request): object
+    {
+        $type = $this->getEntityClass();
+
+        return new $type();
+    }
+
+    /**
+     * Create a form.
+     *
+     * use the method `getFormClassFor`
+     *
+     * A hook is available: `customizeForm` allow you to customize the form
+     * if needed.
+     *
+     * It is preferable to override customizeForm instead of overriding
+     * this method.
+     *
+     * @param mixed $entity
+     * @param string $formClass
+     */
+    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    {
+        $formClass = $formClass ?? $this->getFormClassFor($action);
+
+        $form = $this->createForm($formClass, $entity, $formOptions);
+
+        $this->customizeForm($action, $form);
+
+        return $form;
+    }
+
+    /**
+     * Customize the form created by createFormFor.
+     */
+    protected function customizeForm(string $action, FormInterface $form)
+    {
+    }
+
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+    }
+
+    /**
      * @param $id
      * @param null $formClass
-     * @return null|\Symfony\Component\HttpFoundation\RedirectResponse|Response|void
      */
-    protected function deleteAction(string $action, Request $request, $id, $formClass = null)
+    protected function deleteAction(string $action, Request $request, $id, $formClass = null): Response
     {
-        $this->onPreDelete($action, $request, $id);
+        $this->onPreDelete($action, $request);
 
         $entity = $this->getEntity($action, $id, $request);
 
@@ -100,17 +264,24 @@ class CRUDController extends AbstractController
             return $postFetch;
         }
 
-        if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found"), $this->getCrudName(), $id);
+        if (null === $entity) {
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
         }
 
         $response = $this->checkACL($action, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
 
         $response = $this->onPostCheckACL($action, $request, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -139,515 +310,39 @@ class CRUDController extends AbstractController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', ['id' => $entity->getId()]);
+            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', ['id' => $entity->getId()]);
+        }
 
-        } elseif ($form->isSubmitted()) {
+        if ($form->isSubmitted()) {
             $this->addFlash('error', $this->generateFormErrorMessage($action, $form));
         }
 
         $defaultTemplateParameters = [
             'form' => $form->createView(),
             'entity' => $entity,
-            'crud_name' => $this->getCrudName()
+            'crud_name' => $this->getCrudName(),
         ];
 
         return $this->render(
             $this->getTemplateFor($action, $entity, $request),
             $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
-            );
+        );
     }
 
     /**
-     * @param string $action
-     * @param Request $request
-     */
-    protected function onPreDelete(string $action, Request $request) {}
-
-    /**
-     * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
-     */
-    protected function onPreRemove(string $action, $entity, FormInterface $form, Request $request) {}
-
-    /**
-     * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
-     */
-    protected function onPostRemove(string $action, $entity, FormInterface $form, Request $request) {}
-
-    /**
-     * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
-     */
-    protected function removeEntity(string $action, $entity, FormInterface $form, Request $request)
-    {
-        $this->getDoctrine()
-            ->getManager()
-            ->remove($entity);
-    }
-
-    /**
-     * Base method called by index action.
+     * Duplicate an entity.
      *
-     * @param Request $request
-     * @return type
-     */
-    public function index(Request $request)
-    {
-        return $this->indexEntityAction('index', $request);
-    }
-
-    /**
-     * Build an index page.
-     *
-     * Some steps may be overriden during this process of rendering.
-     *
-     * This method:
-     *
-     * 1.  Launch `onPreIndex`
-     * 2.  check acl. If it does return a response instance, return it
-     * 3.  launch `onPostCheckACL`. If it does return a response instance, return it
-     * 4.  count the items, using `countEntities`
-     * 5.  build a paginator element from the the number of entities ;
-     * 6.  Launch `onPreIndexQuery`. If it does return a response instance, return it
-     * 7.  fetch the results, using `getQueryResult`
-     *
-     *     Internally, this build a query, using `queryEntities`
-     *
-     * 8.  Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
-     * 9.  create default parameters:
-     *
-     *     The default parameters are:
-     *
-     *         * entities: the list en entities ;
-     *         * crud_name: the name of the crud ;
-     *         * paginator: a paginator element ;
-     * 10. Launch rendering, the parameter is fetch using `getTemplateFor`
-     *     The parameters may be personnalized using `generateTemplateParameter`.
-     *
-     * @param string $action
-     * @param Request $request
-     * @return type
-     */
-    protected function indexEntityAction($action, Request $request)
-    {
-        $this->onPreIndex($action, $request);
-
-        $response = $this->checkACL($action, null);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        if (!isset($entity)) {
-            $entity = '';
-        }
-
-        $response = $this->onPostCheckACL($action, $request, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $filterOrder = $this->buildFilterOrderHelper($action, $request);
-        $totalItems = $this->countEntities($action, $request, $filterOrder);
-        $paginator = $this->getPaginatorFactory()->create($totalItems);
-
-        $response = $this->onPreIndexBuildQuery($action, $request, $totalItems,
-            $paginator);
-
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $entities = $this->getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
-
-        $response = $this->onPostIndexFetchQuery($action, $request, $totalItems,
-            $paginator, $entities);
-
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $defaultTemplateParameters = [
-            'entities'  => $entities,
-            'crud_name' => $this->getCrudName(),
-            'paginator' => $paginator,
-            'filter_order' => $filterOrder
-        ];
-
-        return $this->render(
-            $this->getTemplateFor($action, $entities, $request),
-            $this->generateTemplateParameter($action, $entities, $request, $defaultTemplateParameters)
-            );
-    }
-
-    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
-    {
-       return null;
-    }
-
-    /**
-     * @param string $action
-     * @param Request $request
-     */
-    protected function onPreIndex(string $action, Request $request) { }
-
-    /**
-     * method used by indexAction
-     *
-     * @param string $action
-     * @param Request $request
-     * @param int $totalItems
-     * @param PaginatorInterface $paginator
-     */
-    protected function onPreIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator) { }
-
-    /**
-     * method used by indexAction
-     *
-     * @param string $action
-     * @param Request $request
-     * @param int $totalItems
-     * @param PaginatorInterface $paginator
-     * @param mixed $query
-     */
-    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query) { }
-
-    /**
-     * method used by indexAction
-     *
-     * @param string $action
-     * @param Request $request
-     * @param int $totalItems
-     * @param PaginatorInterface $paginator
-     * @param mixed $entities
-     */
-    protected function onPostIndexFetchQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $entities) { }
-
-    /**
-     * Build the base query for listing all entities, normally use in a listing
-     * page.
-     *
-     * This base query does not contains any `WHERE` or `SELECT` clauses. Those
-     * are added by other methods, like `queryEntities` and `countQueries`.
-     *
-     * @param string $action
-     * @param Request $request
-     * @return QueryBuilder
-     */
-    protected function buildQueryEntities(string $action, Request $request)
-    {
-        $query =  $this->getDoctrine()->getManager()
-            ->createQueryBuilder()
-            ->select('e')
-            ->from($this->getEntityClass(), 'e')
-            ;
-
-        $this->customizeQuery($action, $request, $query);
-
-        return $query;
-    }
-
-    protected function customizeQuery(string $action, Request $request, $query): void {}
-
-    /**
-     * Query the entity.
-     *
-     * By default, get all entities.
-     *
-     * The method `orderEntity` is called internally to order entities.
-     *
-     * It returns, by default, a query builder.
-     *
-     * @param string $action
-     * @param Request $request
-     * @param PaginatorInterface $paginator
-     * @return type
-     */
-    protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
-    {
-        $query = $this->buildQueryEntities($action, $request, $filterOrder)
-            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
-            ->setMaxResults($paginator->getItemsPerPage());
-
-        // allow to order queries and return the new query
-        return $this->orderQuery($action, $query, $request, $paginator);
-    }
-
-
-    /**
-     * Add ordering fields in the query build by self::queryEntities
-     *
-     * @param string $action
-     * @param QueryBuilder|mixed $query by default, an instance of QueryBuilder
-     * @param Request $request
-     * @param PaginatorInterface $paginator
-     * @return QueryBuilder|mixed
-     */
-    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
-    {
-        return $query;
-    }
-
-    /**
-     * Get the result of the query
-     *
-     * @param string $action
-     * @param Request $request
-     * @param int $totalItems
-     * @param PaginatorInterface $paginator
      * @return mixed
      */
-    protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator,
-          ?FilterOrderHelper $filterOrder = null)
+    protected function duplicateEntity(string $action, Request $request)
     {
-        $query = $this->queryEntities($action, $request, $paginator, $filterOrder);
+        $id = $request->query->get('duplicate_id', 0);
+        $originalEntity = $this->getEntity($action, $id, $request);
 
-        return $query->getQuery()->getResult();
-    }
+        $this->getDoctrine()->getManager()
+            ->detach($originalEntity);
 
-    /**
-     * Count the number of entities
-     *
-     * @param string $action
-     * @param Request $request
-     * @return int
-     */
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
-    {
-        return $this->buildQueryEntities($action, $request, $filterOrder)
-            ->select('COUNT(e)')
-            ->getQuery()
-            ->getSingleScalarResult()
-            ;
-    }
-
-    /**
-     * BAse method for edit action
-     *
-     * IMplemented by the method formEditAction, with action as 'edit'
-     *
-     * @param Request $request
-     * @param mixed $id
-     * @return Response
-     */
-    public function edit(Request $request, $id): Response
-    {
-        return $this->formEditAction('edit', $request, $id);
-    }
-
-    /**
-     * Base method for new action
-     *
-     * Implemented by the method formNewAction, with action as 'new'
-     *
-     * @param Request $request
-     * @return Response
-     */
-    public function new(Request $request): Response
-    {
-        return $this->formCreateAction('new', $request);
-    }
-
-    /**
-     * Base method for the view action.
-     *
-     * Implemented by the method viewAction, with action as 'view'
-     *
-     * @param Request $request
-     * @param mixed $id
-     * @return Response
-     */
-    public function view(Request $request, $id): Response
-    {
-        return $this->viewAction('view', $request, $id);
-    }
-
-    /**
-     * The view action.
-     *
-     * Some steps may be overriden during this process of rendering:
-     *
-     * This method:
-     *
-     * 1.  fetch the entity, using `getEntity`
-     * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
-     *     this response is returned.
-     * 2.  throw an HttpNotFoundException if entity is null
-     * 3.  check ACL using `checkACL` ;
-     * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
-     *     this response is returned ;
-     * 5.  generate default template parameters:
-     *
-     *     * `entity`: the fetched entity ;
-     *     * `crud_name`: the crud name
-     * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
-     *     The parameters may be personnalized using `generateTemplateParameter`.
-     *
-     * @param string $action
-     * @param Request $request
-     * @param mixed $id
-     * @return Response
-     */
-    protected function viewAction(string $action, Request $request, $id, $_format = 'html'): Response
-    {
-        $entity = $this->getEntity($action, $id, $request);
-
-        $postFetch = $this->onPostFetchEntity($action, $request, $entity);
-
-        if ($postFetch instanceof Response) {
-            return $postFetch;
-        }
-
-        if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found", $this->getCrudName(), $id));
-        }
-
-        $response = $this->checkACL($action, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $response = $this->onPostCheckACL($action, $request, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        if ($_format === 'html') {
-            $defaultTemplateParameters = [
-                'entity' => $entity,
-                'crud_name' => $this->getCrudName()
-            ];
-
-            return $this->render(
-                $this->getTemplateFor($action, $entity, $request),
-                $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
-            );
-        } elseif ($_format === 'json') {
-            $context = $this->getContextForSerialization($action, $request, $entity, $_format);
-
-            return $this->json($entity, Response::HTTP_OK, [], $context);
-        } else {
-            throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException("This format is not implemented");
-        }
-
-    }
-
-    /**
-     * Get the context for the serialization
-     */
-    public function getContextForSerialization(string $action, Request $request, $entity, string $_format): array
-    {
-        return [];
-    }
-
-
-
-    /**
-     * The edit action.
-     *
-     * Some steps may be overriden during this process of rendering:
-     *
-     * This method:
-     *
-     * 1.  fetch the entity, using `getEntity`
-     * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
-     *     this response is returned.
-     * 2.  throw an HttpNotFoundException if entity is null
-     * 3.  check ACL using `checkACL` ;
-     * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
-     *     this response is returned ;
-     * 5.  generate a form using `createFormFor`, and handle request on this form;
-     *
-     *     If the form is valid, the entity is stored and flushed, and a redirection
-     *     is returned.
-     *
-     *     In this case, those hooks are available:
-     *
-     *     * onFormValid
-     *     * onPreFlush
-     *     * onPostFlush
-     *     * onBeforeRedirectAfterSubmission. If this method return an instance of
-     *         Response, this response is returned.
-     *
-     * 5.  generate default template parameters:
-     *
-     *     * `entity`: the fetched entity ;
-     *     * `crud_name`: the crud name ;
-     *     * `form`: the formview instance.
-     *
-     * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
-     *     The parameters may be personnalized using `generateTemplateParameter`.
-     *
-     * @param string $action
-     * @param Request $request
-     * @param mixed $id
-     * @param string $formClass
-     * @param array $formOptions
-     * @return Response
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     */
-    protected function formEditAction(string $action, Request $request, $id, string $formClass = null, array $formOptions = []): Response
-    {
-        $entity = $this->getEntity($action, $id, $request);
-
-        if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found", $this->getCrudName(), $id));
-        }
-
-        $response = $this->checkACL($action, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $response = $this->onPostCheckACL($action, $request, $entity);
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        $form = $this->createFormFor($action, $entity, $formClass, $formOptions);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->onFormValid($action, $entity, $form, $request);
-            $em = $this->getDoctrine()->getManager();
-
-            $this->onPreFlush($action, $entity, $form, $request);
-            $em->flush();
-            $this->onPostFlush($action, $entity, $form, $request);
-
-            $this->addFlash('success', $this->generateFormSuccessMessage($action, $entity));
-
-            $result = $this->onBeforeRedirectAfterSubmission($action, $entity, $form, $request);
-
-            if ($result instanceof Response) {
-                return $result;
-            }
-
-            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index');
-
-        } elseif ($form->isSubmitted()) {
-            $this->addFlash('error', $this->generateFormErrorMessage($action, $form));
-        }
-
-        $defaultTemplateParameters = [
-            'form' => $form->createView(),
-            'entity' => $entity,
-            'crud_name' => $this->getCrudName()
-        ];
-
-        return $this->render(
-            $this->getTemplateFor($action, $entity, $request),
-            $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
-            );
+        return $originalEntity;
     }
 
     /**
@@ -688,10 +383,7 @@ class CRUDController extends AbstractController
      * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
      *     The parameters may be personnalized using `generateTemplateParameter`.
      *
-     * @param string $action
-     * @param Request $request
      * @param type $formClass
-     * @return Response
      */
     protected function formCreateAction(string $action, Request $request, $formClass = null): Response
     {
@@ -702,11 +394,13 @@ class CRUDController extends AbstractController
         }
 
         $response = $this->checkACL($action, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
 
         $response = $this->onPostCheckACL($action, $request, $entity);
+
         if ($response instanceof Response) {
             return $response;
         }
@@ -735,189 +429,135 @@ class CRUDController extends AbstractController
                 return $result;
             }
 
-            return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', ['id' => $entity->getId()]);
+            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', ['id' => $entity->getId()]);
+        }
 
-        } elseif ($form->isSubmitted()) {
+        if ($form->isSubmitted()) {
             $this->addFlash('error', $this->generateFormErrorMessage($action, $form));
         }
 
         $defaultTemplateParameters = [
             'form' => $form->createView(),
             'entity' => $entity,
-            'crud_name' => $this->getCrudName()
+            'crud_name' => $this->getCrudName(),
         ];
 
         return $this->render(
             $this->getTemplateFor($action, $entity, $request),
             $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
-            );
+        );
     }
 
     /**
-     * get the instance of the entity with the given id
+     * The edit action.
      *
-     * @param string $id
-     * @return object
-     */
-    protected function getEntity($action, $id, Request $request): ?object
-    {
-        return $this->getDoctrine()
-            ->getRepository($this->getEntityClass())
-            ->find($id);
-    }
-
-    /**
-     * Duplicate an entity
+     * Some steps may be overriden during this process of rendering:
      *
-     * @param string $action
-     * @param Request $request
-     * @return mixed
-     */
-    protected function duplicateEntity(string $action, Request $request)
-    {
-        $id = $request->query->get('duplicate_id', 0);
-        $originalEntity = $this->getEntity($action, $id, $request);
-
-        $this->getDoctrine()->getManager()
-            ->detach($originalEntity);
-
-        return $originalEntity;
-    }
-
-    /**
+     * This method:
      *
-     * @return string the complete fqdn of the class
-     */
-    protected function getEntityClass(): string
-    {
-        return $this->crudConfig['class'];
-    }
-
-    /**
+     * 1.  fetch the entity, using `getEntity`
+     * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
+     *     this response is returned.
+     * 2.  throw an HttpNotFoundException if entity is null
+     * 3.  check ACL using `checkACL` ;
+     * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
+     *     this response is returned ;
+     * 5.  generate a form using `createFormFor`, and handle request on this form;
      *
-     * @return string the crud name
-     */
-    protected function getCrudName(): string
-    {
-        return $this->crudConfig['name'];
-    }
-
-    /**
-     * check the acl. Called by every action.
+     *     If the form is valid, the entity is stored and flushed, and a redirection
+     *     is returned.
      *
-     * By default, check the role given by `getRoleFor` for the value given in
-     * $entity.
+     *     In this case, those hooks are available:
      *
-     * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
-     * if not accessible.
+     *     * onFormValid
+     *     * onPreFlush
+     *     * onPostFlush
+     *     * onBeforeRedirectAfterSubmission. If this method return an instance of
+     *         Response, this response is returned.
      *
-     * @param string $action
-     * @param mixed $entity
-     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
-     */
-    protected function checkACL(string $action, $entity)
-    {
-        $this->denyAccessUnlessGranted($this->getRoleFor($action), $entity);
-    }
-
-    /**
-     * get the role given from the config.
+     * 5.  generate default template parameters:
      *
-     * @param string $action
-     * @return string
-     */
-    protected function getRoleFor($action)
-    {
-        if (\array_key_exists('role', $this->getActionConfig($action))) {
-            return $this->getActionConfig($action)['role'];
-        }
-
-        return $this->buildDefaultRole($action);
-    }
-
-    /**
-     * build a default role name, using the crud resolver.
+     *     * `entity`: the fetched entity ;
+     *     * `crud_name`: the crud name ;
+     *     * `form`: the formview instance.
      *
-     * This method should not be overriden. Override `getRoleFor` instead.
+     * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
+     *     The parameters may be personnalized using `generateTemplateParameter`.
      *
-     * @param string $action
-     * @return string
-     */
-    protected function buildDefaultRole($action)
-    {
-        return $this->getCrudResolver()->buildDefaultRole($this->getCrudName(),
-            $action);
-    }
-
-    /**
-     * get the default form class from config
-     *
-     * @param string $action
-     * @return string the FQDN of the form class
-     */
-    protected function getFormClassFor($action)
-    {
-        if ($action === 'delete') {
-            return $this->crudConfig[$action]['form_class']
-            ?? $this->getDefaultDeleteFormClass($action);
-        }
-
-        return $this->crudConfig[$action]['form_class']
-            ?? $this->crudConfig['form_class'];
-    }
-
-    protected function getDefaultDeleteFormClass($action)
-    {
-        return CRUDDeleteEntityForm::class;
-    }
-
-    /**
-     * Create a form
-     *
-     * use the method `getFormClassFor`
-     *
-     * A hook is available: `customizeForm` allow you to customize the form
-     * if needed.
-     *
-     * It is preferable to override customizeForm instead of overriding
-     * this method.
-     *
-     * @param string $action
-     * @param mixed $entity
+     * @param mixed $id
      * @param string $formClass
-     * @param array $formOptions
-     * @return FormInterface
-     */
-    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
-    {
-        $formClass = $formClass ?? $this->getFormClassFor($action);
-
-        $form = $this->createForm($formClass, $entity, $formOptions);
-
-        $this->customizeForm($action, $form);
-
-        return $form;
-    }
-
-    /**
-     * Customize the form created by createFormFor.
      *
-     * @param string $action
-     * @param FormInterface $form
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    protected function customizeForm(string $action, FormInterface $form)
+    protected function formEditAction(string $action, Request $request, $id, ?string $formClass = null, array $formOptions = []): Response
     {
+        $entity = $this->getEntity($action, $id, $request);
 
+        if (null === $entity) {
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
+        }
+
+        $response = $this->checkACL($action, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $form = $this->createFormFor($action, $entity, $formClass, $formOptions);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->onFormValid($action, $entity, $form, $request);
+            $em = $this->getDoctrine()->getManager();
+
+            $this->onPreFlush($action, $entity, $form, $request);
+            $em->flush();
+            $this->onPostFlush($action, $entity, $form, $request);
+
+            $this->addFlash('success', $this->generateFormSuccessMessage($action, $entity));
+
+            $result = $this->onBeforeRedirectAfterSubmission($action, $entity, $form, $request);
+
+            if ($result instanceof Response) {
+                return $result;
+            }
+
+            return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+        }
+
+        if ($form->isSubmitted()) {
+            $this->addFlash('error', $this->generateFormErrorMessage($action, $form));
+        }
+
+        $defaultTemplateParameters = [
+            'form' => $form->createView(),
+            'entity' => $entity,
+            'crud_name' => $this->getCrudName(),
+        ];
+
+        return $this->render(
+            $this->getTemplateFor($action, $entity, $request),
+            $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
+        );
     }
 
     /**
      * Generate a message which explains an error about the form.
      *
      * Used in form actions
-     *
-     * @param string $action
-     * @param FormInterface $form
-     * @return string
      */
     protected function generateFormErrorMessage(string $action, FormInterface $form): string
     {
@@ -927,26 +567,31 @@ class CRUDController extends AbstractController
     }
 
     /**
-     * Generate a success message when a form could be flushed successfully
+     * Generate a success message when a form could be flushed successfully.
      *
      * @param string $action
      * @param mixed $entity
-     * @return string
      */
     protected function generateFormSuccessMessage($action, $entity): string
     {
         switch ($action) {
             case 'edit':
-                $msg = "crud.edit.success";
+                $msg = 'crud.edit.success';
+
                 break;
+
             case 'new':
-                $msg = "crud.new.success";
+                $msg = 'crud.new.success';
+
                 break;
+
             case 'delete':
-                $msg = "crud.delete.success";
+                $msg = 'crud.delete.success';
+
                 break;
+
             default:
-                $msg = "crud.default.success";
+                $msg = 'crud.default.success';
         }
 
         return $this->getTranslator()->trans($msg);
@@ -955,10 +600,8 @@ class CRUDController extends AbstractController
     /**
      * Customize template parameters.
      *
-     * @param string $action
      * @param mixed $entity
-     * @param Request $request
-     * @param array $defaultTemplateParameters
+     *
      * @return array
      */
     protected function generateTemplateParameter(
@@ -971,17 +614,137 @@ class CRUDController extends AbstractController
     }
 
     /**
-     * Create an entity.
+     *  Include services.
+     *
+     * @return mixed
+     */
+    protected function getActionConfig(string $action)
+    {
+        return $this->crudConfig['actions'][$action];
+    }
+
+    protected function getAuthorizationHelper(): AuthorizationHelper
+    {
+        return $this->container->get(AuthorizationHelper::class);
+    }
+
+    /**
+     * @return string the crud name
+     */
+    protected function getCrudName(): string
+    {
+        return $this->crudConfig['name'];
+    }
+
+    protected function getCrudResolver(): Resolver
+    {
+        return $this->get(Resolver::class);
+    }
+
+    protected function getDefaultDeleteFormClass($action)
+    {
+        return CRUDDeleteEntityForm::class;
+    }
+
+    /**
+     * get the instance of the entity with the given id.
+     *
+     * @param string $id
+     * @param mixed $action
      *
-     * @param string $action
-     * @param Request $request
      * @return object
      */
-    protected function createEntity(string $action, Request $request): object
+    protected function getEntity($action, $id, Request $request): ?object
     {
-        $type = $this->getEntityClass();
+        return $this->getDoctrine()
+            ->getRepository($this->getEntityClass())
+            ->find($id);
+    }
 
-        return new $type;
+    /**
+     * @return string the complete fqdn of the class
+     */
+    protected function getEntityClass(): string
+    {
+        return $this->crudConfig['class'];
+    }
+
+    protected function getEventDispatcher(): EventDispatcherInterface
+    {
+        return $this->get(EventDispatcherInterface::class);
+    }
+
+    protected function getFilterOrderHelperFactory(): FilterOrderHelperFactoryInterface
+    {
+        return $this->get(FilterOrderHelperFactoryInterface::class);
+    }
+
+    /**
+     * get the default form class from config.
+     *
+     * @param string $action
+     *
+     * @return string the FQDN of the form class
+     */
+    protected function getFormClassFor($action)
+    {
+        if ('delete' === $action) {
+            return $this->crudConfig[$action]['form_class']
+            ?? $this->getDefaultDeleteFormClass($action);
+        }
+
+        return $this->crudConfig[$action]['form_class']
+            ?? $this->crudConfig['form_class'];
+    }
+
+    /**
+     * @todo (check how to do this with dependency injection and make changes...)
+     */
+    protected function getPaginatorFactory(): PaginatorFactory
+    {
+        return $this->container->get('chill_main.paginator_factory');
+    }
+
+    /**
+     * Get the result of the query.
+     *
+     * @return mixed
+     */
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null
+    ) {
+        $query = $this->queryEntities($action, $request, $paginator, $filterOrder);
+
+        return $query->getQuery()->getResult();
+    }
+
+    /**
+     * @return \Chill\MainBundle\Entity\Center[]
+     */
+    protected function getReachableCenters(Role $role, ?Scope $scope = null)
+    {
+        return $this->getAuthorizationHelper()
+            ->getReachableCenters($this->getUser(), $role, $scope);
+    }
+
+    /**
+     * get the role given from the config.
+     *
+     * @param string $action
+     *
+     * @return string
+     */
+    protected function getRoleFor($action)
+    {
+        if (array_key_exists('role', $this->getActionConfig($action))) {
+            return $this->getActionConfig($action)['role'];
+        }
+
+        return $this->buildDefaultRole($action);
     }
 
     /**
@@ -993,9 +756,10 @@ class CRUDController extends AbstractController
      *
      * @param string $action
      * @param mixed $entity the entity for the current request, or an array of entities
-     * @param Request $request
+     *
+     * @throws LogicException if no template are available
+     *
      * @return string the path to the template
-     * @throws \LogicException if no template are available
      */
     protected function getTemplateFor($action, $entity, Request $request)
     {
@@ -1006,26 +770,34 @@ class CRUDController extends AbstractController
         switch ($action) {
             case 'new':
                 return '@ChillMain/CRUD/new.html.twig';
+
             case 'edit':
                 return '@ChillMain/CRUD/edit.html.twig';
+
             case 'index':
                 return '@ChillMain/CRUD/index.html.twig';
+
             case 'view':
                 return '@ChillMain/CRUD/view.html.twig';
+
             case 'delete':
                 return '@ChillMain/CRUD/delete.html.twig';
+
             default:
-                throw new \LogicException("the view for action $action is not "
-                    . "defined. You should override ".__METHOD__." to add this "
-                    . "action");
+                throw new LogicException("the view for action {$action} is not "
+                    . 'defined. You should override ' . __METHOD__ . ' to add this '
+                    . 'action');
         }
     }
 
+    protected function getTranslator(): TranslatorInterface
+    {
+        return $this->container->get('translator');
+    }
+
     /**
      * @param $action
      * @param $entity
-     * @param Request $request
-     * @return bool
      */
     protected function hasCustomTemplate($action, $entity, Request $request): bool
     {
@@ -1033,69 +805,93 @@ class CRUDController extends AbstractController
     }
 
     /**
+     * Build an index page.
+     *
+     * Some steps may be overriden during this process of rendering.
+     *
+     * This method:
+     *
+     * 1.  Launch `onPreIndex`
+     * 2.  check acl. If it does return a response instance, return it
+     * 3.  launch `onPostCheckACL`. If it does return a response instance, return it
+     * 4.  count the items, using `countEntities`
+     * 5.  build a paginator element from the the number of entities ;
+     * 6.  Launch `onPreIndexQuery`. If it does return a response instance, return it
+     * 7.  fetch the results, using `getQueryResult`
+     *
+     *     Internally, this build a query, using `queryEntities`
+     *
+     * 8.  Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
+     * 9.  create default parameters:
+     *
+     *     The default parameters are:
+     *
+     *         * entities: the list en entities ;
+     *         * crud_name: the name of the crud ;
+     *         * paginator: a paginator element ;
+     * 10. Launch rendering, the parameter is fetch using `getTemplateFor`
+     *     The parameters may be personnalized using `generateTemplateParameter`.
+     *
      * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
      */
-    protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request)
+    protected function indexEntityAction($action, Request $request)
     {
-    }
+        $this->onPreIndex($action, $request);
 
-    /**
-     * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
-     */
-    protected function onPostFlush(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
+        $response = $this->checkACL($action, null);
 
-    /**
-     * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
-     */
-    protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
+        if ($response instanceof Response) {
+            return $response;
+        }
 
-    /**
-     * @param string $action
-     * @param $entity
-     * @param FormInterface $form
-     * @param Request $request
-     */
-    protected function onPostPersist(string $action, $entity, FormInterface $form, Request $request)
-    {
-    }
+        $entity = '';
 
-    /**
-     * @param $action
-     * @param Request $request
-     * @param $entity
-     * @return null|Response
-     */
-    protected function onPostFetchEntity($action, Request $request, $entity): ?Response
-    {
-        return null;
-    }
+        $response = $this->onPostCheckACL($action, $request, $entity);
 
-    /**
-     * @param $action
-     * @param Request $request
-     * @param $entity
-     * @return null|Response
-     */
-    protected function onPostCheckACL($action, Request $request, $entity): ?Response
-    {
-        return null;
-    }
+        if ($response instanceof Response) {
+            return $response;
+        }
 
-    protected function onFormValid(string $action, object $entity, FormInterface $form, Request $request)
-    {
+        $filterOrder = $this->buildFilterOrderHelper($action, $request);
+        $totalItems = $this->countEntities($action, $request, $filterOrder);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
+
+        $response = $this->onPreIndexBuildQuery(
+            $action,
+            $request,
+            $totalItems,
+            $paginator
+        );
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $entities = $this->getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+
+        $response = $this->onPostIndexFetchQuery(
+            $action,
+            $request,
+            $totalItems,
+            $paginator,
+            $entities
+        );
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $defaultTemplateParameters = [
+            'entities' => $entities,
+            'crud_name' => $this->getCrudName(),
+            'paginator' => $paginator,
+            'filter_order' => $filterOrder,
+        ];
+
+        return $this->render(
+            $this->getTemplateFor($action, $entities, $request),
+            $this->generateTemplateParameter($action, $entities, $request, $defaultTemplateParameters)
+        );
     }
 
     /**
@@ -1107,113 +903,242 @@ class CRUDController extends AbstractController
      * * save-and-new: return to new page of current crud ;
      * * save-and-view: return to view page of current crud ;
      *
-     * @param string $action
      * @param mixed $entity
-     * @param FormInterface $form
-     * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request)
     {
-        $next = $request->request->get("submit", "save-and-close");
+        $next = $request->request->get('submit', 'save-and-close');
 
         switch ($next) {
-            case "save-and-close":
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index');
-            case "save-and-new":
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_new', $request->query->all());
+            case 'save-and-close':
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index');
+
+            case 'save-and-new':
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_new', $request->query->all());
+
             default:
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
-                    'id' => $entity->getId()
-                    ]);
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
+                    'id' => $entity->getId(),
+                ]);
         }
     }
 
+    protected function onFormValid(string $action, object $entity, FormInterface $form, Request $request)
+    {
+    }
+
     /**
-     *  Include services
+     * @param $action
+     * @param $entity
+     */
+    protected function onPostCheckACL($action, Request $request, $entity): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * @param $action
+     * @param $entity
+     */
+    protected function onPostFetchEntity($action, Request $request, $entity): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * @param $entity
+     */
+    protected function onPostFlush(string $action, $entity, FormInterface $form, Request $request)
+    {
+    }
+
+    /**
+     * method used by indexAction.
      *
-     * @param string $action
-     * @return mixed
+     * @param mixed $query
      */
-    protected function getActionConfig(string $action)
+    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query)
     {
-        return $this->crudConfig['actions'][$action];
     }
 
     /**
-     * @todo (check how to do this with dependency injection and make changes...)
-     * @return PaginatorFactory
+     * method used by indexAction.
+     *
+     * @param mixed $entities
      */
-    protected function getPaginatorFactory(): PaginatorFactory
+    protected function onPostIndexFetchQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $entities)
     {
-        return $this->container->get('chill_main.paginator_factory');
     }
 
     /**
-     * @return TranslatorInterface
+     * @param $entity
      */
-    protected function getTranslator(): TranslatorInterface
+    protected function onPostPersist(string $action, $entity, FormInterface $form, Request $request)
     {
-        return $this->container->get('translator');
     }
 
     /**
-     * @return AuthorizationHelper
+     * @param $entity
      */
-    protected function getAuthorizationHelper(): AuthorizationHelper
+    protected function onPostRemove(string $action, $entity, FormInterface $form, Request $request)
+    {
+    }
+
+    protected function onPreDelete(string $action, Request $request)
     {
-        return $this->container->get(AuthorizationHelper::class);
     }
 
     /**
-     * @param Role $role
-     * @param Scope|null $scope
-     * @return \Chill\MainBundle\Entity\Center[]
+     * @param $entity
      */
-    protected function getReachableCenters(Role $role, Scope $scope = null)
+    protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request)
+    {
+    }
+
+    protected function onPreIndex(string $action, Request $request)
     {
-        return $this->getAuthorizationHelper()
-            ->getReachableCenters($this->getUser(), $role, $scope)
-            ;
     }
 
     /**
-     * @return EventDispatcherInterface
+     * method used by indexAction.
      */
-    protected function getEventDispatcher(): EventDispatcherInterface
+    protected function onPreIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator)
     {
-        return $this->get(EventDispatcherInterface::class);
     }
 
     /**
-     * @return Resolver
+     * @param $entity
      */
-    protected function getCrudResolver(): Resolver
+    protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request)
     {
-        return $this->get(Resolver::class);
-    }
-
-    protected function getFilterOrderHelperFactory(): FilterOrderHelperFactoryInterface
-    {
-        return $this->get(FilterOrderHelperFactoryInterface::class);
     }
 
     /**
-     * @return array
+     * @param $entity
      */
-    public static function getSubscribedServices(): array
+    protected function onPreRemove(string $action, $entity, FormInterface $form, Request $request)
     {
-        return \array_merge(
-            parent::getSubscribedServices(),
-            [
-                'chill_main.paginator_factory' => PaginatorFactory::class,
-                'translator' => TranslatorInterface::class,
-                AuthorizationHelper::class => AuthorizationHelper::class,
-                EventDispatcherInterface::class => EventDispatcherInterface::class,
-                Resolver::class => Resolver::class,
-                SerializerInterface::class => SerializerInterface::class,
-                FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
-            ]
-        );
+    }
+
+    /**
+     * Add ordering fields in the query build by self::queryEntities.
+     *
+     * @param mixed|QueryBuilder $query by default, an instance of QueryBuilder
+     *
+     * @return mixed|QueryBuilder
+     */
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        return $query;
+    }
+
+    /**
+     * Query the entity.
+     *
+     * By default, get all entities.
+     *
+     * The method `orderEntity` is called internally to order entities.
+     *
+     * It returns, by default, a query builder.
+     *
+     * @return type
+     */
+    protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
+    {
+        $query = $this->buildQueryEntities($action, $request)
+            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
+            ->setMaxResults($paginator->getItemsPerPage());
+
+        // allow to order queries and return the new query
+        return $this->orderQuery($action, $query, $request, $paginator);
+    }
+
+    /**
+     * @param $entity
+     */
+    protected function removeEntity(string $action, $entity, FormInterface $form, Request $request)
+    {
+        $this->getDoctrine()
+            ->getManager()
+            ->remove($entity);
+    }
+
+    /**
+     * The view action.
+     *
+     * Some steps may be overriden during this process of rendering:
+     *
+     * This method:
+     *
+     * 1.  fetch the entity, using `getEntity`
+     * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
+     *     this response is returned.
+     * 2.  throw an HttpNotFoundException if entity is null
+     * 3.  check ACL using `checkACL` ;
+     * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
+     *     this response is returned ;
+     * 5.  generate default template parameters:
+     *
+     *     * `entity`: the fetched entity ;
+     *     * `crud_name`: the crud name
+     * 6.  Launch rendering, the parameter is fetch using `getTemplateFor`
+     *     The parameters may be personnalized using `generateTemplateParameter`.
+     *
+     * @param mixed $id
+     * @param mixed $_format
+     */
+    protected function viewAction(string $action, Request $request, $id, $_format = 'html'): Response
+    {
+        $entity = $this->getEntity($action, $id, $request);
+
+        $postFetch = $this->onPostFetchEntity($action, $request, $entity);
+
+        if ($postFetch instanceof Response) {
+            return $postFetch;
+        }
+
+        if (null === $entity) {
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
+        }
+
+        $response = $this->checkACL($action, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        $response = $this->onPostCheckACL($action, $request, $entity);
+
+        if ($response instanceof Response) {
+            return $response;
+        }
+
+        if ('html' === $_format) {
+            $defaultTemplateParameters = [
+                'entity' => $entity,
+                'crud_name' => $this->getCrudName(),
+            ];
+
+            return $this->render(
+                $this->getTemplateFor($action, $entity, $request),
+                $this->generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters)
+            );
+        }
+
+        if ('json' === $_format) {
+            $context = $this->getContextForSerialization($action, $request, $entity, $_format);
+
+            return $this->json($entity, Response::HTTP_OK, [], $context);
+        }
+
+        throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This format is not implemented');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php b/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
index 6b382fca3..00cb7bfc4 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Form/CRUDDeleteEntityForm.php
@@ -1,33 +1,20 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2020, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Form;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-
 
 /**
- * Class CRUDDeleteEntityForm
- *
- * @package Chill\MainBundle\CRUD\Form
+ * Class CRUDDeleteEntityForm.
  */
 class CRUDDeleteEntityForm extends AbstractType
 {
diff --git a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
index f6242a0f1..11b84e586 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
@@ -1,122 +1,116 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2019, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Resolver;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\PropertyAccess\PropertyAccess;
+use LogicException;
+use function array_key_exists;
+use function strtoupper;
 
 /**
- * Class Resolver
- *
- * @package Chill\MainBundle\CRUD\Resolver
+ * Class Resolver.
  */
 class Resolver
 {
     /**
-     * @var EntityManagerInterface
+     * The key to get the role necessary for the action.
      */
-    protected $em;
-    
+    public const ROLE = 'role';
+
     /**
-     * @var \Symfony\Component\PropertyAccess\PropertyAccessor
+     * @deprecated
      */
-    protected $propertyAccess;
-    
+    public const ROLE_EDIT = 'role.edit';
+
+    /**
+     * @deprecated
+     */
+    public const ROLE_VIEW = 'role.view';
+
     /**
      * @var array
      */
     protected $crudConfig;
-    
+
     /**
-     * @deprecated
+     * @var EntityManagerInterface
      */
-    const ROLE_VIEW = 'role.view';
-    
+    protected $em;
+
     /**
-     * @deprecated
+     * @var \Symfony\Component\PropertyAccess\PropertyAccessor
      */
-    const ROLE_EDIT = 'role.edit';
-    
-    /**
-     * The key to get the role necessary for the action
-     */
-    const ROLE = 'role';
-    
+    protected $propertyAccess;
+
     /**
      * Resolver constructor.
-     *
-     * @param EntityManagerInterface $em
-     * @param array $crudConfig
      */
-    function __construct(EntityManagerInterface $em, array $crudConfig)
+    public function __construct(EntityManagerInterface $em, array $crudConfig)
     {
         $this->em = $em;
-        
-        foreach($crudConfig as $conf) {
+
+        foreach ($crudConfig as $conf) {
             $this->crudConfig[$conf['name']] = $conf;
         }
     }
-    
-    /**
-     * @param $key
-     * @param $crudName
-     * @param null $action
-     * @return string
-     */
-    public function getConfigValue($key, $crudName, $action = null)
-    {
-        $config = $this->crudConfig[$crudName];
-        
-        switch ($key) {
-            case self::ROLE:
-                return $config['actions'][$action]['role'] ?? $this->buildDefaultRole($crudName, $action);
-        }
-    }
-    
+
     /**
      * @param $crudName
      * @param $action
+     *
      * @return string
      */
     public function buildDefaultRole($crudName, $action)
     {
         if (empty($this->crudConfig[$crudName]['base_role'])) {
-            throw new \LogicException(sprintf("the base role is not defined. You must define "
-                . "on or override %s or %s methods", __METHOD__, "getRoleFor"));
+            throw new LogicException(sprintf('the base role is not defined. You must define '
+                . 'on or override %s or %s methods', __METHOD__, 'getRoleFor'));
         }
-        
-        return \strtoupper(
-            $this->crudConfig[$crudName]['base_role'].
-            '_'.
-            $action);
+
+        return strtoupper(
+            $this->crudConfig[$crudName]['base_role'] .
+            '_' .
+            $action
+        );
     }
-    
+
+    /**
+     * @param $key
+     * @param $crudName
+     * @param null $action
+     *
+     * @return string
+     */
+    public function getConfigValue($key, $crudName, $action = null)
+    {
+        $config = $this->crudConfig[$crudName];
+
+        switch ($key) {
+            case self::ROLE:
+                return $config['actions'][$action]['role'] ?? $this->buildDefaultRole($crudName, $action);
+        }
+    }
+
     /**
      * @param $crudName
      * @param $action
+     *
      * @return bool
      */
     public function hasAction($crudName, $action)
     {
-        return \array_key_exists($action,
-            $this->crudConfig[$crudName]['actions']);
+        return array_key_exists(
+            $action,
+            $this->crudConfig[$crudName]['actions']
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
index 36aadb8b7..33cce8a2f 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
@@ -1,152 +1,103 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2019, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Routing;
 
+use RuntimeException;
 use Symfony\Component\Config\Loader\Loader;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\MainBundle\CRUD\Controller\ApiController;
-use Chill\MainBundle\CRUD\Controller\CRUDController;
+use function array_filter;
+use function array_keys;
+use function array_search;
+use function count;
+use function in_array;
+use const ARRAY_FILTER_USE_BOTH;
 
-/**
- * Class CRUDRoutesLoader
- * Load the route for CRUD
- *
- * @package Chill\MainBundle\CRUD\Routing
- */
 class CRUDRoutesLoader extends Loader
 {
-    protected array $crudConfig = [];
-
-    protected array $apiCrudConfig = [];
-    
-    /**
-     * @var bool
-     */
-    private $isLoaded = false;
+    private const ALL_INDEX_METHODS = [Request::METHOD_GET, Request::METHOD_HEAD];
 
     private const ALL_SINGLE_METHODS = [
         Request::METHOD_GET,
         Request::METHOD_POST,
         Request::METHOD_PUT,
-        Request::METHOD_DELETE
+        Request::METHOD_DELETE,
     ];
 
-    private const ALL_INDEX_METHODS = [ Request::METHOD_GET, Request::METHOD_HEAD ];
-    
-    /**
-     * CRUDRoutesLoader constructor.
-     *
-     * @param $crudConfig the config from cruds
-     * @param $apicrudConfig the config from api_crud
-     */
-    public function __construct(array $crudConfig, array $apiConfig)
+    protected array $apiCrudConfig = [];
+
+    protected array $crudConfig = [];
+
+    private bool $isLoaded = false;
+
+    public function __construct(array $crudConfig, array $apiCrudConfig)
     {
         $this->crudConfig = $crudConfig;
-        $this->apiConfig = $apiConfig;
+        $this->apiCrudConfig = $apiCrudConfig;
+
+        parent::__construct();
     }
-    
+
+    /**
+     * Load routes for CRUD and CRUD Api.
+     *
+     * @param mixed $resource
+     * @param mixed|null $type
+     */
+    public function load($resource, $type = null): RouteCollection
+    {
+        if (true === $this->isLoaded) {
+            throw new RuntimeException('Do not add the "CRUD" loader twice');
+        }
+
+        $collection = new RouteCollection();
+
+        foreach ($this->crudConfig as $crudConfig) {
+            $collection->addCollection($this->loadCrudConfig($crudConfig));
+        }
+
+        foreach ($this->apiCrudConfig as $crudConfig) {
+            $collection->addCollection($this->loadApi($crudConfig));
+        }
+
+        return $collection;
+    }
+
     /**
      * @param mixed $resource
      * @param null $type
+     *
      * @return bool
      */
     public function supports($resource, $type = null)
     {
         return 'CRUD' === $type;
     }
-    
-    /**
-     * Load routes for CRUD and CRUD Api
-     */
-    public function load($resource, $type = null): RouteCollection
-    {
-        if (true === $this->isLoaded) {
-            throw new \RuntimeException('Do not add the "CRUD" loader twice');
-        }
 
-        $collection = new RouteCollection();
-        
-        foreach ($this->crudConfig as $crudConfig) {
-            $collection->addCollection($this->loadCrudConfig($crudConfig));
-        }
-        foreach ($this->apiConfig as $crudConfig) {
-            $collection->addCollection($this->loadApi($crudConfig));
-        }
-
-        return $collection;
-    }
-    
     /**
-     * Load routes for CRUD (without api)
+     * Load routes for api single.
      *
      * @param $crudConfig
-     * @return RouteCollection
-     */
-    protected function loadCrudConfig($crudConfig): RouteCollection
-    {
-        $collection = new RouteCollection();
-        $controller ='cscrud_'.$crudConfig['name'].'_controller';
-
-        foreach ($crudConfig['actions'] as $name => $action) {
-            // defaults (controller name)
-            $defaults = [
-                '_controller' => $controller.':'.($action['controller_action'] ?? $name)
-            ];
-            
-            if ($name === 'index') {
-                $path = "{_locale}".$crudConfig['base_path'];
-                $route = new Route($path, $defaults);
-            } elseif ($name === 'new') {
-                $path = "{_locale}".$crudConfig['base_path'].'/'.$name;
-                $route = new Route($path, $defaults);
-            } else {
-                $path = "{_locale}".$crudConfig['base_path'].($action['path'] ?? '/{id}/'.$name);
-                $requirements = $action['requirements'] ?? [
-                    '{id}' => '\d+'
-                ];
-                $route = new Route($path, $defaults, $requirements);
-            }
-            
-            $collection->add('chill_crud_'.$crudConfig['name'].'_'.$name, $route);
-        }
-        
-        return $collection;
-    }
-
-    /**
-     * Load routes for api single
-     *
-     * @param $crudConfig
-     * @return RouteCollection
      */
     protected function loadApi(array $crudConfig): RouteCollection
     {
         $collection = new RouteCollection();
-        $controller = 'csapi_'.$crudConfig['name'].'_controller';
+        $controller = 'csapi_' . $crudConfig['name'] . '_controller';
 
         foreach ($crudConfig['actions'] as $name => $action) {
             // filter only on single actions
-            $singleCollection = $action['single_collection'] ?? $name === '_entity' ? 'single' : NULL;
+            $singleCollection = $action['single_collection'] ?? '_entity' === $name ? 'single' : null;
+
             if ('collection' === $singleCollection) {
 //                continue;
             }
@@ -155,46 +106,61 @@ class CRUDRoutesLoader extends Loader
             switch ($name) {
                 case '_entity':
                     $controllerAction = 'entityApi';
+
                     break;
+
                 case '_index':
                     $controllerAction = 'indexApi';
+
                     break;
+
                 default:
-                    $controllerAction = $name.'Api';
+                    $controllerAction = $name . 'Api';
+
                     break;
             }
 
             $defaults = [
-                '_controller' => $controller.':'.($action['controller_action'] ?? $controllerAction)
+                '_controller' => $controller . ':' . ($action['controller_action'] ?? $controllerAction),
             ];
 
             // path are rewritten
             // if name === 'default', we rewrite it to nothing :-)
-            $localName = \in_array($name, [ '_entity', '_index' ]) ? '' : '/'.$name;
+            $localName = in_array($name, ['_entity', '_index'], true) ? '' : '/' . $name;
+
             if ('collection' === $action['single_collection'] || '_index' === $name) {
-                $localPath = $action['path'] ?? $localName.'.{_format}';
+                $localPath = $action['path'] ?? $localName . '.{_format}';
             } else {
-                $localPath = $action['path'] ?? '/{id}'.$localName.'.{_format}';
+                $localPath = $action['path'] ?? '/{id}' . $localName . '.{_format}';
             }
-            $path = $crudConfig['base_path'].$localPath;
+            $path = $crudConfig['base_path'] . $localPath;
 
-            $requirements = $action['requirements'] ?? [ '{id}' => '\d+' ];
+            $requirements = $action['requirements'] ?? ['{id}' => '\d+'];
 
-            $methods = \array_keys(\array_filter($action['methods'], function($value, $key) { return $value; },
-                ARRAY_FILTER_USE_BOTH));
+            $methods = array_keys(array_filter(
+                $action['methods'],
+                static function ($value, $key) { return $value; },
+                ARRAY_FILTER_USE_BOTH
+            ));
 
             if (count($methods) === 0) {
-                throw new \RuntimeException("The api configuration named \"{$crudConfig['name']}\", action \"{$name}\", ".
-                    "does not have any allowed methods. You should remove this action from the config ".
-                    "or allow, at least, one method"); 
+                throw new RuntimeException("The api configuration named \"{$crudConfig['name']}\", action \"{$name}\", " .
+                    'does not have any allowed methods. You should remove this action from the config ' .
+                    'or allow, at least, one method');
             }
 
-            if ('_entity' === $name && \in_array(Request::METHOD_POST, $methods)) {
-                unset($methods[\array_search(Request::METHOD_POST, $methods)]);
-                $entityPostRoute = $this->createEntityPostRoute($name, $crudConfig, $action, 
-                    $controller);
-                $collection->add("chill_api_single_{$crudConfig['name']}_{$name}_create", 
-                    $entityPostRoute);
+            if ('_entity' === $name && in_array(Request::METHOD_POST, $methods, true)) {
+                unset($methods[array_search(Request::METHOD_POST, $methods, true)]);
+                $entityPostRoute = $this->createEntityPostRoute(
+                    $name,
+                    $crudConfig,
+                    $action,
+                    $controller
+                );
+                $collection->add(
+                    "chill_api_single_{$crudConfig['name']}_{$name}_create",
+                    $entityPostRoute
+                );
             }
 
             if (count($methods) === 0) {
@@ -205,8 +171,44 @@ class CRUDRoutesLoader extends Loader
 
             $route = new Route($path, $defaults, $requirements);
             $route->setMethods($methods);
-            
-            $collection->add('chill_api_single_'.$crudConfig['name'].'_'.$name, $route);
+
+            $collection->add('chill_api_single_' . $crudConfig['name'] . '_' . $name, $route);
+        }
+
+        return $collection;
+    }
+
+    /**
+     * Load routes for CRUD (without api).
+     *
+     * @param $crudConfig
+     */
+    protected function loadCrudConfig($crudConfig): RouteCollection
+    {
+        $collection = new RouteCollection();
+        $controller = 'cscrud_' . $crudConfig['name'] . '_controller';
+
+        foreach ($crudConfig['actions'] as $name => $action) {
+            // defaults (controller name)
+            $defaults = [
+                '_controller' => $controller . ':' . ($action['controller_action'] ?? $name),
+            ];
+
+            if ('index' === $name) {
+                $path = '{_locale}' . $crudConfig['base_path'];
+                $route = new Route($path, $defaults);
+            } elseif ('new' === $name) {
+                $path = '{_locale}' . $crudConfig['base_path'] . '/' . $name;
+                $route = new Route($path, $defaults);
+            } else {
+                $path = '{_locale}' . $crudConfig['base_path'] . ($action['path'] ?? '/{id}/' . $name);
+                $requirements = $action['requirements'] ?? [
+                    '{id}' => '\d+',
+                ];
+                $route = new Route($path, $defaults, $requirements);
+            }
+
+            $collection->add('chill_crud_' . $crudConfig['name'] . '_' . $name, $route);
         }
 
         return $collection;
@@ -214,14 +216,14 @@ class CRUDRoutesLoader extends Loader
 
     private function createEntityPostRoute(string $name, $crudConfig, array $action, $controller): Route
     {
-        $localPath = $action['path'].'.{_format}';
+        $localPath = $action['path'] . '.{_format}';
         $defaults = [
-            '_controller' => $controller.':'.($action['controller_action'] ?? 'entityPost')
+            '_controller' => $controller . ':' . ($action['controller_action'] ?? 'entityPost'),
         ];
-        $path = $crudConfig['base_path'].$localPath;
+        $path = $crudConfig['base_path'] . $localPath;
         $requirements = $action['requirements'] ?? [];
         $route = new Route($path, $defaults, $requirements);
-        $route->setMethods([ Request::METHOD_POST ]);
+        $route->setMethods([Request::METHOD_POST]);
 
         return $route;
     }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
index 00956bf2e..8704a79ca 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php
@@ -1,36 +1,23 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2019, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Templating;
 
 use Chill\MainBundle\CRUD\Resolver\Resolver;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
 use Twig\Extension\AbstractExtension;
-use Twig\Environment;
+use Twig\TwigFunction;
 
 /**
  * Class TwigCRUDResolver
- * Twig filters to display data in crud template
- *
- * @package Chill\MainBundle\CRUD\Templating
+ * Twig filters to display data in crud template.
  */
 class TwigCRUDResolver extends AbstractExtension
 {
@@ -38,49 +25,54 @@ class TwigCRUDResolver extends AbstractExtension
      * @var Resolver
      */
     protected $resolver;
-    
+
     /**
      * TwigCRUDResolver constructor.
-     *
-     * @param Resolver $resolver
      */
-    function __construct(Resolver $resolver)
+    public function __construct(Resolver $resolver)
     {
         $this->resolver = $resolver;
     }
-    
-    /**
-     * @return array|TwigFunction[]
-     */
-    public function getFunctions()
-    {
-        return [
-            new TwigFunction('chill_crud_config', [$this, 'getConfig'],
-                ['is_safe' => 'html']),
-            new TwigFunction('chill_crud_action_exists', [$this, 'hasAction'],
-                []),
-        ];
-    }
-    
+
     /**
      * @param $configKey
      * @param $crudName
      * @param null $action
+     *
      * @return string
      */
     public function getConfig($configKey, $crudName, $action = null)
     {
         return $this->resolver->getConfigValue($configKey, $crudName, $action);
     }
-    
+
+    /**
+     * @return array|TwigFunction[]
+     */
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction(
+                'chill_crud_config',
+                [$this, 'getConfig'],
+                ['is_safe' => 'html']
+            ),
+            new TwigFunction(
+                'chill_crud_action_exists',
+                [$this, 'hasAction'],
+                []
+            ),
+        ];
+    }
+
     /**
      * @param $crudName
      * @param $action
+     *
      * @return bool
      */
     public function hasAction($crudName, $action)
     {
         return $this->resolver->hasAction($crudName, $action);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php b/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php
index 5f10d35c8..4fb6071cd 100644
--- a/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php
+++ b/src/Bundle/ChillMainBundle/Center/GroupingCenterInterface.php
@@ -1,27 +1,35 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Center;
 
 /**
  * Interface to declare a groups of centers.
- * 
- * This interface is used to declare a groups of centers in 
+ *
+ * This interface is used to declare a groups of centers in
  * `Chill\MainBundle\Form\Export\PickCenterType`.
- * 
  */
 interface GroupingCenterInterface
 {
     /**
-     * @return string[]
-     */
-    public function getGroups($authorizedCenters = null): array;
-    
-    /**
-     * 
      * @param string $group
+     *
      * @return \Chill\MainBundle\Entity\Center[]
      */
     public function getCentersForGroup($group);
+
+    /**
+     * @param mixed|null $authorizedCenters
+     *
+     * @return string[]
+     */
+    public function getGroups($authorizedCenters = null): array;
 }
diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index f9e79bc8b..2ff7ef862 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -1,29 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle;
 
+use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\ExportsCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\GroupingCenterCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\WidgetsCompilerPass;
+use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass;
+use Chill\MainBundle\DependencyInjection\RoleProvidersCompilerPass;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Search\SearchInterface;
-use Chill\MainBundle\Security\Authorization\ChillVoterInterface;
+use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Security\ProvideRoleInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
 use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
-use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
-use Chill\MainBundle\DependencyInjection\RoleProvidersCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\ExportsCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\WidgetsCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\GroupingCenterCompilerPass;
-use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
 use Chill\MainBundle\Templating\Entity\CompilerPass as RenderEntityCompilerPass;
-
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillMainBundle extends Bundle
 {
@@ -41,6 +48,8 @@ class ChillMainBundle extends Bundle
             ->addTag('chill_main.scope_resolver');
         $container->registerForAutoconfiguration(ChillEntityRenderInterface::class)
             ->addTag('chill.render_entity');
+        $container->registerForAutoconfiguration(SearchApiInterface::class)
+            ->addTag('chill.search_api_provider');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());
diff --git a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
index 99bd17d8f..1f07af303 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
@@ -1,123 +1,114 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\GroupCenter;
+use Chill\MainBundle\Entity\PermissionsGroup;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Exception;
+use League\Csv\Reader;
+use League\Csv\Writer;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use League\Csv\Reader;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\MainBundle\Entity\Center;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
-use Chill\MainBundle\Entity\GroupCenter;
-use Chill\MainBundle\Entity\PermissionsGroup;
 use Symfony\Component\Console\Question\ChoiceQuestion;
-use League\Csv\Writer;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use function array_key_exists;
+use function array_keys;
+use function array_merge;
+use function bin2hex;
+use function count;
+use function implode;
+use function random_bytes;
+use function trim;
 
 class ChillImportUsersCommand extends Command
 {
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var ValidatorInterface
-     */
-    protected $validator;
-    
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     *
-     * @var UserPasswordEncoderInterface
-     */
-    protected $passwordEncoder;
-    
-    /**
-     *
-     * @var \Chill\MainBundle\Repository\UserRepository
-     */
-    protected $userRepository;
-    
-    /**
-     *
-     * @var bool
-     */
-    protected $doChanges = true;
-    
-    /**
-     *
-     * @var OutputInterface
-     */
-    protected $tempOutput;
-    
-    /**
-     *
-     * @var InputInterface
-     */
-    protected $tempInput;
-    
     /**
      * Centers and aliases.
-     * 
+     *
      * key are aliases, values are an array of centers
-     *
-     * @var array
      */
-    protected $centers = [];
-    
-    /**
-     * 
-     * @var array
-     */
-    protected $permissionGroups = [];
-    
-    /**
-     *
-     * @var array
-     */
-    protected $groupCenters = [];
-    
-    /**
-     *
-     * @var Writer
-     */
-    protected $output = null;
-    
+    protected array $centers;
+
+    protected bool $doChanges = true;
+
+    protected EntityManagerInterface $em;
+
+    protected array $groupCenters;
+
+    protected LoggerInterface $logger;
+
+    protected Writer $output;
+
+    protected UserPasswordEncoderInterface $passwordEncoder;
+
+    protected array $permissionGroups;
+
+    protected InputInterface $tempInput;
+
+    protected OutputInterface $tempOutput;
+
+    protected UserRepository $userRepository;
+
+    protected ValidatorInterface $validator;
+
     public function __construct(
         EntityManagerInterface $em,
         LoggerInterface $logger,
         UserPasswordEncoderInterface $passwordEncoder,
-        ValidatorInterface $validator
+        ValidatorInterface $validator,
+        UserRepository $userRepository
     ) {
         $this->em = $em;
         $this->passwordEncoder = $passwordEncoder;
         $this->validator = $validator;
         $this->logger = $logger;
-        
-        
-        $this->userRepository = $em->getRepository(User::class);
-        
+        $this->userRepository = $userRepository;
+
         parent::__construct('chill:main:import-users');
     }
 
-    
-    
+    protected function appendUserToFile(User $user)
+    {
+        $this->output->insertOne([
+            $user->getEmail(),
+            $user->getUsername(),
+            $user->getId(),
+        ]);
+    }
+
+    protected function concatenateViolations(ConstraintViolationListInterface $list)
+    {
+        $str = [];
+
+        foreach ($list as $e) {
+            /* @var $e \Symfony\Component\Validator\ConstraintViolationInterface */
+            $str[] = $e->getMessage();
+        }
+
+        return implode(';', $str);
+    }
+
     protected function configure()
     {
         $this
@@ -126,82 +117,89 @@ class ChillImportUsersCommand extends Command
             ->addArgument('csvfile', InputArgument::REQUIRED, 'Path to the csv file. Columns are: `username`, `email`, `center` (can contain alias), `permission group`')
             ->addOption('grouping-centers', null, InputOption::VALUE_OPTIONAL, 'Path to a csv file to aggregate multiple centers into a single alias')
             ->addOption('dry-run', null, InputOption::VALUE_NONE, 'Do not commit the changes')
-            ->addOption('csv-dump', null, InputOption::VALUE_REQUIRED, 'A path to dump a summary of the created file')
-        ;
+            ->addOption('csv-dump', null, InputOption::VALUE_REQUIRED, 'A path to dump a summary of the created file');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function createOrGetGroupCenter(Center $center, PermissionsGroup $pg): GroupCenter
     {
-        $this->tempOutput = $output;
-        $this->tempInput = $input;
-        
-        if ($input->getOption('dry-run')) {
-            $this->doChanges = false;
-        }
-              
-        $this->prepareWriter();
-        
-        if ($input->hasOption('grouping-centers')) {
-            $this->prepareGroupingCenters();
-        }
-        
-        try {
-            $this->loadUsers();
-        }
-        catch(\Exception $e) {
-            throw $e;
-        }
-    }
-    
-    protected function prepareWriter()
-    {
-        $this->output = $output = Writer::createFromPath($this->tempInput
-            ->getOption('csv-dump'), 'a+');
-        
-        $output->insertOne([
-            'email',
-            'username',
-            'id'
-        ]);
-    }
-    
-    protected function appendUserToFile(User $user)
-    {
-        $this->output->insertOne( [
-            $user->getEmail(),
-            $user->getUsername(),
-            $user->getId()
-            ]);
-    }
-    
-    protected function loadUsers()
-    {
-        $reader = Reader::createFromPath($this->tempInput->getArgument('csvfile'));
-        $reader->setHeaderOffset(0);
-        
-        foreach ($reader->getRecords() as $line => $r) {
-            $this->logger->debug("starting handling new line", [
-                'line' => $line
-            ]);
-            
-            if ($this->doesUserExists($r)) {
-                $this->tempOutput->writeln(sprintf("User with username '%s' already "
-                    . "exists, skipping", $r["username"]));
-                
-                $this->logger->info("One user already exists, skipping creation", [
-                    'username_in_file' => $r['username'],
-                    'email_in_file' => $r['email'],
-                    'line' => $line
-                ]);
-                
-                continue;
+        if (array_key_exists($center->getId(), $this->groupCenters)) {
+            if (array_key_exists($pg->getId(), $this->groupCenters[$center->getId()])) {
+                return $this->groupCenters[$center->getId()][$pg->getId()];
             }
-            
-            $user = $this->createUser($line, $r);
-            $this->appendUserToFile($user);
         }
+
+        $repository = $this->em->getRepository(GroupCenter::class);
+
+        $groupCenter = $repository->findOneBy([
+            'center' => $center,
+            'permissionsGroup' => $pg,
+        ]);
+
+        if (null === $groupCenter) {
+            $groupCenter = new GroupCenter();
+            $groupCenter
+                ->setCenter($center)
+                ->setPermissionsGroup($pg);
+
+            $this->em->persist($groupCenter);
+        }
+
+        $this->groupCenters[$center->getId()][$pg->getId()] = $groupCenter;
+
+        return $groupCenter;
     }
-    
+
+    protected function createUser($offset, $data)
+    {
+        $user = new User();
+        $user
+            ->setEmail(trim($data['email']))
+            ->setUsername(trim($data['username']))
+            ->setEnabled(true)
+            ->setPassword($this->passwordEncoder->encodePassword(
+                $user,
+                bin2hex(random_bytes(32))
+            ));
+
+        $errors = $this->validator->validate($user);
+
+        if ($errors->count() > 0) {
+            $errorMessages = $this->concatenateViolations($errors);
+
+            $this->tempOutput->writeln(sprintf('%d errors found with user with username "%s" at line %d', $errors->count(), $data['username'], $offset));
+            $this->tempOutput->writeln($errorMessages);
+
+            throw new RuntimeException('Found errors while creating an user. '
+                . 'Watch messages in command output');
+        }
+
+        $pgs = $this->getPermissionGroup($data['permission group']);
+        $centers = $this->getCenters($data['center']);
+
+        foreach ($pgs as $pg) {
+            foreach ($centers as $center) {
+                $groupcenter = $this->createOrGetGroupCenter($center, $pg);
+
+                if (false === $user->getGroupCenters()->contains($groupcenter)) {
+                    $user->addGroupCenter($groupcenter);
+                }
+            }
+        }
+
+        if ($this->doChanges) {
+            $this->em->persist($user);
+            $this->em->flush();
+        }
+
+        $this->logger->notice('Create user', [
+            'username' => $user->getUsername(),
+            'id' => $user->getId(),
+            'nb_of_groupCenters' => $user->getGroupCenters()->count(),
+        ]);
+
+        return $user;
+    }
+
     protected function doesUserExists($data)
     {
         if ($this->userRepository->countByUsernameOrEmail($data['username']) > 0) {
@@ -211,238 +209,206 @@ class ChillImportUsersCommand extends Command
         if ($this->userRepository->countByUsernameOrEmail($data['email']) > 0) {
             return true;
         }
-        
+
         return false;
     }
-    
-    protected function createUser($offset, $data)
-    {
-        $user = new User();
-        $user
-            ->setEmail(\trim($data['email']))
-            ->setUsername(\trim($data['username']))
-            ->setEnabled(true)
-            ->setPassword($this->passwordEncoder->encodePassword($user, 
-                \bin2hex(\random_bytes(32))))
-            ;
-        
-        $errors = $this->validator->validate($user);
-        
-        if ($errors->count() > 0) {
-            $errorMessages = $this->concatenateViolations($errors);
-            
-            $this->tempOutput->writeln(sprintf("%d errors found with user with username \"%s\" at line %d", $errors->count(), $data['username'], $offset));
-            $this->tempOutput->writeln($errorMessages);
 
-            throw new \RuntimeException("Found errors while creating an user. "
-                . "Watch messages in command output");
-        }
-        
-        $pgs = $this->getPermissionGroup($data['permission group']);
-        $centers = $this->getCenters($data['center']);
-        
-        foreach($pgs as $pg) {
-            foreach ($centers as $center) {
-                $groupcenter = $this->createOrGetGroupCenter($center, $pg);
-                
-                if (FALSE === $user->getGroupCenters()->contains($groupcenter)) {
-                    $user->addGroupCenter($groupcenter);
-                }
-            }
-        }
-        
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->tempOutput = $output;
+        $this->tempInput = $input;
 
-        if ($this->doChanges) {
-            $this->em->persist($user);
-            $this->em->flush();
+        if ($input->getOption('dry-run')) {
+            $this->doChanges = false;
         }
-                        
-        $this->logger->notice("Create user", [
-            'username' => $user->getUsername(),
-            'id' => $user->getId(),
-            'nb_of_groupCenters' => $user->getGroupCenters()->count()
-        ]);
 
-        return $user;
-    }
-    
-    protected function getPermissionGroup($alias)
-    {
-        if (\array_key_exists($alias, $this->permissionGroups)) {
-            return $this->permissionGroups[$alias];
+        $this->prepareWriter();
+
+        if ($input->hasOption('grouping-centers')) {
+            $this->prepareGroupingCenters();
         }
-        
-        $permissionGroupsByName = [];
-        
-        foreach($this->em->getRepository(PermissionsGroup::class)
-            ->findAll() as $permissionGroup) {
-            $permissionGroupsByName[$permissionGroup->getName()] = $permissionGroup;
-        }
-        
-        if (count($permissionGroupsByName) === 0) {
-            throw new \RuntimeException("no permission groups found. Create them "
-                . "before importing users");
-        }
-        
-        $question = new ChoiceQuestion("To which permission groups associate with \"$alias\" ?", 
-            \array_keys($permissionGroupsByName));
-        $question
-            ->setMultiselect(true)
-            ->setAutocompleterValues(\array_keys($permissionGroupsByName))
-            ->setNormalizer(function($value) {
-                if (NULL === $value) { return ''; }
-                
-                return \trim($value);
-            })
-            ;
-        $helper = $this->getHelper('question');
-        
-        $keys = $helper->ask($this->tempInput, $this->tempOutput, $question);
-        
-        $this->tempOutput->writeln("You have chosen ".\implode(", ", $keys));
-        
-        if ($helper->ask($this->tempInput, $this->tempOutput, 
-            new ConfirmationQuestion("Are you sure ?", true))) {
-            
-            foreach ($keys as $key) {
-                $this->permissionGroups[$alias][] = $permissionGroupsByName[$key];
-            }
-            
-            return $this->permissionGroups[$alias];
-        } else {
-            $this->logger->error("Error while responding to a a question");
-            
-            $this->tempOutput("Ok, I accept, but I do not know what to do. Please try again.");
-            
-            throw new \RuntimeException("Error while responding to a question");
+
+        try {
+            $this->loadUsers();
+        } catch (Exception $e) {
+            throw $e;
         }
     }
-    
-    /**
-     * 
-     * @param Center $center
-     * @param \Chill\MainBundle\Command\PermissionGroup $pg
-     * @return GroupCenter
-     */
-    protected function createOrGetGroupCenter(Center $center, PermissionsGroup $pg): GroupCenter
-    {
-        if (\array_key_exists($center->getId(), $this->groupCenters)) {
-            if (\array_key_exists($pg->getId(), $this->groupCenters[$center->getId()])) {
-                return $this->groupCenters[$center->getId()][$pg->getId()];
-            }
-        }
-        
-        $repository = $this->em->getRepository(GroupCenter::class);
-        
-        $groupCenter = $repository->findOneBy(array(
-                'center' => $center,
-                'permissionsGroup' => $pg
-            ));
-        
-        if ($groupCenter === NULL) {
-            $groupCenter = new GroupCenter();
-            $groupCenter
-                ->setCenter($center)
-                ->setPermissionsGroup($pg)
-                ;
-            
-            $this->em->persist($groupCenter);
-        }
-        
-        $this->groupCenters[$center->getId()][$pg->getId()] = $groupCenter;
-        
-        return $groupCenter;
-    }
-    
-    protected function prepareGroupingCenters()
-    {
-        $reader = Reader::createFromPath($this->tempInput->getOption('grouping-centers'));
-        $reader->setHeaderOffset(0);
-        
-        foreach ($reader->getRecords() as $r) {
-            $this->centers[$r['alias']] = 
-                \array_merge(
-                    $this->centers[$r['alias']] ?? [],
-                    $this->getCenters($r['center']
-                    )
-                );
-        }
-    }
-    
+
     /**
      * return a list of centers matching the name of alias.
-     * 
+     *
      * If the name match one center, this center is returned in an array.
-     * 
-     * If the name match an alias, the centers corresponding to the alias are 
+     *
+     * If the name match an alias, the centers corresponding to the alias are
      * returned in an array.
-     * 
+     *
      * If the center is not found or alias is not created, a new center is created
      * and suggested to user
-     * 
+     *
      * @param string $name the name of the center or the alias regrouping center
+     *
      * @return Center[]
      */
     protected function getCenters($name)
     {
         // sanitize
-        $name = \trim($name);
-        
-        if (\array_key_exists($name, $this->centers)) {
+        $name = trim($name);
+
+        if (array_key_exists($name, $this->centers)) {
             return $this->centers[$name];
         }
-        
+
         // search for a center with given name
         $center = $this->em->getRepository(Center::class)
             ->findOneByName($name);
-        
+
         if ($center instanceof Center) {
             $this->centers[$name] = [$center];
-            
+
             return $this->centers[$name];
         }
-        
+
         // suggest and create
         $center = (new Center())
             ->setName($name);
-        
-        $this->tempOutput->writeln("Center with name \"$name\" not found.");
+
+        $this->tempOutput->writeln("Center with name \"{$name}\" not found.");
         $qFormatter = $this->getHelper('question');
-        $question = new ConfirmationQuestion("Create a center with name \"$name\" ?", true);
-        
+        $question = new ConfirmationQuestion("Create a center with name \"{$name}\" ?", true);
+
         if ($qFormatter->ask($this->tempInput, $this->tempOutput, $question)) {
-            $this->centers[$name] = [ $center ];
-            
+            $this->centers[$name] = [$center];
+
             $errors = $this->validator->validate($center);
-            
+
             if ($errors->count() > 0) {
                 $errorMessages = $this->concatenateViolations($errors);
-                
-                $this->tempOutput->writeln(sprintf("%d errors found with center with name \"%s\"", $errors->count(), $name));
+
+                $this->tempOutput->writeln(sprintf('%d errors found with center with name "%s"', $errors->count(), $name));
                 $this->tempOutput->writeln($errorMessages);
-                
-                throw new \RuntimeException("Found errors while creating one center. "
-                    . "Watch messages in command output");
+
+                throw new RuntimeException('Found errors while creating one center. '
+                    . 'Watch messages in command output');
             }
-            
+
             $this->em->persist($center);
-            
+
             return $this->centers[$name];
         }
-        
+
         return null;
     }
-    
-    protected function concatenateViolations(ConstraintViolationListInterface $list)
+
+    protected function getPermissionGroup($alias)
     {
-        $str = [];
-        
-        foreach ($list as $e) {
-            /* @var $e \Symfony\Component\Validator\ConstraintViolationInterface */
-            $str[] = $e->getMessage();
+        if (array_key_exists($alias, $this->permissionGroups)) {
+            return $this->permissionGroups[$alias];
         }
-        
-        return \implode(";", $str);
+
+        $permissionGroupsByName = [];
+
+        foreach ($this->em->getRepository(PermissionsGroup::class)
+            ->findAll() as $permissionGroup) {
+            $permissionGroupsByName[$permissionGroup->getName()] = $permissionGroup;
+        }
+
+        if (count($permissionGroupsByName) === 0) {
+            throw new RuntimeException('no permission groups found. Create them '
+                . 'before importing users');
+        }
+
+        $question = new ChoiceQuestion(
+            "To which permission groups associate with \"{$alias}\" ?",
+            array_keys($permissionGroupsByName)
+        );
+        $question
+            ->setMultiselect(true)
+            ->setAutocompleterValues(array_keys($permissionGroupsByName))
+            ->setNormalizer(static function ($value) {
+                if (null === $value) {
+                    return '';
+                }
+
+                return trim($value);
+            });
+        $helper = $this->getHelper('question');
+
+        $keys = $helper->ask($this->tempInput, $this->tempOutput, $question);
+
+        $this->tempOutput->writeln('You have chosen ' . implode(', ', $keys));
+
+        if ($helper->ask(
+            $this->tempInput,
+            $this->tempOutput,
+            new ConfirmationQuestion('Are you sure ?', true)
+        )) {
+            foreach ($keys as $key) {
+                $this->permissionGroups[$alias][] = $permissionGroupsByName[$key];
+            }
+
+            return $this->permissionGroups[$alias];
+        }
+
+        $this->logger->error('Error while responding to a a question');
+        $this->tempOutput->writeln('Ok, I accept, but I do not know what to do. Please try again.');
+
+        throw new RuntimeException('Error while responding to a question');
+    }
+
+    protected function loadUsers()
+    {
+        $reader = Reader::createFromPath($this->tempInput->getArgument('csvfile'));
+        $reader->setHeaderOffset(0);
+
+        foreach ($reader->getRecords() as $line => $r) {
+            $this->logger->debug('starting handling new line', [
+                'line' => $line,
+            ]);
+
+            if ($this->doesUserExists($r)) {
+                $this->tempOutput->writeln(sprintf("User with username '%s' already "
+                    . 'exists, skipping', $r['username']));
+
+                $this->logger->info('One user already exists, skipping creation', [
+                    'username_in_file' => $r['username'],
+                    'email_in_file' => $r['email'],
+                    'line' => $line,
+                ]);
+
+                continue;
+            }
+
+            $user = $this->createUser($line, $r);
+            $this->appendUserToFile($user);
+        }
+    }
+
+    protected function prepareGroupingCenters()
+    {
+        $reader = Reader::createFromPath($this->tempInput->getOption('grouping-centers'));
+        $reader->setHeaderOffset(0);
+
+        foreach ($reader->getRecords() as $r) {
+            $this->centers[$r['alias']] =
+                array_merge(
+                    $this->centers[$r['alias']] ?? [],
+                    $this->getCenters(
+                        $r['center']
+                    )
+                );
+        }
+    }
+
+    protected function prepareWriter()
+    {
+        $this->output = $output = Writer::createFromPath($this->tempInput
+            ->getOption('csv-dump'), 'a+');
+
+        $output->insertOne([
+            'email',
+            'username',
+            'id',
+        ]);
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
index bea2fa1a5..c94ea35c2 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -1,88 +1,94 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\Mailer;
+use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Exception;
+use InvalidArgumentException;
+use League\Csv\Reader;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use League\Csv\Reader;
-use Psr\Log\LoggerInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Notification\Mailer;
-use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
-use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use function array_key_exists;
+use function array_merge;
+use function in_array;
+use function trim;
 
 /**
- * Class ChillUserSendRenewPasswordCodeCommand
- *
- * @package Chill\MainBundle\Command
+ * Class ChillUserSendRenewPasswordCodeCommand.
  */
 class ChillUserSendRenewPasswordCodeCommand extends Command
 {
     /**
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     /**
-     *
-     * @var Mailer
-     */
-    protected $mailer;
-    
-    /**
-     *
-     * @var RecoverPasswordHelper
-     */
-    protected $recoverPasswordHelper;
-    
-    /**
-     *
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-    
+
     /**
-     * The current input interface
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * @var Mailer
+     */
+    protected $mailer;
+
+    /**
+     * @var RecoverPasswordHelper
+     */
+    protected $recoverPasswordHelper;
+
+    /**
+     * The current input interface.
      *
      * @var InputInterface
      */
     private $input;
-    
+
     /**
-     * The current output interface
+     * The current output interface.
      *
      * @var OutputInterface
      */
     private $output;
-    
+
     public function __construct(
-        LoggerInterface $logger, 
-        EntityManagerInterface $em, 
-        RecoverPasswordHelper $recoverPasswordHelper, 
+        LoggerInterface $logger,
+        EntityManagerInterface $em,
+        RecoverPasswordHelper $recoverPasswordHelper,
         EventDispatcherInterface $eventDispatcher
     ) {
         $this->logger = $logger;
         $this->em = $em;
         $this->recoverPasswordHelper = $recoverPasswordHelper;
         $this->eventDispatcher = $eventDispatcher;
-        
+
         parent::__construct();
     }
 
-    
-    
     protected function configure()
     {
         $this
@@ -91,113 +97,114 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
             ->addArgument('csvfile', InputArgument::REQUIRED, 'CSV file with the list of users')
             ->addOption('template', null, InputOption::VALUE_REQUIRED, 'Template for email')
             ->addOption('expiration', null, InputOption::VALUE_REQUIRED, 'Expiration of the link, as an unix timestamp')
-            ->addOption('subject', null, InputOption::VALUE_REQUIRED, 'Subject of the email', 'Recover your password')
-        ;
+            ->addOption('subject', null, InputOption::VALUE_REQUIRED, 'Subject of the email', 'Recover your password');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->input = $input;
         $this->output = $output;
-        
+
         $reader = $this->getReader();
-        
-        foreach($reader->getRecords() as $offset => $r) {
+
+        foreach ($reader->getRecords() as $offset => $r) {
             $user = $this->getUser($r);
-            
-            if ($user === null) {
+
+            if (null === $user) {
                 $this->onUserNotFound($r, $offset);
+
                 continue;
             }
-            
+
             $this->sendRecoverCode($user);
         }
     }
-    
-    protected function sendRecoverCode(User $user)
-    {
-        if (empty($user->getEmail())) {
-            $this->logger->alert("User without email", [
-                'user_id' => $user->getId(),
-                'username' => $user->getUsername()
-            ]);
-            
-            return;
-        }
-        
-        $template = $this->input->getOption('template');
-        $expiration = \DateTime::createFromFormat('U', 
-            $this->input->getOption('expiration'));
-        
-        $this->recoverPasswordHelper
-            ->sendRecoverEmail(
-                $user, 
-                $expiration, 
-                $template, 
-                [ 'expiration' => $expiration],
-                false,
-                [ '_locale' => 'fr' ],
-                $this->input->getOption('subject')
-                );
-    }
-    
-    protected function onUserNotFound($row, $offset)
-    {
-        $this->logger->alert('User not found', \array_merge([
-            'offset' => $offset
-        ], $row));
-    }
-    
-    protected function getUser($row)
-    {
-        /* @var $userRepository \Chill\MainBundle\Repository\UserRepository */
-        $userRepository = $this->em->getRepository(User::class);
-        
-        try {
-            if (\array_key_exists('email', $row)) {
-                return $userRepository->findOneByUsernameOrEmail(\trim($row['email']));
-            }
-        } catch (\Doctrine\ORM\NoResultException $e) {
-            // continue, we will try username
-        }
-        
-        try {
-            if (\array_key_exists('username', $row)) {
-                return $userRepository->findOneByUsernameOrEmail(\trim($row['username']));
-            }
-        } catch (\Doctrine\ORM\NoResultException $e) {
-            return null;
-        }
-    }
-    
+
     /**
-     * 
+     * @throws Exception
+     *
      * @return Reader
-     * @throws \Exception
      */
     protected function getReader()
     {
         try {
             $reader = Reader::createFromPath($this->input->getArgument('csvfile'));
-        } catch (\Exception $e) {
-            $this->logger->error("The csv file could not be read", [
-                'path' => $this->input->getArgument('csvfile')
+        } catch (Exception $e) {
+            $this->logger->error('The csv file could not be read', [
+                'path' => $this->input->getArgument('csvfile'),
             ]);
-            
+
             throw $e;
         }
-        
+
         $reader->setHeaderOffset(0);
-        
+
         $headers = $reader->getHeader();
-        
-        if (FALSE === \in_array('username', $headers)
-            && FALSE === \in_array('email', $headers)) {
-            throw new \InvalidArgumentException("The csv file does not have an "
-                . "username or email header");
+
+        if (false === in_array('username', $headers, true)
+            && false === in_array('email', $headers, true)) {
+            throw new InvalidArgumentException('The csv file does not have an '
+                . 'username or email header');
         }
-        
+
         return $reader;
     }
 
+    protected function getUser($row)
+    {
+        /** @var \Chill\MainBundle\Repository\UserRepository $userRepository */
+        $userRepository = $this->em->getRepository(User::class);
+
+        try {
+            if (array_key_exists('email', $row)) {
+                return $userRepository->findOneByUsernameOrEmail(trim($row['email']));
+            }
+        } catch (\Doctrine\ORM\NoResultException $e) {
+            // continue, we will try username
+        }
+
+        try {
+            if (array_key_exists('username', $row)) {
+                return $userRepository->findOneByUsernameOrEmail(trim($row['username']));
+            }
+        } catch (\Doctrine\ORM\NoResultException $e) {
+            return null;
+        }
+    }
+
+    protected function onUserNotFound($row, $offset)
+    {
+        $this->logger->alert('User not found', array_merge([
+            'offset' => $offset,
+        ], $row));
+    }
+
+    protected function sendRecoverCode(User $user)
+    {
+        if (empty($user->getEmail())) {
+            $this->logger->alert('User without email', [
+                'user_id' => $user->getId(),
+                'username' => $user->getUsername(),
+            ]);
+
+            return;
+        }
+
+        $template = $this->input->getOption('template');
+        $expiration = DateTime::createFromFormat(
+            'U',
+            $this->input->getOption('expiration')
+        );
+
+        $this->recoverPasswordHelper
+            ->sendRecoverEmail(
+                $user,
+                $expiration,
+                $template,
+                ['expiration' => $expiration],
+                false,
+                ['_locale' => 'fr'],
+                $this->input->getOption('subject')
+            );
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
index a5c53a551..dfb912eb9 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
@@ -1,96 +1,90 @@
 <?php
 
-/*
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Intl\Intl;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Intl\Intl;
+use function in_array;
 
 /*
  * Load or update the languages entities command
  */
 class LoadAndUpdateLanguagesCommand extends Command
 {
+    public const INCLUDE_ANCIENT = 'include_ancient';
+
+    public const INCLUDE_REGIONAL_VERSION = 'include_regional';
+
+    // Array of ancien languages (to exclude)
+    private $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
+        'dum', 'enm', 'frm', 'gmh', 'mga', 'akk', 'phn', 'zxx', 'got', 'und', ];
+
+    private $availableLanguages;
 
     /**
      * @var EntityManager
      */
     private $entityManager;
-    
-    private $availableLanguages;
-    
+
     // The regional version of language are language with _ in the code
     // This array contains regional code to not exclude
-    private $regionalVersionToInclude = ["ro_MD"];
+    private $regionalVersionToInclude = ['ro_MD'];
 
-    // Array of ancien languages (to exclude)
-    private $ancientToExclude = ["ang", "egy", "fro", "goh", "grc", "la", "non", "peo", "pro", "sga",
-        "dum", "enm", "frm", "gmh", "mga", "akk", "phn", "zxx", "got", "und"];
-
-    const INCLUDE_REGIONAL_VERSION = 'include_regional';
-    const INCLUDE_ANCIENT = 'include_ancient';
-    
     /**
      * LoadCountriesCommand constructor.
      *
-     * @param EntityManager $entityManager
      * @param $availableLanguages
      */
     public function __construct(EntityManager $entityManager, $availableLanguages)
     {
-        $this->entityManager=$entityManager;
-        $this->availableLanguages=$availableLanguages;
+        $this->entityManager = $entityManager;
+        $this->availableLanguages = $availableLanguages;
         parent::__construct();
     }
-    
-    
-    /*
-     * (non-PHPdoc)
+
+    /**
+     * (non-PHPdoc).
+     *
      * @see \Symfony\Component\Console\Command\Command::configure()
      */
     protected function configure()
     {
         $this
             ->setName('chill:main:languages:populate')
-            ->setDescription('Load or update languages in db. This command does not delete existing '.
+            ->setDescription('Load or update languages in db. This command does not delete existing ' .
                 'languages, but will update names according to available languages')
             ->addOption(
-                    self::INCLUDE_REGIONAL_VERSION,
-                    null,
-                    InputOption::VALUE_NONE,
-                    'Include the regional languages. The regional languages are languages with code containing _ excepted '
-                        . implode(',', $this->regionalVersionToInclude) . '.')
+                self::INCLUDE_REGIONAL_VERSION,
+                null,
+                InputOption::VALUE_NONE,
+                'Include the regional languages. The regional languages are languages with code containing _ excepted '
+                        . implode(',', $this->regionalVersionToInclude) . '.'
+            )
             ->addOption(
-                    self::INCLUDE_ANCIENT,
-                    null,
-                    InputOption::VALUE_NONE,
-                    'Include the ancient languages that are languages with code '
-                        . implode(', ', $this->ancientToExclude) . '.')
-            ;
+                self::INCLUDE_ANCIENT,
+                null,
+                InputOption::VALUE_NONE,
+                'Include the ancient languages that are languages with code '
+                        . implode(', ', $this->ancientToExclude) . '.'
+            );
     }
-    
-    /*
-     * (non-PHPdoc)
+
+    /**
+     * (non-PHPdoc).
+     *
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -98,7 +92,7 @@ class LoadAndUpdateLanguagesCommand extends Command
         $em = $this->entityManager;
         $chillAvailableLanguages = $this->availableLanguages;
         $languageBundle = Intl::getLanguageBundle();
-        $languages = array();
+        $languages = [];
 
         foreach ($chillAvailableLanguages as $avLang) {
             $languages[$avLang] = $languageBundle->getLanguageNames($avLang);
@@ -109,25 +103,25 @@ class LoadAndUpdateLanguagesCommand extends Command
         foreach ($languageCodes as $code) {
             $excludeCode = (
                 (
-                    ! $input->getOption(self::INCLUDE_REGIONAL_VERSION)
-                    and strpos($code, '_')
-                    and !in_array($code, $this->regionalVersionToInclude)
-                ) or (
-                    ! $input->getOption(self::INCLUDE_ANCIENT)
-                    and in_array($code, $this->ancientToExclude)
+                    !$input->getOption(self::INCLUDE_REGIONAL_VERSION)
+                    && strpos($code, '_')
+                    && !in_array($code, $this->regionalVersionToInclude, true)
+                ) || (
+                    !$input->getOption(self::INCLUDE_ANCIENT)
+                    && in_array($code, $this->ancientToExclude, true)
                 )
             );
 
             $langageDB = $em->getRepository('ChillMainBundle:Language')->find($code);
 
-            if(! $excludeCode) {
-                if (! $langageDB) {
+            if (!$excludeCode) {
+                if (!$langageDB) {
                     $langageDB = new \Chill\MainBundle\Entity\Language();
                     $langageDB->setId($code);
                     $em->persist($langageDB);
                 }
 
-                $avLangNames = array();
+                $avLangNames = [];
 
                 foreach ($chillAvailableLanguages as $avLang) {
                     $avLangNames[$avLang] = $languages[$avLang][$code];
@@ -135,10 +129,10 @@ class LoadAndUpdateLanguagesCommand extends Command
 
                 $langageDB->setName($avLangNames);
             } else {
-                if($langageDB) {
+                if ($langageDB) {
                     $em->remove($langageDB);
                 }
-                echo "Code excluded : ".$code." - ".$languageBundle->getLanguageName($code)."\n";
+                echo 'Code excluded : ' . $code . ' - ' . $languageBundle->getLanguageName($code) . "\n";
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
index 036ad1de7..b47146324 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
@@ -1,96 +1,102 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Intl\Intl;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Intl\Intl;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop
- *        
- */
 class LoadCountriesCommand extends Command
 {
-    
+    private $availableLanguages;
+
     /**
      * @var EntityManager
      */
     private $entityManager;
-    
-    private $availableLanguages;
-    
+
     /**
      * LoadCountriesCommand constructor.
      *
-     * @param EntityManager $entityManager
      * @param $availableLanguages
      */
     public function __construct(EntityManager $entityManager, $availableLanguages)
     {
-        $this->entityManager=$entityManager;
-        $this->availableLanguages=$availableLanguages;
+        $this->entityManager = $entityManager;
+        $this->availableLanguages = $availableLanguages;
         parent::__construct();
     }
-    
-    /*
-     * (non-PHPdoc)
+
+    public static function prepareCountryList($languages)
+    {
+        $regionBundle = Intl::getRegionBundle();
+        $countries = [];
+
+        foreach ($languages as $language) {
+            $countries[$language] = $regionBundle->getCountryNames($language);
+        }
+
+        $countryEntities = [];
+
+        foreach ($countries[$languages[0]] as $countryCode => $name) {
+            $names = [];
+
+            foreach ($languages as $language) {
+                $names[$language] = $countries[$language][$countryCode];
+            }
+
+            $country = new \Chill\MainBundle\Entity\Country();
+            $country->setName($names)->setCountryCode($countryCode);
+            $countryEntities[] = $country;
+        }
+
+        return $countryEntities;
+    }
+
+    /**
+     * (non-PHPdoc).
+     *
      * @see \Symfony\Component\Console\Command\Command::configure()
      */
     protected function configure()
     {
         $this->setName('chill:main:countries:populate')
-            ->setDescription('Load or update countries in db. This command does not delete existing countries, '.
+            ->setDescription('Load or update countries in db. This command does not delete existing countries, ' .
                 'but will update names according to available languages');
     }
-    
-    /*
-     * (non-PHPdoc)
+
+    /**
+     * (non-PHPdoc).
+     *
      * @see \Symfony\Component\Console\Command\Command::execute()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $countries = static::prepareCountryList($this->availableLanguages);
         $em = $this->entityManager;
-        
-        foreach($countries as $country) {
+
+        foreach ($countries as $country) {
             $countryStored = $em->getRepository('ChillMainBundle:Country')
-                ->findOneBy(array('countryCode' => $country->getCountryCode()));
-            
-            if (NULL === $countryStored) {
+                ->findOneBy(['countryCode' => $country->getCountryCode()]);
+
+            if (null === $countryStored) {
                 $em->persist($country);
             } else {
                 $countryStored->setName($country->getName());
             }
         }
-        
+
         $em->flush();
     }
-
-    public static function prepareCountryList($languages)
-    {
-        $regionBundle = Intl::getRegionBundle();
-        
-        foreach ($languages as $language) {
-            $countries[$language] = $regionBundle->getCountryNames($language);
-        }
-        
-        $countryEntities = array();
-        
-        foreach ($countries[$languages[0]] as $countryCode => $name) {
-            $names = array();
-            
-            foreach ($languages as $language) {
-                $names[$language] = $countries[$language][$countryCode];
-            }
-            
-            $country = new \Chill\MainBundle\Entity\Country();
-            $country->setName($names)->setCountryCode($countryCode);
-            $countryEntities[] = $country;
-        }
-        
-        return $countryEntities;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
index 21090a61f..a5f3c8611 100644
--- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
@@ -1,243 +1,219 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Country;
-use Doctrine\ORM\EntityManager;
+use Chill\MainBundle\Entity\PostalCode;
+use Doctrine\ORM\EntityManagerInterface;
+use Exception;
+use RuntimeException;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Filesystem\Filesystem;
-use Chill\MainBundle\Entity\PostalCode;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use function count;
 
-/**
- * Class LoadPostalCodesCommand
- *
- * @package Chill\MainBundle\Command
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class LoadPostalCodesCommand extends Command
 {
-    
-    /**
-     * @var EntityManager
-     */
-    private $entityManager;
-    
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
-    
-    /**
-     * LoadPostalCodesCommand constructor.
-     *
-     * @param EntityManager $entityManager
-     * @param ValidatorInterface $validator
-     */
-    public function __construct(EntityManager $entityManager, ValidatorInterface $validator)
+    private EntityManagerInterface $entityManager;
+
+    private ValidatorInterface $validator;
+
+    public function __construct(EntityManagerInterface $entityManager, ValidatorInterface $validator)
     {
         $this->entityManager = $entityManager;
         $this->validator = $validator;
         parent::__construct();
     }
-    
+
     protected function configure()
     {
         $this->setName('chill:main:postal-code:populate')
-                ->setDescription("Add the postal code from a csv file.")
-                ->setHelp("This script will try to avoid existing postal code "
+            ->setDescription('Add the postal code from a csv file.')
+            ->setHelp('This script will try to avoid existing postal code '
                         . "using the postal code and name. \n"
-                        . "The CSV file must have the following columns: "
-                        . "postal code, label, country code."
-                        . "Optionally, the csv file can have the following "
-                        . "columns after the country code: reference code, latitude, longitude, source. "
-                        . "The latitude and longitude columns are supposed to be in WGS84 and expressed in decimal degrees. "
-                        . "The CSV file should not have any header row.")
-                ->addArgument('csv_file', InputArgument::REQUIRED, "the path to "
-                        . "the csv file. See the help for specifications.")
-                ->addOption(
-                        'delimiter', 
-                        'd', 
-                        InputOption::VALUE_OPTIONAL, 
-                        "The delimiter character of the csv file", 
-                        ",")
-                ->addOption(
-                        'enclosure',
-                        null,
-                        InputOption::VALUE_OPTIONAL,
-                        "The enclosure character of the csv file",
-                        '"'
-                        )
-                ->addOption(
-                        'escape',
-                        null,
-                        InputOption::VALUE_OPTIONAL,
-                        "The escape character of the csv file",
-                        "\\"
-                        )
-                ;
+                        . 'The CSV file must have the following columns: '
+                        . 'postal code, label, country code.'
+                        . 'Optionally, the csv file can have the following '
+                        . 'columns after the country code: reference code, latitude, longitude, source. '
+                        . 'The latitude and longitude columns are supposed to be in WGS84 and expressed in decimal degrees. '
+                        . 'The CSV file should not have any header row.')
+            ->addArgument('csv_file', InputArgument::REQUIRED, 'the path to '
+                        . 'the csv file. See the help for specifications.')
+            ->addOption(
+                'delimiter',
+                'd',
+                InputOption::VALUE_OPTIONAL,
+                'The delimiter character of the csv file',
+                ','
+            )
+            ->addOption(
+                'enclosure',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The enclosure character of the csv file',
+                '"'
+            )
+            ->addOption(
+                'escape',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The escape character of the csv file',
+                '\\'
+            );
     }
-    
+
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        try {
-            $csv = $this->getCSVResource($input);
-        } catch (\RuntimeException $e) {
-            $output->writeln('<error>Error during opening the csv file : '.
-                    $e->getMessage().'</error>');
-        }
-        
+        $csv = $this->getCSVResource($input);
+
         if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERY_VERBOSE) {
             $output->writeln('The content of the file is ...');
             $output->write(file_get_contents($input->getArgument('csv_file')));
         }
-        
+
         $num = 0;
         $line = 0;
-        
-        while (($row = fgetcsv(
-                $csv, 
-                0, 
-                $input->getOption('delimiter'), 
-                $input->getOption('enclosure'), 
-                $input->getOption('escape'))) !== false) {
-            
-            try{
+
+        while (false !== ($row = fgetcsv(
+            $csv,
+            0,
+            $input->getOption('delimiter'),
+            $input->getOption('enclosure'),
+            $input->getOption('escape')
+        ))) {
+            try {
                 $this->addPostalCode($row, $output);
-                $num++;
+                ++$num;
             } catch (ExistingPostalCodeException $ex) {
-                $output->writeln('<warning> on line '.$line.' : '.$ex->getMessage().'</warning>');
+                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
             } catch (CountryCodeNotFoundException $ex) {
-                $output->writeln('<warning> on line '.$line.' : '.$ex->getMessage().'</warning>');
+                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
             } catch (PostalCodeNotValidException $ex) {
-                $output->writeln('<warning> on line '.$line.' : '.$ex->getMessage().'</warning>');
+                $output->writeln('<warning> on line ' . $line . ' : ' . $ex->getMessage() . '</warning>');
             }
-            $line ++;
+            ++$line;
         }
-        
+
         $this->entityManager->flush();
-        
-        $output->writeln('<info>'.$num.' were added !</info>');
+
+        $output->writeln('<info>' . $num . ' were added !</info>');
     }
-    
-    private function getCSVResource(InputInterface $input)
-    {
-        $fs = new Filesystem();
-        $filename = $input->getArgument('csv_file');
-        
-        if (!$fs->exists($filename)) {
-            throw new \RuntimeException("The file does not exists or you do not "
-                    . "have the right to read it.");
-        }
-        
-        $resource = fopen($filename, 'r');
-        
-        if ($resource == FALSE) {
-            throw new \RuntimeException("The file '$filename' could not be opened.");
-        }
-        
-        return $resource;
-    }
-    
+
     private function addPostalCode($row, OutputInterface $output)
     {
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-            $output->writeln('handling row: '. $row[0].' | '. $row[1].' | '. $row[2]);
+            $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }
         $em = $this->entityManager;
         $country = $em
-                ->getRepository(Country::class)
-                ->findOneBy(array('countryCode' => $row[2]));
-        
-        if ($country === NULL) {
-            throw new CountryCodeNotFoundException(sprintf("The country with code %s is not found. Aborting to insert postal code with %s - %s",
-                    $row[2], $row[0], $row[1]));
+            ->getRepository(Country::class)
+            ->findOneBy(['countryCode' => $row[2]]);
+
+        if (null === $country) {
+            throw new CountryCodeNotFoundException(sprintf(
+                'The country with code %s is not found. Aborting to insert postal code with %s - %s',
+                $row[2],
+                $row[0],
+                $row[1]
+            ));
         }
-        
+
         // try to find an existing postal code
         $existingPC = $em
-                ->getRepository(PostalCode::class)
-                ->findBy(array('code' => $row[0], 'name' => $row[1]));
-        
+            ->getRepository(PostalCode::class)
+            ->findBy(['code' => $row[0], 'name' => $row[1]]);
+
         if (count($existingPC) > 0) {
-            throw new ExistingPostalCodeException(sprintf("A postal code with code : %s and name : %s already exists, skipping", 
-                    $row[0], $row[1]));
+            throw new ExistingPostalCodeException(sprintf(
+                'A postal code with code : %s and name : %s already exists, skipping',
+                $row[0],
+                $row[1]
+            ));
         }
-        
+
         $postalCode = (new PostalCode())
-                ->setCode($row[0])
-                ->setName($row[1])
-                ->setCountry($country)
-                ;
-        
-        if (NULL != $row[3]){
+            ->setCode($row[0])
+            ->setName($row[1])
+            ->setCountry($country);
+
+        if (null !== $row[3]) {
             $postalCode->setRefPostalCodeId($row[3]);
         }
 
-        if (NULL != $row[4] & NULL != $row[5]){
+        if (null !== $row[4] & null !== $row[5]) {
             $postalCode->setCenter(Point::fromLonLat((float) $row[5], (float) $row[4]));
         }
 
-        if (NULL != $row[6]){
+        if (null !== $row[6]) {
             $postalCode->setPostalCodeSource($row[6]);
         }
 
         $errors = $this->validator->validate($postalCode);
-        
-        if ($errors->count() == 0) {
+
+        if ($errors->count() === 0) {
             $em->persist($postalCode);
         } else {
-            $msg = "";
+            $msg = '';
+
             foreach ($errors as $error) {
-                $msg .= " ".$error->getMessage();
+                $msg .= ' ' . $error->getMessage();
             }
-            
+
             throw new PostalCodeNotValidException($msg);
         }
-        
-        
-        
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-            $output->writeln(sprintf('Creating postal code with code: %s, name: %s, countryCode: %s',
-                    $postalCode->getCode(), $postalCode->getName(), $postalCode->getCountry()->getCountryCode()));
+            $output->writeln(sprintf(
+                'Creating postal code with code: %s, name: %s, countryCode: %s',
+                $postalCode->getCode(),
+                $postalCode->getName(),
+                $postalCode->getCountry()->getCountryCode()
+            ));
         }
     }
+
+    private function getCSVResource(InputInterface $input)
+    {
+        $fs = new Filesystem();
+        $filename = $input->getArgument('csv_file');
+
+        if (!$fs->exists($filename)) {
+            throw new RuntimeException('The file does not exists or you do not '
+                    . 'have the right to read it.');
+        }
+
+        $resource = fopen($filename, 'rb');
+
+        if (false === $resource) {
+            throw new RuntimeException("The file '{$filename}' could not be opened.");
+        }
+
+        return $resource;
+    }
 }
 
-
-class ExistingPostalCodeException extends \Exception
+class ExistingPostalCodeException extends Exception
 {
-    
 }
 
-class CountryCodeNotFoundException extends \Exception
+class CountryCodeNotFoundException extends Exception
 {
-    
 }
 
-class PostalCodeNotValidException extends \Exception
+class PostalCodeNotValidException extends Exception
 {
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
index 9e00bd58f..d61aed91c 100644
--- a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
@@ -1,101 +1,57 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManager;
+use LogicException;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
-use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
-use Symfony\Component\Security\Core\Security;
 
 /**
- * Class SetPasswordCommand
- *
- * @package Chill\MainBundle\Command
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Class SetPasswordCommand.
  */
 class SetPasswordCommand extends Command
 {
-    
     /**
      * @var EntityManager
      */
     private $entityManager;
-    
+
     /**
      * SetPasswordCommand constructor.
-     *
-     * @param EntityManager $entityManager
      */
     public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
         parent::__construct();
     }
-    
-    public function configure()
-    {
-        $this->setName('chill:user:set_password')
-              ->setDescription('set a password to user')
-              ->addArgument('username', InputArgument::REQUIRED, 'the user\'s '
-                    . 'username you want to change password')
-              ->addArgument('password', InputArgument::OPTIONAL, 'the new password')
-              ;
-    }
-    
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $user = $this->_getUser($input->getArgument('username'));
-        
-        if ($user === NULL) {
-            throw new \LogicException("The user with username '".
-                  $input->getArgument('username')."' is not found");
-        }
-        
-        $password = $input->getArgument('password');
-        if ($password === NULL) {
-            $dialog = $this->getHelperSet()->get('dialog');
-            $password = $dialog->askHiddenResponse($output, "<question>the new password :"
-                  . "</question>");
-        }
-        
-        $this->_setPassword($user, $password);
-    }
-    
+
     public function _getUser($username)
     {
         return $this->entityManager
             ->getRepository('ChillMainBundle:User')
-            ->findOneBy(array('username' => $username));
+            ->findOneBy(['username' => $username]);
     }
-    
+
     public function _setPassword(User $user, $password)
     {
         $defaultEncoder = new MessageDigestPasswordEncoder('sha512', true, 5000);
         $encoders = [
-            User::class => $defaultEncoder
+            User::class => $defaultEncoder,
         ];
         $encoderFactory = new EncoderFactory($encoders);
         $user->setPassword(
@@ -103,4 +59,33 @@ class SetPasswordCommand extends Command
         );
         $this->entityManager->flush($user);
     }
+
+    public function configure()
+    {
+        $this->setName('chill:user:set_password')
+            ->setDescription('set a password to user')
+            ->addArgument('username', InputArgument::REQUIRED, 'the user\'s '
+                    . 'username you want to change password')
+            ->addArgument('password', InputArgument::OPTIONAL, 'the new password');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $user = $this->_getUser($input->getArgument('username'));
+
+        if (null === $user) {
+            throw new LogicException("The user with username '" .
+                  $input->getArgument('username') . "' is not found");
+        }
+
+        $password = $input->getArgument('password');
+
+        if (null === $password) {
+            $dialog = $this->getHelperSet()->get('dialog');
+            $password = $dialog->askHiddenResponse($output, '<question>the new password :'
+                  . '</question>');
+        }
+
+        $this->_setPassword($user, $password);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
index 5c90cc9a7..db87874e2 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
@@ -12,12 +21,10 @@ use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 class AddressApiController extends ApiController
 {
     /**
-     * Duplicate an existing address
+     * Duplicate an existing address.
      *
      * @Route("/api/1.0/main/address/{id}/duplicate.json", name="chill_api_main_address_duplicate",
-     *  methods={"POST"})
-     *
-     * @param Address $address
+     * methods={"POST"})
      */
     public function duplicate(Address $address): JsonResponse
     {
@@ -30,9 +37,7 @@ class AddressApiController extends ApiController
         $em->flush();
 
         return $this->json($new, Response::HTTP_OK, [], [
-            AbstractNormalizer::GROUPS => ['read']
+            AbstractNormalizer::GROUPS => ['read'],
         ]);
-
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index 3ec690677..498c77c68 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -1,29 +1,83 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\AddressReferenceRepository;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use function trim;
 
-/**
- * Class AddressReferenceAPIController
- *
- * @package Chill\MainBundle\Controller
- * @author Champs Libres
- */
-class AddressReferenceAPIController extends ApiController
+final class AddressReferenceAPIController extends ApiController
 {
+    private AddressReferenceRepository $addressReferenceRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
+    public function __construct(AddressReferenceRepository $addressReferenceRepository, PaginatorFactory $paginatorFactory)
+    {
+        $this->addressReferenceRepository = $addressReferenceRepository;
+        $this->paginatorFactory = $paginatorFactory;
+    }
+
+    /**
+     * @Route("/api/1.0/main/address-reference/by-postal-code/{id}/search.json")
+     */
+    public function search(PostalCode $postalCode, Request $request): JsonResponse
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        if (!$request->query->has('q')) {
+            throw new BadRequestHttpException('You must supply a "q" parameter');
+        }
+
+        $pattern = $request->query->get('q');
+
+        if ('' === trim($pattern)) {
+            throw new BadRequestHttpException('the search pattern is empty');
+        }
+
+        $nb = $this->addressReferenceRepository->countByPostalCodePattern($postalCode, $pattern);
+        $paginator = $this->paginatorFactory->create($nb);
+        $addresses = $this->addressReferenceRepository->findByPostalCodePattern(
+            $postalCode,
+            $pattern,
+            false,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+
+        return $this->json(
+            new Collection($addresses, $paginator),
+            Response::HTTP_OK,
+            [],
+            [AbstractNormalizer::GROUPS => ['read']]
+        );
+    }
 
     protected function customizeQuery(string $action, Request $request, $qb): void
     {
         if ($request->query->has('postal_code')) {
-
             $qb->where('e.postcode = :postal_code')
-               ->setParameter('postal_code', $request->query->get('postal_code'));
-            
+                ->setParameter('postal_code', $request->query->get('postal_code'));
         }
- 
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
@@ -33,5 +87,4 @@ class AddressReferenceAPIController extends ApiController
 
         return $query;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php
index 1fe10ef08..96ba627e4 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php
@@ -1,24 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -27,7 +17,6 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class AdminController extends AbstractController
 {
-
     /**
      * @Route("/{_locale}/admin", name="chill_main_admin_central")
      */
@@ -36,14 +25,13 @@ class AdminController extends AbstractController
         return $this->render('@ChillMain/Admin/index.html.twig');
     }
 
-    public function indexPermissionsAction()
-    {
-        return $this->render('@ChillMain/Admin/layout_permissions.html.twig');
-    }
-
     public function indexLocationsAction()
     {
         return $this->render('@ChillMain/Admin/layout_location.html.twig');
     }
 
+    public function indexPermissionsAction()
+    {
+        return $this->render('@ChillMain/Admin/layout_permissions.html.twig');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php b/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php
index 310a36c60..a0447a1c7 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php
@@ -1,20 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Entity\Country;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 
-/**
- * 
- *
- */
 class AdminCountryCRUDController extends CRUDController
 {
-    
-    function __construct(PaginatorFactory $paginator)
-    {
-        $this->paginatorFactory = $paginator;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php
index c85140ff4..02ea19e20 100644
--- a/src/Bundle/ChillMainBundle/Controller/CenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php
@@ -1,40 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\CenterType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class CenterController
- *
- * @package Chill\MainBundle\Controller
+ * Class CenterController.
  */
 class CenterController extends AbstractController
 {
-
-    /**
-     * Lists all Center entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillMainBundle:Center')->findAll();
-
-        return $this->render('@ChillMain/Center/index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new Center entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -47,71 +37,19 @@ class CenterController extends AbstractController
             $em->persist($center);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_center_show', array('id' => $center->getId())));
+            return $this->redirect($this->generateUrl('admin_center_show', ['id' => $center->getId()]));
         }
 
-        return $this->render('@ChillMain/Center/new.html.twig', array(
+        return $this->render('@ChillMain/Center/new.html.twig', [
             'entity' => $center,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a Center entity.
-     *
-     * @param Center $center The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Center $center)
-    {
-        $form = $this->createForm(CenterType::class, $center, array(
-            'action' => $this->generateUrl('admin_center_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new Center entity.
-     *
-     */
-    public function newAction()
-    {
-        $center = new Center();
-        $form   = $this->createCreateForm($center);
-
-        return $this->render('@ChillMain/Center/new.html.twig', array(
-            'entity' => $center,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a Center entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $center = $em->getRepository('ChillMainBundle:Center')->find($id);
-
-        if (!$center) {
-            throw $this->createNotFoundException('Unable to find Center entity.');
-        }
-
-        return $this->render('@ChillMain/Center/show.html.twig', array(
-            'entity'      => $center
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing Center entity.
      *
+     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -124,33 +62,65 @@ class CenterController extends AbstractController
         }
 
         $editForm = $this->createEditForm($center);
-        return $this->render('@ChillMain/Center/edit.html.twig', array(
-            'entity'      => $center,
-            'edit_form'   => $editForm->createView()
-            ));
+
+        return $this->render('@ChillMain/Center/edit.html.twig', [
+            'entity' => $center,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-    * Creates a form to edit a Center entity.
-    *
-    * @param Center $center The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(Center $center)
+     * Lists all Center entities.
+     */
+    public function indexAction()
     {
-        $form = $this->createForm(CenterType::class, $center, array(
-            'action' => $this->generateUrl('admin_center_update', array('id' => $center->getId())),
-            'method' => 'PUT',
-        ));
+        $em = $this->getDoctrine()->getManager();
 
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        $entities = $em->getRepository('ChillMainBundle:Center')->findAll();
 
-        return $form;
+        return $this->render('@ChillMain/Center/index.html.twig', [
+            'entities' => $entities,
+        ]);
     }
+
+    /**
+     * Displays a form to create a new Center entity.
+     */
+    public function newAction()
+    {
+        $center = new Center();
+        $form = $this->createCreateForm($center);
+
+        return $this->render('@ChillMain/Center/new.html.twig', [
+            'entity' => $center,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a Center entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $center = $em->getRepository('ChillMainBundle:Center')->find($id);
+
+        if (!$center) {
+            throw $this->createNotFoundException('Unable to find Center entity.');
+        }
+
+        return $this->render('@ChillMain/Center/show.html.twig', [
+            'entity' => $center,
+        ]);
+    }
+
     /**
      * Edits an existing Center entity.
      *
+     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -168,12 +138,50 @@ class CenterController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_center_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('admin_center_edit', ['id' => $id]));
         }
 
-        return $this->render('@ChillMain/Center/edit.html.twig', array(
-            'entity'      => $center,
-            'edit_form'   => $editForm->createView()
-        ));
+        return $this->render('@ChillMain/Center/edit.html.twig', [
+            'entity' => $center,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a Center entity.
+     *
+     * @param Center $center The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(Center $center)
+    {
+        $form = $this->createForm(CenterType::class, $center, [
+            'action' => $this->generateUrl('admin_center_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a Center entity.
+     *
+     * @param Center $center The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(Center $center)
+    {
+        $form = $this->createForm(CenterType::class, $center, [
+            'action' => $this->generateUrl('admin_center_update', ['id' => $center->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/DefaultController.php b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
index 8ad6d8d3a..2c8102a39 100644
--- a/src/Bundle/ChillMainBundle/Controller/DefaultController.php
+++ b/src/Bundle/ChillMainBundle/Controller/DefaultController.php
@@ -1,23 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * Class DefaultController
- *
- * @package Chill\MainBundle\Controller
+ * Class DefaultController.
  */
 class DefaultController extends AbstractController
 {
     public function indexAction()
-    {        
+    {
         if ($this->isGranted('ROLE_ADMIN')) {
-            
             return $this->redirectToRoute('chill_main_admin_central', [], 302);
         }
-        
+
         return $this->render('@ChillMain/layout.html.twig');
     }
 
@@ -25,62 +31,61 @@ class DefaultController extends AbstractController
     {
         return $this->redirect($this->generateUrl('chill_main_homepage'));
     }
-    
+
     public function testAction()
     {
         return $this->render('@ChillMain/Tabs/index.html.twig', [
             'tabs' => [
                 'test1' => [
                     [
-                        'name' => "Link 1",
-                        'content' => "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae auctor eu augue ut. Elementum nisi quis eleifend quam. Faucibus purus in massa tempor nec. Turpis massa sed elementum tempus egestas sed sed risus. Etiam sit amet nisl purus in mollis nunc sed id. Enim nunc faucibus a pellentesque sit amet porttitor eget. Risus nec feugiat in fermentum posuere. Augue mauris augue neque gravida. Sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper eget. Id leo in vitae turpis massa sed elementum tempus egestas. Mauris commodo quis imperdiet massa. Fames ac turpis egestas integer eget aliquet nibh praesent. Urna porttitor rhoncus dolor purus non enim praesent elementum. Donec enim diam vulputate ut pharetra sit. Auctor neque vitae tempus quam. Mattis rhoncus urna neque viverra justo nec ultrices.",
+                        'name' => 'Link 1',
+                        'content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae auctor eu augue ut. Elementum nisi quis eleifend quam. Faucibus purus in massa tempor nec. Turpis massa sed elementum tempus egestas sed sed risus. Etiam sit amet nisl purus in mollis nunc sed id. Enim nunc faucibus a pellentesque sit amet porttitor eget. Risus nec feugiat in fermentum posuere. Augue mauris augue neque gravida. Sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper eget. Id leo in vitae turpis massa sed elementum tempus egestas. Mauris commodo quis imperdiet massa. Fames ac turpis egestas integer eget aliquet nibh praesent. Urna porttitor rhoncus dolor purus non enim praesent elementum. Donec enim diam vulputate ut pharetra sit. Auctor neque vitae tempus quam. Mattis rhoncus urna neque viverra justo nec ultrices.',
                     ],
                     [
-                        'name' => "Link 2",
-                        'content' => "Dui sapien eget mi proin sed libero. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Turpis nunc eget lorem dolor. Phasellus egestas tellus rutrum tellus. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Duis ultricies lacus sed turpis tincidunt id. Nisl suscipit adipiscing bibendum est ultricies integer. Elementum nibh tellus molestie nunc non blandit massa enim. Faucibus in ornare quam viverra orci sagittis eu. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Accumsan sit amet nulla facilisi morbi. Leo vel fringilla est ullamcorper eget nulla facilisi etiam dignissim. Amet est placerat in egestas erat imperdiet sed euismod. Quis auctor elit sed vulputate mi. Mauris nunc congue nisi vitae suscipit tellus mauris a diam. At volutpat diam ut venenatis. Facilisis gravida neque convallis a cras semper.",
+                        'name' => 'Link 2',
+                        'content' => 'Dui sapien eget mi proin sed libero. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Turpis nunc eget lorem dolor. Phasellus egestas tellus rutrum tellus. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Duis ultricies lacus sed turpis tincidunt id. Nisl suscipit adipiscing bibendum est ultricies integer. Elementum nibh tellus molestie nunc non blandit massa enim. Faucibus in ornare quam viverra orci sagittis eu. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Accumsan sit amet nulla facilisi morbi. Leo vel fringilla est ullamcorper eget nulla facilisi etiam dignissim. Amet est placerat in egestas erat imperdiet sed euismod. Quis auctor elit sed vulputate mi. Mauris nunc congue nisi vitae suscipit tellus mauris a diam. At volutpat diam ut venenatis. Facilisis gravida neque convallis a cras semper.',
                     ],
                     [
-                        'name' => "Link 3",
-                        'content' => "In ornare quam viverra orci sagittis eu volutpat. Ac tincidunt vitae semper quis lectus nulla at volutpat. Placerat duis ultricies lacus sed turpis tincidunt. Augue interdum velit euismod in pellentesque. Felis eget nunc lobortis mattis aliquam. Volutpat lacus laoreet non curabitur gravida arcu. Gravida cum sociis natoque penatibus et magnis dis parturient montes. Nisl pretium fusce id velit ut tortor. Nunc scelerisque viverra mauris in aliquam sem fringilla ut. Magna eget est lorem ipsum dolor sit. Non consectetur a erat nam at lectus urna. Eget est lorem ipsum dolor sit amet consectetur adipiscing elit. Sed velit dignissim sodales ut.",
+                        'name' => 'Link 3',
+                        'content' => 'In ornare quam viverra orci sagittis eu volutpat. Ac tincidunt vitae semper quis lectus nulla at volutpat. Placerat duis ultricies lacus sed turpis tincidunt. Augue interdum velit euismod in pellentesque. Felis eget nunc lobortis mattis aliquam. Volutpat lacus laoreet non curabitur gravida arcu. Gravida cum sociis natoque penatibus et magnis dis parturient montes. Nisl pretium fusce id velit ut tortor. Nunc scelerisque viverra mauris in aliquam sem fringilla ut. Magna eget est lorem ipsum dolor sit. Non consectetur a erat nam at lectus urna. Eget est lorem ipsum dolor sit amet consectetur adipiscing elit. Sed velit dignissim sodales ut.',
                     ],
                     [
-                        'name' => "Link 4",
-                        'content' => "Ut tellus elementum sagittis vitae et. Vitae purus faucibus ornare suspendisse sed nisi lacus sed viverra. Hendrerit gravida rutrum quisque non tellus orci ac auctor augue. Eleifend quam adipiscing vitae proin sagittis nisl rhoncus mattis rhoncus. Dictumst quisque sagittis purus sit. Suspendisse sed nisi lacus sed viverra. Pretium quam vulputate dignissim suspendisse in est ante. Id eu nisl nunc mi ipsum. Ut venenatis tellus in metus vulputate. Ut morbi tincidunt augue interdum velit euismod.",
+                        'name' => 'Link 4',
+                        'content' => 'Ut tellus elementum sagittis vitae et. Vitae purus faucibus ornare suspendisse sed nisi lacus sed viverra. Hendrerit gravida rutrum quisque non tellus orci ac auctor augue. Eleifend quam adipiscing vitae proin sagittis nisl rhoncus mattis rhoncus. Dictumst quisque sagittis purus sit. Suspendisse sed nisi lacus sed viverra. Pretium quam vulputate dignissim suspendisse in est ante. Id eu nisl nunc mi ipsum. Ut venenatis tellus in metus vulputate. Ut morbi tincidunt augue interdum velit euismod.',
                     ],
                     [
-                        'name' => "Link 5",
-                        'content' => "Vel elit scelerisque mauris pellentesque pulvinar. Ornare suspendisse sed nisi lacus sed viverra tellus. Massa tincidunt dui ut ornare lectus sit. Congue nisi vitae suscipit tellus mauris a diam. At auctor urna nunc id cursus metus aliquam. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Mattis aliquam faucibus purus in massa tempor nec feugiat. Et leo duis ut diam quam. Auctor augue mauris augue neque. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Scelerisque felis imperdiet proin fermentum leo. Diam sit amet nisl suscipit adipiscing bibendum est ultricies. Consectetur libero id faucibus nisl tincidunt. Vel fringilla est ullamcorper eget nulla facilisi. Pharetra diam sit amet nisl suscipit adipiscing. Dignissim diam quis enim lobortis. Auctor eu augue ut lectus arcu bibendum at varius.",
-                    ]
+                        'name' => 'Link 5',
+                        'content' => 'Vel elit scelerisque mauris pellentesque pulvinar. Ornare suspendisse sed nisi lacus sed viverra tellus. Massa tincidunt dui ut ornare lectus sit. Congue nisi vitae suscipit tellus mauris a diam. At auctor urna nunc id cursus metus aliquam. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Mattis aliquam faucibus purus in massa tempor nec feugiat. Et leo duis ut diam quam. Auctor augue mauris augue neque. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Scelerisque felis imperdiet proin fermentum leo. Diam sit amet nisl suscipit adipiscing bibendum est ultricies. Consectetur libero id faucibus nisl tincidunt. Vel fringilla est ullamcorper eget nulla facilisi. Pharetra diam sit amet nisl suscipit adipiscing. Dignissim diam quis enim lobortis. Auctor eu augue ut lectus arcu bibendum at varius.',
+                    ],
                 ],
                 'test2' => [
                     [
-                        'name' => "Link 1",
-                        'link' => "http://localhost",
-                        'content' => "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae auctor eu augue ut. Elementum nisi quis eleifend quam. Faucibus purus in massa tempor nec. Turpis massa sed elementum tempus egestas sed sed risus. Etiam sit amet nisl purus in mollis nunc sed id. Enim nunc faucibus a pellentesque sit amet porttitor eget. Risus nec feugiat in fermentum posuere. Augue mauris augue neque gravida. Sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper eget. Id leo in vitae turpis massa sed elementum tempus egestas. Mauris commodo quis imperdiet massa. Fames ac turpis egestas integer eget aliquet nibh praesent. Urna porttitor rhoncus dolor purus non enim praesent elementum. Donec enim diam vulputate ut pharetra sit. Auctor neque vitae tempus quam. Mattis rhoncus urna neque viverra justo nec ultrices.",
+                        'name' => 'Link 1',
+                        'link' => 'http://localhost',
+                        'content' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae auctor eu augue ut. Elementum nisi quis eleifend quam. Faucibus purus in massa tempor nec. Turpis massa sed elementum tempus egestas sed sed risus. Etiam sit amet nisl purus in mollis nunc sed id. Enim nunc faucibus a pellentesque sit amet porttitor eget. Risus nec feugiat in fermentum posuere. Augue mauris augue neque gravida. Sollicitudin aliquam ultrices sagittis orci a scelerisque purus semper eget. Id leo in vitae turpis massa sed elementum tempus egestas. Mauris commodo quis imperdiet massa. Fames ac turpis egestas integer eget aliquet nibh praesent. Urna porttitor rhoncus dolor purus non enim praesent elementum. Donec enim diam vulputate ut pharetra sit. Auctor neque vitae tempus quam. Mattis rhoncus urna neque viverra justo nec ultrices.',
                     ],
                     [
-                        'name' => "Link 2",
+                        'name' => 'Link 2',
                         //'link' => "http://localhost",
-                        'content' => "Dui sapien eget mi proin sed libero. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Turpis nunc eget lorem dolor. Phasellus egestas tellus rutrum tellus. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Duis ultricies lacus sed turpis tincidunt id. Nisl suscipit adipiscing bibendum est ultricies integer. Elementum nibh tellus molestie nunc non blandit massa enim. Faucibus in ornare quam viverra orci sagittis eu. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Accumsan sit amet nulla facilisi morbi. Leo vel fringilla est ullamcorper eget nulla facilisi etiam dignissim. Amet est placerat in egestas erat imperdiet sed euismod. Quis auctor elit sed vulputate mi. Mauris nunc congue nisi vitae suscipit tellus mauris a diam. At volutpat diam ut venenatis. Facilisis gravida neque convallis a cras semper.",
+                        'content' => 'Dui sapien eget mi proin sed libero. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Turpis nunc eget lorem dolor. Phasellus egestas tellus rutrum tellus. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Duis ultricies lacus sed turpis tincidunt id. Nisl suscipit adipiscing bibendum est ultricies integer. Elementum nibh tellus molestie nunc non blandit massa enim. Faucibus in ornare quam viverra orci sagittis eu. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Accumsan sit amet nulla facilisi morbi. Leo vel fringilla est ullamcorper eget nulla facilisi etiam dignissim. Amet est placerat in egestas erat imperdiet sed euismod. Quis auctor elit sed vulputate mi. Mauris nunc congue nisi vitae suscipit tellus mauris a diam. At volutpat diam ut venenatis. Facilisis gravida neque convallis a cras semper.',
                     ],
                     [
-                        'name' => "Link 3",
+                        'name' => 'Link 3',
                         //'link' => "http://localhost",
-                        'content' => "In ornare quam viverra orci sagittis eu volutpat. Ac tincidunt vitae semper quis lectus nulla at volutpat. Placerat duis ultricies lacus sed turpis tincidunt. Augue interdum velit euismod in pellentesque. Felis eget nunc lobortis mattis aliquam. Volutpat lacus laoreet non curabitur gravida arcu. Gravida cum sociis natoque penatibus et magnis dis parturient montes. Nisl pretium fusce id velit ut tortor. Nunc scelerisque viverra mauris in aliquam sem fringilla ut. Magna eget est lorem ipsum dolor sit. Non consectetur a erat nam at lectus urna. Eget est lorem ipsum dolor sit amet consectetur adipiscing elit. Sed velit dignissim sodales ut.",
+                        'content' => 'In ornare quam viverra orci sagittis eu volutpat. Ac tincidunt vitae semper quis lectus nulla at volutpat. Placerat duis ultricies lacus sed turpis tincidunt. Augue interdum velit euismod in pellentesque. Felis eget nunc lobortis mattis aliquam. Volutpat lacus laoreet non curabitur gravida arcu. Gravida cum sociis natoque penatibus et magnis dis parturient montes. Nisl pretium fusce id velit ut tortor. Nunc scelerisque viverra mauris in aliquam sem fringilla ut. Magna eget est lorem ipsum dolor sit. Non consectetur a erat nam at lectus urna. Eget est lorem ipsum dolor sit amet consectetur adipiscing elit. Sed velit dignissim sodales ut.',
                     ],
                     [
-                        'name' => "Link 4",
-                        'link' => "http://localhost",
+                        'name' => 'Link 4',
+                        'link' => 'http://localhost',
                         //'content' => "Ut tellus elementum sagittis vitae et. Vitae purus faucibus ornare suspendisse sed nisi lacus sed viverra. Hendrerit gravida rutrum quisque non tellus orci ac auctor augue. Eleifend quam adipiscing vitae proin sagittis nisl rhoncus mattis rhoncus. Dictumst quisque sagittis purus sit. Suspendisse sed nisi lacus sed viverra. Pretium quam vulputate dignissim suspendisse in est ante. Id eu nisl nunc mi ipsum. Ut venenatis tellus in metus vulputate. Ut morbi tincidunt augue interdum velit euismod.",
                     ],
                     [
-                        'name' => "Link 5",
+                        'name' => 'Link 5',
                         //'link' => "http://localhost",
-                        'content' => "Vel elit scelerisque mauris pellentesque pulvinar. Ornare suspendisse sed nisi lacus sed viverra tellus. Massa tincidunt dui ut ornare lectus sit. Congue nisi vitae suscipit tellus mauris a diam. At auctor urna nunc id cursus metus aliquam. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Mattis aliquam faucibus purus in massa tempor nec feugiat. Et leo duis ut diam quam. Auctor augue mauris augue neque. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Scelerisque felis imperdiet proin fermentum leo. Diam sit amet nisl suscipit adipiscing bibendum est ultricies. Consectetur libero id faucibus nisl tincidunt. Vel fringilla est ullamcorper eget nulla facilisi. Pharetra diam sit amet nisl suscipit adipiscing. Dignissim diam quis enim lobortis. Auctor eu augue ut lectus arcu bibendum at varius.",
-                    ]
-                ]
-            ]
+                        'content' => 'Vel elit scelerisque mauris pellentesque pulvinar. Ornare suspendisse sed nisi lacus sed viverra tellus. Massa tincidunt dui ut ornare lectus sit. Congue nisi vitae suscipit tellus mauris a diam. At auctor urna nunc id cursus metus aliquam. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Mattis aliquam faucibus purus in massa tempor nec feugiat. Et leo duis ut diam quam. Auctor augue mauris augue neque. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Scelerisque felis imperdiet proin fermentum leo. Diam sit amet nisl suscipit adipiscing bibendum est ultricies. Consectetur libero id faucibus nisl tincidunt. Vel fringilla est ullamcorper eget nulla facilisi. Pharetra diam sit amet nisl suscipit adipiscing. Dignissim diam quis enim lobortis. Auctor eu augue ut lectus arcu bibendum at varius.',
+                    ],
+                ],
+            ],
         ]);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php
index 71f6c0543..809d0502d 100644
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -1,86 +1,70 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
+use Chill\MainBundle\Export\ExportManager;
 use Chill\MainBundle\Form\Type\Export\ExportType;
 use Chill\MainBundle\Form\Type\Export\FormatterType;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Chill\MainBundle\Form\Type\Export\PickCenterType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Chill\MainBundle\Export\ExportManager;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\Form\FormFactoryInterface;
 use Chill\MainBundle\Redis\ChillRedis;
+use LogicException;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use function count;
+use function serialize;
+use function unserialize;
 
 /**
  * Class ExportController
  * Controller used for exporting data.
- *
- * @package Chill\MainBundle\Controller
  */
 class ExportController extends AbstractController
 {
-    
     /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
-    
+
     /**
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     *
-     * @var SessionInterface
-     */
-    protected $session;
-    
-    /**
-     *
      * @var FormFactoryInterface
      */
     protected $formFactory;
-    
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+
     /**
-     *
      * @var ChillRedis
      */
     protected $redis;
-    
+
+    /**
+     * @var SessionInterface
+     */
+    protected $session;
+
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     public function __construct(
         ChillRedis $chillRedis,
         ExportManager $exportManager,
@@ -97,11 +81,63 @@ class ExportController extends AbstractController
         $this->translator = $translator;
     }
 
-    
+    public function downloadResultAction(Request $request, $alias)
+    {
+        /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
+        $exportManager = $this->exportManager;
+        $key = $request->query->get('key', null);
+
+        [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key);
+
+        $formatterAlias = $exportManager->getFormatterAlias($dataExport['export']);
+
+        if (null !== $formatterAlias) {
+            $formater = $exportManager->getFormatter($formatterAlias);
+        } else {
+            $formater = null;
+        }
+
+        $viewVariables = [
+            'alias' => $alias,
+            'export' => $exportManager->getExport($alias),
+        ];
+
+        if ($formater instanceof \Chill\MainBundle\Export\Formatter\CSVListFormatter) {
+            // due to a bug in php, we add the mime type in the download view
+            $viewVariables['mime_type'] = 'text/csv';
+        }
+
+        return $this->render('@ChillMain/Export/download.html.twig', $viewVariables);
+    }
+
     /**
-     * Render the list of available exports
+     * Generate a report.
+     *
+     * This action must work with GET queries.
+     *
+     * @param string $alias
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function generateAction(Request $request, $alias)
+    {
+        /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
+        $exportManager = $this->exportManager;
+        $key = $request->query->get('key', null);
+
+        [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key);
+
+        return $exportManager->generate(
+            $alias,
+            $dataCenters['centers'],
+            $dataExport['export'],
+            null !== $dataFormatter ? $dataFormatter['formatter'] : []
+        );
+    }
+
+    /**
+     * Render the list of available exports.
      *
-     * @param Request $request
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction(Request $request)
@@ -109,14 +145,14 @@ class ExportController extends AbstractController
         $exportManager = $this->exportManager;
 
         $exports = $exportManager->getExportsGrouped(true);
-        
-        return $this->render('@ChillMain/Export/layout.html.twig', array(
-            'grouped_exports' => $exports
-        ));
+
+        return $this->render('@ChillMain/Export/layout.html.twig', [
+            'grouped_exports' => $exports,
+        ]);
     }
 
     /**
-     * handle the step to build a query for an export
+     * handle the step to build a query for an export.
      *
      * This action has three steps :
      *
@@ -129,6 +165,7 @@ class ExportController extends AbstractController
      *
      * @param string $request
      * @param Request $alias
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function newAction(Request $request, $alias)
@@ -137,7 +174,7 @@ class ExportController extends AbstractController
         $exportManager = $this->exportManager;
         $export = $exportManager->getExport($alias);
 
-        if ($exportManager->isGrantedForElement($export) === FALSE) {
+        if ($exportManager->isGrantedForElement($export) === false) {
             throw $this->createAccessDeniedException('The user does not have access to this export');
         }
 
@@ -146,77 +183,87 @@ class ExportController extends AbstractController
         switch ($step) {
             case 'centers':
                 return $this->selectCentersStep($request, $export, $alias);
+
             case 'export':
                 return $this->exportFormStep($request, $export, $alias);
+
                 break;
+
             case 'formatter':
                 return $this->formatterFormStep($request, $export, $alias);
+
                 break;
+
             case 'generate':
                 return $this->forwardToGenerate($request, $export, $alias);
+
                 break;
+
             default:
-                throw $this->createNotFoundException("The given step '$step' is invalid");
+                throw $this->createNotFoundException("The given step '{$step}' is invalid");
         }
     }
 
     /**
-     * 
-     * @param Request $request
-     * @param \Chill\MainBundle\Export\ExportInterface|\Chill\MainBundle\Export\DirectExportInterface $export
+     * create a form to show on different steps.
+     *
      * @param string $alias
-     * @return Response
-     * @throws type
+     * @param array $data the data from previous step. Required for steps 'formatter' and 'generate_formatter'
+     * @param mixed $step
+     *
+     * @return \Symfony\Component\Form\Form
      */
-    protected function selectCentersStep(Request $request, $export, $alias)
+    protected function createCreateFormExport($alias, $step, $data = [])
     {
-        /* @var $exportManager \Chill\MainBundle\Export\ExportManager */
+        /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
+        $isGenerate = strpos($step, 'generate_') === 0;
 
-        $form = $this->createCreateFormExport($alias, 'centers');
+        $builder = $this->formFactory
+            ->createNamedBuilder(null, FormType::class, [], [
+                'method' => $isGenerate ? 'GET' : 'POST',
+                'csrf_protection' => $isGenerate ? false : true,
+            ]);
 
-        if ($request->getMethod() === 'POST') {
-            $form->handleRequest($request);
-            if ($form->isValid()) {
-                $this->logger->debug('form centers is valid', array(
-                      'location' => __METHOD__));
-
-                $data = $form->getData();
-
-                // check ACL
-                if ($exportManager->isGrantedForElement($export, NULL,
-                        $exportManager->getPickedCenters($data['centers'])) === FALSE) {
-                    throw $this->createAccessDeniedException('you do not have '
-                            . 'access to this export for those centers');
-                }
-
-                $this->session->set('centers_step_raw',
-                      $request->request->all());
-                $this->session->set('centers_step', $data);
-
-                return $this->redirectToRoute('chill_main_export_new', array(
-                   'step' => $this->getNextStep('centers', $export),
-                   'alias' => $alias
-                ));
-
-            }
+        if ('centers' === $step || 'generate_centers' === $step) {
+            $builder->add('centers', PickCenterType::class, [
+                'export_alias' => $alias,
+            ]);
         }
 
-        return $this->render('@ChillMain/Export/new_centers_step.html.twig',
-                array(
-                    'form' => $form->createView(),
-                    'export' => $export
-                ));
+        if ('export' === $step || 'generate_export' === $step) {
+            $builder->add('export', ExportType::class, [
+                'export_alias' => $alias,
+                'picked_centers' => $exportManager->getPickedCenters($data['centers']),
+            ]);
+        }
+
+        if ('formatter' === $step || 'generate_formatter' === $step) {
+            $builder->add('formatter', FormatterType::class, [
+                'formatter_alias' => $exportManager
+                    ->getFormatterAlias($data['export']),
+                'export_alias' => $alias,
+                'aggregator_aliases' => $exportManager
+                    ->getUsedAggregatorsAliases($data['export']),
+            ]);
+        }
+
+        $builder->add('submit', SubmitType::class, [
+            'label' => 'Generate',
+        ]);
+
+        return $builder->getForm();
     }
 
     /**
-     * Render the export form
+     * Render the export form.
      *
      * When the method is POST, the form is stored if valid, and a redirection
      * is done to next step.
      *
      * @param string $alias
-     * @param \Chill\MainBundle\Export\ExportInterface|\Chill\MainBundle\Export\DirectExportInterface $export
+     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     protected function exportFormStep(Request $request, $export, $alias)
@@ -226,12 +273,11 @@ class ExportController extends AbstractController
         // check we have data from the previous step (export step)
         $data = $this->session->get('centers_step', null);
 
-        if ($data === null) {
-
-            return $this->redirectToRoute('chill_main_export_new', array(
-               'step' => $this->getNextStep('export', $export, true),
-               'alias' => $alias
-               ));
+        if (null === $data) {
+            return $this->redirectToRoute('chill_main_export_new', [
+                'step' => $this->getNextStep('export', $export, true),
+                'alias' => $alias,
+            ]);
         }
 
         $export = $exportManager->getExport($alias);
@@ -240,123 +286,36 @@ class ExportController extends AbstractController
 
         if ($request->getMethod() === 'POST') {
             $form->handleRequest($request);
-            if ($form->isValid()) {
 
-                $this->logger->debug('form export is valid', array(
-                      'location' => __METHOD__));
+            if ($form->isValid()) {
+                $this->logger->debug('form export is valid', [
+                    'location' => __METHOD__, ]);
 
                 // store data for reusing in next steps
                 $data = $form->getData();
-                $this->session->set('export_step_raw',
-                      $request->request->all());
+                $this->session->set(
+                    'export_step_raw',
+                    $request->request->all()
+                );
                 $this->session->set('export_step', $data);
 
                 //redirect to next step
                 return $this->redirect(
-                      $this->generateUrl('chill_main_export_new', array(
-                         'step' => $this->getNextStep('export', $export),
-                         'alias' => $alias
-                      )));
-            } else {
-                $this->logger->debug('form export is invalid', array(
-                      'location' => __METHOD__));
+                    $this->generateUrl('chill_main_export_new', [
+                        'step' => $this->getNextStep('export', $export),
+                        'alias' => $alias,
+                    ])
+                );
             }
+            $this->logger->debug('form export is invalid', [
+                'location' => __METHOD__, ]);
         }
 
-        return $this->render('@ChillMain/Export/new.html.twig', array(
+        return $this->render('@ChillMain/Export/new.html.twig', [
             'form' => $form->createView(),
             'export_alias' => $alias,
-            'export' => $export
-        ));
-    }
-
-    /**
-     * create a form to show on different steps.
-     *
-     * @param string $alias
-     * @param string $step, can either be 'export', 'formatter', 'generate_export' or 'generate_formatter' (last two are used by generate action)
-     * @param array $data the data from previous step. Required for steps 'formatter' and 'generate_formatter'
-     * @return \Symfony\Component\Form\Form
-     */
-    protected function createCreateFormExport($alias, $step, $data = array())
-    {
-        /* @var $exportManager \Chill\MainBundle\Export\ExportManager */
-        $exportManager = $this->exportManager;
-        $isGenerate = strpos($step, 'generate_') === 0;
-
-        $builder = $this->formFactory
-              ->createNamedBuilder(null, FormType::class, array(), array(
-                    'method' => $isGenerate ? 'GET' : 'POST',
-                    'csrf_protection' => $isGenerate ? false : true,
-              ));
-
-        if ($step === 'centers' or $step === 'generate_centers') {
-            $builder->add('centers', PickCenterType::class, array(
-               'export_alias' => $alias
-            ));
-        }
-
-        if ($step === 'export' or $step === 'generate_export') {
-            $builder->add('export', ExportType::class, array(
-               'export_alias' => $alias,
-               'picked_centers' => $exportManager->getPickedCenters($data['centers'])
-            ));
-        }
-
-        if ($step === 'formatter' or $step === 'generate_formatter') {
-            $builder->add('formatter', FormatterType::class, array(
-                'formatter_alias' => $exportManager
-                     ->getFormatterAlias($data['export']),
-                'export_alias' => $alias,
-                'aggregator_aliases' => $exportManager
-                    ->getUsedAggregatorsAliases($data['export'])
-            ));
-        }
-
-        $builder->add('submit', SubmitType::class, array(
-            'label' => 'Generate'
-        ));
-
-        return $builder->getForm();
-    }
-
-    /**
-     * get the next step. If $reverse === true, the previous step is returned.
-     *
-     * This method provides a centralized way of handling next/previous step.
-     *
-     * @param string $step the current step
-     * @param \Chill\MainBundle\Export\ExportInterface|\Chill\MainBundle\Export\DirectExportInterface $export
-     * @param boolean $reverse set to true to get the previous step
-     * @return string the next/current step
-     * @throws \LogicException if there is no step before or after the given step
-     */
-    private function getNextStep($step, $export, $reverse = false)
-    {
-        switch($step) {
-            case 'centers':
-                if ($reverse !== false) {
-                    throw new \LogicException("there is no step before 'export'");
-                }
-                return 'export';
-            case 'export':
-                if ($export instanceof \Chill\MainBundle\Export\ExportInterface) {
-                    return $reverse ? 'centers' : 'formatter';
-                } elseif ($export instanceof \Chill\MainBundle\Export\DirectExportInterface) {
-                    return $reverse ? 'centers' : 'generate';
-                }
-                
-            case 'formatter' :
-                return $reverse ? 'export' : 'generate';
-            case 'generate' :
-                if ($reverse === false) {
-                    throw new \LogicException("there is no step after 'generate'");
-                }
-                return 'formatter';
-
-            default:
-                throw new \LogicException("the step $step is not defined.");
-        }
+            'export' => $export,
+        ]);
     }
 
     /**
@@ -365,23 +324,21 @@ class ExportController extends AbstractController
      * If the form is posted and valid, store the data in session and
      * redirect to the next step.
      *
-     * @param Request $request
-     * @param \Chill\MainBundle\Export\ExportInterface|\Chill\MainBundle\Export\DirectExportInterface $export
+     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
      * @param string $alias
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     protected function formatterFormStep(Request $request, $export, $alias)
     {
-
         // check we have data from the previous step (export step)
         $data = $this->session->get('export_step', null);
 
-        if ($data === null) {
-
-            return $this->redirectToRoute('chill_main_export_new', array(
-               'step' => $this->getNextStep('formatter', $export, true),
-               'alias' => $alias
-               ));
+        if (null === $data) {
+            return $this->redirectToRoute('chill_main_export_new', [
+                'step' => $this->getNextStep('formatter', $export, true),
+                'alias' => $alias,
+            ]);
         }
 
         $form = $this->createCreateFormExport($alias, 'formatter', $data);
@@ -392,23 +349,29 @@ class ExportController extends AbstractController
             if ($form->isValid()) {
                 $dataFormatter = $form->getData();
                 $this->session->set('formatter_step', $dataFormatter);
-                $this->session->set('formatter_step_raw',
-                      $request->request->all());
+                $this->session->set(
+                    'formatter_step_raw',
+                    $request->request->all()
+                );
 
                 //redirect to next step
-                return $this->redirect($this->generateUrl('chill_main_export_new',
-                      array(
-                         'alias' => $alias,
-                         'step' => $this->getNextStep('formatter', $export)
-                )));
+                return $this->redirect($this->generateUrl(
+                    'chill_main_export_new',
+                    [
+                        'alias' => $alias,
+                        'step' => $this->getNextStep('formatter', $export),
+                    ]
+                ));
             }
         }
 
-        return $this->render('@ChillMain/Export/new_formatter_step.html.twig',
-                array(
-                    'form' => $form->createView(),
-                    'export' => $export
-                ));
+        return $this->render(
+            '@ChillMain/Export/new_formatter_step.html.twig',
+            [
+                'form' => $form->createView(),
+                'export' => $export,
+            ]
+        );
     }
 
     /**
@@ -417,9 +380,9 @@ class ExportController extends AbstractController
      *
      * The data from previous steps is removed from session.
      *
-     * @param Request $request
-     * @param \Chill\MainBundle\Export\ExportInterface|\Chill\MainBundle\Export\DirectExportInterface $export
+     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
      * @param string $alias
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     protected function forwardToGenerate(Request $request, $export, $alias)
@@ -428,22 +391,22 @@ class ExportController extends AbstractController
         $dataFormatter = $this->session->get('formatter_step_raw', null);
         $dataExport = $this->session->get('export_step_raw', null);
 
-        if ($dataFormatter === NULL and $export instanceof \Chill\MainBundle\Export\ExportInterface) {
-            return $this->redirectToRoute('chill_main_export_new', array(
-               'alias' => $alias, 'step' => $this->getNextStep('generate', $export, true)
-            ));
+        if (null === $dataFormatter && $export instanceof \Chill\MainBundle\Export\ExportInterface) {
+            return $this->redirectToRoute('chill_main_export_new', [
+                'alias' => $alias, 'step' => $this->getNextStep('generate', $export, true),
+            ]);
         }
-        
+
         $parameters = [
-              'formatter' => $dataFormatter ?? [],
-              'export' => $dataExport ?? [],
-              'centers' => $dataCenters ?? [],
-              'alias' => $alias
-              ];
+            'formatter' => $dataFormatter ?? [],
+            'export' => $dataExport ?? [],
+            'centers' => $dataCenters ?? [],
+            'alias' => $alias,
+        ];
         unset($parameters['_token']);
-        $key = md5(uniqid(rand(), false));
-        
-        $this->redis->setEx($key, 3600, \serialize($parameters));
+        $key = md5(uniqid(mt_rand(), false));
+
+        $this->redis->setEx($key, 3600, serialize($parameters));
 
         // remove data from session
         $this->session->remove('export_step_raw');
@@ -451,56 +414,30 @@ class ExportController extends AbstractController
         $this->session->remove('formatter_step_raw');
         $this->session->remove('formatter_step');
 
-        return $this->redirectToRoute('chill_main_export_download', [ 'key' => $key, 'alias' => $alias ]);
+        return $this->redirectToRoute('chill_main_export_download', ['key' => $key, 'alias' => $alias]);
     }
 
-    /**
-     * Generate a report.
-     *
-     * This action must work with GET queries.
-     *
-     * @param Request $request
-     * @param string $alias
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function generateAction(Request $request, $alias)
-    {
-        /* @var $exportManager \Chill\MainBundle\Export\ExportManager */
-        $exportManager = $this->exportManager;
-        $key = $request->query->get('key', null);
-        
-        list($dataCenters, $dataExport, $dataFormatter) = $this->rebuildData($key);
-
-        $r = $exportManager->generate(
-            $alias, 
-            $dataCenters['centers'],
-            $dataExport['export'], 
-            $dataFormatter !== NULL ? $dataFormatter['formatter'] : []
-            );
-
-        return $r;
-    }
-    
     protected function rebuildData($key)
     {
-        if ($key === NULL) {
-            throw $this->createNotFoundException("key does not exists");
+        if (null === $key) {
+            throw $this->createNotFoundException('key does not exists');
         }
-        
+
         if ($this->redis->exists($key) !== 1) {
-            $this->addFlash('error', $this->translator->trans("This report is not available any more"));
-            throw $this->createNotFoundException("key does not exists");
+            $this->addFlash('error', $this->translator->trans('This report is not available any more'));
+
+            throw $this->createNotFoundException('key does not exists');
         }
-        
+
         $serialized = $this->redis->get($key);
-        
-        if ($serialized === false) {
-            throw new \LogicException("the key could not be reached from redis");
+
+        if (false === $serialized) {
+            throw new LogicException('the key could not be reached from redis');
         }
-        
-        $rawData = \unserialize($serialized);
+
+        $rawData = unserialize($serialized);
         $alias = $rawData['alias'];
-        
+
         $formCenters = $this->createCreateFormExport($alias, 'generate_centers');
         $formCenters->submit($rawData['centers']);
         $dataCenters = $formCenters->getData();
@@ -510,40 +447,119 @@ class ExportController extends AbstractController
         $dataExport = $formExport->getData();
 
         if (count($rawData['formatter']) > 0) {
-            $formFormatter = $this->createCreateFormExport($alias, 'generate_formatter',
-                  $dataExport);
+            $formFormatter = $this->createCreateFormExport(
+                $alias,
+                'generate_formatter',
+                $dataExport
+            );
             $formFormatter->submit($rawData['formatter']);
             $dataFormatter = $formFormatter->getData();
         }
-        
+
         return [$dataCenters, $dataExport, $dataFormatter ?? null];
     }
 
-    public function downloadResultAction(Request $request, $alias)
-    {  
-        /* @var $exportManager \Chill\MainBundle\Export\ExportManager */
+    /**
+     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
+     * @param string $alias
+     *
+     * @throws type
+     *
+     * @return Response
+     */
+    protected function selectCentersStep(Request $request, $export, $alias)
+    {
+        /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
-        $key = $request->query->get('key', null);
-        
-        list($dataCenters, $dataExport, $dataFormatter) = $this->rebuildData($key);
-        
-        $formatterAlias = $exportManager->getFormatterAlias($dataExport['export']);
-        if ($formatterAlias !== null) {
-            $formater = $exportManager->getFormatter($formatterAlias);
-        } else {
-            $formater = null;
+
+        $form = $this->createCreateFormExport($alias, 'centers');
+
+        if ($request->getMethod() === 'POST') {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->logger->debug('form centers is valid', [
+                    'location' => __METHOD__, ]);
+
+                $data = $form->getData();
+
+                // check ACL
+                if ($exportManager->isGrantedForElement(
+                    $export,
+                    null,
+                    $exportManager->getPickedCenters($data['centers'])
+                ) === false) {
+                    throw $this->createAccessDeniedException('you do not have '
+                            . 'access to this export for those centers');
+                }
+
+                $this->session->set(
+                    'centers_step_raw',
+                    $request->request->all()
+                );
+                $this->session->set('centers_step', $data);
+
+                return $this->redirectToRoute('chill_main_export_new', [
+                    'step' => $this->getNextStep('centers', $export),
+                    'alias' => $alias,
+                ]);
+            }
         }
-        
-        $viewVariables = [
-            'alias' => $alias,
-            'export' => $exportManager->getExport($alias)
-        ];
-        
-        if ($formater instanceof \Chill\MainBundle\Export\Formatter\CSVListFormatter) {
-            // due to a bug in php, we add the mime type in the download view
-            $viewVariables['mime_type'] = 'text/csv';
+
+        return $this->render(
+            '@ChillMain/Export/new_centers_step.html.twig',
+            [
+                'form' => $form->createView(),
+                'export' => $export,
+            ]
+        );
+    }
+
+    /**
+     * get the next step. If $reverse === true, the previous step is returned.
+     *
+     * This method provides a centralized way of handling next/previous step.
+     *
+     * @param string $step the current step
+     * @param \Chill\MainBundle\Export\DirectExportInterface|\Chill\MainBundle\Export\ExportInterface $export
+     * @param bool $reverse set to true to get the previous step
+     *
+     * @throws LogicException if there is no step before or after the given step
+     *
+     * @return string the next/current step
+     */
+    private function getNextStep($step, $export, $reverse = false)
+    {
+        switch ($step) {
+            case 'centers':
+                if (false !== $reverse) {
+                    throw new LogicException("there is no step before 'export'");
+                }
+
+                return 'export';
+
+            case 'export':
+                if ($export instanceof \Chill\MainBundle\Export\ExportInterface) {
+                    return $reverse ? 'centers' : 'formatter';
+                }
+
+                if ($export instanceof \Chill\MainBundle\Export\DirectExportInterface) {
+                    return $reverse ? 'centers' : 'generate';
+                }
+
+                // no break
+            case 'formatter':
+                return $reverse ? 'export' : 'generate';
+
+            case 'generate':
+                if (false === $reverse) {
+                    throw new LogicException("there is no step after 'generate'");
+                }
+
+                return 'formatter';
+
+            default:
+                throw new LogicException("the step {$step} is not defined.");
         }
-        
-        return $this->render("@ChillMain/Export/download.html.twig", $viewVariables);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
index 5c0301959..525475e3c 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php
@@ -1,33 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class LocationApiController
- *
- * @package Chill\MainBundle\Controller
- * @author Champs Libres
+ * Class LocationApiController.
  */
 class LocationApiController extends ApiController
 {
     public function customizeQuery(string $action, Request $request, $query): void
     {
-        $query->andWhere($query->expr()->orX(
-            $query->expr()->andX(
-                $query->expr()->eq('e.createdBy', ':user'),
-                $query->expr()->gte('e.createdAt', ':dateBefore')
-            ),
+        $query->andWhere(
             $query->expr()->andX(
                 $query->expr()->eq('e.availableForUsers', "'TRUE'"),
-                $query->expr()->eq('e.active', "'TRUE'")
+                $query->expr()->eq('e.active', "'TRUE'"),
             )
-        ))
-        ->setParameters([
-            'user' => $this->getUser(),
-            'dateBefore' => (new \DateTime())->sub(new \DateInterval('P6M'))
-        ]);
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationController.php b/src/Bundle/ChillMainBundle/Controller/LocationController.php
index fb1c1c61a..10087ec1e 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -7,11 +16,6 @@ use Symfony\Component\HttpFoundation\Request;
 
 class LocationController extends CRUDController
 {
-    protected function customizeQuery(string $action, Request $request, $query): void
-    {
-        $query->where('e.availableForUsers = true'); //TODO not working
-    }
-
     protected function createEntity(string $action, Request $request): object
     {
         $entity = parent::createEntity($action, $request);
@@ -20,4 +24,9 @@ class LocationController extends CRUDController
 
         return $entity;
     }
+
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        $query->where('e.availableForUsers = true'); //TODO not working
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
new file mode 100644
index 000000000..1c7fbdb89
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class LocationTypeApiController.
+ */
+class LocationTypeApiController extends ApiController
+{
+    public function customizeQuery(string $action, Request $request, $query): void
+    {
+        $query->andWhere(
+            $query->expr()->andX(
+                $query->expr()->eq('e.availableForUsers', "'TRUE'"),
+                $query->expr()->eq('e.active', "'TRUE'"),
+            )
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php b/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
index 4f87cc300..542282260 100644
--- a/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LocationTypeController.php
@@ -1,10 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
-
 class LocationTypeController extends CRUDController
 {
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/LoginController.php b/src/Bundle/ChillMainBundle/Controller/LoginController.php
index 920ce22c3..d853d75af 100644
--- a/src/Bundle/ChillMainBundle/Controller/LoginController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LoginController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -8,41 +17,34 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 
 /**
- * Class LoginController
- *
- * @package Chill\MainBundle\Controller
+ * Class LoginController.
  */
 class LoginController extends AbstractController
 {
     /**
-     *
      * @var AuthenticationUtils
      */
     protected $helper;
-    
+
     public function __construct(AuthenticationUtils $helper)
     {
         $this->helper = $helper;
     }
-    
+
     /**
-     * Show a login form
-     * 
-     * @param Request $request
+     * Show a login form.
+     *
      * @return Response
      */
     public function loginAction(Request $request)
     {
-
-        return $this->render('@ChillMain/Login/login.html.twig', array(
+        return $this->render('@ChillMain/Login/login.html.twig', [
             'last_username' => $this->helper->getLastUsername(),
-            'error'         => $this->helper->getLastAuthenticationError()
-        ));  
+            'error' => $this->helper->getLastAuthenticationError(),
+        ]);
     }
-    
+
     public function LoginCheckAction(Request $request)
     {
-        
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/MenuController.php b/src/Bundle/ChillMainBundle/Controller/MenuController.php
index 8820c8356..81a80f485 100644
--- a/src/Bundle/ChillMainBundle/Controller/MenuController.php
+++ b/src/Bundle/ChillMainBundle/Controller/MenuController.php
@@ -1,23 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * Class MenuController
- *
- * @package Chill\MainBundle\Controller
+ * Class MenuController.
  */
 class MenuController extends AbstractController
 {
-    public function writeMenuAction($menu, $layout, $activeRouteKey = null, array $args = array() )
+    public function writeMenuAction($menu, $layout, $activeRouteKey = null, array $args = [])
     {
-        return $this->render($layout, array(
+        return $this->render($layout, [
             'menu_composer' => $this->get('chill.main.menu_composer'),
             'menu' => $menu,
             'args' => $args,
-            'activeRouteKey' => $activeRouteKey
-        ));
+            'activeRouteKey' => $activeRouteKey,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
index c76e19d9e..4eed79740 100644
--- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php
@@ -1,14 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Chill\MainBundle\Repository\NotificationRepository;
 use Chill\MainBundle\Notification\NotificationRenderer;
-use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Routing\Annotation\Route;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-
+use Chill\MainBundle\Repository\NotificationRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
 
 /**
  * @Route("/{_locale}/notification")
@@ -22,14 +30,14 @@ class NotificationController extends AbstractController
         $this->security = $security;
     }
 
-
     /**
      * @Route("/show", name="chill_main_notification_show")
      */
     public function showAction(
-        NotificationRepository $notificationRepository, NotificationRenderer $notificationRenderer,
-        PaginatorFactory $paginatorFactory)
-    {
+        NotificationRepository $notificationRepository,
+        NotificationRenderer $notificationRenderer,
+        PaginatorFactory $paginatorFactory
+    ) {
         $currentUser = $this->security->getUser();
 
         $notificationsNbr = $notificationRepository->countAllForAttendee(($currentUser));
@@ -37,15 +45,17 @@ class NotificationController extends AbstractController
 
         $notifications = $notificationRepository->findAllForAttendee(
             $currentUser,
-            $limit=$paginator->getItemsPerPage(),
-            $offset= $paginator->getCurrentPage()->getFirstItemNumber());
+            $limit = $paginator->getItemsPerPage(),
+            $offset = $paginator->getCurrentPage()->getFirstItemNumber()
+        );
+
+        $templateData = [];
 
-        $templateData = array();
         foreach ($notifications as $notification) {
             $data = [
                 'template' => $notificationRenderer->getTemplate($notification),
                 'template_data' => $notificationRenderer->getTemplateData($notification),
-                'notification' => $notification
+                'notification' => $notification,
             ];
             $templateData[] = $data;
         }
diff --git a/src/Bundle/ChillMainBundle/Controller/PasswordController.php b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
index a5cab5b9f..2dd700a89 100644
--- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PasswordController.php
@@ -1,72 +1,73 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Chill\MainBundle\Form\UserPasswordType;
 use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
-use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Security\PasswordRecover\TokenManager;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Chill\MainBundle\Form\UserPasswordType;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEvent;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter;
+use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
+use Chill\MainBundle\Security\PasswordRecover\TokenManager;
+use DateInterval;
+use DateTimeImmutable;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Class PasswordController
- *
- * @package Chill\MainBundle\Controller
+ * Class PasswordController.
  */
 class PasswordController extends AbstractController
 {
-    
-    /**
-     * @var UserPasswordEncoderInterface
-     */
-    protected $passwordEncoder;
-    
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
     /**
      * @var LoggerInterface
      */
     protected $chillLogger;
-    
-    /**
-     * @var RecoverPasswordHelper
-     */
-    protected $recoverPasswordHelper;
-    
-    /**
-     * @var TokenManager
-     */
-    protected $tokenManager;
-    
+
     /**
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-    
+
+    /**
+     * @var UserPasswordEncoderInterface
+     */
+    protected $passwordEncoder;
+
+    /**
+     * @var RecoverPasswordHelper
+     */
+    protected $recoverPasswordHelper;
+
+    /**
+     * @var TokenManager
+     */
+    protected $tokenManager;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     /**
      * PasswordController constructor.
-     *
-     * @param LoggerInterface $chillLogger
-     * @param UserPasswordEncoderInterface $passwordEncoder
-     * @param RecoverPasswordHelper $recoverPasswordHelper
-     * @param TokenManager $tokenManager
-     * @param TranslatorInterface $translator
-     * @param EventDispatcherInterface $eventDispatcher
      */
     public function __construct(
         LoggerInterface $chillLogger,
@@ -83,9 +84,163 @@ class PasswordController extends AbstractController
         $this->recoverPasswordHelper = $recoverPasswordHelper;
         $this->eventDispatcher = $eventDispatcher;
     }
-    
+
+    /**
+     * @return Response
+     */
+    public function changeConfirmedAction()
+    {
+        return $this->render('@ChillMain/Password/recover_password_changed.html.twig');
+    }
+
+    /**
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function recoverAction(Request $request)
+    {
+        if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
+            return new Response($this->translator->trans('You are not allowed '
+                . 'to try to recover password, due to mitigating possible '
+                . 'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
+        }
+
+        $query = $request->query;
+        $username = $query->get(TokenManager::USERNAME_CANONICAL);
+        $hash = $query->getAlnum(TokenManager::HASH);
+        $token = $query->getAlnum(TokenManager::TOKEN);
+        $timestamp = $query->getAlnum(TokenManager::TIMESTAMP);
+        $user = $this->getDoctrine()->getRepository(User::class)
+            ->findOneByUsernameCanonical($username);
+
+        if (null === $user) {
+            $this->eventDispatcher->dispatch(
+                PasswordRecoverEvent::INVALID_TOKEN,
+                new PasswordRecoverEvent($token, null, $request->getClientIp())
+            );
+
+            throw $this->createNotFoundException(sprintf('User %s not found', $username));
+        }
+
+        if (true !== $this->tokenManager->verify($hash, $token, $user, $timestamp)) {
+            $this->eventDispatcher->dispatch(
+                PasswordRecoverEvent::INVALID_TOKEN,
+                new PasswordRecoverEvent($token, $user, $request->getClientIp())
+            );
+
+            return new Response('Invalid token', Response::HTTP_FORBIDDEN);
+        }
+
+        $form = $this->passwordForm($user);
+        $form->remove('actual_password');
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $password = $form->get('new_password')->getData();
+            $user->setPassword($this->passwordEncoder->encodePassword($user, $password));
+            // logging for prod
+            $this
+                ->chillLogger
+                ->notice(
+                    'setting new password for user',
+                    [
+                        'user' => $user->getUsername(),
+                    ]
+                );
+
+            $this->getDoctrine()->getManager()->flush();
+
+            return $this->redirectToRoute('password_request_recover_changed');
+        }
+
+        return $this->render('@ChillMain/Password/recover_password_form.html.twig', [
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     *
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function requestRecoverAction(Request $request)
+    {
+        if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
+            return new Response($this->translator->trans('You are not allowed '
+                . 'to try to recover password, due to mitigating possible '
+                . 'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
+        }
+
+        $form = $this->requestRecoverForm();
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            /** @var \Doctrine\ORM\QueryBuilder $qb */
+            $qb = $this->getDoctrine()->getManager()
+                ->createQueryBuilder();
+            $qb->select('u')
+                ->from(User::class, 'u')
+                ->where($qb->expr()->eq('u.usernameCanonical', 'UNACCENT(LOWER(:pattern))'))
+                ->orWhere($qb->expr()->eq('u.emailCanonical', 'UNACCENT(LOWER(:pattern))'))
+                ->setParameter('pattern', $form->get('username_or_email')->getData());
+
+            $user = $qb->getQuery()->getSingleResult();
+
+            if (empty($user->getEmail())) {
+                $this->addFlash('error', $this->translator->trans('This account does not have an email address. '
+                    . 'Please ask your administrator to renew your password.'));
+            } else {
+                if (false === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN, $user)) {
+                    return new Response($this->translator->trans('You are not allowed '
+                        . 'to try to recover password, due to mitigating possible '
+                        . 'attack. Try to contact your system administrator'), Response::HTTP_FORBIDDEN);
+                }
+
+                $this->recoverPasswordHelper->sendRecoverEmail(
+                    $user,
+                    (new DateTimeImmutable('now'))->add(new DateInterval('PT30M'))
+                );
+
+                // logging for prod
+                $this
+                    ->chillLogger
+                    ->notice(
+                        'Sending an email for password recovering',
+                        [
+                            'user' => $user->getUsername(),
+                        ]
+                    );
+
+                $this->eventDispatcher->dispatch(
+                    PasswordRecoverEvent::ASK_TOKEN_SUCCESS,
+                    new PasswordRecoverEvent(null, $user, $request->getClientIp())
+                );
+
+                return $this->redirectToRoute('password_request_recover_confirm');
+            }
+        } elseif ($form->isSubmitted() && false === $form->isValid()) {
+            $this->eventDispatcher->dispatch(
+                PasswordRecoverEvent::ASK_TOKEN_INVALID_FORM,
+                new PasswordRecoverEvent(null, null, $request->getClientIp())
+            );
+        }
+
+        return $this->render('@ChillMain/Password/request_recover_password.html.twig', [
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @return Response
+     */
+    public function requestRecoverConfirmAction()
+    {
+        return $this->render('@ChillMain/Password/request_recover_password_confirm.html.twig');
+    }
+
     /**
-     * @param Request $request
      * @return Response
      */
     public function UserPasswordAction(Request $request)
@@ -107,11 +262,11 @@ class PasswordController extends AbstractController
                 ->chillLogger
                 ->notice(
                     'update password for an user',
-                    array(
-                        'method' => $request->getMethod(), 
-                        'user' => $user->getUsername()
-                )
-            );
+                    [
+                        'method' => $request->getMethod(),
+                        'user' => $user->getUsername(),
+                    ]
+                );
 
             $user->setPassword($this->passwordEncoder->encodePassword($user, $password));
 
@@ -119,186 +274,16 @@ class PasswordController extends AbstractController
             $em->flush();
 
             $this->addFlash('success', $this->translator->trans('Password successfully updated!'));
-            
-            return $this->redirectToRoute('change_my_password');
 
+            return $this->redirectToRoute('change_my_password');
         }
 
         // render into a template
-        return $this->render('@ChillMain/Password/password.html.twig', array(
-            'form' => $form->createView()
-        ));
-
-    }
-
-    /**
-     * @param User $user
-     * @return \Symfony\Component\Form\Form
-     */
-    private function passwordForm(User $user)
-    {
-        return $this
-            ->createForm(
-                UserPasswordType::class,
-                [],
-                [ 'user' => $user ]
-            )
-            ->add('submit', SubmitType::class, array('label' => 'Change password'))
-                ;
-    }
-    
-    /**
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     */
-    public function recoverAction(Request $request)
-    {
-        if (FALSE === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
-            return (new Response($this->translator->trans("You are not allowed "
-                . "to try to recover password, due to mitigating possible "
-                . "attack. Try to contact your system administrator"), Response::HTTP_FORBIDDEN));
-        }
-        
-        $query = $request->query;
-        $username = $query->get(TokenManager::USERNAME_CANONICAL);
-        $hash = $query->getAlnum(TokenManager::HASH);
-        $token = $query->getAlnum(TokenManager::TOKEN);
-        $timestamp = $query->getInt(TokenManager::TIMESTAMP);
-        $user = $this->getDoctrine()->getRepository(User::class)
-            ->findOneByUsernameCanonical($username);
-        
-        if (NULL === $user) {
-            $this->eventDispatcher->dispatch(PasswordRecoverEvent::INVALID_TOKEN, 
-                new PasswordRecoverEvent($token, null, $request->getClientIp()));
-            
-            throw $this->createNotFoundException(sprintf('User %s not found', $username));
-        }
-        
-        if (TRUE !== $this->tokenManager->verify($hash, $token, $user, $timestamp)) {
-            $this->eventDispatcher->dispatch(PasswordRecoverEvent::INVALID_TOKEN, 
-                new PasswordRecoverEvent($token, $user, $request->getClientIp()));
-            
-            return new Response("Invalid token", Response::HTTP_FORBIDDEN);
-        }
-        
-        $form = $this->passwordForm($user);
-        $form->remove('actual_password');
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() && $form->isValid()) {
-            $password = $form->get('new_password')->getData();
-            $user->setPassword($this->passwordEncoder->encodePassword($user, $password));
-            // logging for prod
-            $this
-                ->chillLogger
-                ->notice(
-                    'setting new password for user',
-                    array(
-                        'user' => $user->getUsername()
-                    )
-                );
-            
-            $this->getDoctrine()->getManager()->flush();
-            
-            return $this->redirectToRoute('password_request_recover_changed');
-        }
-        
-        return $this->render('@ChillMain/Password/recover_password_form.html.twig', [
-            'form' => $form->createView()
-        ]);
-        
-    }
-    
-    /**
-     * @return Response
-     */
-    public function changeConfirmedAction()
-    {
-        return $this->render('@ChillMain/Password/recover_password_changed.html.twig');
-    }
-    
-    /**
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
-     * @throws \Doctrine\ORM\NoResultException
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function requestRecoverAction(Request $request)
-    {
-        if (FALSE === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
-            return (new Response($this->translator->trans("You are not allowed "
-                . "to try to recover password, due to mitigating possible "
-                . "attack. Try to contact your system administrator"), Response::HTTP_FORBIDDEN));
-        }
-        
-        $form = $this->requestRecoverForm();
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() && $form->isValid()) {
-            /* @var $qb \Doctrine\ORM\QueryBuilder */
-            $qb = $this->getDoctrine()->getManager()
-                ->createQueryBuilder();
-            $qb->select('u')
-                ->from(User::class, 'u')
-                ->where($qb->expr()->eq('u.usernameCanonical', 'UNACCENT(LOWER(:pattern))'))
-                ->orWhere($qb->expr()->eq('u.emailCanonical', 'UNACCENT(LOWER(:pattern))' ))
-                ->setParameter('pattern', $form->get('username_or_email')->getData())
-                ;
-            
-            $user = $qb->getQuery()->getSingleResult();
-            
-            if (empty($user->getEmail())) {
-                $this->addFlash('error', $this->translator->trans('This account does not have an email address. '
-                    . 'Please ask your administrator to renew your password.'));
-            } else {
-                if (FALSE === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN, $user)) {
-                    return (new Response($this->translator->trans("You are not allowed "
-                        . "to try to recover password, due to mitigating possible "
-                        . "attack. Try to contact your system administrator"), Response::HTTP_FORBIDDEN));
-                }
-                
-                $this->recoverPasswordHelper->sendRecoverEmail($user, 
-                    (new \DateTimeImmutable('now'))->add(new \DateInterval('PT30M')));
-                
-                // logging for prod
-                $this
-                    ->chillLogger
-                    ->notice(
-                        'Sending an email for password recovering',
-                        array(
-                            'user' => $user->getUsername()
-                    )
-                );
-                
-                $this->eventDispatcher->dispatch(
-                    PasswordRecoverEvent::ASK_TOKEN_SUCCESS, 
-                    new PasswordRecoverEvent(null, $user, $request->getClientIp())
-                    );
-                
-                return $this->redirectToRoute('password_request_recover_confirm');
-            }
-        } elseif ($form->isSubmitted() && FALSE === $form->isValid()) {
-            $this->eventDispatcher->dispatch(
-                PasswordRecoverEvent::ASK_TOKEN_INVALID_FORM, 
-                new PasswordRecoverEvent(null, null, $request->getClientIp())
-                );
-        }
-        
-        return $this->render('@ChillMain/Password/request_recover_password.html.twig', [
-            'form' => $form->createView()
+        return $this->render('@ChillMain/Password/password.html.twig', [
+            'form' => $form->createView(),
         ]);
     }
-    
-    /**
-     * @return Response
-     */
-    public function requestRecoverConfirmAction()
-    {
-        return $this->render('@ChillMain/Password/request_recover_password_confirm.html.twig');
-    }
-    
+
     /**
      * @return \Symfony\Component\Form\FormInterface
      */
@@ -310,27 +295,40 @@ class PasswordController extends AbstractController
                 'label' => 'Username or email',
                 'constraints' => [
                     new Callback([
-                        'callback' => function($pattern, ExecutionContextInterface $context, $payload) {
+                        'callback' => function ($pattern, ExecutionContextInterface $context, $payload) {
                             $qb = $this->getDoctrine()->getManager()
-                            ->createQueryBuilder();
+                                ->createQueryBuilder();
                             $qb->select('COUNT(u)')
                                 ->from(User::class, 'u')
                                 ->where($qb->expr()->eq('u.usernameCanonical', 'UNACCENT(LOWER(:pattern))'))
-                                ->orWhere($qb->expr()->eq('u.emailCanonical', 'UNACCENT(LOWER(:pattern))' ))
-                                ->setParameter('pattern', $pattern)
-                            ;
+                                ->orWhere($qb->expr()->eq('u.emailCanonical', 'UNACCENT(LOWER(:pattern))'))
+                                ->setParameter('pattern', $pattern);
 
                             if ((int) $qb->getQuery()->getSingleScalarResult() !== 1) {
                                 $context->addViolation('This username or email does not exists');
                             }
-                        }
-                    ])
-                ]
+                        },
+                    ]),
+                ],
             ])
             ->add('submit', SubmitType::class, [
-                'label' => 'Request recover'
+                'label' => 'Request recover',
             ]);
-        
+
         return $builder->getForm();
     }
+
+    /**
+     * @return \Symfony\Component\Form\Form
+     */
+    private function passwordForm(User $user)
+    {
+        return $this
+            ->createForm(
+                UserPasswordType::class,
+                [],
+                ['user' => $user]
+            )
+            ->add('submit', SubmitType::class, ['label' => 'Change password']);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
new file mode 100644
index 000000000..6a2afccb2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use function array_key_exists;
+use function json_decode;
+
+class PermissionApiController extends AbstractController
+{
+    private DenormalizerInterface $denormalizer;
+
+    private Security $security;
+
+    public function __construct(
+        DenormalizerInterface $denormalizer,
+        Security $security
+    ) {
+        $this->denormalizer = $denormalizer;
+        $this->security = $security;
+    }
+
+    /**
+     * @Route("/api/1.0/main/permissions/info.json", methods={"POST"})
+     *
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
+     */
+    public function getPermissions(Request $request): JsonResponse
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $data = json_decode($request->getContent(), true);
+
+        if (null === $data) {
+            throw new BadRequestHttpException(sprintf(
+                'Could not decode json received, or data invalid: %s, %s',
+                json_last_error(),
+                json_last_error_msg()
+            ));
+        }
+
+        if (!array_key_exists('object', $data)) {
+            throw new BadRequestHttpException('the object key is not present');
+        }
+
+        if (!array_key_exists('class', $data)) {
+            throw new BadRequestHttpException('the class key is not present');
+        }
+
+        if (null !== $data['object']) {
+            $object = $this->denormalizer->denormalize($data['object'], $data['class'], 'json');
+        } else {
+            $object = null;
+        }
+        $roles = [];
+
+        foreach (($data['roles'] ?? []) as $role) {
+            $roles[$role] = $this->security->isGranted($role, $object);
+        }
+
+        return $this->json(
+            ['roles' => $roles],
+            200,
+            [],
+        );
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
index 0a46c4496..8cffd02b3 100644
--- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
@@ -1,62 +1,65 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\Entity\PermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Form\PermissionsGroupType;
+use Chill\MainBundle\Form\Type\ComposedRoleScopeType;
 use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\Entity\PermissionsGroup;
-use Chill\MainBundle\Form\PermissionsGroupType;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Role\RoleHierarchy;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Form\Type\ComposedRoleScopeType;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
 
 /**
- * Class PermissionsGroupController
- *
- * @package Chill\MainBundle\Controller
+ * Class PermissionsGroupController.
  */
 class PermissionsGroupController extends AbstractController
 {
+    /**
+     * @var RoleHierarchy
+     */
+    private $roleHierarchy;
+
+    /**
+     * @var RoleProvider
+     */
+    private $roleProvider;
+
     /**
      * @var TranslatableStringHelper
      */
     private $translatableStringHelper;
-    
-    /**
-     * @var RoleProvider $roleProvider
-     */
-    private $roleProvider;
-    
-    /**
-     * @var RoleHierarchy $roleHierarchy
-     */
-    private $roleHierarchy;
-    
+
     /**
      * @var TranslatorInterface
      */
     private $translator;
-    
+
     /**
      * @var ValidatorInterface
      */
     private $validator;
-    
+
     /**
      * PermissionsGroupController constructor.
-     *
-     * @param TranslatableStringHelper $translatableStringHelper
-     * @param RoleProvider $roleProvider
-     * @param RoleHierarchy $roleHierarchy
-     * @param TranslatorInterface $translator
-     * @param ValidatorInterface $validator
      */
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
@@ -64,33 +67,105 @@ class PermissionsGroupController extends AbstractController
         RoleHierarchy $roleHierarchy,
         TranslatorInterface $translator,
         ValidatorInterface $validator
-    )
-    {
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->roleProvider = $roleProvider;
         $this->roleHierarchy = $roleHierarchy;
         $this->translator = $translator;
         $this->validator = $validator;
     }
-    
+
     /**
-     * Lists all PermissionsGroup entities.
+     * @param int $id
      *
+     * @throws type
+     *
+     * @return Respon
      */
-    public function indexAction()
+    public function addLinkRoleScopeAction(Request $request, $id)
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entities = $em->getRepository('ChillMainBundle:PermissionsGroup')->findAll();
+        $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id);
 
-        return $this->render('@ChillMain/PermissionsGroup/index.html.twig', array(
-            'entities' => $entities,
-        ));
+        if (!$permissionsGroup) {
+            throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
+        }
+
+        $form = $this->createAddRoleScopeForm($permissionsGroup);
+        $form->handleRequest($request);
+
+        if ($form->isValid()) {
+            $roleScope = $this->getPersistentRoleScopeBy(
+                $form['composed_role_scope']->getData()->getRole(),
+                $form['composed_role_scope']->getData()->getScope()
+            );
+
+            $permissionsGroup->addRoleScope($roleScope);
+            $violations = $this->validator->validate($permissionsGroup);
+
+            if ($violations->count() === 0) {
+                $em->flush();
+
+                $this->addFlash(
+                    'notice',
+                    $this->translator->trans('The permissions have been added')
+                );
+
+                return $this->redirect($this->generateUrl(
+                    'admin_permissionsgroup_edit',
+                    ['id' => $id]
+                ));
+            }
+
+            foreach ($violations as $error) {
+                $this->addFlash('error', $error->getMessage());
+            }
+        } else {
+            foreach ($form->getErrors() as $error) {
+                $this->addFlash('error', $error->getMessage());
+            }
+        }
+
+        $editForm = $this->createEditForm($permissionsGroup);
+
+        $deleteRoleScopesForm = [];
+
+        foreach ($permissionsGroup->getRoleScopes() as $roleScope) {
+            $deleteRoleScopesForm[$roleScope->getId()] = $this->createDeleteRoleScopeForm(
+                $permissionsGroup,
+                $roleScope
+            );
+        }
+
+        $addRoleScopesForm = $this->createAddRoleScopeForm($permissionsGroup);
+
+        // sort role scope by title
+
+        $roleProvider = $this->roleProvider;
+        $roleScopesSorted = [];
+
+        foreach ($permissionsGroup->getRoleScopes()->toArray() as $roleScope) {
+            /** @var RoleScope $roleScope */
+            $title = $roleProvider->getRoleTitle($roleScope->getRole());
+            $roleScopesSorted[$title][] = $roleScope;
+        }
+        ksort($roleScopesSorted);
+
+        return $this->render('@ChillMain/PermissionsGroup/edit.html.twig', [
+            'entity' => $permissionsGroup,
+            'edit_form' => $editForm->createView(),
+            'role_scopes_sorted' => $roleScopesSorted,
+            'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
+            'delete_role_scopes_form' => array_map(static function ($form) {
+                return $form->createView();
+            }, $deleteRoleScopesForm),
+            'add_role_scopes_form' => $addRoleScopesForm->createView(),
+        ]);
     }
 
     /**
      * Creates a new PermissionsGroup entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -103,284 +178,24 @@ class PermissionsGroupController extends AbstractController
             $em->persist($permissionsGroup);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_permissionsgroup_edit',
-                    array('id' => $permissionsGroup->getId())));
+            return $this->redirect($this->generateUrl(
+                'admin_permissionsgroup_edit',
+                ['id' => $permissionsGroup->getId()]
+            ));
         }
 
-        return $this->render('@ChillMain/PermissionsGroup/new.html.twig', array(
+        return $this->render('@ChillMain/PermissionsGroup/new.html.twig', [
             'entity' => $permissionsGroup,
-            'form'   => $form->createView(),
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
-     * Creates a form to create a PermissionsGroup entity.
-     *
-     * @param PermissionsGroup $permissionsGroup The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(PermissionsGroup $permissionsGroup)
-    {
-        $form = $this->createForm(PermissionsGroupType::class, $permissionsGroup, array(
-            'action' => $this->generateUrl('admin_permissionsgroup_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new PermissionsGroup entity.
-     *
-     */
-    public function newAction()
-    {
-        $permissionsGroup = new PermissionsGroup();
-        $form   = $this->createCreateForm($permissionsGroup);
-
-        return $this->render('@ChillMain/PermissionsGroup/new.html.twig', array(
-            'entity' => $permissionsGroup,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a PermissionsGroup entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id);
-
-        if (!$permissionsGroup) {
-            throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
-        }
-
-        $translatableStringHelper = $this->translatableStringHelper;
-        $roleScopes = $permissionsGroup->getRoleScopes()->toArray();
-
-        // sort $roleScopes by name
-        usort($roleScopes,
-              function(RoleScope $a, RoleScope $b) use ($translatableStringHelper) {
-                  if ($a->getScope() === NULL) {
-                      return 1;
-                  }
-                  if ($b->getScope() === NULL) {
-                      return +1;
-                  }
-
-                  return strcmp(
-                        $translatableStringHelper->localize($a->getScope()->getName()),
-                        $translatableStringHelper->localize($b->getScope()->getName())
-                        );
-              });
-
-        // sort role scope by title
-        $roleProvider = $this->roleProvider;
-        $roleScopesSorted = array();
-        foreach($roleScopes as $roleScope) {
-            
-            /* @var $roleScope RoleScope */
-            $title = $roleProvider->getRoleTitle($roleScope->getRole());
-            $roleScopesSorted[$title][] = $roleScope;
-        }
-        ksort($roleScopesSorted);
-
-        return $this->render('@ChillMain/PermissionsGroup/show.html.twig', array(
-            'entity'      => $permissionsGroup,
-            'role_scopes_sorted' => $roleScopesSorted,
-            'expanded_roles' => $this->getExpandedRoles($roleScopes)
-        ));
-    }
-
-    /**
-     * expand roleScopes to be easily shown in template
-     *
-     * @param array $roleScopes
-     * @return array
-     */
-    private function getExpandedRoles(array $roleScopes)
-    {
-        $expandedRoles = array();
-        foreach ($roleScopes as $roleScope) {
-            if (!array_key_exists($roleScope->getRole(), $expandedRoles)) {
-                $expandedRoles[$roleScope->getRole()] =
-                      array_map(
-                            function(Role $role) {
-                                return $role->getRole();
-                            },
-                            $this->roleHierarchy
-                                ->getReachableRoles(
-                                      array(new Role($roleScope->getRole()))
-                                    )
-                        );
-            }
-        }
-        return $expandedRoles;
-    }
-
-    /**
-     * Displays a form to edit an existing PermissionsGroup entity.
-     *
-     */
-    public function editAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id);
-
-        if (!$permissionsGroup) {
-            throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
-        }
-
-        // create all the forms
-        $editForm = $this->createEditForm($permissionsGroup);
-
-        $deleteRoleScopesForm = array();
-        foreach ($permissionsGroup->getRoleScopes() as $roleScope) {
-            $deleteRoleScopesForm[$roleScope->getId()] = $this->createDeleteRoleScopeForm(
-                    $permissionsGroup, $roleScope);
-        }
-
-        $addRoleScopesForm = $this->createAddRoleScopeForm($permissionsGroup);
-
-        // sort role scope by title
-        $roleProvider = $this->roleProvider;
-        $roleScopesSorted = array();
-        foreach($permissionsGroup->getRoleScopes()->toArray() as $roleScope) {
-            /* @var $roleScope RoleScope */
-            $title = $roleProvider->getRoleTitle($roleScope->getRole());
-            $roleScopesSorted[$title][] = $roleScope;
-        }
-        ksort($roleScopesSorted);
-
-        return $this->render('@ChillMain/PermissionsGroup/edit.html.twig', array(
-            'entity'      => $permissionsGroup,
-            'role_scopes_sorted' => $roleScopesSorted,
-            'edit_form'   => $editForm->createView(),
-            'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
-            'delete_role_scopes_form' => array_map( function($form) {
-
-                return $form->createView();
-            }, $deleteRoleScopesForm),
-            'add_role_scopes_form' => $addRoleScopesForm->createView()
-        ));
-    }
-
-    /**
-    * Creates a form to edit a PermissionsGroup entity.
-    *
-    * @param PermissionsGroup $permissionsGroup The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(PermissionsGroup $permissionsGroup)
-    {
-        $form = $this->createForm(PermissionsGroupType::class, $permissionsGroup, array(
-            'action' => $this->generateUrl('admin_permissionsgroup_update', array('id' => $permissionsGroup->getId())),
-            'method' => 'PUT',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
-
-        return $form;
-    }
-
-    /**
-     * Edits an existing PermissionsGroup entity.
-     *
-     */
-    public function updateAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $permissionsGroup = $em
-            ->getRepository('ChillMainBundle:PermissionsGroup')
-            ->find($id);
-
-        if (!$permissionsGroup) {
-            throw $this->createNotFoundException('Unable to find Permissions'
-                . 'Group entity.');
-        }
-
-        $editForm = $this->createEditForm($permissionsGroup);
-        $editForm->handleRequest($request);
-
-        if ($editForm->isValid()) {
-
-            $em->flush();
-
-            return $this->redirect($this->generateUrl('admin_permissionsgroup_edit', array('id' => $id)));
-        }
-
-        $deleteRoleScopesForm = array();
-        foreach ($permissionsGroup->getRoleScopes() as $roleScope) {
-            $deleteRoleScopesForm[$roleScope->getId()] = $this->createDeleteRoleScopeForm(
-                    $permissionsGroup, $roleScope);
-        }
-
-        $addRoleScopesForm = $this->createAddRoleScopeForm($permissionsGroup);
-
-        // sort role scope by title
-        $roleProvider = $this->roleProvider;
-        $roleScopesSorted = array();
-        foreach($permissionsGroup->getRoleScopes()->toArray() as $roleScope) {
-            /* @var $roleScope RoleScope */
-            $title = $roleProvider->getRoleTitle($roleScope->getRole());
-            $roleScopesSorted[$title][] = $roleScope;
-        }
-        ksort($roleScopesSorted);
-
-        return $this->render('@ChillMain/PermissionsGroup/edit.html.twig', array(
-            'entity'      => $permissionsGroup,
-            'role_scopes_sorted' => $roleScopesSorted,
-            'edit_form'   => $editForm->createView(),
-            'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
-            'delete_role_scopes_form' => array_map( function($form) {
-
-                return $form->createView();
-            }, $deleteRoleScopesForm),
-            'add_role_scopes_form' => $addRoleScopesForm->createView()
-        ));
-    }
-
-    /**
-     * get a role scope by his parameters. The role scope is persisted if it
-     * doesn't exists in database.
-     *
-     * @param Scope $scope
-     * @param string $role
-     * @return RoleScope
-     */
-    protected function getPersistentRoleScopeBy($role, Scope $scope = null)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $roleScope = $em->getRepository('ChillMainBundle:RoleScope')
-                ->findOneBy(array('role' => $role, 'scope' => $scope));
-
-        if ($roleScope === NULL) {
-            $roleScope = (new RoleScope())
-                    ->setRole($role)
-                    ->setScope($scope)
-                    ;
-
-            $em->persist($roleScope);
-        }
-
-        return $roleScope;
-    }
-
-    /**
-     * remove an association between permissionsGroup and roleScope
+     * remove an association between permissionsGroup and roleScope.
      *
      * @param int $pgid permissionsGroup id
      * @param int $rsid roleScope id
+     *
      * @return redirection to edit form
      */
     public function deleteLinkRoleScopeAction($pgid, $rsid)
@@ -400,48 +215,56 @@ class PermissionsGroupController extends AbstractController
 
         try {
             $permissionsGroup->removeRoleScope($roleScope);
-        } catch (\RuntimeException $ex) {
-            $this->addFlash('notice',
+        } catch (RuntimeException $ex) {
+            $this->addFlash(
+                'notice',
                 $this->translator->trans("The role '%role%' and circle "
-                        . "'%scope%' is not associated with this permission group", array(
+                        . "'%scope%' is not associated with this permission group", [
                             '%role%' => $this->translator->trans($roleScope->getRole()),
                             '%scope%' => $this->translatableStringHelper
-                                ->localize($roleScope->getScope()->getName())
-                        )));
+                                ->localize($roleScope->getScope()->getName()),
+                        ])
+            );
 
-            return $this->redirect($this->generateUrl('admin_permissionsgroup_edit',
-                array('id' => $pgid)));
+            return $this->redirect($this->generateUrl(
+                'admin_permissionsgroup_edit',
+                ['id' => $pgid]
+            ));
         }
 
         $em->flush();
 
-        if ($roleScope->getScope() !== NULL ) {
-            $this->addFlash('notice',
+        if ($roleScope->getScope() !== null) {
+            $this->addFlash(
+                'notice',
                 $this->translator->trans("The role '%role%' on circle "
-                        . "'%scope%' has been removed", array(
+                        . "'%scope%' has been removed", [
                             '%role%' => $this->translator->trans($roleScope->getRole()),
                             '%scope%' => $this->translatableStringHelper
-                                ->localize($roleScope->getScope()->getName())
-                        )));
+                                ->localize($roleScope->getScope()->getName()),
+                        ])
+            );
         } else {
-            $this->addFlash('notice',
-                $this->translator->trans("The role '%role%' has been removed", array(
-                            '%role%' => $this->translator->trans($roleScope->getRole())
-                        )));
+            $this->addFlash(
+                'notice',
+                $this->translator->trans("The role '%role%' has been removed", [
+                    '%role%' => $this->translator->trans($roleScope->getRole()),
+                ])
+            );
         }
 
-        return $this->redirect($this->generateUrl('admin_permissionsgroup_edit',
-                array('id' => $pgid)));
+        return $this->redirect($this->generateUrl(
+            'admin_permissionsgroup_edit',
+            ['id' => $pgid]
+        ));
     }
 
     /**
+     * Displays a form to edit an existing PermissionsGroup entity.
      *
-     * @param Request $request
-     * @param int $id
-     * @return Respon
-     * @throws type
+     * @param mixed $id
      */
-    public function addLinkRoleScopeAction(Request $request, $id)
+    public function editAction($id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -451,71 +274,249 @@ class PermissionsGroupController extends AbstractController
             throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
         }
 
-        $form = $this->createAddRoleScopeForm($permissionsGroup);
-        $form->handleRequest($request);
-
-        if ($form->isValid()) {
-            $roleScope = $this->getPersistentRoleScopeBy(
-                    $form['composed_role_scope']->getData()->getRole(),
-                    $form['composed_role_scope']->getData()->getScope()
-                    );
-
-            $permissionsGroup->addRoleScope($roleScope);
-            $violations = $this->validator->validate($permissionsGroup);
-
-            if ($violations->count() === 0) {
-                $em->flush();
-
-                $this->addFlash('notice',
-                    $this->translator->trans("The permissions have been added"));
-
-                return $this->redirect($this->generateUrl('admin_permissionsgroup_edit',
-                    array('id' => $id)));
-            } else {
-                foreach($violations as $error) {
-                    $this->addFlash('error', $error->getMessage());
-                }
-            }
-
-        } else {
-            foreach ($form->getErrors() as $error) {
-                $this->addFlash('error', $error->getMessage());
-            }
-        }
-
+        // create all the forms
         $editForm = $this->createEditForm($permissionsGroup);
 
-        $deleteRoleScopesForm = array();
+        $deleteRoleScopesForm = [];
+
         foreach ($permissionsGroup->getRoleScopes() as $roleScope) {
             $deleteRoleScopesForm[$roleScope->getId()] = $this->createDeleteRoleScopeForm(
-                    $permissionsGroup, $roleScope);
+                $permissionsGroup,
+                $roleScope
+            );
         }
 
         $addRoleScopesForm = $this->createAddRoleScopeForm($permissionsGroup);
 
         // sort role scope by title
-
         $roleProvider = $this->roleProvider;
-        $roleScopesSorted = array();
-        foreach($permissionsGroup->getRoleScopes()->toArray() as $roleScope) {
-            /* @var $roleScope RoleScope */
+        $roleScopesSorted = [];
+
+        foreach ($permissionsGroup->getRoleScopes()->toArray() as $roleScope) {
+            /** @var RoleScope $roleScope */
             $title = $roleProvider->getRoleTitle($roleScope->getRole());
             $roleScopesSorted[$title][] = $roleScope;
         }
         ksort($roleScopesSorted);
 
-        return $this->render('@ChillMain/PermissionsGroup/edit.html.twig', array(
-            'entity'      => $permissionsGroup,
-            'edit_form'   => $editForm->createView(),
+        return $this->render('@ChillMain/PermissionsGroup/edit.html.twig', [
+            'entity' => $permissionsGroup,
             'role_scopes_sorted' => $roleScopesSorted,
+            'edit_form' => $editForm->createView(),
             'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
-            'delete_role_scopes_form' => array_map( function($form) {
-
+            'delete_role_scopes_form' => array_map(static function ($form) {
                 return $form->createView();
             }, $deleteRoleScopesForm),
-            'add_role_scopes_form' => $addRoleScopesForm->createView()
-        ));
+            'add_role_scopes_form' => $addRoleScopesForm->createView(),
+        ]);
+    }
 
+    /**
+     * Lists all PermissionsGroup entities.
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillMainBundle:PermissionsGroup')->findAll();
+
+        return $this->render('@ChillMain/PermissionsGroup/index.html.twig', [
+            'entities' => $entities,
+        ]);
+    }
+
+    /**
+     * Displays a form to create a new PermissionsGroup entity.
+     */
+    public function newAction()
+    {
+        $permissionsGroup = new PermissionsGroup();
+        $form = $this->createCreateForm($permissionsGroup);
+
+        return $this->render('@ChillMain/PermissionsGroup/new.html.twig', [
+            'entity' => $permissionsGroup,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a PermissionsGroup entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id);
+
+        if (!$permissionsGroup) {
+            throw $this->createNotFoundException('Unable to find PermissionsGroup entity.');
+        }
+
+        $translatableStringHelper = $this->translatableStringHelper;
+        $roleScopes = $permissionsGroup->getRoleScopes()->toArray();
+
+        // sort $roleScopes by name
+        usort(
+            $roleScopes,
+            static function (RoleScope $a, RoleScope $b) use ($translatableStringHelper) {
+                if ($a->getScope() === null) {
+                    return 1;
+                }
+
+                if ($b->getScope() === null) {
+                    return +1;
+                }
+
+                return strcmp(
+                    $translatableStringHelper->localize($a->getScope()->getName()),
+                    $translatableStringHelper->localize($b->getScope()->getName())
+                );
+            }
+        );
+
+        // sort role scope by title
+        $roleProvider = $this->roleProvider;
+        $roleScopesSorted = [];
+
+        foreach ($roleScopes as $roleScope) {
+            /** @var RoleScope $roleScope */
+            $title = $roleProvider->getRoleTitle($roleScope->getRole());
+            $roleScopesSorted[$title][] = $roleScope;
+        }
+        ksort($roleScopesSorted);
+
+        return $this->render('@ChillMain/PermissionsGroup/show.html.twig', [
+            'entity' => $permissionsGroup,
+            'role_scopes_sorted' => $roleScopesSorted,
+            'expanded_roles' => $this->getExpandedRoles($roleScopes),
+        ]);
+    }
+
+    /**
+     * Edits an existing PermissionsGroup entity.
+     *
+     * @param mixed $id
+     */
+    public function updateAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $permissionsGroup = $em
+            ->getRepository('ChillMainBundle:PermissionsGroup')
+            ->find($id);
+
+        if (!$permissionsGroup) {
+            throw $this->createNotFoundException('Unable to find Permissions'
+                . 'Group entity.');
+        }
+
+        $editForm = $this->createEditForm($permissionsGroup);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            return $this->redirect($this->generateUrl('admin_permissionsgroup_edit', ['id' => $id]));
+        }
+
+        $deleteRoleScopesForm = [];
+
+        foreach ($permissionsGroup->getRoleScopes() as $roleScope) {
+            $deleteRoleScopesForm[$roleScope->getId()] = $this->createDeleteRoleScopeForm(
+                $permissionsGroup,
+                $roleScope
+            );
+        }
+
+        $addRoleScopesForm = $this->createAddRoleScopeForm($permissionsGroup);
+
+        // sort role scope by title
+        $roleProvider = $this->roleProvider;
+        $roleScopesSorted = [];
+
+        foreach ($permissionsGroup->getRoleScopes()->toArray() as $roleScope) {
+            /** @var RoleScope $roleScope */
+            $title = $roleProvider->getRoleTitle($roleScope->getRole());
+            $roleScopesSorted[$title][] = $roleScope;
+        }
+        ksort($roleScopesSorted);
+
+        return $this->render('@ChillMain/PermissionsGroup/edit.html.twig', [
+            'entity' => $permissionsGroup,
+            'role_scopes_sorted' => $roleScopesSorted,
+            'edit_form' => $editForm->createView(),
+            'expanded_roles' => $this->getExpandedRoles($permissionsGroup->getRoleScopes()->toArray()),
+            'delete_role_scopes_form' => array_map(static function ($form) {
+                return $form->createView();
+            }, $deleteRoleScopesForm),
+            'add_role_scopes_form' => $addRoleScopesForm->createView(),
+        ]);
+    }
+
+    /**
+     * get a role scope by his parameters. The role scope is persisted if it
+     * doesn't exists in database.
+     *
+     * @param Scope $scope
+     * @param string $role
+     *
+     * @return RoleScope
+     */
+    protected function getPersistentRoleScopeBy($role, ?Scope $scope = null)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $roleScope = $em->getRepository('ChillMainBundle:RoleScope')
+            ->findOneBy(['role' => $role, 'scope' => $scope]);
+
+        if (null === $roleScope) {
+            $roleScope = (new RoleScope())
+                ->setRole($role)
+                ->setScope($scope);
+
+            $em->persist($roleScope);
+        }
+
+        return $roleScope;
+    }
+
+    /**
+     * creates a form to add a role scope to permissionsgroup.
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createAddRoleScopeForm(PermissionsGroup $permissionsGroup)
+    {
+        return $this->createFormBuilder()
+            ->setAction($this->generateUrl(
+                'admin_permissionsgroup_add_role_scope',
+                ['id' => $permissionsGroup->getId()]
+            ))
+            ->setMethod('PUT')
+            ->add('composed_role_scope', ComposedRoleScopeType::class)
+            ->add('submit', SubmitType::class, ['label' => 'Add permission'])
+            ->getForm();
+    }
+
+    /**
+     * Creates a form to create a PermissionsGroup entity.
+     *
+     * @param PermissionsGroup $permissionsGroup The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(PermissionsGroup $permissionsGroup)
+    {
+        $form = $this->createForm(PermissionsGroupType::class, $permissionsGroup, [
+            'action' => $this->generateUrl('admin_permissionsgroup_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
     }
 
     /**
@@ -525,35 +526,63 @@ class PermissionsGroupController extends AbstractController
      *
      * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteRoleScopeForm(PermissionsGroup $permissionsGroup,
-            RoleScope $roleScope)
-    {
+    private function createDeleteRoleScopeForm(
+        PermissionsGroup $permissionsGroup,
+        RoleScope $roleScope
+    ) {
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('admin_permissionsgroup_delete_role_scope',
-                    array('pgid' => $permissionsGroup->getId(), 'rsid' => $roleScope->getId())))
+            ->setAction($this->generateUrl(
+                'admin_permissionsgroup_delete_role_scope',
+                ['pgid' => $permissionsGroup->getId(), 'rsid' => $roleScope->getId()]
+            ))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
     }
 
     /**
-     * creates a form to add a role scope to permissionsgroup
+     * Creates a form to edit a PermissionsGroup entity.
+     *
+     * @param PermissionsGroup $permissionsGroup The entity
      *
-     * @param PermissionsGroup $permissionsGroup
      * @return \Symfony\Component\Form\Form The form
      */
-    private function createAddRoleScopeForm(PermissionsGroup $permissionsGroup)
+    private function createEditForm(PermissionsGroup $permissionsGroup)
     {
-        return $this->createFormBuilder()
-                ->setAction($this->generateUrl('admin_permissionsgroup_add_role_scope',
-                        array('id' => $permissionsGroup->getId())))
-                ->setMethod('PUT')
-                ->add('composed_role_scope', ComposedRoleScopeType::class)
-                ->add('submit', SubmitType::class, array('label' => 'Add permission'))
-                ->getForm()
-                ;
+        $form = $this->createForm(PermissionsGroupType::class, $permissionsGroup, [
+            'action' => $this->generateUrl('admin_permissionsgroup_update', ['id' => $permissionsGroup->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 
+    /**
+     * expand roleScopes to be easily shown in template.
+     *
+     * @return array
+     */
+    private function getExpandedRoles(array $roleScopes)
+    {
+        $expandedRoles = [];
 
+        foreach ($roleScopes as $roleScope) {
+            if (!array_key_exists($roleScope->getRole(), $expandedRoles)) {
+                $expandedRoles[$roleScope->getRole()] =
+                      array_map(
+                          static function (Role $role) {
+                              return $role->getRole();
+                          },
+                          $this->roleHierarchy
+                              ->getReachableRoles(
+                                  [new Role($roleScope->getRole())]
+                              )
+                      );
+            }
+        }
+
+        return $expandedRoles;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
index 026784208..fa1a29296 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php
@@ -1,27 +1,96 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Repository\CountryRepository;
+use Chill\MainBundle\Repository\PostalCodeRepository;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
-/**
- * Class PostalCodeAPIController
- *
- * @package Chill\MainBundle\Controller
- * @author Champs Libres
- */
-class PostalCodeAPIController extends ApiController
+final class PostalCodeAPIController extends ApiController
 {
+    private CountryRepository $countryRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private PostalCodeRepository $postalCodeRepository;
+
+    public function __construct(
+        CountryRepository $countryRepository,
+        PostalCodeRepository $postalCodeRepository,
+        PaginatorFactory $paginatorFactory
+    ) {
+        $this->countryRepository = $countryRepository;
+        $this->postalCodeRepository = $postalCodeRepository;
+        $this->paginatorFactory = $paginatorFactory;
+    }
+
+    /**
+     * @Route("/api/1.0/main/postal-code/search.json")
+     */
+    public function search(Request $request): JsonResponse
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        if (!$request->query->has('q')) {
+            throw new BadRequestHttpException('You must supply a "q" parameter');
+        }
+
+        $pattern = $request->query->get('q');
+
+        if ('' === trim($pattern)) {
+            throw new BadRequestHttpException('the search pattern is empty');
+        }
+
+        if ($request->query->has('country')) {
+            $country = $this->countryRepository->find($request->query->getInt('country'));
+
+            if (null === $country) {
+                throw new NotFoundHttpException('country not found');
+            }
+        } else {
+            $country = null;
+        }
+
+        $nb = $this->postalCodeRepository->countByPattern($pattern, $country);
+        $paginator = $this->paginatorFactory->create($nb);
+        $codes = $this->postalCodeRepository->findByPattern(
+            $pattern,
+            $country,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+
+        return $this->json(
+            new Collection($codes, $paginator),
+            Response::HTTP_OK,
+            [],
+            [AbstractNormalizer::GROUPS => ['read']]
+        );
+    }
 
     protected function customizeQuery(string $action, Request $request, $qb): void
     {
         if ($request->query->has('country')) {
-
             $qb->where('e.country = :country')
-               ->setParameter('country', $request->query->get('country'));
-
+                ->setParameter('country', $request->query->get('country'));
         }
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
index fb88e0763..0280be61f 100644
--- a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
@@ -1,90 +1,78 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2018, Champs Libres Cooperative SCRLFS, <http://www.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\MainBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
-use Chill\MainBundle\Entity\PostalCode;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query;
 
 /**
- * Class PostalCodeController
+ * Chill is a software for social workers
  *
- * @package Chill\MainBundle\Controller
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
+use function array_map;
+
+/**
+ * Class PostalCodeController.
  */
 class PostalCodeController extends AbstractController
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    
     /**
-     * 
      * @Route(
-     *  "{_locale}/postalcode/search"
+     *     "{_locale}/postalcode/search"
      * )
-     * @param Request $request
+     *
      * @return JsonResponse
      */
     public function searchAction(Request $request)
     {
         $pattern = $request->query->getAlnum('q', '');
-        
+
         if (empty($pattern)) {
-            return new JsonResponse(["results" => [], "pagination" => [ "more" => false]]);
+            return new JsonResponse(['results' => [], 'pagination' => ['more' => false]]);
         }
-        
+
         $query = $this->getDoctrine()->getManager()
-            ->createQuery(sprintf(
-                "SELECT p.id AS id, p.name AS name, p.code AS code, "
-                . "country.name AS country_name, "
-                . "country.countryCode AS country_code "
-                . "FROM %s p "
-                . "JOIN p.country country "
-                . "WHERE LOWER(p.name) LIKE LOWER(:pattern) OR LOWER(p.code) LIKE LOWER(:pattern) "
-                . "ORDER BY code"
-                , PostalCode::class)
+            ->createQuery(
+                sprintf(
+                    'SELECT p.id AS id, p.name AS name, p.code AS code, '
+                . 'country.name AS country_name, '
+                . 'country.countryCode AS country_code '
+                . 'FROM %s p '
+                . 'JOIN p.country country '
+                . 'WHERE LOWER(p.name) LIKE LOWER(:pattern) OR LOWER(p.code) LIKE LOWER(:pattern) '
+                . 'ORDER BY code',
+                    PostalCode::class
                 )
-            ->setParameter('pattern', '%'.$pattern.'%')
-            ->setMaxResults(30)
-            ;
-        
-        $results = \array_map(function($row) {
+            )
+            ->setParameter('pattern', '%' . $pattern . '%')
+            ->setMaxResults(30);
+
+        $results = array_map(function ($row) {
             $row['country_name'] = $this->translatableStringHelper->localize($row['country_name']);
-            $row['text'] = $row['code']." ".$row["name"]." (".$row['country_name'].")";
-            
+            $row['text'] = $row['code'] . ' ' . $row['name'] . ' (' . $row['country_name'] . ')';
+
             return $row;
         }, $query->getResult(Query::HYDRATE_ARRAY));
-        
-        return new JsonResponse([ 'results' => $results, "pagination" => [ "more" => false ] ]);
+
+        return new JsonResponse(['results' => $results, 'pagination' => ['more' => false]]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
index 33e37ad94..07945c7fa 100644
--- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
@@ -1,38 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Form\ScopeType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class ScopeController
- *
- * @package Chill\MainBundle\Controller
+ * Class ScopeController.
  */
 class ScopeController extends AbstractController
 {
-
-    /**
-     * Lists all Scope entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillMainBundle:Scope')->findAll();
-
-        return $this->render('@ChillMain/Scope/index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
     /**
      * Creates a new Scope entity.
-     *
      */
     public function createAction(Request $request)
     {
@@ -45,71 +36,19 @@ class ScopeController extends AbstractController
             $em->persist($scope);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_scope_show', array('id' => $scope->getId())));
+            return $this->redirect($this->generateUrl('admin_scope_show', ['id' => $scope->getId()]));
         }
 
-        return $this->render('@ChillMain/Scope/new.html.twig', array(
+        return $this->render('@ChillMain/Scope/new.html.twig', [
             'entity' => $scope,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a Scope entity.
-     *
-     * @param Scope $scope The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Scope $scope)
-    {
-        $form = $this->createForm(ScopeType::class, $scope, array(
-            'action' => $this->generateUrl('admin_scope_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new Scope entity.
-     *
-     */
-    public function newAction()
-    {
-        $scope = new Scope();
-        $form = $this->createCreateForm($scope);
-
-        return $this->render('@ChillMain/Scope/new.html.twig', array(
-            'entity' => $scope,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a Scope entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $scope = $em->getRepository('ChillMainBundle:Scope')->find($id);
-
-        if (!$scope) {
-            throw $this->createNotFoundException('Unable to find Scope entity.');
-        }
-
-        return $this->render('@ChillMain/Scope/show.html.twig', array(
-            'entity'      => $scope
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
      * Displays a form to edit an existing Scope entity.
      *
+     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -123,33 +62,64 @@ class ScopeController extends AbstractController
 
         $editForm = $this->createEditForm($scope);
 
-        return $this->render('@ChillMain/Scope/edit.html.twig', array(
-            'entity'      => $scope,
-            'edit_form'   => $editForm->createView(),
-        ));
+        return $this->render('@ChillMain/Scope/edit.html.twig', [
+            'entity' => $scope,
+            'edit_form' => $editForm->createView(),
+        ]);
     }
 
     /**
-    * Creates a form to edit a Scope entity.
-    *
-    * @param Scope $scope The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
-    */
-    private function createEditForm(Scope $scope)
+     * Lists all Scope entities.
+     */
+    public function indexAction()
     {
-        $form = $this->createForm(ScopeType::class, $scope, array(
-            'action' => $this->generateUrl('admin_scope_update', array('id' => $scope->getId())),
-            'method' => 'PUT',
-        ));
+        $em = $this->getDoctrine()->getManager();
 
-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        $entities = $em->getRepository('ChillMainBundle:Scope')->findAll();
 
-        return $form;
+        return $this->render('@ChillMain/Scope/index.html.twig', [
+            'entities' => $entities,
+        ]);
     }
+
+    /**
+     * Displays a form to create a new Scope entity.
+     */
+    public function newAction()
+    {
+        $scope = new Scope();
+        $form = $this->createCreateForm($scope);
+
+        return $this->render('@ChillMain/Scope/new.html.twig', [
+            'entity' => $scope,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a Scope entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $scope = $em->getRepository('ChillMainBundle:Scope')->find($id);
+
+        if (!$scope) {
+            throw $this->createNotFoundException('Unable to find Scope entity.');
+        }
+
+        return $this->render('@ChillMain/Scope/show.html.twig', [
+            'entity' => $scope,
+        ]);
+    }
+
     /**
      * Edits an existing Scope entity.
      *
+     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -167,12 +137,50 @@ class ScopeController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_scope_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('admin_scope_edit', ['id' => $id]));
         }
 
-        return $this->render('@ChillMain/Scope/edit.html.twig', array(
-            'entity'      => $scope,
-            'edit_form'   => $editForm->createView()
-        ));
+        return $this->render('@ChillMain/Scope/edit.html.twig', [
+            'entity' => $scope,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a Scope entity.
+     *
+     * @param Scope $scope The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(Scope $scope)
+    {
+        $form = $this->createForm(ScopeType::class, $scope, [
+            'action' => $this->generateUrl('admin_scope_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a Scope entity.
+     *
+     * @param Scope $scope The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(Scope $scope)
+    {
+        $form = $this->createForm(ScopeType::class, $scope, [
+            'action' => $this->generateUrl('admin_scope_update', ['id' => $scope->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php
index 4ecc215f7..c231bf162 100644
--- a/src/Bundle/ChillMainBundle/Controller/SearchController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php
@@ -1,62 +1,50 @@
 <?php
 
-
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Search\ParsingException;
+use Chill\MainBundle\Search\SearchApi;
 use Chill\MainBundle\Search\SearchApiNoQueryException;
-use Chill\MainBundle\Serializer\Model\Collection;
-use GuzzleHttp\Psr7\Response;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
+use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Search\SearchProvider;
 use Chill\MainBundle\Search\UnknowSearchDomainException;
 use Chill\MainBundle\Search\UnknowSearchNameException;
-use Chill\MainBundle\Search\ParsingException;
-use Chill\MainBundle\Search\SearchInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Chill\MainBundle\Search\SearchProvider;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Search\SearchApi;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
+use function count;
+use function key;
+use function reset;
 
 /**
- * Class SearchController
- *
- * @package Chill\MainBundle\Controller
+ * Class SearchController.
  */
 class SearchController extends AbstractController
 {
-    protected SearchProvider $searchProvider;
-
-    protected TranslatorInterface $translator;
-
     protected PaginatorFactory $paginatorFactory;
 
     protected SearchApi $searchApi;
 
-    function __construct(
+    protected SearchProvider $searchProvider;
+
+    protected TranslatorInterface $translator;
+
+    public function __construct(
         SearchProvider $searchProvider,
         TranslatorInterface $translator,
         PaginatorFactory $paginatorFactory,
@@ -68,144 +56,23 @@ class SearchController extends AbstractController
         $this->searchApi = $searchApi;
     }
 
-
-    public function searchAction(Request $request, $_format)
-    {
-        $pattern = $request->query->get('q', '');
-
-        if ($pattern === ''){
-            switch($_format) {
-                case 'html':
-                    return $this->render('@ChillMain/Search/error.html.twig',
-                          array(
-                             'message' => $this->translator->trans("Your search is empty. "
-                                   . "Please provide search terms."),
-                             'pattern' => $pattern
-                          ));
-                case 'json':
-                    return new JsonResponse([
-                        'results' => [],
-                        'pagination' => [ 'more' => false ]
-                    ]);
-            }
-        }
-
-        $name = $request->query->get('name', NULL);
-
-        try {
-            if ($name === NULL) {
-                if ($_format === 'json') {
-                    return new JsonResponse('Currently, we still do not aggregate results '
-                        . 'from different providers', JsonResponse::HTTP_BAD_REQUEST);
-                }
-
-                // no specific search selected. Rendering result in "preview" mode
-                $results = $this->searchProvider
-                    ->getSearchResults(
-                        $pattern,
-                        0,
-                        5,
-                        array(SearchInterface::SEARCH_PREVIEW_OPTION => true)
-                        );
-            } else {
-                // we want search on a specific search provider. Display full results.
-                $results = [$this->searchProvider
-                    ->getResultByName(
-                            $pattern,
-                            $name,
-                            $this->paginatorFactory->getCurrentPageFirstItemNumber(),
-                            $this->paginatorFactory->getCurrentItemsPerPage(),
-                            array(
-                                SearchInterface::SEARCH_PREVIEW_OPTION => false,
-                                SearchInterface::REQUEST_QUERY_PARAMETERS => $request
-                                    ->get(SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS, [])
-                                ),
-                            $_format
-                            )];
-
-                if ($_format === 'json') {
-                    return new JsonResponse(\reset($results));
-                }
-            }
-        } catch (UnknowSearchDomainException $ex) {
-            return $this->render('@ChillMain/Search/error.html.twig',
-                  array(
-                     "message" => $this->translator->trans("The domain %domain% "
-                           . "is unknow. Please check your search.", array('%domain%' => $ex->getDomain())),
-                     'pattern' => $pattern
-                  ));
-        } catch (UnknowSearchNameException $ex) {
-            throw $this->createNotFoundException("The name ".$ex->getName()." is not found");
-        } catch (ParsingException $ex) {
-            return $this->render('@ChillMain/Search/error.html.twig',
-                  array(
-                     "message" => $this->translator->trans('Invalid terms').
-                     ": ".$this->translator->trans($ex->getMessage()),
-                     'pattern' => $pattern
-                  ));
-        }
-
-
-        return $this->render('@ChillMain/Search/list.html.twig',
-              array('results' => $results, 'pattern' => $pattern)
-              );
-    }
-
-    public function searchApi(Request $request, $_format): JsonResponse
-    {
-        //TODO this is an incomplete implementation
-        $query = $request->query->get('q', '');
-        $types = $request->query->get('type', []);
-
-        if (count($types) === 0) {
-            throw new BadRequestException("The request must contains at "
-                ." one type");
-        }
-
-        try {
-            $collection = $this->searchApi->getResults($query, $types, []);
-        } catch (SearchApiNoQueryException $e) {
-            throw new BadRequestHttpException($e->getMessage(), $e);
-        }
-
-        return $this->json($collection, \Symfony\Component\HttpFoundation\Response::HTTP_OK, [], [ "groups" =>  ["read"]]);
-    }
-
-    public function advancedSearchListAction(Request $request)
-    {
-        /* @var $variable Chill\MainBundle\Search\SearchProvider */
-        $searchProvider = $this->searchProvider;
-        $advancedSearchProviders = $searchProvider
-            ->getHasAdvancedFormSearchServices();
-
-        if(\count($advancedSearchProviders) === 1) {
-            \reset($advancedSearchProviders);
-
-            return $this->redirectToRoute('chill_main_advanced_search', [
-                'name' => \key($advancedSearchProviders)
-            ]);
-        }
-
-        return $this->render('@ChillMain/Search/choose_list.html.twig');
-    }
-
     public function advancedSearchAction($name, Request $request)
     {
         try {
-            /* @var $variable Chill\MainBundle\Search\SearchProvider */
+            /** @var Chill\MainBundle\Search\SearchProvider $variable */
             $searchProvider = $this->searchProvider;
-            /* @var $variable Chill\MainBundle\Search\HasAdvancedSearchFormInterface */
+            /** @var Chill\MainBundle\Search\HasAdvancedSearchFormInterface $variable */
             $search = $this->searchProvider
-                        ->getHasAdvancedFormByName($name);
-
+                ->getHasAdvancedFormByName($name);
         } catch (\Chill\MainBundle\Search\UnknowSearchNameException $e) {
-            throw $this->createNotFoundException("no advanced search for "
-                . "$name");
+            throw $this->createNotFoundException('no advanced search for '
+                . "{$name}");
         }
 
         if ($request->query->has('q')) {
             $data = $search->convertTermsToFormData($searchProvider->parse(
-                $request->query->get('q')));
+                $request->query->get('q')
+            ));
         }
 
         $form = $this->createAdvancedSearchForm($name, $data ?? []);
@@ -219,17 +86,146 @@ class SearchController extends AbstractController
                     ->convertFormDataToQuery($form->getData());
 
                 return $this->redirectToRoute('chill_main_search', [
-                    'q' => $pattern, 'name' => $name
+                    'q' => $pattern, 'name' => $name,
                 ]);
             }
         }
 
-        return $this->render('@ChillMain/Search/advanced_search.html.twig',
+        return $this->render(
+            '@ChillMain/Search/advanced_search.html.twig',
             [
                 'form' => $form->createView(),
                 'name' => $name,
-                'title' => $search->getAdvancedSearchTitle()
+                'title' => $search->getAdvancedSearchTitle(),
+            ]
+        );
+    }
+
+    public function advancedSearchListAction(Request $request)
+    {
+        /** @var Chill\MainBundle\Search\SearchProvider $variable */
+        $searchProvider = $this->searchProvider;
+        $advancedSearchProviders = $searchProvider
+            ->getHasAdvancedFormSearchServices();
+
+        if (count($advancedSearchProviders) === 1) {
+            reset($advancedSearchProviders);
+
+            return $this->redirectToRoute('chill_main_advanced_search', [
+                'name' => key($advancedSearchProviders),
             ]);
+        }
+
+        return $this->render('@ChillMain/Search/choose_list.html.twig');
+    }
+
+    public function searchAction(Request $request, $_format)
+    {
+        $pattern = $request->query->get('q', '');
+
+        if ('' === $pattern) {
+            switch ($_format) {
+                case 'html':
+                    return $this->render(
+                        '@ChillMain/Search/error.html.twig',
+                        [
+                            'message' => $this->translator->trans('Your search is empty. '
+                                  . 'Please provide search terms.'),
+                            'pattern' => $pattern,
+                        ]
+                    );
+
+                case 'json':
+                    return new JsonResponse([
+                        'results' => [],
+                        'pagination' => ['more' => false],
+                    ]);
+            }
+        }
+
+        $name = $request->query->get('name', null);
+
+        try {
+            if (null === $name) {
+                if ('json' === $_format) {
+                    return new JsonResponse('Currently, we still do not aggregate results '
+                        . 'from different providers', JsonResponse::HTTP_BAD_REQUEST);
+                }
+
+                // no specific search selected. Rendering result in "preview" mode
+                $results = $this->searchProvider
+                    ->getSearchResults(
+                        $pattern,
+                        0,
+                        5,
+                        [SearchInterface::SEARCH_PREVIEW_OPTION => true]
+                    );
+            } else {
+                // we want search on a specific search provider. Display full results.
+                $results = [$this->searchProvider
+                    ->getResultByName(
+                        $pattern,
+                        $name,
+                        $this->paginatorFactory->getCurrentPageFirstItemNumber(),
+                        $this->paginatorFactory->getCurrentItemsPerPage(),
+                        [
+                            SearchInterface::SEARCH_PREVIEW_OPTION => false,
+                            SearchInterface::REQUEST_QUERY_PARAMETERS => $request
+                                ->get(SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS, []),
+                        ],
+                        $_format
+                    ), ];
+
+                if ('json' === $_format) {
+                    return new JsonResponse(reset($results));
+                }
+            }
+        } catch (UnknowSearchDomainException $ex) {
+            return $this->render(
+                '@ChillMain/Search/error.html.twig',
+                [
+                    'message' => $this->translator->trans('The domain %domain% '
+                          . 'is unknow. Please check your search.', ['%domain%' => $ex->getDomain()]),
+                    'pattern' => $pattern,
+                ]
+            );
+        } catch (UnknowSearchNameException $ex) {
+            throw $this->createNotFoundException('The name ' . $ex->getName() . ' is not found');
+        } catch (ParsingException $ex) {
+            return $this->render(
+                '@ChillMain/Search/error.html.twig',
+                [
+                    'message' => $this->translator->trans('Invalid terms') .
+                    ': ' . $this->translator->trans($ex->getMessage()),
+                    'pattern' => $pattern,
+                ]
+            );
+        }
+
+        return $this->render(
+            '@ChillMain/Search/list.html.twig',
+            ['results' => $results, 'pattern' => $pattern]
+        );
+    }
+
+    public function searchApi(Request $request, $_format): JsonResponse
+    {
+        //TODO this is an incomplete implementation
+        $query = $request->query->get('q', '');
+        $types = $request->query->get('type', []);
+
+        if (count($types) === 0) {
+            throw new BadRequestException('The request must contains at '
+                . ' one type');
+        }
+
+        try {
+            $collection = $this->searchApi->getResults($query, $types, []);
+        } catch (SearchApiNoQueryException $e) {
+            throw new BadRequestHttpException($e->getMessage(), $e);
+        }
+
+        return $this->json($collection, \Symfony\Component\HttpFoundation\Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 
     protected function createAdvancedSearchForm($name, array $data = [])
@@ -240,19 +236,17 @@ class SearchController extends AbstractController
                 null,
                 FormType::class,
                 $data,
-                [ 'method' => Request::METHOD_POST ]
+                ['method' => Request::METHOD_POST]
             );
 
         $this->searchProvider
             ->getHasAdvancedFormByName($name)
-            ->buildForm($builder)
-            ;
+            ->buildForm($builder);
 
         $builder->add('submit', SubmitType::class, [
-            'label' => 'Search'
+            'label' => 'Search',
         ]);
 
         return $builder->getForm();
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
index af17993ed..8cf5f8782 100644
--- a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
@@ -1,45 +1,32 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\MainBundle\Timeline\TimelineBuilder;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\MainBundle\Timeline\TimelineBuilder;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
+use function count;
 
 class TimelineCenterController extends AbstractController
 {
-    
-    protected TimelineBuilder $timelineBuilder;
-    
     protected PaginatorFactory $paginatorFactory;
 
+    protected TimelineBuilder $timelineBuilder;
+
     private Security $security;
-    
+
     public function __construct(
         TimelineBuilder $timelineBuilder,
         PaginatorFactory $paginatorFactory,
@@ -52,15 +39,16 @@ class TimelineCenterController extends AbstractController
 
     /**
      * @Route("/{_locale}/center/timeline",
-     *    name="chill_center_timeline",
-     *    methods={"GET"}
-     *  )
-     */ 
+     *     name="chill_center_timeline",
+     *     methods={"GET"}
+     * )
+     */
     public function centerAction(Request $request)
     {
         // collect reachable center for each group
         $user = $this->security->getUser();
         $centers = [];
+
         foreach ($user->getGroupCenters() as $group) {
             $centers[] = $group->getCenter();
         }
@@ -68,24 +56,26 @@ class TimelineCenterController extends AbstractController
         if (0 === count($centers)) {
             throw $this->createNotFoundException();
         }
-        
-        $nbItems = $this->timelineBuilder->countItems('center', 
-            [ 'centers' => $centers ]
-            );
-        
+
+        $nbItems = $this->timelineBuilder->countItems(
+            'center',
+            ['centers' => $centers]
+        );
+
         $paginator = $this->paginatorFactory->create($nbItems);
-        
-        return $this->render('@ChillMain/Timeline/index.html.twig', array
-            (
+
+        return $this->render(
+            '@ChillMain/Timeline/index.html.twig',
+            [
                 'timeline' => $this->timelineBuilder->getTimelineHTML(
-                    'center', 
-                    [ 'centers' => $centers ],
+                    'center',
+                    ['centers' => $centers],
                     $paginator->getCurrentPage()->getFirstItemNumber(),
                     $paginator->getItemsPerPage()
-                    ),
+                ),
                 'nb_items' => $nbItems,
-                'paginator' => $paginator
-            )
+                'paginator' => $paginator,
+            ]
         );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/UIController.php b/src/Bundle/ChillMainBundle/Controller/UIController.php
index 75992bf15..97be4ca3c 100644
--- a/src/Bundle/ChillMainBundle/Controller/UIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UIController.php
@@ -1,30 +1,21 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Chill\MainBundle\Templating\UI\CountNotificationUser;
 
 /**
- * Class UIController
+ * Chill is a software for social workers
  *
- * @package Chill\MainBundle\Controller
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Templating\UI\CountNotificationUser;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+/**
+ * Class UIController.
  */
 class UIController extends AbstractController
 {
@@ -32,9 +23,9 @@ class UIController extends AbstractController
         CountNotificationUser $counter
     ) {
         $nb = $counter->getSumNotification($this->getUser());
-        
+
         return $this->render('@ChillMain/UI/notification_user_counter.html.twig', [
-            'nb' => $nb
+            'nb' => $nb,
         ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
index 3742a7ded..75e566048 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php
@@ -1,9 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -11,17 +19,22 @@ class UserApiController extends ApiController
 {
     /**
      * @Route(
-     *      "/api/1.0/main/whoami.{_format}",
-     *      name="chill_main_user_whoami",
-     *      requirements={
-     *          "_format": "json"
-     *          }
-     *      )
+     *     "/api/1.0/main/whoami.{_format}",
+     *     name="chill_main_user_whoami",
+     *     requirements={
+     *         "_format": "json"
+     *     }
+     * )
+     *
+     * @param mixed $_format
      */
     public function whoami($_format): JsonResponse
     {
-        return $this->json($this->getUser(), JsonResponse::HTTP_OK, [],
-            [ "groups" => [ "read" ] ]);
+        return $this->json(
+            $this->getUser(),
+            JsonResponse::HTTP_OK,
+            [],
+            ['groups' => ['read']]
+        );
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 735546eba..5b72115b8 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -1,55 +1,46 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
-use Chill\MainBundle\CRUD\Controller\AbstractCRUDController;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Entity\GroupCenter;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\ComposedGroupCenterType;
+use Chill\MainBundle\Form\UserCurrentLocationType;
+use Chill\MainBundle\Form\UserPasswordType;
+use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Pagination\PaginatorInterface;
-use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\UserType;
-use Chill\MainBundle\Entity\GroupCenter;
-use Chill\MainBundle\Form\Type\ComposedGroupCenterType;
-use Chill\MainBundle\Form\UserPasswordType;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Routing\Annotation\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
 
-
-/**
- * Class UserController
- *
- * @package Chill\MainBundle\Controller
- */
 class UserController extends CRUDController
 {
+    public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
-    const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
-
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
+    private LoggerInterface $logger;
 
     private UserPasswordEncoderInterface $passwordEncoder;
 
-    /**
-     * UserController constructor.
-     *
-     * @param LoggerInterface $logger
-     * @param ValidatorInterface $validator
-     */
+    private ValidatorInterface $validator;
+
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
@@ -60,19 +51,205 @@ class UserController extends CRUDController
         $this->passwordEncoder = $passwordEncoder;
     }
 
-    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
+    /**
+     * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
+     * name="admin_user_add_groupcenter")
+     *
+     * @param mixed $uid
+     */
+    public function addLinkGroupCenterAction(Request $request, $uid): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $user = $em->getRepository('ChillMainBundle:User')->find($uid);
+
+        if (!$user) {
+            throw $this->createNotFoundException('Unable to find User entity.');
+        }
+
+        $form = $this->createAddLinkGroupCenterForm($user, $request);
+        $form->handleRequest($request);
+
+        if ($form->isValid()) {
+            $groupCenter = $this->getPersistedGroupCenter(
+                $form[self::FORM_GROUP_CENTER_COMPOSED]->getData()
+            );
+            $user->addGroupCenter($groupCenter);
+
+            if ($this->validator->validate($user)->count() === 0) {
+                $em->flush();
+
+                $this->addFlash('success', $this->get('translator')->trans('The '
+                    . 'permissions have been successfully added to the user'));
+
+                $returnPathParams = $request->query->has('returnPath') ?
+                    ['returnPath' => $request->query->get('returnPath')] : [];
+
+                return $this->redirect($this->generateUrl(
+                    'chill_crud_admin_user_edit',
+                    array_merge(['id' => $uid], $returnPathParams)
+                ));
+            }
+
+            foreach ($this->validator->validate($user) as $error) {
+                $this->addFlash('error', $error->getMessage());
+            }
+        }
+
+        return $this->render('@ChillMain/User/edit.html.twig', [
+            'entity' => $user,
+            'edit_form' => $this->createEditForm($user)->createView(),
+            'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($user, $request)->createView(),
+            'delete_groupcenter_form' => array_map(
+                static fn (Form $form) => $form->createView(),
+                iterator_to_array($this->getDeleteLinkGroupCenterByUser($user, $request), true)
+            ),
+        ]);
+    }
+
+    /**
+     * @Route("/{_locale}/admin/main/user/{uid}/delete_link_groupcenter/{gcid}",
+     * name="admin_user_delete_groupcenter")
+     *
+     * @param mixed $uid
+     * @param mixed $gcid
+     */
+    public function deleteLinkGroupCenterAction($uid, $gcid, Request $request): RedirectResponse
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $user = $em->getRepository('ChillMainBundle:User')->find($uid);
+
+        if (!$user) {
+            throw $this->createNotFoundException('Unable to find User entity.');
+        }
+
+        $groupCenter = $em->getRepository('ChillMainBundle:GroupCenter')
+            ->find($gcid);
+
+        if (!$groupCenter) {
+            throw $this->createNotFoundException('Unable to find groupCenter entity');
+        }
+
+        try {
+            $user->removeGroupCenter($groupCenter);
+        } catch (RuntimeException $ex) {
+            $this->addFlash('error', $this->get('translator')->trans($ex->getMessage()));
+
+            return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', ['id' => $uid]));
+        }
+
+        $em->flush();
+
+        $this->addFlash('success', $this->get('translator')
+            ->trans('The permissions where removed.'));
+
+        return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', ['id' => $uid]));
+    }
+
+    /**
+     * Displays a form to edit the user current location.
+     *
+     * @Route("/{_locale}/main/user/current-location/edit", name="chill_main_user_currentlocation_edit")
+     */
+    public function editCurrentLocationAction(Request $request)
+    {
+        $user = $this->getUser();
+        $form = $this->createForm(UserCurrentLocationType::class, $user)
+            ->add('submit', SubmitType::class, ['label' => 'Save'])
+            ->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $currentLocation = $form->get('currentLocation')->getData();
+
+            $user->setCurrentLocation($currentLocation);
+
+            $this->getDoctrine()->getManager()->flush();
+            $this->addFlash('success', $this->get('translator')->trans('Current location successfully updated'));
+
+            return $this->redirect(
+                $request->query->has('returnPath') ? $request->query->get('returnPath') :
+                    $this->generateUrl('chill_main_homepage')
+            );
+        }
+
+        return $this->render('@ChillMain/User/edit_current_location.html.twig', [
+            'entity' => $user,
+            'edit_form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Displays a form to edit the user password.
+     *
+     * @Route("/{_locale}/admin/user/{id}/edit_password", name="admin_user_edit_password")
+     */
+    public function editPasswordAction(User $user, Request $request)
+    {
+        $editForm = $this->createEditPasswordForm($user);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
+            $password = $editForm->get('new_password')->getData();
+
+            // logging for prod
+            $this->logger->info('update password for an user', [
+                'by' => $this->getUser()->getUsername(),
+                'user' => $user->getUsername(),
+            ]);
+
+            $user->setPassword($this->passwordEncoder->encodePassword($user, $password));
+
+            $this->getDoctrine()->getManager()->flush();
+            $this->addFlash('success', $this->get('translator')->trans('Password successfully updated!'));
+
+            return $this->redirect(
+                $request->query->has('returnPath') ? $request->query->get('returnPath') :
+                    $this->generateUrl('chill_crud_admin_user_edit', ['id' => $user->getId()])
+            );
+        }
+
+        return $this->render('@ChillMain/User/edit_password.html.twig', [
+            'entity' => $user,
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
     {
         // for "new", add special config
         if ('new' === $action) {
-            return $this->createForm(UserType::class, $entity, array(
-                'is_creation' => true
-            ));
+            return $this->createForm(UserType::class, $entity, [
+                'is_creation' => true,
+            ]);
         }
 
         // default behaviour
         return parent::createFormFor($action, $entity, $formClass, $formOptions);
     }
 
+    protected function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = [])
+    {
+        // add mini-forms for edit action
+        if ('edit' === $action) {
+            return array_merge(
+                $defaultTemplateParameters,
+                [
+                    'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($entity, $request)->createView(),
+                    'delete_groupcenter_form' => array_map(
+                        static function (Form $form) {
+                            return $form->createView();
+                        },
+                        iterator_to_array($this->getDeleteLinkGroupCenterByUser($entity, $request), true)
+                    ),
+                ]
+            );
+        }
+
+        // default behaviour
+        return parent::generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters);
+    }
+
     protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request)
     {
         // for "new", encode the password
@@ -92,169 +269,61 @@ class UserController extends CRUDController
         return parent::orderQuery($action, $query, $request, $paginator);
     }
 
-    protected function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = [])
+    /**
+     * Create a form to add a link to a groupcenter.
+     */
+    private function createAddLinkGroupCenterForm(User $user, Request $request): FormInterface
     {
-        // add mini-forms for edit action
-        if ("edit" === $action) {
-            return array_merge(
-                $defaultTemplateParameters,
-                [
-                    'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($entity, $request)->createView(),
-                    'delete_groupcenter_form' => array_map(
-                        function(\Symfony\Component\Form\Form $form) {
-                            return $form->createView();
-                        },
-                        iterator_to_array($this->getDeleteLinkGroupCenterByUser($entity, $request), true)
-                    )
-                ]
-            );
-        }
+        $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
 
-        // default behaviour
-        return parent::generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters);
+        return $this->createFormBuilder()
+            ->setAction($this->generateUrl(
+                'admin_user_add_groupcenter',
+                array_merge($returnPathParams, ['uid' => $user->getId()])
+            ))
+            ->setMethod('POST')
+            ->add(self::FORM_GROUP_CENTER_COMPOSED, ComposedGroupCenterType::class)
+            ->add('submit', SubmitType::class, ['label' => 'Add a new groupCenter'])
+            ->getForm();
     }
 
     /**
-     * Displays a form to edit the user password.
+     * Creates a form to delete a link to a GroupCenter.
      *
-     * @Route("/{_locale}/admin/user/{id}/edit_password", name="admin_user_edit_password")
+     * @param mixed $request
      */
-    public function editPasswordAction(User $user, Request $request)
+    private function createDeleteLinkGroupCenterForm(User $user, GroupCenter $groupCenter, $request): FormInterface
     {
-        $editForm = $this->createEditPasswordForm($user, $request);
-        $editForm->handleRequest($request);
+        $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
 
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
-            $password = $editForm->get('new_password')->getData();
-
-            // logging for prod
-            $this->logger->info('update password for an user', [
-                'by' => $this->getUser()->getUsername(),
-                'user' => $user->getUsername()
-            ]);
-
-            $user->setPassword($this->passwordEncoder->encodePassword($user, $password));
-
-            $this->getDoctrine()->getManager()->flush();
-            $this->addFlash('success', $this->get('translator')->trans('Password successfully updated!'));
-
-            return $this->redirect(
-                $request->query->has('returnPath') ? $request->query->get('returnPath') :
-                    $this->generateUrl('chill_crud_admin_user_edit', ['id' => $user->getId()])
-            );
-        }
-
-        return $this->render('@ChillMain/User/edit_password.html.twig', [
-            'entity'      => $user,
-            'edit_form'   => $editForm->createView()
-        ]);
+        return $this->createFormBuilder()
+            ->setAction($this->generateUrl(
+                'admin_user_delete_groupcenter',
+                array_merge($returnPathParams, ['uid' => $user->getId(), 'gcid' => $groupCenter->getId()])
+            ))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
     }
 
-    /**
-     *
-     *
-     * @param User $user
-     * @return \Symfony\Component\Form\Form
-     */
-    private function createEditPasswordForm(User $user)
+    private function createEditPasswordForm(User $user): FormInterface
     {
-        return $this->createForm(UserPasswordType::class, null, array(
-                'user' => $user
-                ))
-            ->add('submit', SubmitType::class, array('label' => 'Change password'))
-            ->remove('actual_password')
-                ;
+        return $this->createForm(
+            UserPasswordType::class,
+            null,
+            [
+                'user' => $user,
+            ]
+        )
+            ->add('submit', SubmitType::class, ['label' => 'Change password'])
+            ->remove('actual_password');
     }
 
-    /**
-     * @Route("/{_locale}/admin/main/user/{uid}/delete_link_groupcenter/{gcid}",
-     *     name="admin_user_delete_groupcenter")
-     */
-    public function deleteLinkGroupCenterAction($uid, $gcid, Request $request): RedirectResponse
+    private function getDeleteLinkGroupCenterByUser(User $user, Request $request)
     {
-        $em = $this->getDoctrine()->getManager();
-
-        $user = $em->getRepository('ChillMainBundle:User')->find($uid);
-
-        if (!$user) {
-            throw $this->createNotFoundException('Unable to find User entity.');
+        foreach ($user->getGroupCenters() as $groupCenter) {
+            yield $groupCenter->getId() => $this->createDeleteLinkGroupCenterForm($user, $groupCenter, $request);
         }
-
-        $groupCenter = $em->getRepository('ChillMainBundle:GroupCenter')
-                ->find($gcid);
-
-        if (!$groupCenter) {
-            throw $this->createNotFoundException('Unable to find groupCenter entity');
-        }
-
-        try {
-            $user->removeGroupCenter($groupCenter);
-        } catch (\RuntimeException $ex) {
-            $this->addFlash('error', $this->get('translator')->trans($ex->getMessage()));
-
-            return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', array('id' => $uid)));
-        }
-
-        $em->flush();
-
-        $this->addFlash('success', $this->get('translator')
-                ->trans('The permissions where removed.'));
-
-        return $this->redirect($this->generateUrl('chill_crud_admin_user_edit', array('id' => $uid)));
-
-    }
-
-    /**
-     * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
-     *     name="admin_user_add_groupcenter")
-     */
-    public function addLinkGroupCenterAction(Request $request, $uid): RedirectResponse
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $user = $em->getRepository('ChillMainBundle:User')->find($uid);
-
-        if (!$user) {
-            throw $this->createNotFoundException('Unable to find User entity.');
-        }
-
-        $form = $this->createAddLinkGroupCenterForm($user, $request);
-        $form->handleRequest($request);
-
-        if ($form->isValid()) {
-            $groupCenter = $this->getPersistedGroupCenter(
-                    $form[self::FORM_GROUP_CENTER_COMPOSED]->getData());
-            $user->addGroupCenter($groupCenter);
-
-            if ($this->validator->validate($user)->count() === 0) {
-                $em->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('The '
-                    . 'permissions have been successfully added to the user'));
-
-            $returnPathParams = $request->query->has('returnPath') ?
-                ['returnPath' => $request->query->get('returnPath')] : [];
-
-            return $this->redirect($this->generateUrl('chill_crud_admin_user_edit',
-                    \array_merge(['id' => $uid], $returnPathParams)));
-
-            } else {
-                foreach($this->validator->validate($user) as $error)
-                $this->addFlash('error', $error->getMessage());
-            }
-        }
-
-        return $this->render('@ChillMain/User/edit.html.twig', array(
-            'entity'      => $user,
-            'edit_form'   => $this->createEditForm($user)->createView(),
-            'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($user)->createView(),
-            'delete_groupcenter_form' => array_map(
-                    function(\Symfony\Component\Form\Form $form) {
-                        return $form->createView();
-
-                    },
-                    iterator_to_array($this->getDeleteLinkGroupCenterByUser($user), true))
-        ));
     }
 
     private function getPersistedGroupCenter(GroupCenter $groupCenter)
@@ -262,68 +331,17 @@ class UserController extends CRUDController
         $em = $this->getDoctrine()->getManager();
 
         $groupCenterManaged = $em->getRepository('ChillMainBundle:GroupCenter')
-                ->findOneBy(array(
-                    'center' => $groupCenter->getCenter(),
-                    'permissionsGroup' => $groupCenter->getPermissionsGroup()
-                ));
+            ->findOneBy([
+                'center' => $groupCenter->getCenter(),
+                'permissionsGroup' => $groupCenter->getPermissionsGroup(),
+            ]);
 
         if (!$groupCenterManaged) {
             $em->persist($groupCenter);
+
             return $groupCenter;
         }
 
         return $groupCenterManaged;
     }
-
-    /**
-     * Creates a form to delete a link to a GroupCenter
-     *
-     * @param mixed $permissionsGroup The entity id
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createDeleteLinkGroupCenterForm(User $user, GroupCenter $groupCenter, $request)
-    {
-        $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
-
-        return $this->createFormBuilder()
-            ->setAction($this->generateUrl('admin_user_delete_groupcenter',
-                    array_merge($returnPathParams, ['uid' => $user->getId(), 'gcid' => $groupCenter->getId()])))
-            ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
-    }
-
-    /**
-     * create a form to add a link to a groupcenter
-     *
-     * @param User $user
-     * @return \Symfony\Component\Form\Form
-     */
-    private function createAddLinkGroupCenterForm(User $user, Request $request)
-    {
-        $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
-
-        return $this->createFormBuilder()
-                ->setAction($this->generateUrl('admin_user_add_groupcenter',
-                        array_merge($returnPathParams, ['uid' => $user->getId()])))
-                ->setMethod('POST')
-                ->add(self::FORM_GROUP_CENTER_COMPOSED, ComposedGroupCenterType::class)
-                ->add('submit', SubmitType::class, array('label' => 'Add a new groupCenter'))
-                ->getForm()
-                ;
-    }
-
-    /**
-     *
-     * @param User $user
-     */
-    private function getDeleteLinkGroupCenterByUser(User $user, Request $request)
-    {
-        foreach ($user->getGroupCenters() as $groupCenter) {
-            yield $groupCenter->getId() => $this
-                    ->createDeleteLinkGroupCenterForm($user, $groupCenter, $request);
-        }
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
index 629b6657e..bbeab94b3 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php
@@ -1,34 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Intl\Intl;
 use Chill\MainBundle\Entity\Notification;
+use DateTimeImmutable;
+use Doctrine\Persistence\ObjectManager;
 
 /**
- * Load notififications into database
+ * Load notififications into database.
  */
 trait LoadAbstractNotificationsTrait
 {
     public function load(ObjectManager $manager)
     {
         return;
+
         foreach ($this->notifs as $notif) {
             $entityId = $this->getReference($notif['entityRef'])->getId();
 
-            print('Adding notification for '.$notif['entityClass'].'(entity id:'.$entityId.")\n");
+            echo 'Adding notification for ' . $notif['entityClass'] . '(entity id:' . $entityId . ")\n";
 
             $newNotif = (new Notification())
                 ->setMessage($notif['message'])
                 ->setSender($this->getReference($notif['sender']))
                 ->setRelatedEntityClass($notif['entityClass'])
                 ->setRelatedEntityId($entityId)
-                ->setDate(new \DateTimeImmutable('now'))
-                ->setRead([])
-                ;
+                ->setDate(new DateTimeImmutable('now'))
+                ->setRead([]);
 
             foreach ($notif['addressees'] as $addressee) {
                 $newNotif->addAddressee($this->getReference($addressee));
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
index 81bd1d909..a4afefa2b 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
@@ -1,89 +1,51 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Doctrine\Model\Point;
+use Chill\MainBundle\Entity\AddressReference;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
-use Chill\MainBundle\Entity\AddressReference;
-use Chill\MainBundle\Doctrine\Model\Point;
 
 /**
- * Load reference addresses into database
- *
- * @author Champs Libres
+ * Load reference addresses into database.
  */
-class LoadAddressReferences extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface {
-
-
+class LoadAddressReferences extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
+{
     protected $faker;
 
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
     public function __construct()
     {
         $this->faker = \Faker\Factory::create('fr_FR');
     }
 
-    /**
-     *
-     * @var ContainerInterface
-     */
-    private $container;
-
-    public function setContainer(ContainerInterface $container = null)
+    public function getOrder()
     {
-        $this->container = $container;
-    }
-
-    public function getOrder() {
         return 51;
     }
 
-
-    /**
-     * Create a random point
-     *
-     * @return Point
-     */
-    private function getRandomPoint()
+    public function load(ObjectManager $manager)
     {
-        $lonBrussels = 4.35243;
-        $latBrussels = 50.84676;
-        $lon = $lonBrussels + 0.01 * rand(-5, 5);
-        $lat = $latBrussels + 0.01 * rand(-5, 5);
-        return Point::fromLonLat($lon, $lat);
-    }
-
-    /**
-     * Create a random reference address
-     *
-     * @return AddressReference
-     */
-    private function getRandomAddressReference()
-    {
-        $ar= new AddressReference();
-
-        $ar->setRefId($this->faker->numerify('ref-id-######'));
-        $ar->setStreet($this->faker->streetName);
-        $ar->setStreetNumber(rand(0,199));
-        $ar ->setPoint($this->getRandomPoint());
-        $ar->setPostcode($this->getReference(
-            LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
-        ));
-
-        $ar->setMunicipalityCode($ar->getPostcode()->getCode());
-
-        return $ar
-        ;
-    }
-
-    public function load(ObjectManager $manager) {
-
         echo "loading some reference address... \n";
 
-        for ($i=0; $i<10; $i++) {
+        for ($i = 0; 10 > $i; ++$i) {
             $ar = $this->getRandomAddressReference();
             $manager->persist($ar);
         }
@@ -91,5 +53,45 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
         $manager->flush();
     }
 
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
 
+    /**
+     * Create a random reference address.
+     *
+     * @return AddressReference
+     */
+    private function getRandomAddressReference()
+    {
+        $ar = new AddressReference();
+
+        $ar->setRefId($this->faker->numerify('ref-id-######'));
+        $ar->setStreet($this->faker->streetName);
+        $ar->setStreetNumber((string) mt_rand(0, 199));
+        $ar->setPoint($this->getRandomPoint());
+        $ar->setPostcode($this->getReference(
+            LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
+        ));
+
+        $ar->setMunicipalityCode($ar->getPostcode()->getCode());
+
+        return $ar;
+    }
+
+    /**
+     * Create a random point.
+     *
+     * @return Point
+     */
+    private function getRandomPoint()
+    {
+        $lonBrussels = 4.35243;
+        $latBrussels = 50.84676;
+        $lon = $lonBrussels + 0.01 * mt_rand(-5, 5);
+        $lat = $latBrussels + 0.01 * mt_rand(-5, 5);
+
+        return Point::fromLonLat($lon, $lat);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php
index a3c01fdf6..e4cd7d565 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCenters.php
@@ -1,57 +1,41 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\Center;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Chill\MainBundle\Entity\Center;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class LoadCenters extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $centers = [
+        [
+            'name' => 'Center A',
+            'ref' => 'centerA',
+        ],
+        [
+            'name' => 'Center B',
+            'ref' => 'centerB',
+        ],
+    ];
+
+    public static $refs = [];
+
     public function getOrder()
     {
         return 100;
     }
-    
-    public static $centers = array(
-        array(
-            'name' => 'Center A',
-            'ref' => 'centerA'
-        ),
-        array(
-            'name' => 'Center B',
-            'ref'  => 'centerB'
-        )
-    );
-    
-    public static $refs = array();
-    
+
     public function load(ObjectManager $manager)
     {
         foreach (static::$centers as $new) {
@@ -62,7 +46,7 @@ class LoadCenters extends AbstractFixture implements OrderedFixtureInterface
             $this->addReference($new['ref'], $center);
             static::$refs[] = $new['ref'];
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
index b26b5b991..07cf976eb 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Entity\Civility;
@@ -17,18 +26,18 @@ class LoadCivility extends Fixture implements FixtureGroupInterface
     public function load(ObjectManager $manager): void
     {
         $civilities = [
-            ['name' => ['fr' => "Monsieur" ], 'abbrev' => ['fr' => 'M.']],
-            ['name' => ['fr' => "Madame" ], 'abbrev' => ['fr' => 'Mme']],
-            ['name' => ['fr' => "Docteur" ], 'abbrev' => ['fr' => 'Dr']],
-            ['name' => ['fr' => "Professeur" ], 'abbrev' => ['fr' => 'Pr']],
-            ['name' => ['fr' => "Madame la Directrice" ], 'abbrev' => ['fr' => 'Mme']],
-            ['name' => ['fr' => "Monsieur le Directeur" ], 'abbrev' => ['fr' => 'M.']],
-            ['name' => ['fr' => "Madame la Maire" ]],
-            ['name' => ['fr' => "Monsieur le Maire" ]],
-            ['name' => ['fr' => "Maître" ], 'abbrev' => ['fr' => 'Me']],
+            ['name' => ['fr' => 'Madame'], 'abbrev' => ['fr' => 'Mme']],
+            ['name' => ['fr' => 'Monsieur'], 'abbrev' => ['fr' => 'M.']],
+            ['name' => ['fr' => 'Docteur'], 'abbrev' => ['fr' => 'Dr']],
+            ['name' => ['fr' => 'Professeur'], 'abbrev' => ['fr' => 'Pr']],
+            ['name' => ['fr' => 'Madame la Directrice'], 'abbrev' => ['fr' => 'Mme']],
+            ['name' => ['fr' => 'Monsieur le Directeur'], 'abbrev' => ['fr' => 'M.']],
+            ['name' => ['fr' => 'Madame la Maire']],
+            ['name' => ['fr' => 'Monsieur le Maire']],
+            ['name' => ['fr' => 'Maître'], 'abbrev' => ['fr' => 'Me']],
         ];
 
-        foreach ( $civilities as $val) {
+        foreach ($civilities as $val) {
             $civility = (new Civility())
                 ->setName($val['name'])
                 ->setAbbreviation($val['abbrev'] ?? [])
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
index 2405b4a98..88750b340 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
@@ -1,48 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Command\LoadCountriesCommand;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Command\LoadCountriesCommand;
 
 /**
- * Load countries into database
- *
- * @author Julien Fastré <julien arobase fastre point info>
+ * Load countries into database.
  */
-class LoadCountries extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface {
-    
+class LoadCountries extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
+{
     /**
-     * 
      * @var ContainerInterface
      */
     private $container;
-    
-    public function setContainer(ContainerInterface $container = null)
+
+    public function getOrder()
+    {
+        return 20;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        echo "loading countries... \n";
+
+        $languages = $this->container->getParameter('chill_main.available_languages');
+
+        foreach (LoadCountriesCommand::prepareCountryList($languages) as $country) {
+            $manager->persist($country);
+        }
+
+        $manager->flush();
+    }
+
+    public function setContainer(?ContainerInterface $container = null)
     {
         $this->container = $container;
     }
-    
-    public function getOrder() {
-        return 20;
-    }
-    
-    public function load(ObjectManager $manager) {
-        
-        echo "loading countries... \n";
-        
-        $languages = $this->container->getParameter('chill_main.available_languages');
-        
-        foreach (LoadCountriesCommand::prepareCountryList($languages) as $country){
-            $manager->persist($country);
-        }
-        
-        $manager->flush();
-    }
-    
-
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
index d44a3bbbf..ad04709ab 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadGroupCenters.php
@@ -1,45 +1,29 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\GroupCenter;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Entity\GroupCenter;
-use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class LoadGroupCenters extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $refs = [];
+
     public function getOrder()
     {
         return 500;
     }
-    
-    public static $refs = array();
 
     public function load(ObjectManager $manager)
     {
@@ -48,16 +32,16 @@ class LoadGroupCenters extends AbstractFixture implements OrderedFixtureInterfac
                 $GroupCenter = new GroupCenter();
                 $GroupCenter->setCenter($this->getReference($centerRef));
                 $GroupCenter->setPermissionsGroup($this->getReference($permissionGroupRef));
-                
+
                 $manager->persist($GroupCenter);
-                
-                $reference = $centerRef.'_'.$permissionGroupRef;
+
+                $reference = $centerRef . '_' . $permissionGroupRef;
                 $this->addReference($reference, $GroupCenter);
                 static::$refs[] = $reference;
-                echo "Creating $reference...  \n";
+                echo "Creating {$reference}...  \n";
             }
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
index a048b6b9f..47d63efdf 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
@@ -1,80 +1,85 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\Language;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Intl\Intl;
-use Chill\MainBundle\Entity\Language;
+use function in_array;
 
 /**
- * Load languages into database
- *
- * @author Julien Fastré <julien arobase fastre point info>
+ * Load languages into database.
  */
 class LoadLanguages extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
-    // The regional version of language are language with _ in the code
-    // This array contains regional code to not exclude
-    private $regionalVersionToInclude = ["ro_MD"];
-
     // Array of ancien languages (to exclude)
-    private $ancientToExclude = ["ang", "egy", "fro", "goh", "grc", "la", "non", "peo", "pro", "sga",
-        "dum", "enm", "frm", "gmh", "mga", "akk", "phn", "zxx", "got", "und"];
-    
+    private $ancientToExclude = ['ang', 'egy', 'fro', 'goh', 'grc', 'la', 'non', 'peo', 'pro', 'sga',
+        'dum', 'enm', 'frm', 'gmh', 'mga', 'akk', 'phn', 'zxx', 'got', 'und', ];
+
     /**
-     * 
      * @var ContainerInterface
      */
     private $container;
-    
-    public function setContainer(ContainerInterface $container = null)
+
+    // The regional version of language are language with _ in the code
+    // This array contains regional code to not exclude
+    private $regionalVersionToInclude = ['ro_MD'];
+
+    public function getOrder()
     {
-        $this->container = $container;
-    }
-    
-    public function getOrder() {
         return 10;
     }
-    
-    public function load(ObjectManager $manager) {
-        
+
+    public function load(ObjectManager $manager)
+    {
         echo "loading languages... \n";
-        
+
         foreach (Intl::getLanguageBundle()->getLanguageNames() as $code => $language) {
             if (
-                    !in_array($code, $this->regionalVersionToInclude)
-                    &&
-                    !in_array($code, $this->ancientToExclude)
+                    !in_array($code, $this->regionalVersionToInclude, true)
+                    && !in_array($code, $this->ancientToExclude, true)
                 ) {
-
                 $lang = (new Language())
-                        ->setId($code)
-                        ->setName($this->prepareName($code))
-                        ;
+                    ->setId($code)
+                    ->setName($this->prepareName($code));
                 $manager->persist($lang);
             }
         }
-        
+
         $manager->flush();
     }
-    
+
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
     /**
-     * prepare names for languages
-     * 
-     * @param string $languageCode
+     * Prepare names for languages.
+     *
      * @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);
         }
-        
+
         return $names;
     }
-    
-
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
index 4e103cc8e..3e24d034c 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
@@ -1,57 +1,58 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\LocationType;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Entity\LocationType;
 
 /**
- * Load location types into database
- *
- * @author Champs Libres
+ * Load location types into database.
  */
-class LoadLocationType extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface {
-
-
+class LoadLocationType extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
+{
     /**
-     *
      * @var ContainerInterface
      */
     private $container;
 
-    public function setContainer(ContainerInterface $container = null)
+    public function getOrder()
     {
-        $this->container = $container;
-    }
-
-    public function getOrder() {
         return 52;
     }
 
-    public function load(ObjectManager $manager): void {
-
+    public function load(ObjectManager $manager): void
+    {
         echo "loading some location type... \n";
 
         $arr = [
             [
                 'name' => ['fr' => 'Mairie'],
-                'address_required' => LocationType::STATUS_OPTIONAL
+                'address_required' => LocationType::STATUS_OPTIONAL,
             ],
             [
                 'name' => ['fr' => 'Guichet d\'accueil'],
-                'address_required' => LocationType::STATUS_OPTIONAL
+                'address_required' => LocationType::STATUS_OPTIONAL,
             ],
             [
                 'name' => ['fr' => 'Domicile de l\'usager'],
-                'address_required' => LocationType::STATUS_REQUIRED
+                'address_required' => LocationType::STATUS_REQUIRED,
             ],
             [
                 'name' => ['fr' => 'Centre d\'aide sociale'],
-                'address_required' => LocationType::STATUS_OPTIONAL
+                'address_required' => LocationType::STATUS_OPTIONAL,
             ],
         ];
 
@@ -66,4 +67,9 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
 
         $manager->flush();
     }
-}
\ No newline at end of file
+
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
index 92d459aac..dc7773765 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPermissionsGroup.php
@@ -1,87 +1,74 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\PermissionsGroup;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Entity\PermissionsGroup;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class LoadPermissionsGroup extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $permissionGroup = [
+        [
+            'name' => 'social',
+            'role_scopes' => [
+                'role_scope_CHILL_FOO_EDIT_social',
+                'role_scope_CHILL_FOO_SEE_administrative',
+                'role_scope_CHILL_FOO_EDIT_all',
+            ],
+        ],
+        [
+            'name' => 'administrative',
+            'role_scopes' => [
+                'role_scope_CHILL_FOO_SEE_social',
+                'role_scope_CHILL_FOO_EDIT_administrative',
+                'role_scope_CHILL_FOO_EDIT_all',
+            ],
+        ],
+        [
+            'name' => 'direction',
+            'role_scopes' => [
+                'role_scope_CHILL_FOO_EDIT_all',
+                'role_scope_CHILL_FOO_SEE_DETAILS_social',
+                'role_scope_CHILL_FOO_SEE_DETAILS_administrative',
+            ],
+        ],
+    ];
+
+    public static $refs = [];
+
     public function getOrder()
     {
         return 400;
     }
-    
-    public static $permissionGroup = array(
-        array(
-            'name' => 'social',
-            'role_scopes' => array(
-                'role_scope_CHILL_FOO_EDIT_social', 
-                'role_scope_CHILL_FOO_SEE_administrative',
-                "role_scope_CHILL_FOO_EDIT_all"
-            )
-        ),
-        array(
-            'name' => 'administrative',
-            'role_scopes' => array(
-                "role_scope_CHILL_FOO_SEE_social",
-                "role_scope_CHILL_FOO_EDIT_administrative",
-                "role_scope_CHILL_FOO_EDIT_all"
-            )
-        ),
-        array(
-            'name' => 'direction',
-            'role_scopes' => array(
-                "role_scope_CHILL_FOO_EDIT_all",
-                "role_scope_CHILL_FOO_SEE_DETAILS_social",
-                "role_scope_CHILL_FOO_SEE_DETAILS_administrative"
-            )
-        )
-    );
-    
-    public static $refs = array();
 
     public function load(ObjectManager $manager)
     {
         foreach (static::$permissionGroup as $new) {
             $permissionGroup = new PermissionsGroup();
             $permissionGroup->setName($new['name']);
+
             foreach ($new['role_scopes'] as $roleScopeRef) {
                 $permissionGroup->addRoleScope($this->getReference($roleScopeRef));
             }
-            
+
             $manager->persist($permissionGroup);
-            $reference = 'permission_group_'.$new['name'];
-            echo "Creating $reference \n";
+            $reference = 'permission_group_' . $new['name'];
+            echo "Creating {$reference} \n";
             $this->setReference($reference, $permissionGroup);
             static::$refs[] = $reference;
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index 947243f55..ecf839450 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -1,48 +1,336 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2016, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Country;
+use Chill\MainBundle\Entity\PostalCode;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Entity\PostalCode;
+use function strtolower;
+use function ucwords;
 
 /**
- * Description of LoadPostalCodes
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Description of LoadPostalCodes.
  */
 class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $refs = [];
+
+    private static $postalCodeBelgium = <<<'EOF'
+        1000,BRUXELLES,BE
+        1020,BRUXELLES,BE
+        1030,SCHAERBEEK,BE
+        1040,ETTERBEEK,BE
+        1050,IXELLES,BE
+        1060,SAINT-GILLES,BE
+        1070,ANDERLECHT,BE
+        1080,MOLENBEEK-SAINT-JEAN,BE
+        1081,KOEKELBERG,BE
+        1082,BERCHEM-SAINTE-AGATHE,BE
+        1083,GANSHOREN,BE
+        1090,JETTE,BE
+        1120,BRUXELLES,BE
+        1130,BRUXELLES,BE
+        1140,EVERE,BE
+        1150,WOLUWE-SAINT-PIERRE,BE
+        1160,AUDERGHEM,BE
+        1170,WATERMAEL-BOITSFORT,BE
+        1180,UCCLE,BE
+        1190,FOREST,BE
+        1200,WOLUWE-SAINT-LAMBERT,BE
+        1210,SAINT-JOSSE-TEN-NOODE,BE
+        1300,WAVRE,BE
+        1300,WAVRE,BE
+        1301,WAVRE,BE
+        1310,LA HULPE,BE
+        1315,INCOURT,BE
+        1315,INCOURT,BE
+        1315,INCOURT,BE
+        1315,INCOURT,BE
+        1315,INCOURT,BE
+        1320,BEAUVECHAIN,BE
+        EOF;
+
+    private static $postalCodeFrance = <<<'EOF'
+        85000,LA ROCHE SUR YON,FR,85191,46.6675261644,-1.4077954093,INSEE
+        85000,MOUILLERON LE CAPTIF,FR,85155,46.7104764993,-1.46129661418,INSEE
+        85100,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
+        85110,STE CECILE,FR,85202,46.7309688326,-1.12107316048,INSEE
+        85110,LA JAUDONNIERE,FR,85115,46.6488761831,-0.962477574588,INSEE
+        85110,ST GERMAIN DE PRINCAY,FR,85220,46.7356314659,-1.04299885081,INSEE
+        85110,MONSIREIGNE,FR,85145,46.7383480028,-0.931953130855,INSEE
+        85110,ST VINCENT STERLANGES,FR,85276,46.7397220689,-1.08371759277,INSEE
+        85110,SIGOURNAIS,FR,85282,46.7140097406,-0.98747730882,INSEE
+        85110,CHANTONNAY,FR,85051,46.6690167793,-1.04372588019,INSEE
+        85110,ST PROUANT,FR,85266,46.7502017421,-0.974504061491,INSEE
+        85120,LA CHAPELLE AUX LYS,FR,85053,46.6221916887,-0.642706103195,INSEE
+        85120,VOUVANT,FR,85305,46.5626835135,-0.764380170382,INSEE
+        85120,ANTIGNY,FR,85005,46.6191770822,-0.767030058653,INSEE
+        85120,ST MAURICE DES NOUES,FR,85251,46.5955876221,-0.724327725888,INSEE
+        85120,LOGE FOUGEREUSE,FR,85125,46.6180854641,-0.6899276733,INSEE
+        85120,LA TARDIERE,FR,85289,46.663737434,-0.727562430214,INSEE
+        85120,LA CHATAIGNERAIE,FR,85059,46.6416143401,-0.739561966419,INSEE
+        85120,ST HILAIRE DE VOUST,FR,85229,46.5914988312,-0.651486245674,INSEE
+        85120,BREUIL BARRET,FR,85037,46.6503266235,-0.671948654426,INSEE
+        85120,ST PIERRE DU CHEMIN,FR,85264,46.6957771744,-0.701777715154,INSEE
+        85130,LA GAUBRETIERE,FR,85097,46.9345007303,-1.05578200702,INSEE
+        85130,ST MARTIN DES TILLEULS,FR,85247,46.9711539531,-1.06282621567,INSEE
+        85130,TIFFAUGES,FR,85293,47.0020573556,-1.09858009203,INSEE
+        85130,CHANVERRIE,FR,85302,46.9634774521,-0.985340006089,INSEE
+        85130,BAZOGES EN PAILLERS,FR,85013,46.9213757643,-1.14415666313,INSEE
+        85130,LES LANDES GENUSSON,FR,85119,46.9663828627,-1.12900644447,INSEE
+        85130,ST AUBIN DES ORMEAUX,FR,85198,46.9958175597,-1.04216568722,INSEE
+        85140,ESSARTS EN BOCAGE,FR,85084,46.7806739038,-1.22925967851,INSEE
+        85140,LA MERLATIERE,FR,85142,46.7557703112,-1.29794577,INSEE
+        85140,ST MARTIN DES NOYERS,FR,85246,46.7239461187,-1.20379080965,INSEE
+        85140,CHAUCHE,FR,85064,46.8282791899,-1.27090860656,INSEE
+        85150,ST MATHURIN,FR,85250,46.5686332748,-1.70787622288,INSEE
+        85150,MARTINET,FR,85138,46.6620680463,-1.6772013304,INSEE
+        85150,STE FLAIVE DES LOUPS,FR,85211,46.611019489,-1.58031627863,INSEE
+        85150,STE FOY,FR,85214,46.5327600427,-1.69243074733,INSEE
+        85150,ST JULIEN DES LANDES,FR,85236,46.6395925444,-1.7159724914,INSEE
+        85150,ST GEORGES DE POINTINDOUX,FR,85218,46.6423470977,-1.62881823574,INSEE
+        85150,LE GIROUARD,FR,85099,46.5726064909,-1.58872487716,INSEE
+        85150,LANDERONDE,FR,85118,46.6549237031,-1.57351777893,INSEE
+        85150,LES ACHARDS,FR,85152,46.6163645636,-1.65038156849,INSEE
+        85150,VAIRE,FR,85298,46.6055340621,-1.74863672042,INSEE
+        85160,ST JEAN DE MONTS,FR,85234,46.8021968737,-2.04839789308,INSEE
+        85170,BELLEVIGNY,FR,85019,46.7756383534,-1.43313700054,INSEE
+        85170,LE POIRE SUR VIE,FR,85178,46.769919754,-1.50488626452,INSEE
+        85170,BEAUFOU,FR,85015,46.8191122027,-1.52479250801,INSEE
+        85170,DOMPIERRE SUR YON,FR,85081,46.7599858068,-1.37275519417,INSEE
+        85170,LES LUCS SUR BOULOGNE,FR,85129,46.8527299002,-1.48398928084,INSEE
+        85170,ST DENIS LA CHEVASSE,FR,85208,46.8325959261,-1.3830312677,INSEE
+        85180,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
+        85190,AIZENAY,FR,85003,46.7384516809,-1.62702889721,INSEE
+        85190,VENANSAULT,FR,85300,46.685677363,-1.54112129191,INSEE
+        85190,MACHE,FR,85130,46.771364944,-1.69526445062,INSEE
+        85190,BEAULIEU SOUS LA ROCHE,FR,85016,46.6872087211,-1.62355064963,INSEE
+        85190,LA GENETOUZE,FR,85098,46.7244524541,-1.50410719693,INSEE
+        85200,PISSOTTE,FR,85176,46.5010870694,-0.808352236192,INSEE
+        85200,AUCHAY SUR VENDEE,FR,85009,46.4474386161,-0.876574265149,INSEE
+        85200,FONTENAY LE COMTE,FR,85092,46.4563186117,-0.793449510859,INSEE
+        85200,MERVENT,FR,85143,46.5325327351,-0.748519927998,INSEE
+        85200,DOIX LES FONTAINES,FR,85080,46.3849492327,-0.806840287485,INSEE
+        85200,LONGEVES,FR,85126,46.4722105292,-0.858917690239,INSEE
+        85200,ST MARTIN DE FRAIGNEAU,FR,85244,46.4289052087,-0.758948963227,INSEE
+        85200,SERIGNE,FR,85281,46.5054321828,-0.848819460581,INSEE
+        85200,BOURNEAU,FR,85033,46.5476882922,-0.813838020265,INSEE
+        85200,ST MICHEL LE CLOUCQ,FR,85256,46.4861591475,-0.743056336646,INSEE
+        85200,MONTREUIL,FR,85148,46.3973419593,-0.840846860992,INSEE
+        85200,L ORBRIE,FR,85167,46.4997145725,-0.77427886573,INSEE
+        85210,ST JEAN DE BEUGNE,FR,85233,46.5196817523,-1.10826075013,INSEE
+        85210,ST MARTIN LARS EN STE HERMINE,FR,85248,46.5970244335,-0.976384286709,INSEE
+        85210,LA REORTHE,FR,85188,46.6113748938,-1.04881036553,INSEE
+        85210,ST AUBIN LA PLAINE,FR,85199,46.5040293195,-1.06506577005,INSEE
+        85210,ST JUIRE CHAMPGILLON,FR,85235,46.5882648491,-1.00959676911,INSEE
+        85210,LA CHAPELLE THEMER,FR,85056,46.5639307793,-0.960376685588,INSEE
+        85210,ST ETIENNE DE BRILLOUET,FR,85209,46.5138850327,-1.01157660374,INSEE
+        85210,STE HERMINE,FR,85223,46.5572659953,-1.07210861039,INSEE
+        85210,THIRE,FR,85290,46.5433098199,-1.00699777534,INSEE
+        85220,ST MAIXENT SUR VIE,FR,85239,46.7329496925,-1.82595152879,INSEE
+        85220,LA CHAIZE GIRAUD,FR,85045,46.6476375058,-1.81865076161,INSEE
+        85220,LANDEVIEILLE,FR,85120,46.6444349925,-1.7854367847,INSEE
+        85220,L AIGUILLON SUR VIE,FR,85002,46.6706426618,-1.82599992318,INSEE
+        85220,COEX,FR,85070,46.7078707764,-1.75788339462,INSEE
+        85220,ST REVEREND,FR,85268,46.7057741864,-1.83155480996,INSEE
+        85220,APREMONT,FR,85006,46.7572682339,-1.74841313647,INSEE
+        85220,LA CHAPELLE HERMIER,FR,85054,46.6826679204,-1.72083372442,INSEE
+        85220,COMMEQUIERS,FR,85071,46.7674752232,-1.82534079642,INSEE
+        85230,BEAUVOIR SUR MER,FR,85018,46.9086155426,-2.06349351302,INSEE
+        85230,BOUIN,FR,85029,46.9815930867,-2.00423808381,INSEE
+        85230,ST URBAIN,FR,85273,46.8818371328,-2.01607828912,INSEE
+        85230,ST GERVAIS,FR,85221,46.9285711589,-1.98059327519,INSEE
+        85240,MARILLET,FR,85136,46.5667525381,-0.634287713939,INSEE
+        85240,ST HILAIRE DES LOGES,FR,85227,46.4747117878,-0.650611151998,INSEE
+        85240,FAYMOREAU,FR,85087,46.5427361252,-0.624271378946,INSEE
+        85240,XANTON CHASSENON,FR,85306,46.4519408659,-0.706316598666,INSEE
+        85240,FOUSSAIS PAYRE,FR,85094,46.5230750581,-0.687135962627,INSEE
+        85240,RIVES D AUTISE,FR,85162,46.424726987,-0.665995249042,INSEE
+        85240,PUY DE SERRE,FR,85184,46.5650384637,-0.680144631346,INSEE
+        85250,ST ANDRE GOULE D OIE,FR,85196,46.8410224478,-1.19644211396,INSEE
+        85250,LA RABATELIERE,FR,85186,46.8584147661,-1.2569733759,INSEE
+        85250,CHAVAGNES EN PAILLERS,FR,85065,46.8951394423,-1.24054768713,INSEE
+        85250,ST FULGENT,FR,85215,46.8705618525,-1.16246465678,INSEE
+        85250,VENDRENNES,FR,85301,46.8226741756,-1.11650982164,INSEE
+        85260,LA COPECHAGNIERE,FR,85072,46.8523980181,-1.34349746898,INSEE
+        85260,L HERBERGEMENT,FR,85108,46.9166207979,-1.37033557148,INSEE
+        85260,MONTREVERD,FR,85197,46.9277672307,-1.4126154924,INSEE
+        85260,LES BROUZILS,FR,85038,46.8854235235,-1.33186892233,INSEE
+        85270,NOTRE DAME DE RIEZ,FR,85189,46.7532179022,-1.8935292542,INSEE
+        85270,ST HILAIRE DE RIEZ,FR,85226,46.7432732188,-1.96439228965,INSEE
+        85280,LA FERRIERE,FR,85089,46.7215872927,-1.33469332327,INSEE
+        85290,MORTAGNE SUR SEVRE,FR,85151,46.9910941319,-0.946500033344,INSEE
+        85290,ST LAURENT SUR SEVRE,FR,85238,46.9506837971,-0.901123752328,INSEE
+        85300,CHALLANS,FR,85047,46.8354416653,-1.84036683139,INSEE
+        85300,FROIDFOND,FR,85095,46.8789464367,-1.75511438567,INSEE
+        85300,SOULLANS,FR,85284,46.7951288466,-1.91392699457,INSEE
+        85300,LE PERRIER,FR,85172,46.8196487652,-1.97926629071,INSEE
+        85300,SALLERTAINE,FR,85280,46.8659054157,-1.94894081389,INSEE
+        85310,LA CHAIZE LE VICOMTE,FR,85046,46.6729533879,-1.29188591019,INSEE
+        85310,NESMY,FR,85160,46.5921936479,-1.40947698594,INSEE
+        85310,RIVES DE L YON,FR,85213,46.605637391,-1.3354497172,INSEE
+        85310,LE TABLIER,FR,85285,46.5596307281,-1.32788759657,INSEE
+        85320,CHATEAU GUIBERT,FR,85061,46.5741109302,-1.25524886228,INSEE
+        85320,LES PINEAUX,FR,85175,46.599225902,-1.17865799724,INSEE
+        85320,ROSNAY,FR,85193,46.5324344973,-1.3007139449,INSEE
+        85320,BESSAY,FR,85023,46.5397253861,-1.17028433093,INSEE
+        85320,LA BRETONNIERE LA CLAYE,FR,85036,46.4879459421,-1.26773426545,INSEE
+        85320,CORPE,FR,85073,46.5050234767,-1.17034425311,INSEE
+        85320,MAREUIL SUR LAY DISSAIS,FR,85135,46.5335825488,-1.22688907859,INSEE
+        85320,PEAULT,FR,85171,46.502029199,-1.22708559855,INSEE
+        85320,LA COUTURE,FR,85074,46.523938732,-1.26493227292,INSEE
+        85320,MOUTIERS SUR LE LAY,FR,85157,46.5651677306,-1.16826489836,INSEE
+        85320,STE PEXINE,FR,85261,46.5596018797,-1.12406235901,INSEE
+        85330,NOIRMOUTIER EN L ILE,FR,85163,47.0086655085,-2.26243620205,INSEE
+        85340,L ILE D OLONNE,FR,85112,46.570163703,-1.7737502368,INSEE
+        85340,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
+        85350,L ILE D YEU,FR,85113,46.7093514816,-2.34712702345,INSEE
+        85360,LA TRANCHE SUR MER,FR,85294,46.3564601605,-1.43136322126,INSEE
+        85370,MOUZEUIL ST MARTIN,FR,85158,46.4591118412,-0.984449849889,INSEE
+        85370,NALLIERS,FR,85159,46.4658962703,-1.03958611312,INSEE
+        85370,LE LANGON,FR,85121,46.4393119039,-0.947017086151,INSEE
+        85390,BAZOGES EN PAREDS,FR,85014,46.6602005512,-0.914053446792,INSEE
+        85390,ST MAURICE LE GIRARD,FR,85252,46.6398624578,-0.810875649028,INSEE
+        85390,TALLUD STE GEMME,FR,85287,46.6949386862,-0.886169517112,INSEE
+        85390,CHAVAGNES LES REDOUX,FR,85066,46.7101499475,-0.915900131393,INSEE
+        85390,CHEFFOIS,FR,85067,46.6786935635,-0.782949851125,INSEE
+        85390,MOUILLERON ST GERMAIN,FR,85154,46.6612700667,-0.846784201071,INSEE
+        85400,STE GEMME LA PLAINE,FR,85216,46.4732196212,-1.11103084694,INSEE
+        85400,LAIROUX,FR,85117,46.4496842668,-1.27114022202,INSEE
+        85400,LUCON,FR,85128,46.4510564854,-1.16449285012,INSEE
+        85400,LES MAGNILS REIGNIERS,FR,85131,46.4635045649,-1.210635375,INSEE
+        85400,CHASNAIS,FR,85058,46.4459908481,-1.2385924923,INSEE
+        85410,ST LAURENT DE LA SALLE,FR,85237,46.5854041653,-0.922177315485,INSEE
+        85410,LA CAILLERE ST HILAIRE,FR,85040,46.6293907412,-0.933153931505,INSEE
+        85410,ST CYR DES GATS,FR,85205,46.572397925,-0.86344873853,INSEE
+        85410,THOUARSAIS BOUILDROUX,FR,85292,46.6062740621,-0.873461023865,INSEE
+        85410,CEZAIS,FR,85041,46.5917363748,-0.802618133558,INSEE
+        85410,ST SULPICE EN PAREDS,FR,85271,46.6130038733,-0.8310839288,INSEE
+        85420,LE MAZEAU,FR,85139,46.3298580373,-0.672957405035,INSEE
+        85420,LIEZ,FR,85123,46.3698532376,-0.70502476758,INSEE
+        85420,BOUILLE COURDAULT,FR,85028,46.3847932448,-0.684917815779,INSEE
+        85420,DAMVIX,FR,85078,46.32063079,-0.743504259797,INSEE
+        85420,MAILLE,FR,85132,46.3417503082,-0.787487297301,INSEE
+        85420,ST PIERRE LE VIEUX,FR,85265,46.4009643491,-0.742816267425,INSEE
+        85420,ST SIGISMOND,FR,85269,46.3368577973,-0.707293731101,INSEE
+        85420,MAILLEZAIS,FR,85133,46.3642178261,-0.750260780443,INSEE
+        85420,RIVES D AUTISE,FR,85162,46.424726987,-0.665995249042,INSEE
+        85430,AUBIGNY LES CLOUZEAUX,FR,85008,46.6028241769,-1.46743549114,INSEE
+        85430,NIEUL LE DOLENT,FR,85161,46.5676509922,-1.51560194548,INSEE
+        85430,LA BOISSIERE DES LANDES,FR,85026,46.5581861734,-1.44371985689,INSEE
+        85440,ST HILAIRE LA FORET,FR,85231,46.4551155186,-1.53048160541,INSEE
+        85440,TALMONT ST HILAIRE,FR,85288,46.475786445,-1.62751498166,INSEE
+        85440,POIROUX,FR,85179,46.5107890457,-1.53929317556,INSEE
+        85440,GROSBREUIL,FR,85103,46.5390090882,-1.6072005484,INSEE
+        85440,AVRILLE,FR,85010,46.4744272125,-1.49524360118,INSEE
+        85450,CHAMPAGNE LES MARAIS,FR,85049,46.3735020647,-1.13380723653,INSEE
+        85450,LA TAILLEE,FR,85286,46.3852513569,-0.941017792066,INSEE
+        85450,CHAILLE LES MARAIS,FR,85042,46.3853555319,-1.01044079362,INSEE
+        85450,VOUILLE LES MARAIS,FR,85304,46.3891941167,-0.968106001439,INSEE
+        85450,MOREILLES,FR,85149,46.4218721314,-1.09404530407,INSEE
+        85450,PUYRAVAULT,FR,85185,46.3653834101,-1.09115660367,INSEE
+        85450,STE RADEGONDE DES NOYERS,FR,85267,46.3694246909,-1.06671995264,INSEE
+        85460,LA FAUTE SUR MER,FR,85307,46.3199919131,-1.31487049579,INSEE
+        85460,L AIGUILLON SUR MER,FR,85001,46.304138479,-1.2623239198,INSEE
+        85470,BRETIGNOLLES SUR MER,FR,85035,46.6374826705,-1.86324200464,INSEE
+        85470,BREM SUR MER,FR,85243,46.6118566989,-1.81003917923,INSEE
+        85480,BOURNEZEAU,FR,85034,46.6296975315,-1.14101742229,INSEE
+        85480,FOUGERE,FR,85093,46.6617881911,-1.23612691916,INSEE
+        85480,ST HILAIRE LE VOUHIS,FR,85232,46.6859198669,-1.15222590884,INSEE
+        85480,THORIGNY,FR,85291,46.6179795025,-1.24888057642,INSEE
+        85490,BENET,FR,85020,46.368873213,-0.613959918706,INSEE
+        85500,BEAUREPAIRE,FR,85017,46.9050210355,-1.10144867013,INSEE
+        85500,ST PAUL EN PAREDS,FR,85259,46.8303789022,-0.964515191283,INSEE
+        85500,LES HERBIERS,FR,85109,46.8666125813,-1.02216086186,INSEE
+        85500,MESNARD LA BAROTIERE,FR,85144,46.851716793,-1.10954466033,INSEE
+        85500,CHANVERRIE,FR,85302,46.9634774521,-0.985340006089,INSEE
+        85510,ROCHETREJOUX,FR,85192,46.7852546732,-0.996743019108,INSEE
+        85510,LE BOUPERE,FR,85031,46.7877960262,-0.930897406714,INSEE
+        85520,JARD SUR MER,FR,85114,46.4246376808,-1.60014921643,INSEE
+        85520,ST VINCENT SUR JARD,FR,85278,46.4297504489,-1.54956205778,INSEE
+        85530,LA BRUFFIERE,FR,85039,47.0148006973,-1.18329758318,INSEE
+        85540,LE CHAMP ST PERE,FR,85050,46.5157210212,-1.33946630196,INSEE
+        85540,LE GIVRE,FR,85101,46.4729146043,-1.40256149118,INSEE
+        85540,MOUTIERS LES MAUXFAITS,FR,85156,46.489279204,-1.43622387207,INSEE
+        85540,ST VINCENT SUR GRAON,FR,85277,46.5034756656,-1.382954206,INSEE
+        85540,LA JONCHERE,FR,85116,46.4358647401,-1.38517843312,INSEE
+        85540,ST BENOIST SUR MER,FR,85201,46.4266286403,-1.3399129604,INSEE
+        85540,CURZON,FR,85077,46.4512376923,-1.30138059216,INSEE
+        85540,ST AVAUGOURD DES LANDES,FR,85200,46.5136722903,-1.47528120789,INSEE
+        85540,ST CYR EN TALMONDAIS,FR,85206,46.4597334032,-1.33722144355,INSEE
+        85550,LA BARRE DE MONTS,FR,85012,46.8722784154,-2.09984018879,INSEE
+        85560,LE BERNARD,FR,85022,46.44832528,-1.43979865314,INSEE
+        85560,LONGEVILLE SUR MER,FR,85127,46.4091029013,-1.47711855345,INSEE
+        85570,POUILLE,FR,85181,46.5022256779,-0.955223380119,INSEE
+        85570,ST VALERIEN,FR,85274,46.5348508899,-0.944470507825,INSEE
+        85570,L HERMENAULT,FR,85110,46.5156262822,-0.898430664265,INSEE
+        85570,PETOSSE,FR,85174,46.4796848965,-0.911734176662,INSEE
+        85570,ST MARTIN DES FONTAINES,FR,85245,46.5464637508,-0.907394581139,INSEE
+        85570,MARSAIS STE RADEGONDE,FR,85137,46.5380790745,-0.868868309437,INSEE
+        85580,ST DENIS DU PAYRE,FR,85207,46.4118936776,-1.27222282402,INSEE
+        85580,ST MICHEL EN L HERM,FR,85255,46.3366903175,-1.2483968538,INSEE
+        85580,TRIAIZE,FR,85297,46.3792685111,-1.19928351422,INSEE
+        85580,GRUES,FR,85104,46.3813091348,-1.32364519268,INSEE
+        85590,TREIZE VENTS,FR,85296,46.9168130123,-0.845959158017,INSEE
+        85590,LES EPESSES,FR,85082,46.8917166066,-0.903422756546,INSEE
+        85590,MALLIEVRE,FR,85134,46.9112847287,-0.864977836096,INSEE
+        85590,ST MALO DU BOIS,FR,85240,46.9248120291,-0.914182961099,INSEE
+        85590,ST MARS LA REORTHE,FR,85242,46.8597253005,-0.925777900202,INSEE
+        85600,LA BOISSIERE DE MONTAIGU,FR,85025,46.9451858636,-1.1916392484,INSEE
+        85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
+        85600,TREIZE SEPTIERS,FR,85295,46.9975586143,-1.23193361154,INSEE
+        85610,CUGAND,FR,85076,47.0602388146,-1.25289811103,INSEE
+        85610,LA BERNARDIERE,FR,85021,47.0361828072,-1.27390355206,INSEE
+        85620,ROCHESERVIERE,FR,85190,46.9274273036,-1.50132208111,INSEE
+        85630,BARBATRE,FR,85011,46.9335754783,-2.16743559847,INSEE
+        85640,MOUCHAMPS,FR,85153,46.7870550926,-1.05454102867,INSEE
+        85660,ST PHILBERT DE BOUAINE,FR,85262,46.9927907526,-1.5073882242,INSEE
+        85670,LA CHAPELLE PALLUAU,FR,85055,46.7873638997,-1.62492863273,INSEE
+        85670,FALLERON,FR,85086,46.8623928354,-1.70108938038,INSEE
+        85670,ST ETIENNE DU BOIS,FR,85210,46.8418481774,-1.59617737479,INSEE
+        85670,ST PAUL MONT PENIT,FR,85260,46.8070059547,-1.66964833149,INSEE
+        85670,ST CHRISTOPHE DU LIGNERON,FR,85204,46.8151386519,-1.74035413493,INSEE
+        85670,GRAND LANDES,FR,85102,46.8483283063,-1.64453002578,INSEE
+        85670,PALLUAU,FR,85169,46.8063002019,-1.60225256402,INSEE
+        85680,LA GUERINIERE,FR,85106,46.9669962053,-2.2302799245,INSEE
+        85690,NOTRE DAME DE MONTS,FR,85164,46.8424284611,-2.10928732775,INSEE
+        85700,SEVREMONT,FR,85090,46.8211105864,-0.854584153953,INSEE
+        85700,LA MEILLERAIE TILLAY,FR,85140,46.742582825,-0.85478763606,INSEE
+        85700,MONTOURNAIS,FR,85147,46.7502937556,-0.770013941158,INSEE
+        85700,POUZAUGES,FR,85182,46.7812581702,-0.828778359084,INSEE
+        85700,REAUMUR,FR,85187,46.7145137269,-0.816742537248,INSEE
+        85700,MENOMBLET,FR,85141,46.7301338667,-0.728654955878,INSEE
+        85700,ST MESMIN,FR,85254,46.8005779435,-0.748892533741,INSEE
+        85710,BOIS DE CENE,FR,85024,46.9479643351,-1.89668693466,INSEE
+        85710,CHATEAUNEUF,FR,85062,46.916944435,-1.9261131832,INSEE
+        85710,LA GARNACHE,FR,85096,46.8977541296,-1.82443040539,INSEE
+        85740,L EPINE,FR,85083,46.9843405667,-2.26449527608,INSEE
+        85750,ANGLES,FR,85004,46.3870511077,-1.40049386944,INSEE
+        85770,LES VELLUIRE SUR VENDEE,FR,85177,46.4190919441,-0.910475769222,INSEE
+        85770,VIX,FR,85303,46.3543018169,-0.856628326667,INSEE
+        85770,LE GUE DE VELLUIRE,FR,85105,46.3675950645,-0.905432724485,INSEE
+        85770,L ILE D ELLE,FR,85111,46.3334258655,-0.919100677098,INSEE
+        85800,ST GILLES CROIX DE VIE,FR,85222,46.6904708814,-1.91946363327,INSEE
+        85800,LE FENOUILLER,FR,85088,46.7161264566,-1.89206667498,INSEE
+        85800,GIVRAND,FR,85100,46.6822701061,-1.8787272243,INSEE
+        EOF;
+
     public function getOrder()
     {
         return 50;
     }
-    
-    public static $refs = [];
 
     public function load(ObjectManager $manager)
     {
@@ -51,342 +339,40 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
         $this->loadPostalCodeCSV($manager, self::$postalCodeFrance, 'FR');
     }
 
-    private function loadPostalCodeCSV(ObjectManager $manager, string $csv, string $countryCode) {
-
+    private function loadPostalCodeCSV(ObjectManager $manager, string $csv, string $countryCode)
+    {
         $lines = str_getcsv($csv, "\n");
         $country = $manager->getRepository(Country::class)
-              ->findOneBy(['countryCode' => $countryCode]);
-        
-        foreach($lines as $line) {
-            $code = str_getcsv($line); 
+            ->findOneBy(['countryCode' => $countryCode]);
+
+        foreach ($lines as $line) {
+            $code = str_getcsv($line);
             $c = new PostalCode();
             $c->setCountry($country)
-                  ->setCode($code[0])
-                  ->setName(\ucwords(\strtolower($code[1])))
-                  ;
+                ->setCode($code[0])
+                ->setName(ucwords(strtolower($code[1])));
 
-            if (NULL != $code[3]){
+            if (null !== $code[3]) {
                 $c->setRefPostalCodeId($code[3]);
             }
 
-            if (NULL != $code[4] & NULL != $code[5]){
+            if (null !== $code[4] & null !== $code[5]) {
                 $c->setCenter(Point::fromLonLat((float) $code[5], (float) $code[4]));
             }
 
-            if (NULL != $code[6]){
+            if (null !== $code[6]) {
                 $c->setPostalCodeSource($code[6]);
             }
 
             $manager->persist($c);
-            $ref = 'postal_code_'.$code[0];
-            
-            if (! $this->hasReference($ref)) {
+            $ref = 'postal_code_' . $code[0];
+
+            if (!$this->hasReference($ref)) {
                 $this->addReference($ref, $c);
                 self::$refs[] = $ref;
             }
         }
-        
+
         $manager->flush();
     }
-
-    private static $postalCodeBelgium = <<<EOF
-1000,BRUXELLES,BE
-1020,BRUXELLES,BE
-1030,SCHAERBEEK,BE
-1040,ETTERBEEK,BE
-1050,IXELLES,BE
-1060,SAINT-GILLES,BE
-1070,ANDERLECHT,BE
-1080,MOLENBEEK-SAINT-JEAN,BE
-1081,KOEKELBERG,BE
-1082,BERCHEM-SAINTE-AGATHE,BE
-1083,GANSHOREN,BE
-1090,JETTE,BE
-1120,BRUXELLES,BE
-1130,BRUXELLES,BE
-1140,EVERE,BE
-1150,WOLUWE-SAINT-PIERRE,BE
-1160,AUDERGHEM,BE
-1170,WATERMAEL-BOITSFORT,BE
-1180,UCCLE,BE
-1190,FOREST,BE
-1200,WOLUWE-SAINT-LAMBERT,BE
-1210,SAINT-JOSSE-TEN-NOODE,BE
-1300,WAVRE,BE
-1300,WAVRE,BE
-1301,WAVRE,BE
-1310,LA HULPE,BE
-1315,INCOURT,BE
-1315,INCOURT,BE
-1315,INCOURT,BE
-1315,INCOURT,BE
-1315,INCOURT,BE
-1320,BEAUVECHAIN,BE    
-EOF;
-
-    private static $postalCodeFrance = <<<EOF
-85000,LA ROCHE SUR YON,FR,85191,46.6675261644,-1.4077954093,INSEE
-85000,MOUILLERON LE CAPTIF,FR,85155,46.7104764993,-1.46129661418,INSEE
-85100,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
-85110,STE CECILE,FR,85202,46.7309688326,-1.12107316048,INSEE
-85110,LA JAUDONNIERE,FR,85115,46.6488761831,-0.962477574588,INSEE
-85110,ST GERMAIN DE PRINCAY,FR,85220,46.7356314659,-1.04299885081,INSEE
-85110,MONSIREIGNE,FR,85145,46.7383480028,-0.931953130855,INSEE
-85110,ST VINCENT STERLANGES,FR,85276,46.7397220689,-1.08371759277,INSEE
-85110,SIGOURNAIS,FR,85282,46.7140097406,-0.98747730882,INSEE
-85110,CHANTONNAY,FR,85051,46.6690167793,-1.04372588019,INSEE
-85110,ST PROUANT,FR,85266,46.7502017421,-0.974504061491,INSEE
-85120,LA CHAPELLE AUX LYS,FR,85053,46.6221916887,-0.642706103195,INSEE
-85120,VOUVANT,FR,85305,46.5626835135,-0.764380170382,INSEE
-85120,ANTIGNY,FR,85005,46.6191770822,-0.767030058653,INSEE
-85120,ST MAURICE DES NOUES,FR,85251,46.5955876221,-0.724327725888,INSEE
-85120,LOGE FOUGEREUSE,FR,85125,46.6180854641,-0.6899276733,INSEE
-85120,LA TARDIERE,FR,85289,46.663737434,-0.727562430214,INSEE
-85120,LA CHATAIGNERAIE,FR,85059,46.6416143401,-0.739561966419,INSEE
-85120,ST HILAIRE DE VOUST,FR,85229,46.5914988312,-0.651486245674,INSEE
-85120,BREUIL BARRET,FR,85037,46.6503266235,-0.671948654426,INSEE
-85120,ST PIERRE DU CHEMIN,FR,85264,46.6957771744,-0.701777715154,INSEE
-85130,LA GAUBRETIERE,FR,85097,46.9345007303,-1.05578200702,INSEE
-85130,ST MARTIN DES TILLEULS,FR,85247,46.9711539531,-1.06282621567,INSEE
-85130,TIFFAUGES,FR,85293,47.0020573556,-1.09858009203,INSEE
-85130,CHANVERRIE,FR,85302,46.9634774521,-0.985340006089,INSEE
-85130,BAZOGES EN PAILLERS,FR,85013,46.9213757643,-1.14415666313,INSEE
-85130,LES LANDES GENUSSON,FR,85119,46.9663828627,-1.12900644447,INSEE
-85130,ST AUBIN DES ORMEAUX,FR,85198,46.9958175597,-1.04216568722,INSEE
-85140,ESSARTS EN BOCAGE,FR,85084,46.7806739038,-1.22925967851,INSEE
-85140,LA MERLATIERE,FR,85142,46.7557703112,-1.29794577,INSEE
-85140,ST MARTIN DES NOYERS,FR,85246,46.7239461187,-1.20379080965,INSEE
-85140,CHAUCHE,FR,85064,46.8282791899,-1.27090860656,INSEE
-85150,ST MATHURIN,FR,85250,46.5686332748,-1.70787622288,INSEE
-85150,MARTINET,FR,85138,46.6620680463,-1.6772013304,INSEE
-85150,STE FLAIVE DES LOUPS,FR,85211,46.611019489,-1.58031627863,INSEE
-85150,STE FOY,FR,85214,46.5327600427,-1.69243074733,INSEE
-85150,ST JULIEN DES LANDES,FR,85236,46.6395925444,-1.7159724914,INSEE
-85150,ST GEORGES DE POINTINDOUX,FR,85218,46.6423470977,-1.62881823574,INSEE
-85150,LE GIROUARD,FR,85099,46.5726064909,-1.58872487716,INSEE
-85150,LANDERONDE,FR,85118,46.6549237031,-1.57351777893,INSEE
-85150,LES ACHARDS,FR,85152,46.6163645636,-1.65038156849,INSEE
-85150,VAIRE,FR,85298,46.6055340621,-1.74863672042,INSEE
-85160,ST JEAN DE MONTS,FR,85234,46.8021968737,-2.04839789308,INSEE
-85170,BELLEVIGNY,FR,85019,46.7756383534,-1.43313700054,INSEE
-85170,LE POIRE SUR VIE,FR,85178,46.769919754,-1.50488626452,INSEE
-85170,BEAUFOU,FR,85015,46.8191122027,-1.52479250801,INSEE
-85170,DOMPIERRE SUR YON,FR,85081,46.7599858068,-1.37275519417,INSEE
-85170,LES LUCS SUR BOULOGNE,FR,85129,46.8527299002,-1.48398928084,INSEE
-85170,ST DENIS LA CHEVASSE,FR,85208,46.8325959261,-1.3830312677,INSEE
-85180,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
-85190,AIZENAY,FR,85003,46.7384516809,-1.62702889721,INSEE
-85190,VENANSAULT,FR,85300,46.685677363,-1.54112129191,INSEE
-85190,MACHE,FR,85130,46.771364944,-1.69526445062,INSEE
-85190,BEAULIEU SOUS LA ROCHE,FR,85016,46.6872087211,-1.62355064963,INSEE
-85190,LA GENETOUZE,FR,85098,46.7244524541,-1.50410719693,INSEE
-85200,PISSOTTE,FR,85176,46.5010870694,-0.808352236192,INSEE
-85200,AUCHAY SUR VENDEE,FR,85009,46.4474386161,-0.876574265149,INSEE
-85200,FONTENAY LE COMTE,FR,85092,46.4563186117,-0.793449510859,INSEE
-85200,MERVENT,FR,85143,46.5325327351,-0.748519927998,INSEE
-85200,DOIX LES FONTAINES,FR,85080,46.3849492327,-0.806840287485,INSEE
-85200,LONGEVES,FR,85126,46.4722105292,-0.858917690239,INSEE
-85200,ST MARTIN DE FRAIGNEAU,FR,85244,46.4289052087,-0.758948963227,INSEE
-85200,SERIGNE,FR,85281,46.5054321828,-0.848819460581,INSEE
-85200,BOURNEAU,FR,85033,46.5476882922,-0.813838020265,INSEE
-85200,ST MICHEL LE CLOUCQ,FR,85256,46.4861591475,-0.743056336646,INSEE
-85200,MONTREUIL,FR,85148,46.3973419593,-0.840846860992,INSEE
-85200,L ORBRIE,FR,85167,46.4997145725,-0.77427886573,INSEE
-85210,ST JEAN DE BEUGNE,FR,85233,46.5196817523,-1.10826075013,INSEE
-85210,ST MARTIN LARS EN STE HERMINE,FR,85248,46.5970244335,-0.976384286709,INSEE
-85210,LA REORTHE,FR,85188,46.6113748938,-1.04881036553,INSEE
-85210,ST AUBIN LA PLAINE,FR,85199,46.5040293195,-1.06506577005,INSEE
-85210,ST JUIRE CHAMPGILLON,FR,85235,46.5882648491,-1.00959676911,INSEE
-85210,LA CHAPELLE THEMER,FR,85056,46.5639307793,-0.960376685588,INSEE
-85210,ST ETIENNE DE BRILLOUET,FR,85209,46.5138850327,-1.01157660374,INSEE
-85210,STE HERMINE,FR,85223,46.5572659953,-1.07210861039,INSEE
-85210,THIRE,FR,85290,46.5433098199,-1.00699777534,INSEE
-85220,ST MAIXENT SUR VIE,FR,85239,46.7329496925,-1.82595152879,INSEE
-85220,LA CHAIZE GIRAUD,FR,85045,46.6476375058,-1.81865076161,INSEE
-85220,LANDEVIEILLE,FR,85120,46.6444349925,-1.7854367847,INSEE
-85220,L AIGUILLON SUR VIE,FR,85002,46.6706426618,-1.82599992318,INSEE
-85220,COEX,FR,85070,46.7078707764,-1.75788339462,INSEE
-85220,ST REVEREND,FR,85268,46.7057741864,-1.83155480996,INSEE
-85220,APREMONT,FR,85006,46.7572682339,-1.74841313647,INSEE
-85220,LA CHAPELLE HERMIER,FR,85054,46.6826679204,-1.72083372442,INSEE
-85220,COMMEQUIERS,FR,85071,46.7674752232,-1.82534079642,INSEE
-85230,BEAUVOIR SUR MER,FR,85018,46.9086155426,-2.06349351302,INSEE
-85230,BOUIN,FR,85029,46.9815930867,-2.00423808381,INSEE
-85230,ST URBAIN,FR,85273,46.8818371328,-2.01607828912,INSEE
-85230,ST GERVAIS,FR,85221,46.9285711589,-1.98059327519,INSEE
-85240,MARILLET,FR,85136,46.5667525381,-0.634287713939,INSEE
-85240,ST HILAIRE DES LOGES,FR,85227,46.4747117878,-0.650611151998,INSEE
-85240,FAYMOREAU,FR,85087,46.5427361252,-0.624271378946,INSEE
-85240,XANTON CHASSENON,FR,85306,46.4519408659,-0.706316598666,INSEE
-85240,FOUSSAIS PAYRE,FR,85094,46.5230750581,-0.687135962627,INSEE
-85240,RIVES D AUTISE,FR,85162,46.424726987,-0.665995249042,INSEE
-85240,PUY DE SERRE,FR,85184,46.5650384637,-0.680144631346,INSEE
-85250,ST ANDRE GOULE D OIE,FR,85196,46.8410224478,-1.19644211396,INSEE
-85250,LA RABATELIERE,FR,85186,46.8584147661,-1.2569733759,INSEE
-85250,CHAVAGNES EN PAILLERS,FR,85065,46.8951394423,-1.24054768713,INSEE
-85250,ST FULGENT,FR,85215,46.8705618525,-1.16246465678,INSEE
-85250,VENDRENNES,FR,85301,46.8226741756,-1.11650982164,INSEE
-85260,LA COPECHAGNIERE,FR,85072,46.8523980181,-1.34349746898,INSEE
-85260,L HERBERGEMENT,FR,85108,46.9166207979,-1.37033557148,INSEE
-85260,MONTREVERD,FR,85197,46.9277672307,-1.4126154924,INSEE
-85260,LES BROUZILS,FR,85038,46.8854235235,-1.33186892233,INSEE
-85270,NOTRE DAME DE RIEZ,FR,85189,46.7532179022,-1.8935292542,INSEE
-85270,ST HILAIRE DE RIEZ,FR,85226,46.7432732188,-1.96439228965,INSEE
-85280,LA FERRIERE,FR,85089,46.7215872927,-1.33469332327,INSEE
-85290,MORTAGNE SUR SEVRE,FR,85151,46.9910941319,-0.946500033344,INSEE
-85290,ST LAURENT SUR SEVRE,FR,85238,46.9506837971,-0.901123752328,INSEE
-85300,CHALLANS,FR,85047,46.8354416653,-1.84036683139,INSEE
-85300,FROIDFOND,FR,85095,46.8789464367,-1.75511438567,INSEE
-85300,SOULLANS,FR,85284,46.7951288466,-1.91392699457,INSEE
-85300,LE PERRIER,FR,85172,46.8196487652,-1.97926629071,INSEE
-85300,SALLERTAINE,FR,85280,46.8659054157,-1.94894081389,INSEE
-85310,LA CHAIZE LE VICOMTE,FR,85046,46.6729533879,-1.29188591019,INSEE
-85310,NESMY,FR,85160,46.5921936479,-1.40947698594,INSEE
-85310,RIVES DE L YON,FR,85213,46.605637391,-1.3354497172,INSEE
-85310,LE TABLIER,FR,85285,46.5596307281,-1.32788759657,INSEE
-85320,CHATEAU GUIBERT,FR,85061,46.5741109302,-1.25524886228,INSEE
-85320,LES PINEAUX,FR,85175,46.599225902,-1.17865799724,INSEE
-85320,ROSNAY,FR,85193,46.5324344973,-1.3007139449,INSEE
-85320,BESSAY,FR,85023,46.5397253861,-1.17028433093,INSEE
-85320,LA BRETONNIERE LA CLAYE,FR,85036,46.4879459421,-1.26773426545,INSEE
-85320,CORPE,FR,85073,46.5050234767,-1.17034425311,INSEE
-85320,MAREUIL SUR LAY DISSAIS,FR,85135,46.5335825488,-1.22688907859,INSEE
-85320,PEAULT,FR,85171,46.502029199,-1.22708559855,INSEE
-85320,LA COUTURE,FR,85074,46.523938732,-1.26493227292,INSEE
-85320,MOUTIERS SUR LE LAY,FR,85157,46.5651677306,-1.16826489836,INSEE
-85320,STE PEXINE,FR,85261,46.5596018797,-1.12406235901,INSEE
-85330,NOIRMOUTIER EN L ILE,FR,85163,47.0086655085,-2.26243620205,INSEE
-85340,L ILE D OLONNE,FR,85112,46.570163703,-1.7737502368,INSEE
-85340,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
-85350,L ILE D YEU,FR,85113,46.7093514816,-2.34712702345,INSEE
-85360,LA TRANCHE SUR MER,FR,85294,46.3564601605,-1.43136322126,INSEE
-85370,MOUZEUIL ST MARTIN,FR,85158,46.4591118412,-0.984449849889,INSEE
-85370,NALLIERS,FR,85159,46.4658962703,-1.03958611312,INSEE
-85370,LE LANGON,FR,85121,46.4393119039,-0.947017086151,INSEE
-85390,BAZOGES EN PAREDS,FR,85014,46.6602005512,-0.914053446792,INSEE
-85390,ST MAURICE LE GIRARD,FR,85252,46.6398624578,-0.810875649028,INSEE
-85390,TALLUD STE GEMME,FR,85287,46.6949386862,-0.886169517112,INSEE
-85390,CHAVAGNES LES REDOUX,FR,85066,46.7101499475,-0.915900131393,INSEE
-85390,CHEFFOIS,FR,85067,46.6786935635,-0.782949851125,INSEE
-85390,MOUILLERON ST GERMAIN,FR,85154,46.6612700667,-0.846784201071,INSEE
-85400,STE GEMME LA PLAINE,FR,85216,46.4732196212,-1.11103084694,INSEE
-85400,LAIROUX,FR,85117,46.4496842668,-1.27114022202,INSEE
-85400,LUCON,FR,85128,46.4510564854,-1.16449285012,INSEE
-85400,LES MAGNILS REIGNIERS,FR,85131,46.4635045649,-1.210635375,INSEE
-85400,CHASNAIS,FR,85058,46.4459908481,-1.2385924923,INSEE
-85410,ST LAURENT DE LA SALLE,FR,85237,46.5854041653,-0.922177315485,INSEE
-85410,LA CAILLERE ST HILAIRE,FR,85040,46.6293907412,-0.933153931505,INSEE
-85410,ST CYR DES GATS,FR,85205,46.572397925,-0.86344873853,INSEE
-85410,THOUARSAIS BOUILDROUX,FR,85292,46.6062740621,-0.873461023865,INSEE
-85410,CEZAIS,FR,85041,46.5917363748,-0.802618133558,INSEE
-85410,ST SULPICE EN PAREDS,FR,85271,46.6130038733,-0.8310839288,INSEE
-85420,LE MAZEAU,FR,85139,46.3298580373,-0.672957405035,INSEE
-85420,LIEZ,FR,85123,46.3698532376,-0.70502476758,INSEE
-85420,BOUILLE COURDAULT,FR,85028,46.3847932448,-0.684917815779,INSEE
-85420,DAMVIX,FR,85078,46.32063079,-0.743504259797,INSEE
-85420,MAILLE,FR,85132,46.3417503082,-0.787487297301,INSEE
-85420,ST PIERRE LE VIEUX,FR,85265,46.4009643491,-0.742816267425,INSEE
-85420,ST SIGISMOND,FR,85269,46.3368577973,-0.707293731101,INSEE
-85420,MAILLEZAIS,FR,85133,46.3642178261,-0.750260780443,INSEE
-85420,RIVES D AUTISE,FR,85162,46.424726987,-0.665995249042,INSEE
-85430,AUBIGNY LES CLOUZEAUX,FR,85008,46.6028241769,-1.46743549114,INSEE
-85430,NIEUL LE DOLENT,FR,85161,46.5676509922,-1.51560194548,INSEE
-85430,LA BOISSIERE DES LANDES,FR,85026,46.5581861734,-1.44371985689,INSEE
-85440,ST HILAIRE LA FORET,FR,85231,46.4551155186,-1.53048160541,INSEE
-85440,TALMONT ST HILAIRE,FR,85288,46.475786445,-1.62751498166,INSEE
-85440,POIROUX,FR,85179,46.5107890457,-1.53929317556,INSEE
-85440,GROSBREUIL,FR,85103,46.5390090882,-1.6072005484,INSEE
-85440,AVRILLE,FR,85010,46.4744272125,-1.49524360118,INSEE
-85450,CHAMPAGNE LES MARAIS,FR,85049,46.3735020647,-1.13380723653,INSEE
-85450,LA TAILLEE,FR,85286,46.3852513569,-0.941017792066,INSEE
-85450,CHAILLE LES MARAIS,FR,85042,46.3853555319,-1.01044079362,INSEE
-85450,VOUILLE LES MARAIS,FR,85304,46.3891941167,-0.968106001439,INSEE
-85450,MOREILLES,FR,85149,46.4218721314,-1.09404530407,INSEE
-85450,PUYRAVAULT,FR,85185,46.3653834101,-1.09115660367,INSEE
-85450,STE RADEGONDE DES NOYERS,FR,85267,46.3694246909,-1.06671995264,INSEE
-85460,LA FAUTE SUR MER,FR,85307,46.3199919131,-1.31487049579,INSEE
-85460,L AIGUILLON SUR MER,FR,85001,46.304138479,-1.2623239198,INSEE
-85470,BRETIGNOLLES SUR MER,FR,85035,46.6374826705,-1.86324200464,INSEE
-85470,BREM SUR MER,FR,85243,46.6118566989,-1.81003917923,INSEE
-85480,BOURNEZEAU,FR,85034,46.6296975315,-1.14101742229,INSEE
-85480,FOUGERE,FR,85093,46.6617881911,-1.23612691916,INSEE
-85480,ST HILAIRE LE VOUHIS,FR,85232,46.6859198669,-1.15222590884,INSEE
-85480,THORIGNY,FR,85291,46.6179795025,-1.24888057642,INSEE
-85490,BENET,FR,85020,46.368873213,-0.613959918706,INSEE
-85500,BEAUREPAIRE,FR,85017,46.9050210355,-1.10144867013,INSEE
-85500,ST PAUL EN PAREDS,FR,85259,46.8303789022,-0.964515191283,INSEE
-85500,LES HERBIERS,FR,85109,46.8666125813,-1.02216086186,INSEE
-85500,MESNARD LA BAROTIERE,FR,85144,46.851716793,-1.10954466033,INSEE
-85500,CHANVERRIE,FR,85302,46.9634774521,-0.985340006089,INSEE
-85510,ROCHETREJOUX,FR,85192,46.7852546732,-0.996743019108,INSEE
-85510,LE BOUPERE,FR,85031,46.7877960262,-0.930897406714,INSEE
-85520,JARD SUR MER,FR,85114,46.4246376808,-1.60014921643,INSEE
-85520,ST VINCENT SUR JARD,FR,85278,46.4297504489,-1.54956205778,INSEE
-85530,LA BRUFFIERE,FR,85039,47.0148006973,-1.18329758318,INSEE
-85540,LE CHAMP ST PERE,FR,85050,46.5157210212,-1.33946630196,INSEE
-85540,LE GIVRE,FR,85101,46.4729146043,-1.40256149118,INSEE
-85540,MOUTIERS LES MAUXFAITS,FR,85156,46.489279204,-1.43622387207,INSEE
-85540,ST VINCENT SUR GRAON,FR,85277,46.5034756656,-1.382954206,INSEE
-85540,LA JONCHERE,FR,85116,46.4358647401,-1.38517843312,INSEE
-85540,ST BENOIST SUR MER,FR,85201,46.4266286403,-1.3399129604,INSEE
-85540,CURZON,FR,85077,46.4512376923,-1.30138059216,INSEE
-85540,ST AVAUGOURD DES LANDES,FR,85200,46.5136722903,-1.47528120789,INSEE
-85540,ST CYR EN TALMONDAIS,FR,85206,46.4597334032,-1.33722144355,INSEE
-85550,LA BARRE DE MONTS,FR,85012,46.8722784154,-2.09984018879,INSEE
-85560,LE BERNARD,FR,85022,46.44832528,-1.43979865314,INSEE
-85560,LONGEVILLE SUR MER,FR,85127,46.4091029013,-1.47711855345,INSEE
-85570,POUILLE,FR,85181,46.5022256779,-0.955223380119,INSEE
-85570,ST VALERIEN,FR,85274,46.5348508899,-0.944470507825,INSEE
-85570,L HERMENAULT,FR,85110,46.5156262822,-0.898430664265,INSEE
-85570,PETOSSE,FR,85174,46.4796848965,-0.911734176662,INSEE
-85570,ST MARTIN DES FONTAINES,FR,85245,46.5464637508,-0.907394581139,INSEE
-85570,MARSAIS STE RADEGONDE,FR,85137,46.5380790745,-0.868868309437,INSEE
-85580,ST DENIS DU PAYRE,FR,85207,46.4118936776,-1.27222282402,INSEE
-85580,ST MICHEL EN L HERM,FR,85255,46.3366903175,-1.2483968538,INSEE
-85580,TRIAIZE,FR,85297,46.3792685111,-1.19928351422,INSEE
-85580,GRUES,FR,85104,46.3813091348,-1.32364519268,INSEE
-85590,TREIZE VENTS,FR,85296,46.9168130123,-0.845959158017,INSEE
-85590,LES EPESSES,FR,85082,46.8917166066,-0.903422756546,INSEE
-85590,MALLIEVRE,FR,85134,46.9112847287,-0.864977836096,INSEE
-85590,ST MALO DU BOIS,FR,85240,46.9248120291,-0.914182961099,INSEE
-85590,ST MARS LA REORTHE,FR,85242,46.8597253005,-0.925777900202,INSEE
-85600,LA BOISSIERE DE MONTAIGU,FR,85025,46.9451858636,-1.1916392484,INSEE
-85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
-85600,TREIZE SEPTIERS,FR,85295,46.9975586143,-1.23193361154,INSEE
-85610,CUGAND,FR,85076,47.0602388146,-1.25289811103,INSEE
-85610,LA BERNARDIERE,FR,85021,47.0361828072,-1.27390355206,INSEE
-85620,ROCHESERVIERE,FR,85190,46.9274273036,-1.50132208111,INSEE
-85630,BARBATRE,FR,85011,46.9335754783,-2.16743559847,INSEE
-85640,MOUCHAMPS,FR,85153,46.7870550926,-1.05454102867,INSEE
-85660,ST PHILBERT DE BOUAINE,FR,85262,46.9927907526,-1.5073882242,INSEE
-85670,LA CHAPELLE PALLUAU,FR,85055,46.7873638997,-1.62492863273,INSEE
-85670,FALLERON,FR,85086,46.8623928354,-1.70108938038,INSEE
-85670,ST ETIENNE DU BOIS,FR,85210,46.8418481774,-1.59617737479,INSEE
-85670,ST PAUL MONT PENIT,FR,85260,46.8070059547,-1.66964833149,INSEE
-85670,ST CHRISTOPHE DU LIGNERON,FR,85204,46.8151386519,-1.74035413493,INSEE
-85670,GRAND LANDES,FR,85102,46.8483283063,-1.64453002578,INSEE
-85670,PALLUAU,FR,85169,46.8063002019,-1.60225256402,INSEE
-85680,LA GUERINIERE,FR,85106,46.9669962053,-2.2302799245,INSEE
-85690,NOTRE DAME DE MONTS,FR,85164,46.8424284611,-2.10928732775,INSEE
-85700,SEVREMONT,FR,85090,46.8211105864,-0.854584153953,INSEE
-85700,LA MEILLERAIE TILLAY,FR,85140,46.742582825,-0.85478763606,INSEE
-85700,MONTOURNAIS,FR,85147,46.7502937556,-0.770013941158,INSEE
-85700,POUZAUGES,FR,85182,46.7812581702,-0.828778359084,INSEE
-85700,REAUMUR,FR,85187,46.7145137269,-0.816742537248,INSEE
-85700,MENOMBLET,FR,85141,46.7301338667,-0.728654955878,INSEE
-85700,ST MESMIN,FR,85254,46.8005779435,-0.748892533741,INSEE
-85710,BOIS DE CENE,FR,85024,46.9479643351,-1.89668693466,INSEE
-85710,CHATEAUNEUF,FR,85062,46.916944435,-1.9261131832,INSEE
-85710,LA GARNACHE,FR,85096,46.8977541296,-1.82443040539,INSEE
-85740,L EPINE,FR,85083,46.9843405667,-2.26449527608,INSEE
-85750,ANGLES,FR,85004,46.3870511077,-1.40049386944,INSEE
-85770,LES VELLUIRE SUR VENDEE,FR,85177,46.4190919441,-0.910475769222,INSEE
-85770,VIX,FR,85303,46.3543018169,-0.856628326667,INSEE
-85770,LE GUE DE VELLUIRE,FR,85105,46.3675950645,-0.905432724485,INSEE
-85770,L ILE D ELLE,FR,85111,46.3334258655,-0.919100677098,INSEE
-85800,ST GILLES CROIX DE VIE,FR,85222,46.6904708814,-1.91946363327,INSEE
-85800,LE FENOUILLER,FR,85088,46.7161264566,-1.89206667498,INSEE
-85800,GIVRAND,FR,85100,46.6822701061,-1.8787272243,INSEE    
-EOF;
-
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
index 94c2d2d2f..9db21414d 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadRoleScopes.php
@@ -1,86 +1,69 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class LoadRoleScopes extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $permissions = [
+        'CHILL_FOO_SEE' => [
+            'names' => [
+                'fr' => 'voir foo',
+                'en' => 'see foo',
+                'nl' => 'zie foo',
+            ],
+        ],
+        'CHILL_FOO_SEE_DETAILS' => [
+            'names' => [
+                'fr' => 'voir foo avec détails',
+                'en' => 'see foo with details',
+                'nl' => 'zie foo in details',
+            ],
+        ],
+        'CHILL_FOO_EDIT' => [
+            'names' => [
+                'fr' => 'modifier foo',
+                'en' => 'edit foo',
+                'nl' => 'editie foo',
+            ],
+        ],
+    ];
+
+    public static $references = [];
+
     public function getOrder()
     {
         return 300;
     }
-    
-    public static $permissions = array(
-        'CHILL_FOO_SEE' => array(
-            'names' => array(
-                'fr' => 'voir foo',
-                'en' => 'see foo',
-                'nl' => 'zie foo'
-            )
-        ),
-        'CHILL_FOO_SEE_DETAILS' => array(
-            'names' => array(
-                'fr' => 'voir foo avec détails',
-                'en' => 'see foo with details',
-                'nl' => 'zie foo in details'
-            )
-        ),
-        'CHILL_FOO_EDIT' => array(
-            'names' => array(
-                'fr' => 'modifier foo',
-                'en' => 'edit foo',
-                'nl' => 'editie foo'
-            )
-        )
-    );
-    
-    public static $references = array();
 
     public function load(ObjectManager $manager)
     {
         foreach (static::$permissions as $key => $permission) {
-            foreach(LoadScopes::$references as $scopeReference) {
+            foreach (LoadScopes::$references as $scopeReference) {
                 $roleScope = new RoleScope();
                 $roleScope->setRole($key)
-                        ->setScope($this->getReference($scopeReference))
-                        ;
-                $reference = 'role_scope_'.$key.'_'.$this->getReference($scopeReference)->getName()['en'];
-                echo "Creating $reference \n";
+                    ->setScope($this->getReference($scopeReference));
+                $reference = 'role_scope_' . $key . '_' . $this->getReference($scopeReference)->getName()['en'];
+                echo "Creating {$reference} \n";
                 $this->addReference($reference, $roleScope);
                 $manager->persist($roleScope);
                 static::$references[] = $reference;
             }
         }
-        
+
         $manager->flush();
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
index 834de5e80..d3a66d887 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadScopes.php
@@ -1,23 +1,14 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
@@ -25,55 +16,53 @@ use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
 /**
- * Create scopes
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Create scopes.
  */
 class LoadScopes extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $references = [];
+
+    public $scopes = [
+        [
+            'names' => [
+                'fr' => 'tous',
+                'en' => 'all',
+                'nl' => 'algemeen',
+            ],
+        ],
+        [
+            'names' => [
+                'fr' => 'social',
+                'en' => 'social',
+                'nl' => 'sociaal',
+            ],
+        ],
+        [
+            'names' => [
+                'fr' => 'administratif',
+                'en' => 'administrative',
+                'nl' => 'administratief',
+            ],
+        ],
+    ];
+
     public function getOrder()
     {
         return 200;
     }
-    
-    public $scopes = array(
-        array(
-            'names' => array(
-                'fr' => 'tous',
-                'en' => 'all',
-                'nl' => 'algemeen'
-            ),
-        ),
-        array(
-            'names' => array(
-                'fr' => 'social',
-                'en' => 'social',
-                'nl' => 'sociaal'
-            )
-        ),
-        array(
-            'names' => array(
-                'fr' => 'administratif',
-                'en' => 'administrative',
-                'nl' => 'administratief'
-            )
-        )
-    );
-    
-    public static $references = array();
 
     public function load(ObjectManager $manager)
-    { 
+    {
         foreach ($this->scopes as $new) {
             $scope = new \Chill\MainBundle\Entity\Scope();
             $scope->setName($new['names']);
-            
+
             $manager->persist($scope);
-            $reference = 'scope_'.$new['names']['en'];
+            $reference = 'scope_' . $new['names']['en'];
             $this->addReference($reference, $scope);
             static::$references[] = $reference;
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
index 02f1bfd18..b7d7cb941 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
@@ -1,30 +1,61 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\Entity\User;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use LogicException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\User;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
+use function str_replace;
 
 /**
- * Load fixtures users into database
+ * Load fixtures users into database.
  *
  * create a user for each permission_group and center.
  * username and password are identicals.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+class LoadUsers extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
+    public static $refs = [
+        'center a_social' => [
+            'groupCenterRefs' => ['centerA_permission_group_social'],
+        ],
+        'center a_administrative' => [
+            'groupCenterRefs' => ['centerA_permission_group_administrative'],
+        ],
+        'center a_direction' => [
+            'groupCenterRefs' => ['centerA_permission_group_direction'],
+        ],
+        'center b_social' => [
+            'groupCenterRefs' => ['centerB_permission_group_social'],
+        ],
+        'center b_administrative' => [
+            'groupCenterRefs' => ['centerB_permission_group_administrative'],
+        ],
+        'center b_direction' => [
+            'groupCenterRefs' => ['centerB_permission_group_direction'],
+        ],
+        'multi_center' => [
+            'groupCenterRefs' => ['centerA_permission_group_social',
+                'centerB_permission_group_social', ],
+        ],
+    ];
+
     /**
-     *
      * @var ContainerInterface
      */
     private $container;
@@ -34,58 +65,31 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
         return 1000;
     }
 
-    public static $refs = array(
-        'center a_social' => array(
-            'groupCenterRefs' => ['centerA_permission_group_social']
-        ),
-        'center a_administrative' => array(
-            'groupCenterRefs' => ['centerA_permission_group_administrative']
-        ),
-        'center a_direction' => array(
-            'groupCenterRefs' => ['centerA_permission_group_direction']
-        ),
-        'center b_social' => array(
-            'groupCenterRefs' => ['centerB_permission_group_social']
-        ),
-        'center b_administrative' => array(
-            'groupCenterRefs' => ['centerB_permission_group_administrative']
-        ),
-        'center b_direction' => array(
-            'groupCenterRefs' => ['centerB_permission_group_direction']
-        ),
-        'multi_center' => array(
-            'groupCenterRefs' => ['centerA_permission_group_social',
-                'centerB_permission_group_social']
-        )
-
-    );
-
     public function load(ObjectManager $manager)
     {
         foreach (self::$refs as $username => $params) {
-
             $user = new User();
 
             $defaultEncoder = new MessageDigestPasswordEncoder('sha512', true, 5000);
 
             $encoderFactory = new EncoderFactory([
-                User::class => $defaultEncoder
+                User::class => $defaultEncoder,
             ]);
 
             $user
                 ->setUsername($username)
-                ->setPassword($encoderFactory
-                            ->getEncoder($user)
-                            ->encodePassword('password', $user->getSalt())
-                        )
-                ->setEmail(sprintf("%s@chill.social", \str_replace(' ', '', $username)))
-                ;
+                ->setPassword(
+                    $encoderFactory
+                        ->getEncoder($user)
+                        ->encodePassword('password', $user->getSalt())
+                )
+                ->setEmail(sprintf('%s@chill.social', str_replace(' ', '', $username)));
 
             foreach ($params['groupCenterRefs'] as $groupCenterRef) {
                 $user->addGroupCenter($this->getReference($groupCenterRef));
             }
 
-            echo 'Creating user ' . $username ."... \n";
+            echo 'Creating user ' . $username . "... \n";
             $manager->persist($user);
             $this->addReference($username, $user);
         }
@@ -93,13 +97,12 @@ class LoadUsers extends AbstractFixture implements OrderedFixtureInterface, Cont
         $manager->flush();
     }
 
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null)
     {
-        if (NULL === $container) {
-            throw new \LogicException('$container should not be null');
+        if (null === $container) {
+            throw new LogicException('$container should not be null');
         }
 
         $this->container = $container;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 972c046d9..012643aad 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -1,81 +1,79 @@
 <?php
 
-/*
- * Copyright (C) 2014-2018 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
-use Chill\MainBundle\Doctrine\DQL\STContains;
-use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Form\UserJobType;
-use Chill\MainBundle\Form\UserType;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
-use Chill\MainBundle\DependencyInjection\Configuration;
 use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey;
-use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\DQL\JsonAggregate;
+use Chill\MainBundle\Doctrine\DQL\JsonbArrayLength;
 use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray;
-use Chill\MainBundle\Doctrine\DQL\Similarity;
 use Chill\MainBundle\Doctrine\DQL\OverlapsI;
 use Chill\MainBundle\Doctrine\DQL\Replace;
+use Chill\MainBundle\Doctrine\DQL\Similarity;
+use Chill\MainBundle\Doctrine\DQL\STContains;
+use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
+use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType;
 use Chill\MainBundle\Doctrine\Type\PointType;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\LocationType;
-use Chill\MainBundle\Form\LocationTypeType;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\LocationFormType;
+use Chill\MainBundle\Form\LocationTypeType;
+use Chill\MainBundle\Form\UserJobType;
+use Chill\MainBundle\Form\UserType;
+use Exception;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use function count;
 
 /**
  * Class ChillMainExtension
  * This class load config for chillMainExtension.
- *
- * @package Chill\MainBundle\DependencyInjection
  */
-class ChillMainExtension extends Extension implements PrependExtensionInterface,
+class ChillMainExtension extends Extension implements
+    PrependExtensionInterface,
     Widget\HasWidgetFactoriesExtensionInterface
 {
     /**
-     * widget factory
+     * widget factory.
      *
      * @var WidgetFactoryInterface[]
      */
-    protected $widgetFactories = array();
+    protected $widgetFactories = [];
 
-    /**
-     * @param WidgetFactoryInterface $factory
-     */
     public function addWidgetFactory(WidgetFactoryInterface $factory)
     {
         $this->widgetFactories[] = $factory;
     }
 
+    /**
+     * @return \Chill\MainBundle\DependencyInjection\Configuration|object|\Symfony\Component\Config\Definition\ConfigurationInterface|null
+     */
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->widgetFactories, $container);
+    }
+
     /**
      * @return WidgetFactoryInterface[]
      */
@@ -85,10 +83,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
     }
 
     /**
-     * {@inheritDoc}
-     * @param array $configs
-     * @param ContainerBuilder $container
-     * @throws \Exception
+     * @throws Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -96,35 +91,59 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
-        $container->setParameter('chill_main.installation_name',
-            $config['installation_name']);
+        // replace all config with a main key:
+        $container->setParameter('chill_main', $config);
 
-        $container->setParameter('chill_main.available_languages',
-            $config['available_languages']);
+        // legacy config
+        $container->setParameter(
+            'chill_main.installation_name',
+            $config['installation_name']
+        );
 
-        $container->setParameter('chill_main.routing.resources',
-            $config['routing']['resources']);
+        $container->setParameter(
+            'chill_main.available_languages',
+            $config['available_languages']
+        );
 
-        $container->setParameter('chill_main.pagination.item_per_page',
-            $config['pagination']['item_per_page']);
+        $container->setParameter(
+            'chill_main.available_countries',
+            $config['available_countries']
+        );
 
-        $container->setParameter('chill_main.notifications',
-            $config['notifications']);
+        $container->setParameter(
+            'chill_main.routing.resources',
+            $config['routing']['resources']
+        );
 
-        $container->setParameter('chill_main.redis',
-            $config['redis']);
+        $container->setParameter(
+            'chill_main.pagination.item_per_page',
+            $config['pagination']['item_per_page']
+        );
 
-        $container->setParameter('chill_main.phone_helper',
-            $config['phone_helper'] ?? []);
+        $container->setParameter(
+            'chill_main.notifications',
+            $config['notifications']
+        );
+
+        $container->setParameter(
+            'chill_main.redis',
+            $config['redis']
+        );
+
+        $container->setParameter(
+            'chill_main.phone_helper',
+            $config['phone_helper'] ?? []
+        );
 
         // add the key 'widget' without the key 'enable'
-        $container->setParameter('chill_main.widgets',
+        $container->setParameter(
+            'chill_main.widgets',
             isset($config['widgets']['homepage']) ?
-                array('homepage' => $config['widgets']['homepage']):
-                array()
-                );
+                ['homepage' => $config['widgets']['homepage']] :
+                []
+        );
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/doctrine.yaml');
         $loader->load('services/logger.yaml');
@@ -151,33 +170,20 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader);
     }
 
-    /**
-     * @param array $config
-     * @param ContainerBuilder $container
-     * @return \Chill\MainBundle\DependencyInjection\Configuration|null|object|\Symfony\Component\Config\Definition\ConfigurationInterface
-     */
-    public function getConfiguration(array $config, ContainerBuilder $container)
-    {
-        return new Configuration($this->widgetFactories, $container);
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     */
     public function prepend(ContainerBuilder $container)
     {
         //add installation_name and date_format to globals
         $chillMainConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this
-                ->getConfiguration($chillMainConfig, $container), $chillMainConfig);
-        $twigConfig = array(
-            'globals' => array(
-                'installation' => array(
-                    'name' => $config['installation_name']),
-                'available_languages' => $config['available_languages']
-            ),
-            'form_themes' => array('@ChillMain/Form/fields.html.twig')
-        );
+            ->getConfiguration($chillMainConfig, $container), $chillMainConfig);
+        $twigConfig = [
+            'globals' => [
+                'installation' => [
+                    'name' => $config['installation_name'], ],
+                'available_languages' => $config['available_languages'],
+            ],
+            'form_themes' => ['@ChillMain/Form/fields.html.twig'],
+        ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
         //add DQL function to ORM (default entity_manager)
@@ -199,6 +205,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 'OVERLAPSI' => OverlapsI::class,
                                 'STRICT_WORD_SIMILARITY_OPS' => StrictWordSimilarityOPS::class,
                                 'ST_CONTAINS' => STContains::class,
+                                'JSONB_ARRAY_LENGTH' => JsonbArrayLength::class,
                             ],
                         ],
                         'hydrators' => [
@@ -206,7 +213,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         ],
                     ],
                 ],
-        );
+            );
 
         //add dbal types (default entity_manager)
         $container
@@ -222,45 +229,43 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         ],
                         'types' => [
                             'dateinterval' => [
-                                'class' => NativeDateIntervalType::class
+                                'class' => NativeDateIntervalType::class,
                             ],
                             'point' => [
-                                'class' => PointType::class
-                            ]
-                        ]
-                    ]
+                                'class' => PointType::class,
+                            ],
+                        ],
+                    ],
                 ]
-        );
+            );
 
         //add current route to chill main
-        $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillMainBundle/config/routes.yaml'
-              )
-
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillMainBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
 
         //add a channel to log app events
-        $container->prependExtensionConfig('monolog', array(
-            'channels' => array('chill')
-        ));
+        $container->prependExtensionConfig('monolog', [
+            'channels' => ['chill'],
+        ]);
 
         //add crud api
         $this->prependCruds($container);
     }
 
     /**
-     * Load parameter for configuration and set parameters for api
+     * Load parameter for configuration and set parameters for api.
      */
     protected function configureCruds(
         ContainerBuilder $container,
         array $crudConfig,
         array $apiConfig,
         Loader\YamlFileLoader $loader
-    ): void
-    {
+    ): void {
         if (count($crudConfig) === 0) {
             return;
         }
@@ -273,10 +278,6 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         // Note: the controller are loaded inside compiler pass
     }
 
-
-    /**
-     * @param ContainerBuilder $container
-     */
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
@@ -293,11 +294,11 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                             'template' => '@ChillMain/UserJob/index.html.twig',
                         ],
                         'new' => [
-                                'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
                         'edit' => [
-                            'role' => 'ROLE_ADMIN'
-                        ]
+                            'role' => 'ROLE_ADMIN',
+                        ],
                     ],
                 ],
                 [
@@ -310,17 +311,17 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/User/index.html.twig'
+                            'template' => '@ChillMain/User/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/User/new.html.twig'
+                            'template' => '@ChillMain/User/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/User/edit.html.twig'
-                        ]
-                    ]
+                            'template' => '@ChillMain/User/edit.html.twig',
+                        ],
+                    ],
                 ],
                 [
                     'class' => Location::class,
@@ -334,15 +335,15 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/Location/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/Location/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/Location/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => LocationType::class,
@@ -356,15 +357,15 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/LocationType/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/LocationType/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillMain/LocationType/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
             ],
             'apis' => [
@@ -378,7 +379,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
@@ -386,10 +387,10 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 Request::METHOD_GET => true,
                                 Request::METHOD_POST => true,
                                 Request::METHOD_HEAD => true,
-                                Request::METHOD_PATCH => true
-                            ]
+                                Request::METHOD_PATCH => true,
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'controller' => \Chill\MainBundle\Controller\AddressReferenceAPIController::class,
@@ -401,16 +402,16 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
-                            ]
+                                Request::METHOD_HEAD => true,
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'controller' => \Chill\MainBundle\Controller\PostalCodeAPIController::class,
@@ -422,7 +423,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
@@ -430,9 +431,9 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
                                 Request::METHOD_POST => true,
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\Country::class,
@@ -443,16 +444,16 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
-                            ]
+                                Request::METHOD_HEAD => true,
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\User::class,
@@ -464,16 +465,16 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\Scope::class,
@@ -484,16 +485,16 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\Location::class,
@@ -505,7 +506,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
@@ -513,13 +514,13 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
                                 Request::METHOD_POST => true,
-                            ]
+                            ],
                         ],
-
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\MainBundle\Entity\LocationType::class,
+                    'controller' => \Chill\MainBundle\Controller\LocationTypeApiController::class,
                     'name' => 'location_type',
                     'base_path' => '/api/1.0/main/location-type',
                     'base_role' => 'ROLE_USER',
@@ -527,19 +528,18 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                            ]
+                            ],
                         ],
-
-                    ]
-                ]
-            ]
+                    ],
+                ],
+            ],
         ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
index 9197ddb83..b8b3b4d85 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php
@@ -1,37 +1,46 @@
 <?php
-/*
- */
-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;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\DependencyInjection\CompilerPass;
+
+use Chill\MainBundle\Form\PermissionsGroupType;
+use LogicException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
 class ACLFlagsCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         $permissionGroupType = $container->getDefinition(PermissionsGroupType::class);
-        
-        foreach($container->findTaggedServiceIds('chill_main.flags') as $id => $tags) {
+
+        foreach ($container->findTaggedServiceIds('chill_main.flags') as $id => $tags) {
             $reference = new Reference($id);
-            
+
             foreach ($tags as $tag) {
-                switch($tag['scope']) {
+                switch ($tag['scope']) {
                     case PermissionsGroupType::FLAG_SCOPE:
-                        
-                        $permissionGroupType->addMethodCall('addFlagProvider', [ $reference ]);
+                        $permissionGroupType->addMethodCall('addFlagProvider', [$reference]);
+
                         break;
+
                     default:
-                        throw new \LogicalException(sprintf(
-                            "This tag 'scope' is not implemented: %s, on service with id %s", $tag['scope'], $id)
-                            );
+                        throw new LogicException(
+                            sprintf(
+                                "This tag 'scope' is not implemented: %s, on service with id %s",
+                                $tag['scope'],
+                                $id
+                            )
+                        );
                 }
             }
         }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
index 2aa5327b0..64b5704bc 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
@@ -1,51 +1,40 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Compiles the services tagged with : 
- * 
+ * Compiles the services tagged with :.
+ *
  * - chill.export
  * - chill.export_formatter
  * - chill.export_aggregator
  * - chill.export_filter
  * - chill.export_elements_provider
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ExportsCompilerPass implements CompilerPassInterface
 {
-    
     public function process(ContainerBuilder $container)
     {
         if (!$container->has('Chill\MainBundle\Export\ExportManager')) {
-            throw new \LogicException('service Chill\MainBundle\Export\ExportManager '
+            throw new LogicException('service Chill\MainBundle\Export\ExportManager '
                     . 'is not defined. It is required by ExportsCompilerPass');
         }
-        
+
         $chillManagerDefinition = $container->findDefinition(
             'Chill\MainBundle\Export\ExportManager'
         );
@@ -56,155 +45,159 @@ class ExportsCompilerPass implements CompilerPassInterface
         $this->compileFormatters($chillManagerDefinition, $container);
         $this->compileExportElementsProvider($chillManagerDefinition, $container);
     }
-    
-    private function compileExports(Definition $chillManagerDefinition, 
-            ContainerBuilder $container)
-    {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export'
-        );
-        
-        $knownAliases = array();
-        
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes["alias"])) {
-                    throw new \LogicException("the 'alias' attribute is missing in your ".
-                        "service '$id' definition");
-                }
-                
-                if (array_search($attributes["alias"], $knownAliases)) {
-                    throw new \LogicException("There is already a chill.export service with alias "
-                        .$attributes["alias"].". Choose another alias.");
-                }
-                $knownAliases[] = $attributes["alias"];
-                
-                $chillManagerDefinition->addMethodCall(
-                    'addExport',
-                    array(new Reference($id), $attributes["alias"])
-                );
-            }
-        }
-    }
-    
-    private function compileFilters(Definition $chillManagerDefinition,
-            ContainerBuilder $container)
-    {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export_filter'
-        );
-        
-        $knownAliases = array();
-        
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes["alias"])) {
-                    throw new \LogicException("the 'alias' attribute is missing in your ".
-                        "service '$id' definition");
-                }
-                
-                if (array_search($attributes["alias"], $knownAliases)) {
-                    throw new \LogicException("There is already a chill.export_filter service with alias "
-                        .$attributes["alias"].". Choose another alias.");
-                }
-                $knownAliases[] = $attributes["alias"];
-                
-                $chillManagerDefinition->addMethodCall(
-                    'addFilter',
-                    array(new Reference($id), $attributes["alias"])
-                );
-            }
-        }
-    }
-    
-    private function compileAggregators(Definition $chillManagerDefinition,
-            ContainerBuilder $container)
-    {
+
+    private function compileAggregators(
+        Definition $chillManagerDefinition,
+        ContainerBuilder $container
+    ) {
         $taggedServices = $container->findTaggedServiceIds(
             'chill.export_aggregator'
         );
-        
-        $knownAliases = array();
-        
+
+        $knownAliases = [];
+
         foreach ($taggedServices as $id => $tagAttributes) {
             foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes["alias"])) {
-                    throw new \LogicException("the 'alias' attribute is missing in your ".
-                        "service '$id' definition");
+                if (!isset($attributes['alias'])) {
+                    throw new LogicException("the 'alias' attribute is missing in your " .
+                        "service '{$id}' definition");
                 }
-                
-                if (array_search($attributes["alias"], $knownAliases)) {
-                    throw new \LogicException("There is already a chill.export_aggregator service with alias "
-                        .$attributes["alias"].". Choose another alias.");
+
+                if (array_search($attributes['alias'], $knownAliases, true)) {
+                    throw new LogicException('There is already a chill.export_aggregator service with alias '
+                        . $attributes['alias'] . '. Choose another alias.');
                 }
-                $knownAliases[] = $attributes["alias"];
-                
+                $knownAliases[] = $attributes['alias'];
+
                 $chillManagerDefinition->addMethodCall(
                     'addAggregator',
-                    array(new Reference($id), $attributes["alias"])
-                );
-            }
-        }
-    }
-    
-    private function compileFormatters(Definition $chillManagerDefinition,
-            ContainerBuilder $container)
-    {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export_formatter'
-        );
-        
-        $knownAliases = array();
-        
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes["alias"])) {
-                    throw new \LogicException("the 'alias' attribute is missing in your ".
-                        "service '$id' definition");
-                }
-                
-                if (array_search($attributes["alias"], $knownAliases)) {
-                    throw new \LogicException("There is already a chill.export_formatter service with alias "
-                        .$attributes["alias"].". Choose another alias.");
-                }
-                $knownAliases[] = $attributes["alias"];
-                
-                $chillManagerDefinition->addMethodCall(
-                    'addFormatter',
-                    array(new Reference($id), $attributes["alias"])
-                );
-            }
-        }
-    }
-    
-    private function compileExportElementsProvider(Definition $chillManagerDefinition, 
-            ContainerBuilder $container)
-    {
-        $taggedServices = $container->findTaggedServiceIds(
-            'chill.export_elements_provider'
-        );
-        
-        $knownAliases = array();
-        
-        foreach ($taggedServices as $id => $tagAttributes) {
-            foreach ($tagAttributes as $attributes) {
-                if (!isset($attributes["prefix"])) {
-                    throw new \LogicException("the 'prefix' attribute is missing in your ".
-                        "service '$id' definition");
-                }
-                
-                if (array_search($attributes["prefix"], $knownAliases)) {
-                    throw new \LogicException("There is already a chill.export_elements_provider service with prefix "
-                        .$attributes["prefix"].". Choose another prefix.");
-                }
-                $knownAliases[] = $attributes["prefix"];
-                
-                $chillManagerDefinition->addMethodCall(
-                    'addExportElementsProvider',
-                    array(new Reference($id), $attributes["prefix"])
+                    [new Reference($id), $attributes['alias']]
                 );
             }
         }
     }
 
+    private function compileExportElementsProvider(
+        Definition $chillManagerDefinition,
+        ContainerBuilder $container
+    ) {
+        $taggedServices = $container->findTaggedServiceIds(
+            'chill.export_elements_provider'
+        );
+
+        $knownAliases = [];
+
+        foreach ($taggedServices as $id => $tagAttributes) {
+            foreach ($tagAttributes as $attributes) {
+                if (!isset($attributes['prefix'])) {
+                    throw new LogicException("the 'prefix' attribute is missing in your " .
+                        "service '{$id}' definition");
+                }
+
+                if (array_search($attributes['prefix'], $knownAliases, true)) {
+                    throw new LogicException('There is already a chill.export_elements_provider service with prefix '
+                        . $attributes['prefix'] . '. Choose another prefix.');
+                }
+                $knownAliases[] = $attributes['prefix'];
+
+                $chillManagerDefinition->addMethodCall(
+                    'addExportElementsProvider',
+                    [new Reference($id), $attributes['prefix']]
+                );
+            }
+        }
+    }
+
+    private function compileExports(
+        Definition $chillManagerDefinition,
+        ContainerBuilder $container
+    ) {
+        $taggedServices = $container->findTaggedServiceIds(
+            'chill.export'
+        );
+
+        $knownAliases = [];
+
+        foreach ($taggedServices as $id => $tagAttributes) {
+            foreach ($tagAttributes as $attributes) {
+                if (!isset($attributes['alias'])) {
+                    throw new LogicException("the 'alias' attribute is missing in your " .
+                        "service '{$id}' definition");
+                }
+
+                if (array_search($attributes['alias'], $knownAliases, true)) {
+                    throw new LogicException('There is already a chill.export service with alias '
+                        . $attributes['alias'] . '. Choose another alias.');
+                }
+                $knownAliases[] = $attributes['alias'];
+
+                $chillManagerDefinition->addMethodCall(
+                    'addExport',
+                    [new Reference($id), $attributes['alias']]
+                );
+            }
+        }
+    }
+
+    private function compileFilters(
+        Definition $chillManagerDefinition,
+        ContainerBuilder $container
+    ) {
+        $taggedServices = $container->findTaggedServiceIds(
+            'chill.export_filter'
+        );
+
+        $knownAliases = [];
+
+        foreach ($taggedServices as $id => $tagAttributes) {
+            foreach ($tagAttributes as $attributes) {
+                if (!isset($attributes['alias'])) {
+                    throw new LogicException("the 'alias' attribute is missing in your " .
+                        "service '{$id}' definition");
+                }
+
+                if (array_search($attributes['alias'], $knownAliases, true)) {
+                    throw new LogicException('There is already a chill.export_filter service with alias '
+                        . $attributes['alias'] . '. Choose another alias.');
+                }
+                $knownAliases[] = $attributes['alias'];
+
+                $chillManagerDefinition->addMethodCall(
+                    'addFilter',
+                    [new Reference($id), $attributes['alias']]
+                );
+            }
+        }
+    }
+
+    private function compileFormatters(
+        Definition $chillManagerDefinition,
+        ContainerBuilder $container
+    ) {
+        $taggedServices = $container->findTaggedServiceIds(
+            'chill.export_formatter'
+        );
+
+        $knownAliases = [];
+
+        foreach ($taggedServices as $id => $tagAttributes) {
+            foreach ($tagAttributes as $attributes) {
+                if (!isset($attributes['alias'])) {
+                    throw new LogicException("the 'alias' attribute is missing in your " .
+                        "service '{$id}' definition");
+                }
+
+                if (array_search($attributes['alias'], $knownAliases, true)) {
+                    throw new LogicException('There is already a chill.export_formatter service with alias '
+                        . $attributes['alias'] . '. Choose another alias.');
+                }
+                $knownAliases[] = $attributes['alias'];
+
+                $chillManagerDefinition->addMethodCall(
+                    'addFormatter',
+                    [new Reference($id), $attributes['alias']]
+                );
+            }
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
index 3239e7045..9b5d0903c 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php
@@ -1,46 +1,37 @@
 <?php
-/*
- * Copyright (C) 2019 Champs-Libres <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\MainBundle\DependencyInjection\CompilerPass;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Chill\MainBundle\Form\Type\Export\PickCenterType;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * 
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\DependencyInjection\CompilerPass;
+
+use LogicException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
 class GroupingCenterCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (FALSE === $container->hasDefinition('chill.main.form.pick_centers_type')) {
-            throw new \LogicException("The service chill.main.form.pick_centers_type does "
-                . "not exists in container");
+        if (false === $container->hasDefinition('chill.main.form.pick_centers_type')) {
+            throw new LogicException('The service chill.main.form.pick_centers_type does '
+                . 'not exists in container');
         }
-        
+
         $pickCenterType = $container->getDefinition('chill.main.form.pick_centers_type');
-        
+
         foreach ($container->findTaggedServiceIds('chill.grouping_center') as $serviceId => $tagged) {
-            $pickCenterType->addMethodCall('addGroupingCenter', 
-                [ new Reference($serviceId) ]);
+            $pickCenterType->addMethodCall(
+                'addGroupingCenter',
+                [new Reference($serviceId)]
+            );
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
index a8d87d950..7a63412d5 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php
@@ -1,44 +1,35 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\DependencyInjection\CompilerPass;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Chill\MainBundle\Routing\MenuComposer;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\DependencyInjection\CompilerPass;
+
+use Chill\MainBundle\Routing\MenuComposer;
+use LogicException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
 class MenuCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('chill.main.menu_composer')) { 
-            throw new \LogicException(sprintf("The service %s does not exists in "
-                . "container.", MenuComposer::class));
+        if (!$container->hasDefinition('chill.main.menu_composer')) {
+            throw new LogicException(sprintf('The service %s does not exists in '
+                . 'container.', MenuComposer::class));
         }
-        
+
         $menuComposerDefinition = $container->getDefinition('chill.main.menu_composer');
 
         $services = [];
+
         foreach ($container->findTaggedServiceIds('chill.menu_builder') as $id => $tags) {
             $services[] = [
                 'id' => $id,
@@ -46,15 +37,17 @@ class MenuCompilerPass implements CompilerPassInterface
             ];
         }
 
-        usort($services, function ($a, $b) {
-            if ($a['priority'] == $b['priority']) {
+        usort($services, static function ($a, $b) {
+            if ($a['priority'] === $b['priority']) {
                 return 0;
             }
+
             return ($a['priority'] < $b['priority']) ? -1 : 1;
         });
 
         foreach ($services as $service) {
             $class = $container->getDefinition($service['id'])->getClass();
+
             foreach ($class::getMenuIds() as $menuId) {
                 $menuComposerDefinition
                     ->addMethodCall('addLocalMenuBuilder', [new Reference($service['id']), $menuId]);
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
index 941aeeb7a..36435400c 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/NotificationCounterCompilerPass.php
@@ -1,43 +1,33 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\DependencyInjection\CompilerPass;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Chill\MainBundle\Templating\UI\CountNotificationUser;
-use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\DependencyInjection\CompilerPass;
+
+use Chill\MainBundle\Templating\UI\CountNotificationUser;
+use LogicException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
 class NotificationCounterCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition(CountNotificationUser::class)) {
-            throw new \LogicException("The service ".CountNotificationUser::class." "
-                . "should be defined");
+            throw new LogicException('The service ' . CountNotificationUser::class . ' '
+                . 'should be defined');
         }
-        
+
         $notificationCounterDefinition = $container->getDefinition(CountNotificationUser::class);
-        
+
         foreach ($container->findTaggedServiceIds('chill.count_notification.user') as $id => $tags) {
             $notificationCounterDefinition
                 ->addMethodCall('addNotificationCounter', [new Reference($id)]);
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
index e07849ed2..e5504a532 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
@@ -1,43 +1,35 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 class SearchableServicesCompilerPass implements CompilerPassInterface
 {
-
-    /*
-     * (non-PHPdoc)
+    /**
+     * (non-PHPdoc).
+     *
      * @see \Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface::process()
      */
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill_main.search_provider')) {
-            throw new \LogicException('service chill_main.search_provider '
+            throw new LogicException('service chill_main.search_provider '
                     . 'is not defined.');
         }
-        
+
         $definition = $container->getDefinition(
             'chill_main.search_provider'
         );
@@ -45,29 +37,27 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
         $taggedServices = $container->findTaggedServiceIds(
             'chill.search'
         );
-        
-        $knownAliases = array();
-        
+
+        $knownAliases = [];
+
         foreach ($taggedServices as $id => $tagAttributes) {
-            
             foreach ($tagAttributes as $attributes) {
-                
-                if (!isset($attributes["alias"])) {
-                    throw new \LogicException("the 'name' attribute is missing in your ".
-                        "service '$id' definition");
+                if (!isset($attributes['alias'])) {
+                    throw new LogicException("the 'name' attribute is missing in your " .
+                        "service '{$id}' definition");
                 }
-                
-                if (array_search($attributes["alias"], $knownAliases)) {
-                    throw new \LogicException("There is already a chill.search service with alias "
-                        .$attributes["alias"].". Choose another alias.");
+
+                if (array_search($attributes['alias'], $knownAliases, true)) {
+                    throw new LogicException('There is already a chill.search service with alias '
+                        . $attributes['alias'] . '. Choose another alias.');
                 }
-                $knownAliases[] = $attributes["alias"];
-                
+                $knownAliases[] = $attributes['alias'];
+
                 $definition->addMethodCall(
                     'addSearchService',
-                    array(new Reference($id), $attributes["alias"])
+                    [new Reference($id), $attributes['alias']]
                 );
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
index d5b8efbde..8b9b83fb6 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/TimelineCompilerClass.php
@@ -1,42 +1,34 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
+use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Add services taggued with  `name: chill.timeline` to 
- * timeline_builder service definition
- *
+ * Add services taggued with  `name: chill.timeline` to
+ * timeline_builder service definition.
  */
 class TimelineCompilerClass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill_main.timeline_builder')) {
-            throw new \LogicException('service chill_main.timeline_builder '
+            throw new LogicException('service chill_main.timeline_builder '
                     . 'is not defined.');
         }
-        
+
         $definition = $container->getDefinition(
             'chill_main.timeline_builder'
         );
@@ -44,22 +36,19 @@ class TimelineCompilerClass implements CompilerPassInterface
         $taggedServices = $container->findTaggedServiceIds(
             'chill.timeline'
         );
-        
+
         foreach ($taggedServices as $id => $tagAttributes) {
-            
             foreach ($tagAttributes as $attributes) {
-                
-                if (!isset($attributes["context"])) {
-                    throw new \LogicException("the 'context' attribute is missing in your ".
-                        "service '$id' definition");
+                if (!isset($attributes['context'])) {
+                    throw new LogicException("the 'context' attribute is missing in your " .
+                        "service '{$id}' definition");
                 }
 
                 $definition->addMethodCall(
                     'addProvider',
-                    array($attributes["context"], $id, new Reference($id))
+                    [$attributes['context'], $id, new Reference($id)]
                 );
             }
         }
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php
index b28b8fdbb..f079571a1 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/WidgetsCompilerPass.php
@@ -1,34 +1,26 @@
 <?php
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Compile the service definition to register widgets.
- * 
  */
-class WidgetsCompilerPass extends AbstractWidgetsCompilerPass {
-    
-   public function process(ContainerBuilder $container)
-   {
-       $this->doProcess($container, 'chill_main', 'chill_main.widgets');
-   }
+class WidgetsCompilerPass extends AbstractWidgetsCompilerPass
+{
+    public function process(ContainerBuilder $container)
+    {
+        $this->doProcess($container, 'chill_main', 'chill_main.widgets');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
index 3331b29bb..5a803e9de 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ConfigConsistencyCompilerPass.php
@@ -1,59 +1,55 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
+use LogicException;
+use RuntimeException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use function count;
 
 /**
- * Description of ConfigConsistencyCompilerPass
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Description of ConfigConsistencyCompilerPass.
  */
 class ConfigConsistencyCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         $availableLanguages = $container
-              ->getParameter('chill_main.available_languages');
+            ->getParameter('chill_main.available_languages');
         $methodCallsTranslator = $container
-              ->findDefinition('translator.default')
-              ->getMethodCalls();
-        
-        $fallbackLocales = array();
-        foreach($methodCallsTranslator as $call) {
-            if ($call[0] === 'setFallbackLocales') {
-                $fallbackLocales = array_merge($fallbackLocales,
-                      $call[1][0]);
-            }    
+            ->findDefinition('translator.default')
+            ->getMethodCalls();
+
+        $fallbackLocales = [];
+
+        foreach ($methodCallsTranslator as $call) {
+            if ('setFallbackLocales' === $call[0]) {
+                $fallbackLocales = array_merge(
+                    $fallbackLocales,
+                    $call[1][0]
+                );
+            }
         }
-        
+
         if (count($fallbackLocales) === 0) {
-            throw new \LogicException('the fallback locale are not defined. '
+            throw new LogicException('the fallback locale are not defined. '
                   . 'The framework config should not allow this.');
         }
-        
+
         $diff = array_diff($fallbackLocales, $availableLanguages);
+
         if (count($diff) > 0) {
-            throw new \RuntimeException(sprintf('The chill_main.available_languages'
+            throw new RuntimeException(sprintf('The chill_main.available_languages'
                   . ' parameter does not contains fallback locales. The languages %s'
                   . ' are missing.', implode(', ', $diff)));
         }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index c711f911f..9236c8a50 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -1,41 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
+use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
-
 /**
- * Configure the main bundle
+ * Configure the main bundle.
  */
 class Configuration implements ConfigurationInterface
 {
-    
     use AddWidgetConfigurationTrait;
-    
-    /**
-     *
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
 
-    
-    public function __construct(array $widgetFactories = array(), 
-            ContainerBuilder $containerBuilder)
-    {
+    private ContainerBuilder $containerBuilder;
+
+    public function __construct(
+        array $widgetFactories,
+        ContainerBuilder $containerBuilder
+    ) {
         $this->setWidgetFactories($widgetFactories);
         $this->containerBuilder = $containerBuilder;
     }
-    
-    /**
-     * {@inheritDoc}
-     */
+
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_main');
@@ -43,211 +41,221 @@ class Configuration implements ConfigurationInterface
 
         $rootNode
             ->children()
-                ->scalarNode('installation_name')
-                    ->cannotBeEmpty()
-                    ->defaultValue('Chill')
-                ->end() // end of scalar 'installation_name'
-                ->arrayNode('available_languages')
-                    ->defaultValue(array('fr'))
-                    ->prototype('scalar')->end()
-                ->end() // end of array 'available_languages'
-                ->arrayNode('routing')
-                    ->children()
-                        ->arrayNode('resources')
-                        ->prototype('scalar')->end()
-                        ->end() // end of array 'resources'
-                    ->end() // end of children
-                ->end() // end of array node 'routing'
-                ->arrayNode('pagination')
-                    ->canBeDisabled()
-                    ->children()
-                        ->integerNode('item_per_page')
-                        ->info('The number of item to show in the page result, by default')
-                        ->min(1)
-                        ->defaultValue(50)
-                        ->end() // end of integer 'item_per_page'
-                    ->end() // end of children
-                ->end() // end of pagination
-                ->arrayNode('notifications')
-                    ->children()
-                        ->scalarNode('from_email')
-                            ->cannotBeEmpty()
-                        ->end()
-                        ->scalarNode('from_name')
-                            ->cannotBeEmpty()
-                        ->end()
-                        ->enumNode('scheme')
-                            ->cannotBeEmpty()
-                            ->values(['http', 'https'])
-                            ->defaultValue('https')
-                        ->end()
-                        ->scalarNode('host')
-                            ->cannotBeEmpty()
-                        ->end()
-                    ->end()
-                ->end() // end of notifications
-                ->arrayNode('phone_helper')
-                    ->canBeUnset()
-                    ->children()
-                        ->scalarNode('twilio_sid')
-                            ->defaultNull()
-                        ->end()
-                        ->scalarNode('twilio_secret')
-                            ->defaultNull()
-                        ->end()
-                    ->end()
-                ->end()
-                ->arrayNode('redis')
-                    ->children()
-                        ->scalarNode('host')
-                            ->cannotBeEmpty()
-                        ->end()
-                        ->scalarNode('port')
-                            ->defaultValue(6379)
-                        ->end()
-                        ->scalarNode('timeout')
-                            ->defaultValue(1)
-                        ->end()
-                    ->end()
-                ->end()
-                ->arrayNode('widgets')
-                    ->canBeEnabled()
-                    ->canBeUnset()
-                    ->children()
-                         ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
-                    ->end() // end of widgets/children
-                ->end() // end of widgets
-                ->arrayNode('cruds')
-                    ->defaultValue([])
-                    ->arrayPrototype()
-                        ->children()
-                            ->scalarNode('class')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('controller')
-                                ->cannotBeEmpty()
-                                ->defaultValue(\Chill\MainBundle\CRUD\Controller\CRUDController::class)
-                            ->end()
-                            ->scalarNode('name')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('base_path')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('base_role')->defaultNull()->end()
-                            ->scalarNode('form_class')->defaultNull()->end()
-                            ->arrayNode('actions')
-                                ->defaultValue([
-                                    'edit' => [],
-                                    'new'  => []
-                                ])
-                                ->useAttributeAsKey('name')
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('controller_action')
-                                            ->defaultNull()
-                                            ->info('the method name to call in the route. Will be set to the action name if left empty.')
-                                            ->example("action")
-                                        ->end()
-                                        ->scalarNode('path')
-                                            ->defaultNull()
-                                            ->info('the path that will be **appended** after the base path. Do not forget to add '
+            ->scalarNode('installation_name')
+            ->cannotBeEmpty()
+            ->defaultValue('Chill')
+            ->end() // end of scalar 'installation_name'
+            ->arrayNode('available_languages')
+            ->defaultValue(['fr'])
+            ->prototype('scalar')->end()
+            ->end() // end of array 'available_languages'
+            ->arrayNode('available_countries')
+            ->defaultValue(['FR'])
+            ->prototype('scalar')->end()
+            ->end() // end of array 'available_countries'
+            ->arrayNode('routing')
+            ->children()
+            ->arrayNode('resources')
+            ->prototype('scalar')->end()
+            ->end() // end of array 'resources'
+            ->end() // end of children
+            ->end() // end of array node 'routing'
+            ->arrayNode('pagination')
+            ->canBeDisabled()
+            ->children()
+            ->integerNode('item_per_page')
+            ->info('The number of item to show in the page result, by default')
+            ->min(1)
+            ->defaultValue(50)
+            ->end() // end of integer 'item_per_page'
+            ->end() // end of children
+            ->end() // end of pagination
+            ->arrayNode('notifications')
+            ->children()
+            ->scalarNode('from_email')
+            ->cannotBeEmpty()
+            ->end()
+            ->scalarNode('from_name')
+            ->cannotBeEmpty()
+            ->end()
+            ->enumNode('scheme')
+            ->cannotBeEmpty()
+            ->values(['http', 'https'])
+            ->defaultValue('https')
+            ->end()
+            ->scalarNode('host')
+            ->cannotBeEmpty()
+            ->end()
+            ->end()
+            ->end() // end of notifications
+            ->arrayNode('phone_helper')
+            ->canBeUnset()
+            ->children()
+            ->scalarNode('twilio_sid')
+            ->defaultNull()
+            ->end()
+            ->scalarNode('twilio_secret')
+            ->defaultNull()
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('acl')
+            ->addDefaultsIfNotSet()
+            ->children()
+            ->booleanNode('form_show_scopes')
+            ->defaultTrue()
+            ->end()
+            ->booleanNode('form_show_centers')
+            ->defaultTrue()
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('redis')
+            ->children()
+            ->scalarNode('host')
+            ->cannotBeEmpty()
+            ->end()
+            ->scalarNode('port')
+            ->defaultValue(6379)
+            ->end()
+            ->scalarNode('timeout')
+            ->defaultValue(1)
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('widgets')
+            ->canBeEnabled()
+            ->canBeUnset()
+            ->children()
+            ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
+            ->end() // end of widgets/children
+            ->end() // end of widgets
+            ->arrayNode('cruds')
+            ->defaultValue([])
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('class')->cannotBeEmpty()->isRequired()->end()
+            ->scalarNode('controller')
+            ->cannotBeEmpty()
+            ->defaultValue(\Chill\MainBundle\CRUD\Controller\CRUDController::class)
+            ->end()
+            ->scalarNode('name')->cannotBeEmpty()->isRequired()->end()
+            ->scalarNode('base_path')->cannotBeEmpty()->isRequired()->end()
+            ->scalarNode('base_role')->defaultNull()->end()
+            ->scalarNode('form_class')->defaultNull()->end()
+            ->arrayNode('actions')
+            ->defaultValue([
+                'edit' => [],
+                'new' => [],
+            ])
+            ->useAttributeAsKey('name')
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('controller_action')
+            ->defaultNull()
+            ->info('the method name to call in the route. Will be set to the action name if left empty.')
+            ->example('action')
+            ->end()
+            ->scalarNode('path')
+            ->defaultNull()
+            ->info('the path that will be **appended** after the base path. Do not forget to add '
                                                 . 'arguments for the method. Will be set to the action name, including an `{id}` '
                                                 . 'parameter if left empty.')
-                                            ->example('/{id}/my-action')
-                                        ->end()
-                                        ->arrayNode('requirements')
-                                            ->ignoreExtraKeys(false)
-                                            ->info('the requirements for the route. Will be set to `[ \'id\' => \'\d+\' ]` if left empty.')
-                                        ->end()
-                                        ->scalarNode('role')
-                                            ->defaultNull()
-                                            ->info('the role that will be required for this action. Override option `base_role`')
-                                        ->end()
-                                        ->scalarNode('template')
-                                            ->defaultNull()
-                                            ->info('the template to render the view')
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-
-                ->end()
-
-
-                ->arrayNode('apis')
-                    ->defaultValue([])
-                    ->arrayPrototype()
-                        ->children()
-                            ->scalarNode('class')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('controller')
-                                ->cannotBeEmpty()
-                                ->defaultValue(\Chill\MainBundle\CRUD\Controller\ApiController::class)
-                            ->end()
-                            ->scalarNode('name')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('base_path')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('base_role')->defaultNull()->end()
-                            ->arrayNode('actions')
-                                ->useAttributeAsKey('name')
-                                ->arrayPrototype()
-                                    ->children()
-                                        ->scalarNode('controller_action')
-                                            ->defaultNull()
-                                            ->info('the method name to call in the controller. Will be set to the concatenation '.
+            ->example('/{id}/my-action')
+            ->end()
+            ->arrayNode('requirements')
+            ->ignoreExtraKeys(false)
+            ->info('the requirements for the route. Will be set to `[ \'id\' => \'\d+\' ]` if left empty.')
+            ->end()
+            ->scalarNode('role')
+            ->defaultNull()
+            ->info('the role that will be required for this action. Override option `base_role`')
+            ->end()
+            ->scalarNode('template')
+            ->defaultNull()
+            ->info('the template to render the view')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->arrayNode('apis')
+            ->defaultValue([])
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('class')->cannotBeEmpty()->isRequired()->end()
+            ->scalarNode('controller')
+            ->cannotBeEmpty()
+            ->defaultValue(\Chill\MainBundle\CRUD\Controller\ApiController::class)
+            ->end()
+            ->scalarNode('name')->cannotBeEmpty()->isRequired()->end()
+            ->scalarNode('base_path')->cannotBeEmpty()->isRequired()->end()
+            ->scalarNode('base_role')->defaultNull()->end()
+            ->arrayNode('actions')
+            ->useAttributeAsKey('name')
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('controller_action')
+            ->defaultNull()
+            ->info('the method name to call in the controller. Will be set to the concatenation ' .
                                                 'of action name + \'Api\' if left empty.')
-                                            ->example("showApi")
-                                        ->end()
-                                        ->scalarNode('path')
-                                            ->defaultNull()
-                                            ->info('the path that will be **appended** after the base path. Do not forget to add ' .
-                                                'arguments for the method. By default, will set to the action name, including an `{id}` '.
-                                                'parameter. A suffix of action name will be appended, except if the action name '.
+            ->example('showApi')
+            ->end()
+            ->scalarNode('path')
+            ->defaultNull()
+            ->info('the path that will be **appended** after the base path. Do not forget to add ' .
+                                                'arguments for the method. By default, will set to the action name, including an `{id}` ' .
+                                                'parameter. A suffix of action name will be appended, except if the action name ' .
                                                 'is "_entity".')
-                                            ->example('/{id}/my-action')
-                                        ->end()
-                                        ->arrayNode('requirements')
-                                            ->ignoreExtraKeys(false)
-                                            ->info('the requirements for the route. Will be set to `[ \'id\' => \'\d+\' ]` if left empty.')
-                                        ->end()
-                                        ->enumNode('single_collection')
-                                            ->values(['single', 'collection'])
-                                            ->defaultValue('single')
-                                            ->info('indicates if the returned object is a single element or a collection. '.
-                                                    'If the action name is `_index`, this value will always be considered as '.
+            ->example('/{id}/my-action')
+            ->end()
+            ->arrayNode('requirements')
+            ->ignoreExtraKeys(false)
+            ->info('the requirements for the route. Will be set to `[ \'id\' => \'\d+\' ]` if left empty.')
+            ->end()
+            ->enumNode('single_collection')
+            ->values(['single', 'collection'])
+            ->defaultValue('single')
+            ->info('indicates if the returned object is a single element or a collection. ' .
+                                                    'If the action name is `_index`, this value will always be considered as ' .
                                                     '`collection`')
-                                        ->end()
-                                        ->arrayNode('methods')
-                                            ->addDefaultsIfNotSet()
-                                            ->info('the allowed methods')
-                                            ->children()
-                                                ->booleanNode(Request::METHOD_GET)->defaultTrue()->end()
-                                                ->booleanNode(Request::METHOD_HEAD)->defaultTrue()->end()
-                                                ->booleanNode(Request::METHOD_POST)->defaultFalse()->end()
-                                                ->booleanNode(Request::METHOD_DELETE)->defaultFalse()->end()
-                                                ->booleanNode(Request::METHOD_PUT)->defaultFalse()->end()
-                                                ->booleanNode(Request::METHOD_PATCH)->defaultFalse()->end()
-                                            ->end()
-                                        ->end()
-                                        ->arrayNode('roles')
-                                            ->addDefaultsIfNotSet()
-                                            ->info("The role require for each http method")
-                                            ->children()
-                                                ->scalarNode(Request::METHOD_GET)->defaultNull()->end()
-                                                ->scalarNode(Request::METHOD_HEAD)->defaultNull()->end()
-                                                ->scalarNode(Request::METHOD_POST)->defaultNull()->end()
-                                                ->scalarNode(Request::METHOD_DELETE)->defaultNull()->end()
-                                                ->scalarNode(Request::METHOD_PUT)->defaultNull()->end()
-                                                ->scalarNode(Request::METHOD_PATCH)->defaultNull()->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-
-                ->end()
-               ->end() // end of root/children
+            ->end()
+            ->arrayNode('methods')
+            ->addDefaultsIfNotSet()
+            ->info('the allowed methods')
+            ->children()
+            ->booleanNode(Request::METHOD_GET)->defaultTrue()->end()
+            ->booleanNode(Request::METHOD_HEAD)->defaultTrue()->end()
+            ->booleanNode(Request::METHOD_POST)->defaultFalse()->end()
+            ->booleanNode(Request::METHOD_DELETE)->defaultFalse()->end()
+            ->booleanNode(Request::METHOD_PUT)->defaultFalse()->end()
+            ->booleanNode(Request::METHOD_PATCH)->defaultFalse()->end()
+            ->end()
+            ->end()
+            ->arrayNode('roles')
+            ->addDefaultsIfNotSet()
+            ->info('The role require for each http method')
+            ->children()
+            ->scalarNode(Request::METHOD_GET)->defaultNull()->end()
+            ->scalarNode(Request::METHOD_HEAD)->defaultNull()->end()
+            ->scalarNode(Request::METHOD_POST)->defaultNull()->end()
+            ->scalarNode(Request::METHOD_DELETE)->defaultNull()->end()
+            ->scalarNode(Request::METHOD_PUT)->defaultNull()->end()
+            ->scalarNode(Request::METHOD_PATCH)->defaultNull()->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end() // end of root/children
             ->end() // end of root
-        ;
+;
 
-        
         return $treeBuilder;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
index 2b4f33b88..54961699a 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/MissingBundleException.php
@@ -1,20 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
 use Exception;
 
 /**
- * Description of MissingBundleException
- *
- * @author julien
+ * Description of MissingBundleException.
  */
-class MissingBundleException extends Exception {
-    
-    public function __construct($missingBundleName) {
-        $message = "The bundle $missingBundleName is missing.";
-        
+class MissingBundleException extends Exception
+{
+    public function __construct($missingBundleName)
+    {
+        $message = "The bundle {$missingBundleName} is missing.";
+
         parent::__construct($message, 500);
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
index 1f2b92388..fa9fd2d30 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/RoleProvidersCompilerPass.php
@@ -1,42 +1,30 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use LogicException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class RoleProvidersCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition('chill.main.role_provider')) {
-            throw new \LogicException('service chill.main.role_provider '
+            throw new LogicException('service chill.main.role_provider '
                     . 'is not defined. It is required by RoleProviderCompilerPass');
         }
-        
+
         $definition = $container->getDefinition(
             'chill.main.role_provider'
         );
@@ -44,14 +32,12 @@ class RoleProvidersCompilerPass implements CompilerPassInterface
         $taggedServices = $container->findTaggedServiceIds(
             'chill.role'
         );
-        
+
         foreach ($taggedServices as $id => $tagAttributes) {
             $definition->addMethodCall(
                 'addProvider',
-                array(new Reference($id))
+                [new Reference($id)]
             );
         }
-        
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
index d26e09293..e352470e7 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
@@ -1,317 +1,239 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\Widget;
 
+use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
+use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
+use LengthException;
+use LogicException;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Definition;
-use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
-use Chill\MainBundle\DependencyInjection\Widget\HasWidgetFactoriesExtensionInterface;
+use Symfony\Component\DependencyInjection\Reference;
+use UnexpectedValueException;
+use function array_key_exists;
+use function count;
+use function get_class;
+use function in_array;
+use function is_array;
 
 /**
  * Compile the configurations and inject required service into container.
- * 
+ *
  * The widgets are services tagged with :
- * 
+ *
  * ```
  * { name: chill_widget, alias: my_alias, place: my_place }
  * ```
- * 
- * Or, if the tag does not exist or if you need to add some config to your 
+ *
+ * Or, if the tag does not exist or if you need to add some config to your
  * service depending on the config, you should use a `WidgetFactory` (see
  * `WidgetFactoryInterface`.
- * 
- * To reuse this compiler pass, simple execute the doProcess metho in your 
+ *
+ * To reuse this compiler pass, simple execute the doProcess metho in your
  * compiler. Example :
- * 
+ *
  * ```
  * namespace Chill\MainBundle\DependencyInjection\CompilerPass;
- * 
+ *
  * use Symfony\Component\DependencyInjection\ContainerBuilder;
  * use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass;
  * class WidgetsCompilerPass extends AbstractWidgetsCompilerPass {
- *     
+ *
  *    public function process(ContainerBuilder $container)
  *    {
  *       $this->doProcess($container, 'chill_main', 'chill_main.widgets');
  *    }
  * }
  * ```
- *
- *        
  */
 abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 {
-    private $widgetServices = array();
-    
     /**
-     *
-     * @var WidgetFactoryInterface[]
+     * the key to use to identify widget for a given place.
      */
-    private $widgetFactories;
-    
+    public const WIDGET_CONFIG_ALIAS = 'widget_alias';
+
     /**
-     * The service which will manage the widgets
-     * 
+     * the key to use to order widget for a given place.
+     */
+    public const WIDGET_CONFIG_ORDER = 'order';
+
+    /**
+     * The service which will manage the widgets.
+     *
      * @var string
      */
-    const WIDGET_MANAGER = 'chill.main.twig.widget';
-    
+    public const WIDGET_MANAGER = 'chill.main.twig.widget';
+
     /**
      * the method wich register the widget into give service.
      */
-    const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
-    
+    public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
+
     /**
-     * the value of the `name` key in service definitions's tag
-     * 
-     * @var string
-     */
-    const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
-    
-    /**
-     * the key used to collect the alias in the service definition's tag. 
-     * the alias must be 
+     * the key used to collect the alias in the service definition's tag.
+     * the alias must be
      * injected into the configuration under 'alias' key.
-     * 
+     *
      * @var string
      */
-    const WIDGET_SERVICE_TAG_ALIAS = 'alias';
-    
+    public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
+
     /**
-     * the key used to collect the authorized place in the service definition's tag
-     * 
+     * the value of the `name` key in service definitions's tag.
+     *
      * @var string
      */
-    const WIDGET_SERVICE_TAG_PLACES = 'place';
-    
-    /**
-     * the key to use to order widget for a given place
-     */
-    const WIDGET_CONFIG_ORDER = 'order';
-    
-    /**
-     * the key to use to identify widget for a given place
-     */
-    const WIDGET_CONFIG_ALIAS = 'widget_alias';
-
+    public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
 
     /**
-     * process the configuration and the container to add the widget available
-     * 
-     * @param ContainerBuilder $container
+     * the key used to collect the authorized place in the service definition's tag.
+     *
+     * @var string
+     */
+    public const WIDGET_SERVICE_TAG_PLACES = 'place';
+
+    /**
+     * cache of ordering by place.
+     *
+     * @internal used by function cacheAndGetOrdering
+     *
+     * @var array
+     */
+    private $cacheOrdering = [];
+
+    /**
+     * @var WidgetFactoryInterface[]
+     */
+    private $widgetFactories;
+
+    private $widgetServices = [];
+
+    /**
+     * process the configuration and the container to add the widget available.
+     *
      * @param string $extension the extension of your bundle
      * @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
+     *
+     * @throws LogicException
+     * @throws UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
      */
-    public function doProcess(ContainerBuilder $container, $extension,
-            $containerWidgetConfigParameterName)
-    {
+    public function doProcess(
+        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);
+            throw new LogicException('the service ' . self::WIDGET_MANAGER . ' should' .
+                ' be present. It is required by ' . self::class);
         }
-        
+
         $managerDefinition = $container->getDefinition(self::WIDGET_MANAGER);
-        
+
         // collect the widget factories
-        /* @var $extensionClass HasWidgetFactoriesExtensionInterface */
+        /** @var HasWidgetFactoriesExtensionInterface $extensionClass */
         $extensionClass = $container->getExtension($extension);
         // throw an error if extension does not implement HasWidgetFactoriesExtensionInterface
         if (!$extensionClass instanceof HasWidgetFactoriesExtensionInterface) {
-            throw new \UnexpectedValueException(sprintf("The extension for %s "
-                    . "do not implements %s. You should implement %s on %s",
-                    $extension,
-                    HasWidgetFactoriesExtensionInterface::class,
-                    HasWidgetFactoriesExtensionInterface::class,
-                    get_class($extensionClass)));
+            throw new UnexpectedValueException(sprintf(
+                'The extension for %s '
+                    . 'do not implements %s. You should implement %s on %s',
+                $extension,
+                HasWidgetFactoriesExtensionInterface::class,
+                HasWidgetFactoriesExtensionInterface::class,
+                get_class($extensionClass)
+            ));
         }
-        
-        
+
         $this->widgetFactories = $extensionClass->getWidgetFactories();
-        
+
         // collect the availabled tagged services
         $this->collectTaggedServices($container);
-        
+
         // collect the widgets and their config :
         $widgetParameters = $container->getParameter($containerWidgetConfigParameterName);
-        
+
         // and add them to the delegated_block
-        foreach($widgetParameters as $place => $widgets) {
-            
+        foreach ($widgetParameters as $place => $widgets) {
             foreach ($widgets as $param) {
                 $alias = $param[self::WIDGET_CONFIG_ALIAS];
                 // check that the service exists
                 if (!array_key_exists($alias, $this->widgetServices)) {
-                    throw new InvalidConfigurationException(sprintf("The alias %s".
-                        " is not defined.", $alias));
+                    throw new InvalidConfigurationException(sprintf('The alias %s' .
+                        ' is not defined.', $alias));
                 }
-                
+
                 // check that the widget is allowed at this place
                 if (!$this->isPlaceAllowedForWidget($place, $alias, $container)) {
-                    throw new \InvalidConfigurationException(sprintf(
-                        "The widget with alias %s is not allowed at place %s",
-                        $alias, 
+                    throw new InvalidConfigurationException(sprintf(
+                        'The widget with alias %s is not allowed at place %s',
+                        $alias,
                         $place
-                        ));
+                    ));
                 }
-                
+
                 // get the order, eventually corrected
-                $order = $this->cacheAndGetOrdering($place, $param[self::WIDGET_CONFIG_ORDER]); 
-                
+                $order = $this->cacheAndGetOrdering($place, $param[self::WIDGET_CONFIG_ORDER]);
+
                 // register the widget with config to the service, using the method
                 // `addWidget`
                 if ($this->widgetServices[$alias] instanceof WidgetFactoryInterface) {
-                    /* @var $factory WidgetFactoryInterface */
+                    /** @var WidgetFactoryInterface $factory */
                     $factory = $this->widgetServices[$alias];
                     // get the config (under the key which equals to widget_alias
-                    $config = isset($param[$factory->getWidgetAlias()]) ? 
-                                    $param[$factory->getWidgetAlias()] : array();
+                    $config = isset($param[$factory->getWidgetAlias()]) ?
+                                    $param[$factory->getWidgetAlias()] : [];
                     // register the service into the container
-                    $serviceId =$this->registerServiceIntoContainer($container, 
-                            $factory, $place, $order, $config);
-                    
-                    $managerDefinition->addMethodCall(self::WIDGET_MANAGER_METHOD_REGISTER,
-                            array(
-                                $place, 
-                                $order, 
-                                new Reference($serviceId), 
-                                $config
-                        ));
+                    $serviceId = $this->registerServiceIntoContainer(
+                        $container,
+                        $factory,
+                        $place,
+                        $order,
+                        $config
+                    );
+
+                    $managerDefinition->addMethodCall(
+                        self::WIDGET_MANAGER_METHOD_REGISTER,
+                        [
+                            $place,
+                            $order,
+                            new Reference($serviceId),
+                            $config,
+                        ]
+                    );
                 } else {
-                    $managerDefinition->addMethodCall(self::WIDGET_MANAGER_METHOD_REGISTER,
-                            array(
-                                $place, 
-                                $order, 
-                                new Reference($this->widgetServices[$alias]),
-                                array() // the config is alway an empty array
-                        ));
+                    $managerDefinition->addMethodCall(
+                        self::WIDGET_MANAGER_METHOD_REGISTER,
+                        [
+                            $place,
+                            $order,
+                            new Reference($this->widgetServices[$alias]),
+                            [], // the config is alway an empty array
+                        ]
+                    );
                 }
             }
         }
     }
-    
-    /**
-     * register the service into container.
-     * 
-     * @param ContainerBuilder $container
-     * @param WidgetFactoryInterface $factory
-     * @param string $place
-     * @param float $order
-     * @param array $config
-     * @return string the id of the new service
-     */
-    protected function registerServiceIntoContainer(
-            ContainerBuilder $container,
-            WidgetFactoryInterface $factory,
-            $place,
-            $order,
-            array $config
-            ) {
-        $serviceId = $factory->getServiceId($container, $place, $order, $config);
-        $definition = $factory->createDefinition($container, $place, 
-                $order, $config);
-        $container->setDefinition($serviceId, $definition);
-        
-        return $serviceId;
-    }
-    
-    /**
-     * cache of ordering by place.
-     * 
-     * @internal used by function cacheAndGetOrdering
-     * @var array
-     */
-    private $cacheOrdering = array();
-    
-    /**
-     * check if the ordering has already be used for the given $place and,
-     * if yes, correct the ordering by incrementation of 1 until the ordering
-     * has not be used.
-     * 
-     * recursive method.
-     * 
-     * @param string $place
-     * @param float $ordering
-     * @return float
-     */
-    private function cacheAndGetOrdering($place, $ordering) {
-        // create a key in the cache array if not exists
-        if (!array_key_exists($place, $this->cacheOrdering)) {
-            $this->cacheOrdering[$place] = array();
-        }
-        
-        // check if the order exists
-        if (array_search($ordering, $this->cacheOrdering[$place])) {
-            // if the order exists, increment of 1 and try again
-            return $this->cacheAndGetOrdering($place, $ordering + 1);
-        } else {
-            // cache the ordering
-            $this->cacheOrdering[$place][] = $ordering;
-            
-            return $ordering;
-        }
-    }
-    
-    /**
-     * get the places where the service is allowed
-     * 
-     * @param Definition $definition
-     * @return unknown
-     */
-    private function isPlaceAllowedForWidget($place, $widgetAlias, ContainerBuilder $container)
-    {
-        if ($this->widgetServices[$widgetAlias] instanceof WidgetFactoryInterface) {
-            if (in_array($place, $this->widgetServices[$widgetAlias]
-                    ->getAllowedPlaces())) {
-                return true;
-            }
-            
-        } else {
-            $definition = $container->findDefinition($this->widgetServices[$widgetAlias]);
 
-            foreach($definition->getTag(self::WIDGET_SERVICE_TAG_NAME) as $attrs) {
-                $placeValue = $attrs[self::WIDGET_SERVICE_TAG_PLACES];
-
-                if ($placeValue === $place) {
-                    return true;
-                }
-            }
-        }
-        
-        return false;
-    }
-    
     /**
      * This method collect all service tagged with `self::WIDGET_SERVICE_TAG`, and
-     * add also the widget defined by factories
-     * 
+     * add also the widget defined by factories.
+     *
      * This method also check that the service is correctly tagged with `alias` and
      * `places`, or the factory give a correct alias and more than one place.
-     * 
-     * @param ContainerBuilder $container
+     *
      * @throws InvalidConfigurationException
      * @throws InvalidArgumentException
      */
@@ -320,69 +242,153 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         // first, check the service tagged in service definition
         foreach ($container->findTaggedServiceIds(self::WIDGET_SERVICE_TAG_NAME) as $id => $attrs) {
             foreach ($attrs as $attr) {
-                
                 // check the alias is set
                 if (!isset($attr[self::WIDGET_SERVICE_TAG_ALIAS])) {
-                    throw new InvalidConfigurationException("you should add an ".self::WIDGET_SERVICE_TAG_ALIAS.
-                        " key on the service ".$id);
+                    throw new InvalidConfigurationException('you should add an ' . self::WIDGET_SERVICE_TAG_ALIAS .
+                        ' key on the service ' . $id);
                 }
-                
+
                 // check the place is set
                 if (!isset($attr[self::WIDGET_SERVICE_TAG_PLACES])) {
                     throw new InvalidConfigurationException(sprintf(
-                        "You should add a %s key on the service %s",
+                        'You should add a %s key on the service %s',
                         self::WIDGET_SERVICE_TAG_PLACES,
                         $id
-                        ));
+                    ));
                 }
-                
+
                 // check the alias does not exists yet
                 if (array_key_exists($attr[self::WIDGET_SERVICE_TAG_ALIAS], $this->widgetServices)) {
-                    throw new InvalidArgumentException("a service has already be defined with the ".
-                        self::WIDGET_SERVICE_TAG_ALIAS." ".$attr[self::WIDGET_SERVICE_TAG_ALIAS]);
+                    throw new InvalidArgumentException('a service has already be defined with the ' .
+                        self::WIDGET_SERVICE_TAG_ALIAS . ' ' . $attr[self::WIDGET_SERVICE_TAG_ALIAS]);
                 }
-                
+
                 // register the service as available
                 $this->widgetServices[$attr[self::WIDGET_SERVICE_TAG_ALIAS]] = $id;
             }
         }
-        
+
         // add the services defined by factories
-        foreach($this->widgetFactories as $factory) {
-            /* @var $factory WidgetFactoryInterface */
+        foreach ($this->widgetFactories as $factory) {
+            /** @var WidgetFactoryInterface $factory */
             $alias = $factory->getWidgetAlias();
-            
+
             // check the alias is not empty
             if (empty($alias)) {
-                throw new \LogicException(sprintf(
-                        "the widget factory %s returns an empty alias",
-                        get_class($factory)));
+                throw new LogicException(sprintf(
+                    'the widget factory %s returns an empty alias',
+                    get_class($factory)
+                ));
             }
-            
+
             // check the places are not empty
             if (!is_array($factory->getAllowedPlaces())) {
-                throw new \UnexpectedValueException("the method 'getAllowedPlaces' "
-                        . "should return a non-empty array. Unexpected value on ".
+                throw new UnexpectedValueException("the method 'getAllowedPlaces' "
+                        . 'should return a non-empty array. Unexpected value on ' .
                         get_class($factory));
             }
-            
-            if (count($factory->getAllowedPlaces()) == 0) {
-                throw new \LengthException("The method 'getAllowedPlaces' should "
-                        . "return a non-empty array, but returned 0 elements on ".
-                        get_class($factory).'::getAllowedPlaces()');
+
+            if (count($factory->getAllowedPlaces()) === 0) {
+                throw new LengthException("The method 'getAllowedPlaces' should "
+                        . 'return a non-empty array, but returned 0 elements on ' .
+                        get_class($factory) . '::getAllowedPlaces()');
             }
-            
+
             // check the alias does not exists yet
             if (array_key_exists($alias, $this->widgetServices)) {
-                throw new InvalidArgumentException("a service has already be defined with the ".
-                    self::WIDGET_SERVICE_TAG_ALIAS." ".$alias);
+                throw new InvalidArgumentException('a service has already be defined with the ' .
+                    self::WIDGET_SERVICE_TAG_ALIAS . ' ' . $alias);
             }
-            
+
             // register the factory as available
             $this->widgetServices[$factory->getWidgetAlias()] = $factory;
-            
         }
     }
-    
-    
-}
\ No newline at end of file
+
+    /**
+     * register the service into container.
+     *
+     * @param string $place
+     * @param float $order
+     *
+     * @return string the id of the new service
+     */
+    protected function registerServiceIntoContainer(
+        ContainerBuilder $container,
+        WidgetFactoryInterface $factory,
+        $place,
+        $order,
+        array $config
+    ) {
+        $serviceId = $factory->getServiceId($container, $place, $order, $config);
+        $definition = $factory->createDefinition(
+            $container,
+            $place,
+            $order,
+            $config
+        );
+        $container->setDefinition($serviceId, $definition);
+
+        return $serviceId;
+    }
+
+    /**
+     * check if the ordering has already be used for the given $place and,
+     * if yes, correct the ordering by incrementation of 1 until the ordering
+     * has not be used.
+     *
+     * recursive method.
+     *
+     * @param string $place
+     * @param float $ordering
+     *
+     * @return float
+     */
+    private function cacheAndGetOrdering($place, $ordering)
+    {
+        // create a key in the cache array if not exists
+        if (!array_key_exists($place, $this->cacheOrdering)) {
+            $this->cacheOrdering[$place] = [];
+        }
+
+        // check if the order exists
+        if (array_search($ordering, $this->cacheOrdering[$place], true)) {
+            // if the order exists, increment of 1 and try again
+            return $this->cacheAndGetOrdering($place, $ordering + 1);
+        }
+        // cache the ordering
+        $this->cacheOrdering[$place][] = $ordering;
+
+        return $ordering;
+    }
+
+    /**
+     * get the places where the service is allowed.
+     *
+     * @param mixed $place
+     * @param mixed $widgetAlias
+     *
+     * @return unknown
+     */
+    private function isPlaceAllowedForWidget($place, $widgetAlias, ContainerBuilder $container)
+    {
+        if ($this->widgetServices[$widgetAlias] instanceof WidgetFactoryInterface) {
+            if (in_array($place, $this->widgetServices[$widgetAlias]
+                ->getAllowedPlaces(), true)) {
+                return true;
+            }
+        } else {
+            $definition = $container->findDefinition($this->widgetServices[$widgetAlias]);
+
+            foreach ($definition->getTag(self::WIDGET_SERVICE_TAG_NAME) as $attrs) {
+                $placeValue = $attrs[self::WIDGET_SERVICE_TAG_PLACES];
+
+                if ($placeValue === $place) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
index 847af0618..2b2d0f001 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php
@@ -1,90 +1,86 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\Widget;
 
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass as WidgetsCompilerPass;
+use Generator;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use function array_key_exists;
+use function count;
+use function implode;
+use function in_array;
 
 /**
  * This trait allow to add automatic configuration for widget inside your config.
- * 
- * Usage 
+ *
+ * Usage
  * ======
- * 
+ *
  * 1. Register widget factories
  * ----------------------------
- * 
+ *
  * Add widget factories, using `setWidgetFactories`
- * 
- * Example : 
- * 
+ *
+ * Example :
+ *
  * ```
  * use Symfony\Component\DependencyInjection\ContainerBuilder;
  * use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
- * 
- * class MyConfig 
+ *
+ * class MyConfig
  * {
- * 
+ *
  *    use addWidgetConfigurationTrait;
- * 
+ *
  *    public function __construct(array $widgetFactories = array(), ContainerBuilder $container)
  *        {
  *            $this->setWidgetFactories($widgetFactories);
  *            // will be used on next step
  *            $this->container = $container;
  *        }
- * 
+ *
  * }
  * ```
- * 
- * 
- * 
+ *
+ *
+ *
  * 2. add widget config to your config
  * -----------------------------------
- * 
+ *
  * ```
  * use Symfony\Component\DependencyInjection\ContainerBuilder;
  * use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
  * use Symfony\Component\Config\Definition\Builder\TreeBuilder;
- * 
- * class MyConfig 
+ *
+ * class MyConfig
  * {
- * 
+ *
  *    use addWidgetConfigurationTrait;
- * 
+ *
  *    private $container;
- * 
+ *
  *    public function __construct(array $widgetFactories = array(), ContainerBuilder $container)
  *    {
  *        $this->setWidgetFactories($widgetFactories);
  *        $this->container;
  *    }
- * 
+ *
  *    public function getConfigTreeBuilder()
  *    {
  *        $treeBuilder = new TreeBuilder();
  *        $root = $treeBuilder->root('my_root');
- * 
+ *
  *        $root->children()
  *            ->arrayNode('widgets')
  *            ->canBeDisabled()
@@ -93,15 +89,15 @@ use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
  *            ->end()
  *        ->end()
  *        ;
- * 
+ *
  *        return $treeBuilder;
  *    }
- * 
+ *
  * }
  * ```
- * 
- * the above code will add to the config : 
- * 
+ *
+ * the above code will add to the config :
+ *
  * ```
  *     widgets:
  *      enabled:              true
@@ -113,8 +109,6 @@ use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
  *          person_list:
  *              # options for the person_list
  * ```
- * 
- *
  */
 trait AddWidgetConfigurationTrait
 {
@@ -122,16 +116,7 @@ trait AddWidgetConfigurationTrait
      * @param WidgetFactoryInterface[]
      */
     private $widgetFactories;
-    
-    /**
-     * 
-     * @param WidgetFactoryInterface[] $widgetFactories
-     */
-    public function setWidgetFactories(array $widgetFactories)
-    {
-        $this->widgetFactories = $widgetFactories;
-    }
-    
+
     /**
      * @return WidgetFactoryInterface[]
      */
@@ -139,12 +124,20 @@ trait AddWidgetConfigurationTrait
     {
         return $this->widgetFactories;
     }
-    
+
+    /**
+     * @param WidgetFactoryInterface[] $widgetFactories
+     */
+    public function setWidgetFactories(array $widgetFactories)
+    {
+        $this->widgetFactories = $widgetFactories;
+    }
+
     /**
      * add configuration nodes for the widget at the given place.
-     * 
+     *
      * @param type $place
-     * @param ContainerBuilder $containerBuilder
+     *
      * @return type
      */
     protected function addWidgetsConfiguration($place, ContainerBuilder $containerBuilder)
@@ -152,101 +145,104 @@ trait AddWidgetConfigurationTrait
         $treeBuilder = new TreeBuilder($place);
         $root = $treeBuilder->getRootNode($place)
             ->canBeUnset()
-            ->info('register widgets on place "'.$place.'"');
-        
+            ->info('register widgets on place "' . $place . '"');
+
         // if no childen, return the root
         if (count(iterator_to_array($this->filterWidgetByPlace($place))) === 0) {
             return $root;
         }
-    
+
         $prototypeChildren = $root->prototype('array')->children();
-        
+
         $prototypeChildren
             ->floatNode(WidgetsCompilerPass::WIDGET_CONFIG_ORDER)
-                ->isRequired()
-                ->info("the ordering of the widget. May be a number with decimal")
-                ->example("10.58")
-                ->end()
+            ->isRequired()
+            ->info('the ordering of the widget. May be a number with decimal')
+            ->example('10.58')
+            ->end()
             ->scalarNode(WidgetsCompilerPass::WIDGET_CONFIG_ALIAS)
                 // this node is scalar: when the configuration is build, the
                 // tagged services are not available. But when the config reference
                 // is build, the services are avaialble => we add the possible aliases
                 // in the info.
-                ->info("the widget alias (see your installed bundles config). "
-                        . "Possible values are (maybe incomplete) : ".  
-                        \implode(", ", $this->getWidgetAliasesbyPlace($place, $containerBuilder)))
-                ->isRequired()
-            ->end()
-        ;
-            
+            ->info('the widget alias (see your installed bundles config). '
+                        . 'Possible values are (maybe incomplete) : ' .
+                        implode(', ', $this->getWidgetAliasesbyPlace($place, $containerBuilder)))
+            ->isRequired()
+            ->end();
+
         // adding the possible config on each widget under the widget_alias
         foreach ($this->filterWidgetByPlace($place) as $factory) {
             $builder = new TreeBuilder($factory->getWidgetAlias());
             $widgetOptionsRoot = $builder->getRootNode($factory->getWidgetAlias());
             $widgetOptionsRoot->canBeUnset()
-                ->info(sprintf('the configuration for the widget "%s" (only required if this widget is set in widget_alias)', 
-                        $factory->getWidgetAlias()));
+                ->info(sprintf(
+                    'the configuration for the widget "%s" (only required if this widget is set in widget_alias)',
+                    $factory->getWidgetAlias()
+                ));
             $factory->configureOptions($place, $widgetOptionsRoot->children());
             $prototypeChildren->append($widgetOptionsRoot);
         }
-    
+
         return $root;
     }
-    
+
     /**
      * get all widget  factories for the given place.
      *
      * @param string $place
-     * @return \Generator a generator containing a widget factory
+     *
+     * @return Generator a generator containing a widget factory
      */
     protected function filterWidgetByPlace($place)
     {
-        foreach($this->widgetFactories as $factory) {
-            if (in_array($place, $factory->getAllowedPlaces())) {
+        foreach ($this->widgetFactories as $factory) {
+            if (in_array($place, $factory->getAllowedPlaces(), true)) {
                 yield $factory;
             }
         }
     }
-    
+
     /**
      * get the all possible aliases for the given place. This method
-     * search within service tags and widget factories
-     * 
-     * **Note** that services are not available when the config is build: the whole 
+     * search within service tags and widget factories.
+     *
+     * **Note** that services are not available when the config is build: the whole
      * aliases will be checked in compiler pass, or when the command
      * `config:dump-reference` is runned.
-     * 
+     *
      * @param type $place
-     * @param ContainerBuilder $containerBuilder
-     * @return type
+     *
      * @throws InvalidConfigurationException if a service's tag does not have the "alias" key
+     *
+     * @return type
      */
     protected function getWidgetAliasesbyPlace($place, ContainerBuilder $containerBuilder)
     {
-        $result = array();
-    
+        $result = [];
+
         foreach ($this->filterWidgetByPlace($place) as $factory) {
             $result[] = $factory->getWidgetAlias();
         }
 
         // append the aliases added without factory
         foreach ($containerBuilder
-            ->findTaggedServiceIds(WidgetsCompilerPass::WIDGET_SERVICE_TAG_NAME) 
+            ->findTaggedServiceIds(WidgetsCompilerPass::WIDGET_SERVICE_TAG_NAME)
             as $serviceId => $tags) {
-                foreach ($tags as $tag) {
-                    // throw an error if no alias in definition
-                    if (!array_key_exists(WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS, $tag)) {
-                        throw new InvalidConfigurationException(sprintf(
-                            "The service with id %s does not have any %d key",
-                            $serviceId,
-                            WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS
-                            ));
-                    }
-                    // add the key to the possible results
-                    $result[] = $tag[WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS];
+            foreach ($tags as $tag) {
+                // throw an error if no alias in definition
+                if (!array_key_exists(WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS, $tag)) {
+                    throw new InvalidConfigurationException(sprintf(
+                        'The service with id %s does not have any %d key',
+                        $serviceId,
+                        WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS
+                    ));
                 }
+                // add the key to the possible results
+                $result[] = $tag[WidgetsCompilerPass::WIDGET_SERVICE_TAG_ALIAS];
             }
-    
+        }
+
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
index 7e5a12871..242b46e9c 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
@@ -1,47 +1,34 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\Widget\Factory;
 
-use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Allow to easily create WidgetFactory. 
- * 
+ * Allow to easily create WidgetFactory.
+ *
  * Extending this factory, the widget will be created using the already defined
  * service created "as other services" in your configuration (the most frequent
  * way is using `services.yml` file.
- * 
- * If you need to create different service based upon place, position or 
+ *
+ * If you need to create different service based upon place, position or
  * definition, you should implements directly
  * `Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface`
- *
- *        
  */
 abstract class AbstractWidgetFactory implements WidgetFactoryInterface
 {
-
     /**
-     *
      * {@inheritdoc}
-     * 
+     *
      * Will create the definition by returning the definition from the `services.yml`
      * file (or `services.xml` or `what-you-want.yml`).
      *
@@ -49,9 +36,9 @@ abstract class AbstractWidgetFactory implements WidgetFactoryInterface
      */
     public function createDefinition(ContainerBuilder $containerBuilder, $place, $order, array $config)
     {
-        return $containerBuilder->getDefinition($this
+        return $containerBuilder->getDefinition(
+            $this
                 ->getServiceId($containerBuilder, $place, $order, $config)
-                );
+        );
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
index 6e7836b01..8ab19a270 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
@@ -1,52 +1,43 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\MainBundle\DependencyInjection\Widget\Factory;
+declare(strict_types=1);
 
+namespace Chill\MainBundle\DependencyInjection\Widget\Factory;
 
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Factory for creating configuration of widgets.
- * 
+ *
  * When you need a widget with some configuration, you should implements this
- * interface on a factory. The factory will add configuration to the bundle 
+ * interface on a factory. The factory will add configuration to the bundle
  * giving the places for your widget.
- * 
- * Using this interface, **you do not need** to define the service in your 
- * container configuration (`services.yml` files). 
- * 
+ *
+ * Using this interface, **you do not need** to define the service in your
+ * container configuration (`services.yml` files).
+ *
  * Once the class is created, you should inject the factory inside the container
  * at compile time, in your `Bundle` class :
- * 
- * 
+ *
+ *
  * ```
  * namespace Chill\PersonBundle;
  *
  * use Symfony\Component\HttpKernel\Bundle\Bundle;
  * use Symfony\Component\DependencyInjection\ContainerBuilder;
  * use Chill\PersonBundle\Widget\PersonListWidgetFactory;
- * 
+ *
  * class ChillPersonBundle extends Bundle
  * {
- *      public function build(ContainerBuilder $container) 
+ *      public function build(ContainerBuilder $container)
  *   {
  *       parent::build($container);
  *       // register a widget factory into chill_main :
@@ -55,49 +46,40 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
  *   }
  * }
  * ```
- * 
- * 
- *
  */
 interface WidgetFactoryInterface
 {
     /**
-     * configure options for the widget. Those options will be added in 
+     * configure options for the widget. Those options will be added in
      * configuration in the bundle where the widget will be used.
-     * 
+     *
      * @param type $place
-     * @param NodeBuilder $node
      */
     public function configureOptions($place, NodeBuilder $node);
-    
-    /**
-     * get the widget alias. This alias will be used in configuration (`config.yml`)
-     */
-    public function getWidgetAlias();
-    
+
     /**
      * Create a definition for the service which will render the widget.
-     * 
-     * (Note: you can define the service by yourself, as other services, 
+     *
+     * (Note: you can define the service by yourself, as other services,
      * using the `AbstractWidgetFactory`)
-     * 
-     * @param ContainerBuilder $containerBuilder
+     *
      * @param type $place
      * @param type $order
-     * @param array $config
      */
     public function createDefinition(ContainerBuilder $containerBuilder, $place, $order, array $config);
-    
+
     /**
      * return the service id to build the widget.
-     * 
-     * @param ContainerBuilder $containerBuilder
+     *
      * @param string $place
      * @param float $order
-     * @param array $config
-     * 
+     *
      * @return string the service definition
-     * 
      */
     public function getServiceId(ContainerBuilder $containerBuilder, $place, $order, array $config);
+
+    /**
+     * get the widget alias. This alias will be used in configuration (`config.yml`).
+     */
+    public function getWidgetAlias();
 }
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
index b25c487b6..92279ea70 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
@@ -1,42 +1,33 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 
 /**
  * Register widget factories to an extension.
- *
  */
-interface HasWidgetFactoriesExtensionInterface {
-    
+interface HasWidgetFactoriesExtensionInterface
+{
     /**
-     * register a widget factory
-     * 
+     * register a widget factory.
+     *
      * @param \Chill\MainBundle\DependencyInjection\Widget\WidgetFactoryInterface $factory
      */
     public function addWidgetFactory(WidgetFactoryInterface $factory);
-    
+
     /**
-     * get all the widget factories registered for this extension
-     * 
+     * get all the widget factories registered for this extension.
+     *
      * @return WidgetFactoryInterface[]
      */
     public function getWidgetFactories();
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
index addc6b9b7..d57cc866d 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/GetJsonFieldByKey.php
@@ -1,20 +1,14 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -22,16 +16,21 @@ use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class GetJsonFieldByKey extends FunctionNode
 {
     private $expr1;
+
     private $expr2;
 
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            '(%s->%s)',
+            $this->expr1->dispatch($sqlWalker),
+            $this->expr2->dispatch($sqlWalker)
+        );
+    }
+
     public function parse(Parser $parser)
     {
         $parser->match(Lexer::T_IDENTIFIER);
@@ -41,13 +40,4 @@ class GetJsonFieldByKey extends FunctionNode
         $this->expr2 = $parser->StringPrimary();
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
-
-    public function getSql(SqlWalker $sqlWalker)
-    {
-        return sprintf(
-            '(%s->%s)',
-            $this->expr1->dispatch($sqlWalker),
-            $this->expr2->dispatch($sqlWalker)
-        );
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
index 54ef45493..a678f8c27 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonAggregate.php
@@ -1,20 +1,14 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -24,16 +18,14 @@ use Doctrine\ORM\Query\SqlWalker;
 
 /**
  * Return an aggregation of values in a json representation, as a string.
- * 
+ *
  * Internally, this function use the postgresql `jsonb_agg` function. Using
  * json allow to aggregate data from different types without have to cast them.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class JsonAggregate extends FunctionNode
 {
     private $expr;
-    
+
     public function getSql(SqlWalker $sqlWalker)
     {
         return sprintf('jsonb_agg(%s)', $this->expr->dispatch($sqlWalker));
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
new file mode 100644
index 000000000..680d5c6f4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbArrayLength.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+/**
+ * Return the length of an array.
+ */
+class JsonbArrayLength extends FunctionNode
+{
+    private $expr1;
+
+    public function getSql(SqlWalker $sqlWalker): string
+    {
+        return sprintf(
+            'jsonb_array_length(%s)',
+            $this->expr1->dispatch($sqlWalker),
+        );
+    }
+
+    public function parse(Parser $parser): void
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $this->expr1 = $parser->StringPrimary();
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
index 6c4eaa5c3..6295cf366 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/JsonbExistsInArray.php
@@ -1,8 +1,14 @@
 <?php
-/*
- * 
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -10,20 +16,16 @@ use Doctrine\ORM\Query\Lexer;
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class JsonbExistsInArray extends FunctionNode
 {
     private $expr1;
+
     private $expr2;
-    
+
     public function getSql(SqlWalker $sqlWalker): string
     {
         return sprintf(
-            'jsonb_exists(%s, %s)',
+            '%s ?? %s',
             $this->expr1->dispatch($sqlWalker),
             $sqlWalker->walkInputParameter($this->expr2)
         );
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
index ae9df72f4..52b39e97f 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php
@@ -1,110 +1,107 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2018 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Exception;
 
 /**
- * DQL function for OVERLAPS function in postgresql
- * 
- * If a value is null in period start, it will be replaced by -infinity. 
+ * DQL function for OVERLAPS function in postgresql.
+ *
+ * If a value is null in period start, it will be replaced by -infinity.
  * If a value is null in period end, it will be replaced by infinity
- * 
  */
 class OverlapsI extends FunctionNode
 {
-    private $firstPeriodStart;
-    
     private $firstPeriodEnd;
-    
-    private $secondPeriodStart;
-    
+
+    private $firstPeriodStart;
+
     private $secondPeriodEnd;
-    
+
+    private $secondPeriodStart;
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return '('
-            .$this->makeCase($sqlWalker, $this->firstPeriodStart, 'start').', '
-            .$this->makeCase($sqlWalker, $this->firstPeriodEnd, 'end').
-            ') OVERLAPS ('
-            .$this->makeCase($sqlWalker, $this->secondPeriodStart, 'start').', '
-            .$this->makeCase($sqlWalker, $this->secondPeriodEnd, 'end').')'
-            ;
-    }
-    
-    protected function makeCase($sqlWalker, $part, $position)
-    {
-        //return $part->dispatch($sqlWalker);
-        
-        switch ($position) {
-            case 'start' :
-                $p = '-infinity';
-                break;
-            case 'end':
-                $p = 'infinity';
-                break;
-        }
-        
-        if ($part instanceof \Doctrine\ORM\Query\AST\PathExpression) {
-            return 'CASE WHEN '
-                .'  '.$part->dispatch($sqlWalker).' IS NOT NULL '
-                . 'THEN '.
-                $part->dispatch($sqlWalker)
-                . ' ELSE '.
-                "'".$p."'::date "
-                . 'END';
-        } else {
-            return 'CASE WHEN '
-                .'  '.$part->dispatch($sqlWalker).'::date IS NOT NULL '
-                . 'THEN '.
-                $part->dispatch($sqlWalker)
-                . '::date ELSE '.
-                "'".$p."'::date "
-                . 'END';
-        }
+        return sprintf(
+            '(%s, %s) OVERLAPS (%s, %s)',
+            $this->makeCase($sqlWalker, $this->firstPeriodStart, 'start'),
+            $this->makeCase($sqlWalker, $this->firstPeriodEnd, 'end'),
+            $this->makeCase($sqlWalker, $this->secondPeriodStart, 'start'),
+            $this->makeCase($sqlWalker, $this->secondPeriodEnd, 'end')
+        );
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
-        
+
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->firstPeriodStart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->firstPeriodEnd = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->secondPeriodStart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->secondPeriodEnd = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
+
+    protected function makeCase($sqlWalker, $part, string $position): string
+    {
+        switch ($position) {
+            case 'start':
+                $p = '-infinity';
+
+                break;
+
+            case 'end':
+                $p = 'infinity';
+
+                break;
+
+            default:
+                throw new Exception('Unexpected position value.');
+        }
+
+        if ($part instanceof PathExpression) {
+            return sprintf(
+                "CASE WHEN %s IS NOT NULL THEN %s ELSE '%s'::date END",
+                $part->dispatch($sqlWalker),
+                $part->dispatch($sqlWalker),
+                $p
+            );
+        }
+
+        return sprintf(
+            "CASE WHEN %s::date IS NOT NULL THEN %s::date ELSE '%s'::date END",
+            $part->dispatch($sqlWalker),
+            $part->dispatch($sqlWalker),
+            $p
+        );
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
index 6d30ec7d9..d7f46ab54 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Replace.php
@@ -1,46 +1,35 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2019 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
-/**
- * 
- *
- */
 class Replace extends FunctionNode
 {
-    protected $string;
-    
     protected $from;
-    
+
+    protected $string;
+
     protected $to;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
-        return 'REPLACE('.
-            $this->string->dispatch($sqlWalker).
-            ', '.
-            $this->from->dispatch($sqlWalker).
-            ', '.
-            $this->to->dispatch($sqlWalker).
+        return 'REPLACE(' .
+            $this->string->dispatch($sqlWalker) .
+            ', ' .
+            $this->from->dispatch($sqlWalker) .
+            ', ' .
+            $this->to->dispatch($sqlWalker) .
             ')';
     }
 
@@ -48,17 +37,17 @@ class Replace extends FunctionNode
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->string = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->from = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->to = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
index 5235d51bb..810084e56 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/STContains.php
@@ -1,28 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2018 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
 /**
- * Geometry function 'ST_CONTAINS', added by postgis
+ * Geometry function 'ST_CONTAINS', added by postgis.
  */
 class STContains extends FunctionNode
 {
@@ -32,8 +25,8 @@ class STContains extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ST_CONTAINS('.$this->firstPart->dispatch($sqlWalker).
-            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+        return 'ST_CONTAINS(' . $this->firstPart->dispatch($sqlWalker) .
+            ', ' . $this->secondPart->dispatch($sqlWalker) . ')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
index 1875f978c..d6a3c1238 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Similarity.php
@@ -1,21 +1,14 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
- * Copyright (C) 2018 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -29,8 +22,8 @@ class Similarity extends FunctionNode
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'SIMILARITY('.$this->firstPart->dispatch($sqlWalker).
-            ', ' . $this->secondPart->dispatch($sqlWalker) .")";
+        return 'SIMILARITY(' . $this->firstPart->dispatch($sqlWalker) .
+            ', ' . $this->secondPart->dispatch($sqlWalker) . ')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
index 22dcda879..fead5a37d 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/StrictWordSimilarityOPS.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\Lexer;
@@ -12,13 +21,13 @@ class StrictWordSimilarityOPS extends \Doctrine\ORM\Query\AST\Functions\Function
 
     private $secondPart;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(SqlWalker $sqlWalker)
     {
-        return $this->firstPart->dispatch($sqlWalker).
+        return $this->firstPart->dispatch($sqlWalker) .
             ' <<% ' . $this->secondPart->dispatch($sqlWalker);
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(Parser $parser)
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
index 2ced15344..799b208bb 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/DQL/Unaccent.php
@@ -1,53 +1,41 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
 
 /**
- * Unaccent string using postgresql extension unaccent : 
- * http://www.postgresql.org/docs/current/static/unaccent.html
- * 
- * Usage : StringFunction UNACCENT(string)
+ * Unaccent string using postgresql extension unaccent :
+ * http://www.postgresql.org/docs/current/static/unaccent.html.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Usage : StringFunction UNACCENT(string)
  */
 class Unaccent extends FunctionNode
 {
     private $string;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'UNACCENT(' . $this->string->dispatch($sqlWalker) .")";
+        return 'UNACCENT(' . $this->string->dispatch($sqlWalker) . ')';
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->string = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
index 3926e2062..3aabe46fc 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
@@ -1,36 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Event;
 
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Events;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Symfony\Component\Security\Core\Security;
 
-
 class TrackCreateUpdateSubscriber implements EventSubscriber
 {
     private Security $security;
 
-    /**
-     * @param Security $security
-     */
     public function __construct(Security $security)
     {
         $this->security = $security;
     }
-    
-    /**
-     * {@inheritDoc}
-     */
+
     public function getSubscribedEvents()
     {
         return [
             Events::prePersist,
-            Events::preUpdate
+            Events::preUpdate,
         ];
     }
 
@@ -41,7 +44,7 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
         if ($object instanceof TrackCreationInterface
             && $this->security->getUser() instanceof User) {
             $object->setCreatedBy($this->security->getUser());
-            $object->setCreatedAt(new \DateTimeImmutable('now'));
+            $object->setCreatedAt(new DateTimeImmutable('now'));
         }
 
         $this->onUpdate($object);
@@ -56,10 +59,10 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
 
     protected function onUpdate(object $object): void
     {
-        if ($object instanceof TrackUpdateInterface 
+        if ($object instanceof TrackUpdateInterface
             && $this->security->getUser() instanceof User) {
             $object->setUpdatedBy($this->security->getUser());
-            $object->setUpdatedAt(new \DateTimeImmutable('now'));
+            $object->setUpdatedAt(new DateTimeImmutable('now'));
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
index 120d621a0..aafa852f6 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Migrations/VersionComparator.php
@@ -1,12 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Migrations;
 
 use Doctrine\Migrations\Version\Comparator;
 use Doctrine\Migrations\Version\Version;
 
-use function strcmp;
 use function explode;
+use function strcmp;
 
 /**
  * Compare Version classes names from different namespaces and order them.
@@ -15,18 +24,15 @@ use function explode;
  */
 final class VersionComparator implements Comparator
 {
+    public function compare(Version $a, Version $b): int
+    {
+        return strcmp($this->getNumber($a), $this->getNumber($b));
+    }
+
     private function getNumber(Version $version): string
     {
-        $names = explode("\\", (string) $version);
+        $names = explode('\\', (string) $version);
 
         return end($names);
     }
-
-    public function compare(Version $a, Version $b): int
-    {
-        $q = strcmp($this->getNumber($a), $this->getNumber($b));
-
-        return $q;
-    }
 }
-
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
index 2e6f83a69..f63101b33 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/Point.php
@@ -1,92 +1,71 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Model;
 
-use \JsonSerializable;
+use Exception;
+use JsonSerializable;
+use function json_encode;
 
-/**
- * Description of Point
- *
- */
-class Point implements JsonSerializable {
-    private ?float $lat = null;
-    private ?float $lon = null;
+class Point implements JsonSerializable
+{
     public static string $SRID = '4326';
 
+    private ?float $lat;
+
+    private ?float $lon;
+
     private function __construct(?float $lon, ?float $lat)
     {
         $this->lat = $lat;
         $this->lon = $lon;
     }
 
-    public function toGeoJson(): string
+    public static function fromArrayGeoJson(array $array): self
     {
-        $array = $this->toArrayGeoJson();
-        return \json_encode($array);
+        if ('Point' === $array['type'] && 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 jsonSerialize(): array
-    {
-        return $this->toArrayGeoJson();
-    }
-
-    public function toArrayGeoJson(): array
-    {
-        return [
-            "type" => "Point",
-            "coordinates" => [ $this->lon, $this->lat ]
-        ];
-    }
-
-    /**
-     *
-     * @return string
-     */
-    public function toWKT(): string
-    {
-        return 'SRID='.self::$SRID.';POINT('.$this->lon.' '.$this->lat.')';
-    }
-
-    /**
-     *
-     * @param type $geojson
-     * @return Point
-     */
-    public static function fromGeoJson(string $geojson): Point
+    public static function fromGeoJson(string $geojson): self
     {
         $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 ('Point' !== $a->type) {
             throw PointException::badGeoType();
         }
 
-        $lat = $a->coordinates[1];
-        $lon = $a->coordinates[0];
+        [$lon, $lat] = $a->coordinates;
 
         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 ((-180 < $lon && 180 > $lon) && (-90 < $lat && 90 > $lat)) {
             return new Point($lon, $lat);
-        } else {
-            throw PointException::badCoordinates($lon, $lat);
         }
-    }
 
-    public static function fromArrayGeoJson(array $array): Point
-    {
-        if ($array['type'] == 'Point' &&
-                isset($array['coordinates']))
-        {
-            return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
-        }
+        throw PointException::badCoordinates($lon, $lat);
     }
 
     public function getLat(): float
@@ -98,6 +77,29 @@ class Point implements JsonSerializable {
     {
         return $this->lon;
     }
+
+    public function jsonSerialize(): array
+    {
+        return $this->toArrayGeoJson();
+    }
+
+    public function toArrayGeoJson(): array
+    {
+        return [
+            'type' => 'Point',
+            'coordinates' => [$this->lon, $this->lat],
+        ];
+    }
+
+    public function toGeoJson(): string
+    {
+        $array = $this->toArrayGeoJson();
+
+        return json_encode($array);
+    }
+
+    public function toWKT(): string
+    {
+        return sprintf('SRID=%s;POINT(%s %s)', self::$SRID, $this->lon, $this->lat);
+    }
 }
-
-
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
index 4e3101435..5186e8168 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/PointException.php
@@ -1,27 +1,35 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Model;
 
-use \Exception;
+use Exception;
 
 /**
- * Description of PointException
- *
+ * Description of PointException.
  */
-class PointException extends Exception {
-
+class PointException extends Exception
+{
     public static function badCoordinates($lon, $lat): self
     {
-        return new self("Input coordinates are not valid in the used coordinate system (longitude = $lon , latitude = $lat)");
-    }
-
-    public static function badJsonString($str): self
-    {
-        return new self("The JSON string is not valid: $str");
+        return new self("Input coordinates are not valid in the used coordinate system (longitude = {$lon} , latitude = {$lat})");
     }
 
     public static function badGeoType(): self
     {
-        return new self("The geoJSON object type is not valid");
+        return new self('The geoJSON object type is not valid');
+    }
+
+    public static function badJsonString($str): self
+    {
+        return new self("The JSON string is not valid: {$str}");
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
index 192d4e7a9..f4862c35a 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationInterface.php
@@ -1,12 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
+use DateTimeInterface;
 
 interface TrackCreationInterface
 {
-    public function setCreatedBy(User $user): self;
+    public function setCreatedAt(DateTimeInterface $datetime): self;
 
-    public function setCreatedAt(\DateTimeInterface $datetime): self;
+    public function setCreatedBy(User $user): self;
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
index 0628d20ab..d85dc5809 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateInterface.php
@@ -1,12 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Model;
 
 use Chill\MainBundle\Entity\User;
+use DateTimeInterface;
 
 interface TrackUpdateInterface
 {
-    public function setUpdatedBy(User $user): self;
+    public function setUpdatedAt(DateTimeInterface $datetime): self;
 
-    public function setUpdatedAt(\DateTimeInterface $datetime): self;
+    public function setUpdatedBy(User $user): self;
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
index c389b543d..140f06b65 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Doctrine\ORM\Hydration;
@@ -16,17 +23,6 @@ final class FlatHierarchyEntityHydrator extends ObjectHydrator
         return array_values(iterator_to_array($this->flatListGenerator($this->buildChildrenHashmap(parent::hydrateAllData()))));
     }
 
-    private function flatListGenerator(array $hashMap, ?object $parent = null): Generator
-    {
-        $parent = null === $parent ? null : spl_object_id($parent);
-        $hashMap += [$parent => []];
-
-        foreach ($hashMap[$parent] as $node) {
-            yield spl_object_id($node) => $node;
-            yield from $this->flatListGenerator($hashMap, $node);
-        }
-    }
-
     private function buildChildrenHashmap(array $nodes): array
     {
         return array_reduce(
@@ -44,4 +40,15 @@ final class FlatHierarchyEntityHydrator extends ObjectHydrator
         );
     }
 
+    private function flatListGenerator(array $hashMap, ?object $parent = null): Generator
+    {
+        $parent = null === $parent ? null : spl_object_id($parent);
+        $hashMap += [$parent => []];
+
+        foreach ($hashMap[$parent] as $node) {
+            yield spl_object_id($node) => $node;
+
+            yield from $this->flatListGenerator($hashMap, $node);
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
index 38c704a2d..a1ec0c955 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
@@ -1,111 +1,128 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Type;
 
-use Doctrine\DBAL\Types\DateIntervalType;
+use DateInterval;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\DateIntervalType;
+use Exception;
+use function count;
+use function current;
+use function preg_match;
+use function reset;
 
 /**
  * Re-declare the date interval to use the implementation of date interval in
- * postgreql
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * postgreql.
  */
 class NativeDateIntervalType extends DateIntervalType
 {
-    const FORMAT = '%rP%YY%MM%DDT%HH%IM%SS';
-    
-    public function getName(): string
-    {
-        return \Doctrine\DBAL\Types\Type::DATEINTERVAL;
-    }
+    public const FORMAT = '%rP%YY%MM%DDT%HH%IM%SS';
 
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
-    {
-        return 'INTERVAL';
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
         if (null === $value) {
             return null;
         }
 
-        if ($value instanceof \DateInterval) {
+        if ($value instanceof DateInterval) {
             return $value->format(self::FORMAT);
         }
 
         throw ConversionException::conversionFailedInvalidType($value, $this->getName(), ['null', 'DateInterval']);
     }
-    
+
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === null || $value instanceof \DateInterval) {
+        if (null === $value || $value instanceof DateInterval) {
             return $value;
         }
-        
+
         try {
             $strings = explode(' ', $value);
-            
+
             if (count($strings) === 0) {
                 return null;
             }
             $intervalSpec = 'P';
-            \reset($strings);
-            
+            reset($strings);
+
             do {
                 $intervalSpec .= $this->convertEntry($strings);
-            } while (next($strings) !== FALSE);
-            
-            return new \DateInterval($intervalSpec);
-        } catch (\Exception $exception) {
+            } while (next($strings) !== false);
+
+            return new DateInterval($intervalSpec);
+        } catch (Exception $exception) {
             throw $this->createConversionException($value, $exception);
         }
     }
-    
-    private function convertEntry(&$strings)
+
+    public function getName(): string
     {
-        $current = \current($strings);
-        
-        if (is_numeric($current)) {
-            $next = \next($strings);
-            switch($next) {
-                case 'year':
-                case 'years':
-                    $unit = 'Y';
-                    break;
-                case 'mon':
-                case 'mons': 
-                    $unit = 'M';
-                    break;
-                case 'day':
-                case 'days':
-                    $unit = 'D';
-                    break;
-                default:
-                    throw $this->createConversionException(implode('', $strings));
-            }
-            
-            return $current.$unit;
-            
-        } elseif (\preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', $current) === 1) {
-            $tExploded = explode(':', $current);
-            $intervalSpec = 'T';
-            $intervalSpec.= $tExploded[0].'H';
-            $intervalSpec.= $tExploded[1].'M';
-            $intervalSpec.= $tExploded[2].'S';
-            
-            return $intervalSpec;
-        }
+        return \Doctrine\DBAL\Types\Types::DATEINTERVAL;
     }
-    
+
+    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
+    {
+        return 'INTERVAL';
+    }
+
     protected function createConversionException($value, $exception = null)
     {
         return ConversionException::conversionFailedFormat($value, $this->getName(), 'xx year xx mons xx days 01:02:03', $exception);
     }
 
+    private function convertEntry(&$strings)
+    {
+        $current = current($strings);
+
+        if (is_numeric($current)) {
+            $next = next($strings);
+
+            switch ($next) {
+                case 'year':
+                case 'years':
+                    $unit = 'Y';
+
+                    break;
+
+                case 'mon':
+                case 'mons':
+                    $unit = 'M';
+
+                    break;
+
+                case 'day':
+                case 'days':
+                    $unit = 'D';
+
+                    break;
+
+                default:
+                    throw $this->createConversionException(implode('', $strings));
+            }
+
+            return $current . $unit;
+        }
+
+        if (preg_match('/([0-9]{2}\:[0-9]{2}:[0-9]{2})/', $current) === 1) {
+            $tExploded = explode(':', $current);
+            $intervalSpec = 'T';
+            $intervalSpec .= $tExploded[0] . 'H';
+            $intervalSpec .= $tExploded[1] . 'M';
+            $intervalSpec .= $tExploded[2] . 'S';
+
+            return $intervalSpec;
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
index 0a0c160cd..1d44b2358 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php
@@ -1,46 +1,64 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Type;
 
 use Chill\MainBundle\Doctrine\Model\Point;
-use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Chill\MainBundle\Doctrine\Model\PointException;
-
+use Doctrine\DBAL\Types\Type;
 
 /**
  * A Type for Doctrine to implement the Geography Point type
- * implemented by Postgis on postgis+postgresql databases
- *
+ * implemented by Postgis on postgis+postgresql databases.
  */
-class PointType extends Type {
+class PointType extends Type
+{
+    public const POINT = 'point';
 
-    const POINT = 'point';
-
-    /**
-     *
-     * @param array $fieldDeclaration
-     * @param AbstractPlatform $platform
-     * @return string
-     */
-    public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    public function canRequireSQLConversion()
     {
-        return 'geometry(POINT,'.Point::$SRID.')';
+        return true;
+    }
+
+    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    {
+        if (null === $value) {
+            return null;
+        }
+
+        return $value->toWKT();
+    }
+
+    public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
+    {
+        return $sqlExpr;
     }
 
     /**
+     * @param mixed $value
      *
-     * @param type $value
-     * @param AbstractPlatform $platform
      * @return ?Point
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        if ($value === NULL){
-            return NULL;
-        } else {
-            return Point::fromGeoJson($value);
+        if (null === $value) {
+            return null;
         }
+
+        return Point::fromGeoJson($value);
+    }
+
+    public function convertToPHPValueSQL($sqlExpr, $platform)
+    {
+        return 'ST_AsGeoJSON(' . $sqlExpr . ') ';
     }
 
     public function getName()
@@ -48,28 +66,11 @@ class PointType extends Type {
         return self::POINT;
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    /**
+     * @return string
+     */
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform)
     {
-        if ($value === NULL){
-            return NULL;
-        } else {
-            return $value->toWKT();
-        }
-    }
-
-    public function canRequireSQLConversion()
-    {
-        return true;
-    }
-
-    public function convertToPHPValueSQL($sqlExpr, $platform)
-    {
-        return 'ST_AsGeoJSON('.$sqlExpr.') ';
-    }
-
-    public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
-    {
-        return $sqlExpr;
+        return 'geometry(POINT,' . Point::$SRID . ')';
     }
 }
-
diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 06839ec99..dcf0c5a96 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -1,79 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTime;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Address
+ * Address.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_main_address")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Address
 {
     /**
-     * @var integer
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\ManyToOne(targetEntity=AddressReference::class)
      * @Groups({"write"})
      */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     * @Groups({"write"})
-     */
-    private $street = '';
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     * @Groups({"write"})
-     */
-    private $streetNumber = '';
-
-    /**
-     * @var PostalCode
-     *
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
-     * @Groups({"write"})
-     */
-    private $postcode;
-
-    /**
-     * @var string|null
-     *
-     * @ORM\Column(type="string", length=16, nullable=true)
-     * @Groups({"write"})
-     */
-    private $floor;
-
-    /**
-     * @var string|null
-     *
-     * @ORM\Column(type="string", length=16, nullable=true)
-     * @Groups({"write"})
-     */
-    private $corridor;
-
-    /**
-     * @var string|null
-     *
-     * @ORM\Column(type="string", length=16, nullable=true)
-     * @Groups({"write"})
-     */
-    private $steps;
+    private ?AddressReference $addressReference = null;
 
     /**
      * @var string|null
@@ -89,7 +48,14 @@ class Address
      * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
-    private $flat;
+    private $corridor;
+
+    /**
+     * A list of metadata, added by customizable fields.
+     *
+     * @var array
+     */
+    private $customs = [];
 
     /**
      * @var string|null
@@ -108,29 +74,34 @@ class Address
     private $extra;
 
     /**
-     * Indicates when the address starts validation. Used to build an history
-     * of address. By default, the current date.
+     * @var string|null
      *
-     * @var \DateTime
-     *
-     * @ORM\Column(type="date")
+     * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
-    private \DateTime $validFrom;
+    private $flat;
 
     /**
-     * Indicates when the address ends. Used to build an history
-     * of address.
+     * @var string|null
      *
-     * @var \DateTime|null
-     *
-     * @ORM\Column(type="date", nullable=true)
+     * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
-    private ?\DateTime $validTo = null;
+    private $floor;
+
+    /**
+     * @var int
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"write"})
+     */
+    private $id;
 
     /**
      * True if the address is a "no address", aka homeless person, ...
+     *
      * @Groups({"write"})
      * @ORM\Column(type="boolean")
      *
@@ -139,17 +110,7 @@ class Address
     private $isNoAddress = false;
 
     /**
-     * A geospatial field storing the coordinates of the Address
-     *
-     * @var Point|null
-     *
-     * @ORM\Column(type="point", nullable=true)
-     * @Groups({"write"})
-     */
-    private $point;
-
-    /**
-     * A ThirdParty reference for person's addresses that are linked to a third party
+     * A ThirdParty reference for person's addresses that are linked to a third party.
      *
      * @var ThirdParty|null
      *
@@ -160,226 +121,71 @@ class Address
     private $linkedToThirdParty;
 
     /**
-     * A list of metadata, added by customizable fields
+     * A geospatial field storing the coordinates of the Address.
      *
-     * @var array
-     */
-    private $customs = [];
-
-    /**
-     * @ORM\ManyToOne(targetEntity=AddressReference::class)
+     * @var Point|null
+     *
+     * @ORM\Column(type="point", nullable=true)
      * @Groups({"write"})
      */
-    private ?AddressReference $addressReference = null;
+    private $point;
+
+    /**
+     * @var PostalCode
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     * @Groups({"write"})
+     */
+    private $postcode;
+
+    /**
+     * @var string|null
+     *
+     * @ORM\Column(type="string", length=16, nullable=true)
+     * @Groups({"write"})
+     */
+    private $steps;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255)
+     * @Groups({"write"})
+     */
+    private $street = '';
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255)
+     * @Groups({"write"})
+     */
+    private $streetNumber = '';
+
+    /**
+     * Indicates when the address starts validation. Used to build an history
+     * of address. By default, the current date.
+     *
+     * @ORM\Column(type="date")
+     * @Groups({"write"})
+     */
+    private DateTime $validFrom;
+
+    /**
+     * Indicates when the address ends. Used to build an history
+     * of address.
+     *
+     * @ORM\Column(type="date", nullable=true)
+     * @Groups({"write"})
+     */
+    private ?DateTime $validTo = null;
 
     public function __construct()
     {
-        $this->validFrom = new \DateTime();
+        $this->validFrom = new DateTime();
     }
 
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set streetAddress1 (legacy function)
-     *
-     * @param string $streetAddress1
-     *
-     * @return Address
-     */
-    public function setStreetAddress1($streetAddress1)
-    {
-        $this->street = $streetAddress1 === NULL ? '' : $streetAddress1;
-
-        return $this;
-    }
-
-    /**
-     * Get streetAddress1 (legacy function)
-     *
-     * @return string
-     */
-    public function getStreetAddress1()
-    {
-        return $this->street;
-    }
-
-    /**
-     * Set streetAddress2 (legacy function)
-     *
-     * @param string $streetAddress2
-     *
-     * @return Address
-     */
-    public function setStreetAddress2($streetAddress2)
-    {
-        $this->streetNumber = $streetAddress2 === NULL ? '' : $streetAddress2;
-
-        return $this;
-    }
-
-    /**
-     * Get streetAddress2 (legacy function)
-     *
-     * @return string
-     */
-    public function getStreetAddress2()
-    {
-        return $this->streetNumber;
-    }
-
-    /**
-     * Set postcode
-     *
-     * @param PostalCode $postcode
-     *
-     * @return Address
-     */
-    public function setPostcode(PostalCode $postcode = null)
-    {
-        $this->postcode = $postcode;
-
-        return $this;
-    }
-
-    /**
-     * Get postcode
-     *
-     * @return PostalCode
-     */
-    public function getPostcode()
-    {
-        return $this->postcode;
-    }
-
-    /**
-     * @return \DateTime
-     */
-    public function getValidFrom()
-    {
-        return $this->validFrom;
-    }
-
-    /**
-     * @param \DateTime $validFrom
-     * @return Address
-     */
-    public function setValidFrom(\DateTime $validFrom)
-    {
-        $this->validFrom = $validFrom;
-        return $this;
-    }
-
-    /**
-     * Get IsNoAddress
-     *
-     * Indicate true if the address is a fake address (homeless, ...)
-     *
-     * @return bool
-     */
-    public function getIsNoAddress(): bool
-    {
-        return $this->isNoAddress;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isNoAddress(): bool
-    {
-        return $this->getIsNoAddress();
-    }
-
-    /**
-     * Set IsNoAddress
-     *
-     * Indicate true if the address is a fake address (homeless, ...)
-     *
-     * @param bool $isNoAddress
-     * @return $this
-     */
-    public function setIsNoAddress(bool $isNoAddress): self
-    {
-        $this->isNoAddress = $isNoAddress;
-        return $this;
-    }
-
-    /**
-     * Get customs informations in the address
-     *
-     * @return array
-     */
-    public function getCustoms(): array
-    {
-        return $this->customs;
-    }
-
-    /**
-     * Store custom informations in the address
-     *
-     * @param array $customs
-     * @return $this
-     */
-    public function setCustoms(array $customs): self
-    {
-        $this->customs = $customs;
-
-        return $this;
-    }
-
-    /**
-     * Validate the address.
-     *
-     * Check that:
-     *
-     * * if the address is not home address:
-     *     * the postal code is present
-     *     * the valid from is not null
-     *     * the address street 1 is greater than 2
-     *
-     * @param ExecutionContextInterface $context
-     * @param array $payload
-     */
-    public function validate(ExecutionContextInterface $context, $payload)
-    {
-        if (!$this->getValidFrom() instanceof \DateTime) {
-            $context
-                ->buildViolation("address.date-should-be-set")
-                ->atPath('validFrom')
-                ->addViolation();
-        }
-
-        if ($this->isNoAddress()) {
-            return;
-        }
-
-        if (empty($this->getStreetAddress1())) {
-            $context
-                ->buildViolation("address.street1-should-be-set")
-                ->atPath('streetAddress1')
-                ->addViolation();
-        }
-
-        if (!$this->getPostcode() instanceof PostalCode) {
-            $context
-                ->buildViolation("address.postcode-should-be-set")
-                ->atPath('postCode')
-                ->addViolation();
-        }
-    }
-
-    /**
-     * @param Address $original
-     * @return Address
-     */
-    public static function createFromAddress(Address $original) : Address
+    public static function createFromAddress(Address $original): Address
     {
         return (new Address())
             ->setAddressReference($original->getAddressReference())
@@ -398,8 +204,7 @@ class Address
             ->setStreet($original->getStreet())
             ->setStreetNumber($original->getStreetNumber())
             ->setValidFrom($original->getValidFrom())
-            ->setValidTo($original->getValidTo())
-            ;
+            ->setValidTo($original->getValidTo());
     }
 
     public static function createFromAddressReference(AddressReference $original): Address
@@ -409,44 +214,17 @@ class Address
             ->setPostcode($original->getPostcode())
             ->setStreet($original->getStreet())
             ->setStreetNumber($original->getStreetNumber())
-            ->setAddressReference($original)
-            ;
+            ->setAddressReference($original);
     }
 
-    public function getStreet(): ?string
+    public function getAddressReference(): ?AddressReference
     {
-        return $this->street;
+        return $this->addressReference;
     }
 
-    public function setStreet(string $street): self
+    public function getBuildingName(): ?string
     {
-        $this->street = $street;
-
-        return $this;
-    }
-
-    public function getStreetNumber(): ?string
-    {
-        return $this->streetNumber;
-    }
-
-    public function setStreetNumber(string $streetNumber): self
-    {
-        $this->streetNumber = $streetNumber;
-
-        return $this;
-    }
-
-    public function getFloor(): ?string
-    {
-        return $this->floor;
-    }
-
-    public function setFloor(?string $floor): self
-    {
-        $this->floor = $floor;
-
-        return $this;
+        return $this->buildingName;
     }
 
     public function getCorridor(): ?string
@@ -454,11 +232,72 @@ class Address
         return $this->corridor;
     }
 
-    public function setCorridor(?string $corridor): self
+    /**
+     * Get customs informations in the address.
+     */
+    public function getCustoms(): array
     {
-        $this->corridor = $corridor;
+        return $this->customs;
+    }
 
-        return $this;
+    public function getDistribution(): ?string
+    {
+        return $this->distribution;
+    }
+
+    public function getExtra(): ?string
+    {
+        return $this->extra;
+    }
+
+    public function getFlat(): ?string
+    {
+        return $this->flat;
+    }
+
+    public function getFloor(): ?string
+    {
+        return $this->floor;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get IsNoAddress.
+     *
+     * Indicate true if the address is a fake address (homeless, ...)
+     */
+    public function getIsNoAddress(): bool
+    {
+        return $this->isNoAddress;
+    }
+
+    public function getLinkedToThirdParty()
+    {
+        return $this->linkedToThirdParty;
+    }
+
+    public function getPoint(): ?Point
+    {
+        return $this->point;
+    }
+
+    /**
+     * Get postcode.
+     *
+     * @return PostalCode
+     */
+    public function getPostcode()
+    {
+        return $this->postcode;
     }
 
     public function getSteps(): ?string
@@ -466,16 +305,59 @@ class Address
         return $this->steps;
     }
 
-    public function setSteps(?string $steps): self
+    public function getStreet(): ?string
     {
-        $this->steps = $steps;
-
-        return $this;
+        return $this->street;
     }
 
-    public function getBuildingName(): ?string
+    /**
+     * Get streetAddress1 (legacy function).
+     *
+     * @return string
+     */
+    public function getStreetAddress1()
     {
-        return $this->buildingName;
+        return $this->street;
+    }
+
+    /**
+     * Get streetAddress2 (legacy function).
+     *
+     * @return string
+     */
+    public function getStreetAddress2()
+    {
+        return $this->streetNumber;
+    }
+
+    public function getStreetNumber(): ?string
+    {
+        return $this->streetNumber;
+    }
+
+    /**
+     * @return DateTime
+     */
+    public function getValidFrom()
+    {
+        return $this->validFrom;
+    }
+
+    public function getValidTo(): ?DateTimeInterface
+    {
+        return $this->validTo;
+    }
+
+    public function isNoAddress(): bool
+    {
+        return $this->getIsNoAddress();
+    }
+
+    public function setAddressReference(?AddressReference $addressReference = null): Address
+    {
+        $this->addressReference = $addressReference;
+
+        return $this;
     }
 
     public function setBuildingName(?string $buildingName): self
@@ -485,21 +367,23 @@ class Address
         return $this;
     }
 
-    public function getFlat(): ?string
+    public function setCorridor(?string $corridor): self
     {
-        return $this->flat;
-    }
-
-    public function setFlat(?string $flat): self
-    {
-        $this->flat = $flat;
+        $this->corridor = $corridor;
 
         return $this;
     }
 
-    public function getDistribution(): ?string
+    /**
+     * Store custom informations in the address.
+     *
+     * @return $this
+     */
+    public function setCustoms(array $customs): self
     {
-        return $this->distribution;
+        $this->customs = $customs;
+
+        return $this;
     }
 
     public function setDistribution(?string $distribution): self
@@ -509,11 +393,6 @@ class Address
         return $this;
     }
 
-    public function getExtra(): ?string
-    {
-        return $this->extra;
-    }
-
     public function setExtra(?string $extra): self
     {
         $this->extra = $extra;
@@ -521,33 +400,32 @@ class Address
         return $this;
     }
 
-    public function getValidTo(): ?\DateTimeInterface
+    public function setFlat(?string $flat): self
     {
-        return $this->validTo;
-    }
-
-    public function setValidTo(?\DateTimeInterface $validTo = null): self
-    {
-        $this->validTo = $validTo;
+        $this->flat = $flat;
 
         return $this;
     }
 
-    public function getPoint(): ?Point
+    public function setFloor(?string $floor): self
     {
-        return $this->point;
-    }
-
-    public function setPoint(?Point $point): self
-    {
-        $this->point = $point;
+        $this->floor = $floor;
 
         return $this;
     }
 
-    public function getLinkedToThirdParty()
+    /**
+     * Set IsNoAddress.
+     *
+     * Indicate true if the address is a fake address (homeless, ...)
+     *
+     * @return $this
+     */
+    public function setIsNoAddress(bool $isNoAddress): self
     {
-        return $this->linkedToThirdParty;
+        $this->isNoAddress = $isNoAddress;
+
+        return $this;
     }
 
     public function setLinkedToThirdParty($linkedToThirdParty): self
@@ -557,22 +435,130 @@ class Address
         return $this;
     }
 
-    /**
-     * @return AddressReference|null
-     */
-    public function getAddressReference(): ?AddressReference
+    public function setPoint(?Point $point): self
     {
-        return $this->addressReference;
-    }
+        $this->point = $point;
 
-    /**
-     * @param AddressReference|null $addressReference
-     * @return Address
-     */
-    public function setAddressReference(?AddressReference $addressReference = null): Address
-    {
-        $this->addressReference = $addressReference;
         return $this;
     }
-}
 
+    /**
+     * Set postcode.
+     *
+     * @param PostalCode $postcode
+     *
+     * @return Address
+     */
+    public function setPostcode(?PostalCode $postcode = null)
+    {
+        $this->postcode = $postcode;
+
+        return $this;
+    }
+
+    public function setSteps(?string $steps): self
+    {
+        $this->steps = $steps;
+
+        return $this;
+    }
+
+    public function setStreet(string $street): self
+    {
+        $this->street = $street;
+
+        return $this;
+    }
+
+    /**
+     * Set streetAddress1 (legacy function).
+     *
+     * @param string $streetAddress1
+     *
+     * @return Address
+     */
+    public function setStreetAddress1($streetAddress1)
+    {
+        $this->street = null === $streetAddress1 ? '' : $streetAddress1;
+
+        return $this;
+    }
+
+    /**
+     * Set streetAddress2 (legacy function).
+     *
+     * @param string $streetAddress2
+     *
+     * @return Address
+     */
+    public function setStreetAddress2($streetAddress2)
+    {
+        $this->streetNumber = null === $streetAddress2 ? '' : $streetAddress2;
+
+        return $this;
+    }
+
+    public function setStreetNumber(string $streetNumber): self
+    {
+        $this->streetNumber = $streetNumber;
+
+        return $this;
+    }
+
+    /**
+     * @return Address
+     */
+    public function setValidFrom(DateTime $validFrom)
+    {
+        $this->validFrom = $validFrom;
+
+        return $this;
+    }
+
+    public function setValidTo(?DateTimeInterface $validTo = null): self
+    {
+        $this->validTo = $validTo;
+
+        return $this;
+    }
+
+    /**
+     * Validate the address.
+     *
+     * Check that:
+     *
+     * * if the address is not home address:
+     *     * the postal code is present
+     *     * the valid from is not null
+     *     * the address street 1 is greater than 2
+     *
+     * @param array $payload
+     */
+    public function validate(ExecutionContextInterface $context, $payload)
+    {
+        if (!$this->getValidFrom() instanceof DateTime) {
+            $context
+                ->buildViolation('address.date-should-be-set')
+                ->atPath('validFrom')
+                ->addViolation();
+        }
+
+        if ($this->isNoAddress()) {
+            return;
+        }
+
+        if (empty($this->getStreetAddress1())) {
+            $context
+                ->buildViolation('address.street1-should-be-set')
+                ->atPath('streetAddress1')
+                ->addViolation();
+        }
+
+        if (!$this->getPostcode() instanceof PostalCode) {
+            $context
+                ->buildViolation('address.postcode-should-be-set')
+                ->atPath('postCode')
+                ->addViolation();
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index 2a50932f4..99efd391d 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -1,18 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Doctrine\Model\Point;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_main_address_reference")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class AddressReference
 {
+    /**
+     * This is an internal column which is populated by database.
+     *
+     * This column will ease the search operations
+     *
+     * @ORM\Column(type="text", options={"default": ""})
+     */
+    private string $addressCanonical = '';
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -21,12 +39,42 @@ class AddressReference
      */
     private $id;
 
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
+     */
+    private $municipalityCode;
+
+    /**
+     * A geospatial field storing the coordinates of the Address.
+     *
+     * @var Point
+     *
+     * @ORM\Column(type="point")
+     * @groups({"read"})
+     */
+    private $point;
+
+    /**
+     * @var PostalCode
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     * @groups({"read"})
+     */
+    private $postcode;
+
     /**
      * @ORM\Column(type="string", length=255)
      * @groups({"read"})
      */
     private $refId;
 
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
+     */
+    private $source;
+
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
      * @groups({"read"})
@@ -39,94 +87,23 @@ class AddressReference
      */
     private $streetNumber;
 
-    /**
-     * @var PostalCode
-     *
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
-     * @groups({"read"})
-     */
-    private $postcode;
-
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     * @groups({"read"})
-     */
-    private $municipalityCode;
-
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     * @groups({"read"})
-     */
-    private $source;
-
-    /**
-     * A geospatial field storing the coordinates of the Address
-     *
-     * @var Point
-     *
-     * @ORM\Column(type="point")
-     * @groups({"read"})
-     */
-    private $point;
-
-
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getRefId(): ?string
+    public function getMunicipalityCode(): ?string
     {
-        return $this->refId;
+        return $this->municipalityCode;
     }
 
-    public function setRefId(string $refId): self
+    public function getPoint(): ?Point
     {
-        $this->refId = $refId;
-
-        return $this;
-    }
-
-    public function getStreet(): ?string
-    {
-        return $this->street;
-    }
-
-    public function setStreet(?string $street): self
-    {
-        $this->street = $street;
-
-        return $this;
-    }
-
-    public function getStreetNumber(): ?string
-    {
-        return $this->streetNumber;
-    }
-
-    public function setStreetNumber(?string $streetNumber): self
-    {
-        $this->streetNumber = $streetNumber;
-
-        return $this;
+        return $this->point;
     }
 
     /**
-     * Set postcode
-     *
-     * @param PostalCode $postcode
-     *
-     * @return Address
-     */
-    public function setPostcode(PostalCode $postcode = null)
-    {
-        $this->postcode = $postcode;
-
-        return $this;
-    }
-
-    /**
-     * Get postcode
+     * Get postcode.
      *
      * @return PostalCode
      */
@@ -135,9 +112,24 @@ class AddressReference
         return $this->postcode;
     }
 
-    public function getMunicipalityCode(): ?string
+    public function getRefId(): ?string
     {
-        return $this->municipalityCode;
+        return $this->refId;
+    }
+
+    public function getSource(): ?string
+    {
+        return $this->source;
+    }
+
+    public function getStreet(): ?string
+    {
+        return $this->street;
+    }
+
+    public function getStreetNumber(): ?string
+    {
+        return $this->streetNumber;
     }
 
     public function setMunicipalityCode(?string $municipalityCode): self
@@ -147,9 +139,32 @@ class AddressReference
         return $this;
     }
 
-    public function getSource(): ?string
+    public function setPoint(?Point $point): self
     {
-        return $this->source;
+        $this->point = $point;
+
+        return $this;
+    }
+
+    /**
+     * Set postcode.
+     *
+     * @param PostalCode $postcode
+     *
+     * @return Address
+     */
+    public function setPostcode(?PostalCode $postcode = null)
+    {
+        $this->postcode = $postcode;
+
+        return $this;
+    }
+
+    public function setRefId(string $refId): self
+    {
+        $this->refId = $refId;
+
+        return $this;
     }
 
     public function setSource(?string $source): self
@@ -159,14 +174,16 @@ class AddressReference
         return $this;
     }
 
-    public function getPoint(): ?Point
+    public function setStreet(?string $street): self
     {
-        return $this->point;
+        $this->street = $street;
+
+        return $this;
     }
 
-    public function setPoint(?Point $point): self
+    public function setStreetNumber(?string $streetNumber): self
     {
-        $this->point = $point;
+        $this->streetNumber = $streetNumber;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php
index 2d87a20ab..5b25ee119 100644
--- a/src/Bundle/ChillMainBundle/Entity/Center.php
+++ b/src/Bundle/ChillMainBundle/Entity/Center.php
@@ -1,54 +1,27 @@
 <?php
 
-/*
- * 
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="centers")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class Center implements HasCenterInterface
 {
-
-    /**
-     * @var integer
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     */
-    private $name;
-    
     /**
      * @var Collection
      *
@@ -58,8 +31,23 @@ class Center implements HasCenterInterface
      * )
      */
     private $groupCenters;
-    
-    
+
+    /**
+     * @var int
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Serializer\Groups({"docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     * @Serializer\Groups({"docgen:read"})
+     */
+    private string $name = '';
+
     /**
      * Center constructor.
      */
@@ -67,51 +55,7 @@ class Center implements HasCenterInterface
     {
         $this->groupCenters = new \Doctrine\Common\Collections\ArrayCollection();
     }
-    
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    
-    /**
-     * @param $name
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-    
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-    
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getGroupCenters()
-    {
-        return $this->groupCenters;
-    }
-    
-    /**
-     * @param GroupCenter $groupCenter
-     * @return $this
-     */
-    public function addGroupCenter(GroupCenter $groupCenter)
-    {
-        $this->groupCenters->add($groupCenter);
-        return $this;
-    }
-    
+
     /**
      * @return string
      */
@@ -119,7 +63,17 @@ class Center implements HasCenterInterface
     {
         return $this->getName();
     }
-    
+
+    /**
+     * @return $this
+     */
+    public function addGroupCenter(GroupCenter $groupCenter)
+    {
+        $this->groupCenters->add($groupCenter);
+
+        return $this;
+    }
+
     /**
      * @return $this|Center
      */
@@ -128,4 +82,39 @@ class Center implements HasCenterInterface
         return $this;
     }
 
+    /**
+     * @return ArrayCollection|Collection
+     */
+    public function getGroupCenters()
+    {
+        return $this->groupCenters;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php
index 32f5396cd..48b2a7569 100644
--- a/src/Bundle/ChillMainBundle/Entity/Civility.php
+++ b/src/Bundle/ChillMainBundle/Entity/Civility.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
@@ -31,23 +20,10 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  */
 class Civility
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
-     */
-    private $id;
-
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
-     */
-    private array $name = [];
-
-    /**
-     * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $abbreviation = [];
 
@@ -56,6 +32,31 @@ class Civility
      */
     private bool $active = true;
 
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $name = [];
+
+    public function getAbbreviation(): array
+    {
+        return $this->abbreviation;
+    }
+
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -66,18 +67,16 @@ class Civility
         return $this->name;
     }
 
-    public function setName(array $name): self
+    /**
+     * @return Civility
+     */
+    public function setAbbreviation(array $abbreviation): self
     {
-        $this->name = $name;
+        $this->abbreviation = $abbreviation;
 
         return $this;
     }
 
-    public function getActive(): ?bool
-    {
-        return $this->active;
-    }
-
     public function setActive(bool $active): self
     {
         $this->active = $active;
@@ -85,21 +84,10 @@ class Civility
         return $this;
     }
 
-    /**
-     * @return array
-     */
-    public function getAbbreviation(): array
+    public function setName(array $name): self
     {
-        return $this->abbreviation;
-    }
+        $this->name = $name;
 
-    /**
-     * @param array $abbreviation
-     * @return Civility
-     */
-    public function setAbbreviation(array $abbreviation): self
-    {
-        $this->abbreviation = $abbreviation;
         return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php
index 043a4e82e..f1fc18557 100644
--- a/src/Bundle/ChillMainBundle/Entity/Country.php
+++ b/src/Bundle/ChillMainBundle/Entity/Country.php
@@ -1,81 +1,56 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Context;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * Country
+ * Country.
  *
  * @ORM\Entity
  * @ORM\Table(name="country")
  * @ORM\Cache(usage="READ_ONLY", region="country_cache_region")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Country
 {
     /**
-     * @var integer
+     * @ORM\Column(type="string", length=3)
+     * @groups({"read", "docgen:read"})
+     * @Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private string $countryCode = '';
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @groups({"read"})
+     * @groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @var string
      *
-     * @ORM\Column(type="json_array")
-     * @groups({"read"})
-     *
+     * @ORM\Column(type="json")
+     * @groups({"read", "docgen:read"})
+     * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private $name;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=3)
-     * @groups({"read"})
-     */
-    private $countryCode;
-
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set name
-     *
-     * @param string $name
-     * @return Country
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
     /**
      * @return string
      */
@@ -85,7 +60,6 @@ class Country
     }
 
     /**
-     *
      * @return the string
      */
     public function getCountryCode()
@@ -94,13 +68,46 @@ class Country
     }
 
     /**
+     * Get id.
      *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
      * @param string $countryCode
      */
     public function setCountryCode($countryCode)
     {
         $this->countryCode = $countryCode;
+
         return $this;
     }
 
+    /**
+     * Set name.
+     *
+     * @param string $name
+     *
+     * @return Country
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
index 9c99c98b4..51b8978a0 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
@@ -1,12 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity\Embeddable;
 
-use Chill\MainBundle\Entity\User;
+use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Embeddable()
+ * @ORM\Embeddable
  */
 class CommentEmbeddable
 {
@@ -17,18 +26,19 @@ class CommentEmbeddable
     private $comment;
 
     /**
-     * Embeddable does not support associations
-     * @var integer
-     * @ORM\Column(type="integer", nullable=true)
-     */
-    private $userId;
-
-    /**
-     * @var \DateTime
+     * @var DateTime
      * @ORM\Column(type="datetime", nullable=true)
      */
     private $date;
 
+    /**
+     * Embeddable does not support associations.
+     *
+     * @var int
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    private $userId;
+
     /**
      * @return string
      */
@@ -37,6 +47,22 @@ class CommentEmbeddable
         return $this->comment;
     }
 
+    /**
+     * @return DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+
+    /**
+     * @return interger $userId
+     */
+    public function getUserId()
+    {
+        return $this->userId;
+    }
+
     public function isEmpty()
     {
         return empty($this->getComment());
@@ -51,34 +77,18 @@ class CommentEmbeddable
     }
 
     /**
-     * @return interger $userId
+     * @param DateTime $date
      */
-    public function getUserId()
+    public function setDate(?DateTime $date)
     {
-        return $this->userId;
+        $this->date = $date;
     }
 
     /**
-     * @param integer $userId
+     * @param int $userId
      */
     public function setUserId($userId)
     {
         $this->userId = $userId;
     }
-
-    /**
-     * @return \DateTime
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * @param \DateTime $date
-     */
-    public function setDate(?\DateTime $date)
-    {
-        $this->date = $date;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
index a7700001f..ccf000b9d 100644
--- a/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
+++ b/src/Bundle/ChillMainBundle/Entity/GroupCenter.php
@@ -1,49 +1,27 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\PermissionsGroup;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="group_centers")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class GroupCenter
 {
-    /**
-     * @var int
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-    
     /**
      * @var Center
      *
@@ -54,7 +32,26 @@ class GroupCenter
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private $center;
-    
+
+    /**
+     * @var int
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var PermissionsGroup
+     *
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\MainBundle\Entity\PermissionsGroup",
+     * inversedBy="groupCenters")
+     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
+     */
+    private $permissionsGroup;
+
     /**
      * @var Collection
      *
@@ -64,18 +61,7 @@ class GroupCenter
      * )
      */
     private $users;
-    
-    /**
-     * @var PermissionsGroup
-     *
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\MainBundle\Entity\PermissionsGroup",
-     *     inversedBy="groupCenters")
-     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
-     */
-    private $permissionsGroup;
-    
-    
+
     /**
      * GroupCenter constructor.
      */
@@ -84,14 +70,6 @@ class GroupCenter
         $this->permissionsGroup = new ArrayCollection();
         $this->users = new ArrayCollection();
     }
-    
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
 
     /**
      * @return Center
@@ -102,23 +80,13 @@ class GroupCenter
     }
 
     /**
-     * @param Center $center
-     * @return \Chill\MainBundle\Entity\GroupCenter
+     * @return int
      */
-    public function setCenter(Center $center)
+    public function getId()
     {
-        $this->center = $center;
-        return $this;
+        return $this->id;
     }
-    
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getUsers()
-    {
-        return $this->users;
-    }
-    
+
     /**
      * @return PermissionGroup
      */
@@ -128,17 +96,30 @@ class GroupCenter
     }
 
     /**
-     * @param \Chill\MainBundle\Entity\PermissionsGroup $permissionGroup
+     * @return ArrayCollection|Collection
+     */
+    public function getUsers()
+    {
+        return $this->users;
+    }
+
+    /**
+     * @return \Chill\MainBundle\Entity\GroupCenter
+     */
+    public function setCenter(Center $center)
+    {
+        $this->center = $center;
+
+        return $this;
+    }
+
+    /**
      * @return \Chill\MainBundle\Entity\GroupCenter
      */
     public function setPermissionsGroup(PermissionsGroup $permissionsGroup)
     {
         $this->permissionsGroup = $permissionsGroup;
+
         return $this;
     }
-
-
-
-
-
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php b/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php
index 8d6d541d8..5ffe6dc87 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasCenterInterface.php
@@ -1,35 +1,24 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 /**
- * Interface for entities which may be linked to a center
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Interface for entities which may be linked to a center.
  */
 interface HasCenterInterface
 {
     /**
-     * the linked center
-     * 
+     * the linked center.
+     *
      * @return Center
      */
     public function getCenter();
diff --git a/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
index 921cbba41..ae22cd6c6 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasCentersInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 interface HasCentersInterface
diff --git a/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php b/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php
index 344d58557..44d4b4834 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasScopeInterface.php
@@ -1,34 +1,24 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 /**
- * Interface for entities which have a scop
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Interface for entities which have a scop.
  */
 interface HasScopeInterface
 {
     /**
-     * Return the linked scope
-     * 
+     * Return the linked scope.
+     *
      * @return Scope
      */
     public function getScope();
diff --git a/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
index 911dea563..1beea38f5 100644
--- a/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
+++ b/src/Bundle/ChillMainBundle/Entity/HasScopesInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 interface HasScopesInterface
diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php
index 22895b61b..b4929b662 100644
--- a/src/Bundle/ChillMainBundle/Entity/Language.php
+++ b/src/Bundle/ChillMainBundle/Entity/Language.php
@@ -1,56 +1,51 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
- * Language
+ * Language.
  *
  * @ORM\Entity
  * @ORM\Table(name="language")
  * @ORM\Cache(usage="READ_ONLY", region="language_cache_region")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Language
 {
     /**
      * @var string
      *
-     * @ORM\Id()
+     * @ORM\Id
      * @ORM\Column(type="string")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $id;
+    private ?string $id = null;
 
     /**
      * @var string array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
-    private $name;
+    private array $name = [];
 
     /**
-     * Get id
+     * Get id.
      *
-     * @return string 
+     * @return string
      */
     public function getId()
     {
@@ -58,37 +53,40 @@ class Language
     }
 
     /**
-     * Set id
-     * 
+     * Get name.
+     *
+     * @return string array
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set id.
+     *
      * @param string $id
+     *
      * @return Language
      */
     public function setId($id)
     {
         $this->id = $id;
+
         return $this;
     }
 
     /**
-     * Set name
+     * Set name.
      *
      * @param string array $name
+     *
      * @return Language
      */
     public function setName($name)
     {
         $this->name = $name;
-    
+
         return $this;
     }
-
-    /**
-     * Get name
-     *
-     * @return string array 
-     */
-    public function getName()
-    {
-        return $this->name;
-    } 
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php
index 06e5ccca5..ba1ad8fb0 100644
--- a/src/Bundle/ChillMainBundle/Entity/Location.php
+++ b/src/Bundle/ChillMainBundle/Entity/Location.php
@@ -1,25 +1,73 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
-use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Table(name="chill_main_location")
  * @ORM\Entity(repositoryClass=LocationRepository::class)
  * @DiscriminatorMap(typeProperty="type", mapping={
- *  "location"=Location::class
- *  })
+ *     "location": Location::class
+ * })
  */
 class Location implements TrackCreationInterface, TrackUpdateInterface
 {
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private bool $active = true;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Address::class, cascade={"persist"})
+     * @ORM\JoinColumn(nullable=true)
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Address $address = null;
+
+    /**
+     * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read"})
+     */
+    private bool $availableForUsers = false;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @Serializer\Groups({"read"})
+     */
+    private ?User $createdBy = null;
+
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?string $email = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -35,13 +83,6 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
      */
     private ?LocationType $locationType = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Address::class, cascade={"persist"})
-     * @ORM\JoinColumn(nullable=true)
-     * @Serializer\Groups({"read", "write"})
-     */
-    private ?Address $address = null;
-
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
      * @Serializer\Groups({"read", "write"})
@@ -64,35 +105,11 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
      */
     private ?string $phonenumber2 = null;
 
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     * @Serializer\Groups({"read", "write"})
-     */
-    private ?string $email = null;
-
-    /**
-     * @ORM\Column(type="boolean")
-     * @Serializer\Groups({"read"})
-     */
-    private bool $availableForUsers = false;
-
-    /**
-     * @ORM\Column(type="boolean", nullable=true)
-     * @Serializer\Groups({"read"})
-     */
-    private bool $active = true;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @Serializer\Groups({"read"})
-     */
-    private ?User $createdBy = null;
-
     /**
      * @ORM\Column(type="datetime_immutable", nullable=true)
      * @Serializer\Groups({"read"})
      */
-    private ?\DateTimeImmutable $createdAt = null;
+    private ?DateTimeImmutable $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
@@ -100,14 +117,35 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
      */
     private ?User $updatedBy = null;
 
-    /**
-     * @ORM\Column(type="datetime_immutable", nullable=true)
-     * @Serializer\Groups({"read"})
-     */
-    private  ?\DateTimeImmutable $updatedAt = null;
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
 
+    public function getAddress(): ?Address
+    {
+        return $this->address;
+    }
 
+    public function getAvailableForUsers(): ?bool
+    {
+        return $this->availableForUsers;
+    }
 
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function getEmail(): ?string
+    {
+        return $this->email;
+    }
 
     public function getId(): ?int
     {
@@ -119,88 +157,29 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this->locationType;
     }
 
-    public function setLocationType(?LocationType $locationType): self
-    {
-        $this->locationType = $locationType;
-
-        return $this;
-    }
-
-    public function getAddress(): ?Address
-    {
-        return $this->address;
-    }
-
-    public function setAddress(Address $address): self
-    {
-        $this->address = $address;
-
-        return $this;
-    }
-
     public function getName(): ?string
     {
         return $this->name;
     }
 
-    public function setName(?string $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
     public function getPhonenumber1(): ?string
     {
         return $this->phonenumber1;
     }
 
-    public function setPhonenumber1(?string $phonenumber1): self
-    {
-        $this->phonenumber1 = $phonenumber1;
-
-        return $this;
-    }
-
     public function getPhonenumber2(): ?string
     {
         return $this->phonenumber2;
     }
 
-    public function setPhonenumber2(?string $phonenumber2): self
+    public function getUpdatedAt(): ?DateTimeImmutable
     {
-        $this->phonenumber2 = $phonenumber2;
-
-        return $this;
+        return $this->updatedAt;
     }
 
-    public function getEmail(): ?string
+    public function getUpdatedBy(): ?User
     {
-        return $this->email;
-    }
-
-    public function setEmail(?string $email): self
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    public function getAvailableForUsers(): ?bool
-    {
-        return $this->availableForUsers;
-    }
-
-    public function setAvailableForUsers(bool $availableForUsers): self
-    {
-        $this->availableForUsers = $availableForUsers;
-
-        return $this;
-    }
-
-    public function getActive(): ?bool
-    {
-        return $this->active;
+        return $this->updatedBy;
     }
 
     public function setActive(bool $active): self
@@ -210,9 +189,25 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function getCreatedBy(): ?User
+    public function setAddress(Address $address): self
     {
-        return $this->createdBy;
+        $this->address = $address;
+
+        return $this;
+    }
+
+    public function setAvailableForUsers(bool $availableForUsers): self
+    {
+        $this->availableForUsers = $availableForUsers;
+
+        return $this;
+    }
+
+    public function setCreatedAt(?DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
     }
 
     public function setCreatedBy(?User $createdBy): self
@@ -222,21 +217,46 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function getCreatedAt(): ?\DateTimeImmutable
+    public function setEmail(?string $email): self
     {
-        return $this->createdAt;
-    }
-
-    public function setCreatedAt(?\DateTimeInterface $createdAt): self
-    {
-        $this->createdAt = $createdAt;
+        $this->email = $email;
 
         return $this;
     }
 
-    public function getUpdatedBy(): ?User
+    public function setLocationType(?LocationType $locationType): self
     {
-        return $this->updatedBy;
+        $this->locationType = $locationType;
+
+        return $this;
+    }
+
+    public function setName(?string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function setPhonenumber1(?string $phonenumber1): self
+    {
+        $this->phonenumber1 = $phonenumber1;
+
+        return $this;
+    }
+
+    public function setPhonenumber2(?string $phonenumber2): self
+    {
+        $this->phonenumber2 = $phonenumber2;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(?DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
     }
 
     public function setUpdatedBy(?User $updatedBy): self
@@ -245,16 +265,4 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
-
-    public function getUpdatedAt(): ?\DateTimeImmutable
-    {
-        return $this->updatedAt;
-    }
-
-    public function setUpdatedAt(?\DateTimeInterface $updatedAt): self
-    {
-        $this->updatedAt = $updatedAt;
-
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/LocationType.php b/src/Bundle/ChillMainBundle/Entity/LocationType.php
index 026fc727d..cda7e073f 100644
--- a/src/Bundle/ChillMainBundle/Entity/LocationType.php
+++ b/src/Bundle/ChillMainBundle/Entity/LocationType.php
@@ -1,9 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
@@ -11,14 +21,51 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  * @ORM\Table(name="chill_main_location_type")
  * @ORM\Entity(repositoryClass=LocationTypeRepository::class)
  * @DiscriminatorMap(typeProperty="type", mapping={
- *  "location-type"=LocationType::class
- *  })
+ *     "location-type": LocationType::class
+ * })
+ * @UniqueEntity({"defaultFor"})
  */
 class LocationType
 {
-    const STATUS_OPTIONAL = 'optional';
-    const STATUS_REQUIRED = 'required';
-    const STATUS_NEVER = 'never';
+    public const DEFAULT_FOR_3PARTY = 'thirdparty';
+
+    public const DEFAULT_FOR_PERSON = 'person';
+
+    public const STATUS_NEVER = 'never';
+
+    public const STATUS_OPTIONAL = 'optional';
+
+    public const STATUS_REQUIRED = 'required';
+
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private bool $active = true;
+
+    /**
+     * @ORM\Column(type="string", length=32, options={"default": "optional"})
+     * @Serializer\Groups({"read"})
+     */
+    private string $addressRequired = self::STATUS_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read"})
+     */
+    private bool $availableForUsers = true;
+
+    /**
+     * @ORM\Column(type="string", length=32, options={"default": "optional"})
+     * @Serializer\Groups({"read"})
+     */
+    private string $contactData = self::STATUS_OPTIONAL;
+
+    /**
+     * @ORM\Column(type="string", nullable=true, length=32, unique=true)
+     * @Serializer\Groups({"read"})
+     */
+    private ?string $defaultFor = null;
 
     /**
      * @ORM\Id
@@ -34,30 +81,30 @@ class LocationType
      */
     private array $title = [];
 
-    /**
-     * @ORM\Column(type="boolean")
-     * @Serializer\Groups({"read"})
-     */
-    private bool $availableForUsers = true;
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
 
-    /**
-     * @ORM\Column(type="boolean", nullable=true)
-     * @Serializer\Groups({"read"})
-     */
-    private bool $active = true;
+    public function getAddressRequired(): ?string
+    {
+        return $this->addressRequired;
+    }
 
-    /**
-     * @ORM\Column(type="string", length=32, options={"default"="optional"})
-     * @Serializer\Groups({"read"})
-     */
-    private string $addressRequired = self::STATUS_OPTIONAL;
+    public function getAvailableForUsers(): ?bool
+    {
+        return $this->availableForUsers;
+    }
 
-    /**
-     * @ORM\Column(type="string", length=32, options={"default"="optional"})
-     * @Serializer\Groups({"read"})
-     */
-    private string $contactData = self::STATUS_OPTIONAL;
+    public function getContactData(): ?string
+    {
+        return $this->contactData;
+    }
 
+    public function getDefaultFor(): ?string
+    {
+        return $this->defaultFor;
+    }
 
     public function getId(): ?int
     {
@@ -69,18 +116,6 @@ class LocationType
         return $this->title;
     }
 
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function getActive(): ?bool
-    {
-        return $this->active;
-    }
-
     public function setActive(bool $active): self
     {
         $this->active = $active;
@@ -88,23 +123,6 @@ class LocationType
         return $this;
     }
 
-    public function getAvailableForUsers(): ?bool
-    {
-        return $this->availableForUsers;
-    }
-
-    public function setAvailableForUsers(bool $availableForUsers): self
-    {
-        $this->availableForUsers = $availableForUsers;
-
-        return $this;
-    }
-
-    public function getAddressRequired(): ?string
-    {
-        return $this->addressRequired;
-    }
-
     public function setAddressRequired(string $addressRequired): self
     {
         $this->addressRequired = $addressRequired;
@@ -112,9 +130,11 @@ class LocationType
         return $this;
     }
 
-    public function getContactData(): ?string
+    public function setAvailableForUsers(bool $availableForUsers): self
     {
-        return $this->contactData;
+        $this->availableForUsers = $availableForUsers;
+
+        return $this;
     }
 
     public function setContactData(string $contactData): self
@@ -123,4 +143,18 @@ class LocationType
 
         return $this;
     }
+
+    public function setDefaultFor(?string $defaultFor): self
+    {
+        $this->defaultFor = $defaultFor;
+
+        return $this;
+    }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php
index 092445c9b..cba4f33e5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Notification.php
+++ b/src/Bundle/ChillMainBundle/Entity/Notification.php
@@ -1,25 +1,17 @@
 <?php
 
-/*
- * Copyright (C) 2021 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -27,14 +19,25 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * @ORM\Entity
  * @ORM\Table(
- *      name="chill_main_notification",
- *      uniqueConstraints={
- *          @ORM\UniqueConstraint(columns={"relatedEntityClass", "relatedEntityId"})
- *      }
+ *     name="chill_main_notification",
+ *     uniqueConstraints={
+ *         @ORM\UniqueConstraint(columns={"relatedEntityClass", "relatedEntityId"})
+ *     }
  * )
  */
 class Notification
 {
+    /**
+     * @ORM\ManyToMany(targetEntity=User::class)
+     * @ORM\JoinTable(name="chill_main_notification_addresses_user")
+     */
+    private Collection $addressees;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private DateTimeImmutable $date;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -48,21 +51,9 @@ class Notification
     private string $message;
 
     /**
-     * @ORM\Column(type="datetime_immutable")
+     * @ORM\Column(type="json")
      */
-    private \DateTimeImmutable $date;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private User $sender;
-
-    /**
-     * @ORM\ManyToMany(targetEntity=User::class)
-     * @ORM\JoinTable(name="chill_main_notification_addresses_user")
-     */
-    private Collection $addressees;
+    private array $read;
 
     /**
      * @ORM\Column(type="string", length=255)
@@ -75,52 +66,21 @@ class Notification
     private int $relatedEntityId;
 
     /**
-     * @ORM\Column(type="json")
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
      */
-    private array $read;
+    private User $sender;
 
     public function __construct()
     {
         $this->addressees = new ArrayCollection();
     }
 
-    public function getId(): ?int
+    public function addAddressee(User $addressee): self
     {
-        return $this->id;
-    }
-
-    public function getMessage(): ?string
-    {
-        return $this->message;
-    }
-
-    public function setMessage(string $message): self
-    {
-        $this->message = $message;
-
-        return $this;
-    }
-
-    public function getDate(): ?\DateTimeImmutable
-    {
-        return $this->date;
-    }
-
-    public function setDate(\DateTimeImmutable $date): self
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    public function getSender(): ?User
-    {
-        return $this->sender;
-    }
-
-    public function setSender(?User $sender): self
-    {
-        $this->sender = $sender;
+        if (!$this->addressees->contains($addressee)) {
+            $this->addressees[] = $addressee;
+        }
 
         return $this;
     }
@@ -133,13 +93,39 @@ class Notification
         return $this->addressees;
     }
 
-    public function addAddressee(User $addressee): self
+    public function getDate(): ?DateTimeImmutable
     {
-        if (!$this->addressees->contains($addressee)) {
-            $this->addressees[] = $addressee;
-        }
+        return $this->date;
+    }
 
-        return $this;
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getMessage(): ?string
+    {
+        return $this->message;
+    }
+
+    public function getRead(): array
+    {
+        return $this->read;
+    }
+
+    public function getRelatedEntityClass(): ?string
+    {
+        return $this->relatedEntityClass;
+    }
+
+    public function getRelatedEntityId(): ?int
+    {
+        return $this->relatedEntityId;
+    }
+
+    public function getSender(): ?User
+    {
+        return $this->sender;
     }
 
     public function removeAddressee(User $addressee): self
@@ -149,9 +135,25 @@ class Notification
         return $this;
     }
 
-    public function getRelatedEntityClass(): ?string
+    public function setDate(DateTimeImmutable $date): self
     {
-        return $this->relatedEntityClass;
+        $this->date = $date;
+
+        return $this;
+    }
+
+    public function setMessage(string $message): self
+    {
+        $this->message = $message;
+
+        return $this;
+    }
+
+    public function setRead(array $read): self
+    {
+        $this->read = $read;
+
+        return $this;
     }
 
     public function setRelatedEntityClass(string $relatedEntityClass): self
@@ -161,11 +163,6 @@ class Notification
         return $this;
     }
 
-    public function getRelatedEntityId(): ?int
-    {
-        return $this->relatedEntityId;
-    }
-
     public function setRelatedEntityId(int $relatedEntityId): self
     {
         $this->relatedEntityId = $relatedEntityId;
@@ -173,14 +170,9 @@ class Notification
         return $this;
     }
 
-    public function getRead(): array
+    public function setSender(?User $sender): self
     {
-        return $this->read;
-    }
-
-    public function setRead(array $read): self
-    {
-        $this->read = $read;
+        $this->sender = $sender;
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
index 456ee29e3..f066178dc 100644
--- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
@@ -1,74 +1,36 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
-use Chill\MainBundle\Entity\RoleScope;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use RuntimeException;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="permission_groups")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class PermissionsGroup
 {
-    /**
-     * @var integer
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-    
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     */
-    private $name;
-    
     /**
      * @var string[]
      *
      * @ORM\Column(type="json")
      */
     private $flags = [];
-    
-    /**
-     * @var Collection
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\MainBundle\Entity\RoleScope",
-     *     inversedBy="permissionsGroups",
-     *     cascade={ "persist" })
-     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
-     */
-    private $roleScopes;
-    
+
     /**
      * @var Collection
      *
@@ -78,8 +40,34 @@ class PermissionsGroup
      * )
      */
     private $groupCenters;
-    
-    
+
+    /**
+     * @var int
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255)
+     */
+    private $name;
+
+    /**
+     * @var Collection
+     *
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\MainBundle\Entity\RoleScope",
+     *     inversedBy="permissionsGroups",
+     * cascade={ "persist" })
+     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
+     */
+    private $roleScopes;
+
     /**
      * PermissionsGroup constructor.
      */
@@ -88,7 +76,20 @@ class PermissionsGroup
         $this->roleScopes = new \Doctrine\Common\Collections\ArrayCollection();
         $this->groupCenters = new \Doctrine\Common\Collections\ArrayCollection();
     }
-    
+
+    public function addRoleScope(RoleScope $roleScope)
+    {
+        $this->roleScopes->add($roleScope);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getFlags()
+    {
+        return $this->flags;
+    }
+
     /**
      * @return int
      */
@@ -104,7 +105,7 @@ class PermissionsGroup
     {
         return $this->name;
     }
-    
+
     /**
      * @return ArrayCollection|Collection
      */
@@ -112,78 +113,62 @@ class PermissionsGroup
     {
         return $this->roleScopes;
     }
-    
+
     /**
-     * @param $name
-     * @return $this
+     * Test that a role scope is associated only once
+     * with the permission group.
      */
-    public function setName($name)
+    public function isRoleScopePresentOnce(ExecutionContextInterface $context)
     {
-        $this->name = $name;
-        return $this;
+        $roleScopesId = array_map(
+            static function (RoleScope $roleScope) {
+                return $roleScope->getId();
+            },
+            $this->getRoleScopes()->toArray()
+        );
+        $countedIds = array_count_values($roleScopesId);
+
+        foreach ($countedIds as $id => $nb) {
+            if (1 < $nb) {
+                $context->buildViolation('A permission is already present '
+                        . 'for the same role and scope')
+                    ->addViolation();
+            }
+        }
     }
 
     /**
-     * @param RoleScope $roleScope
-     */
-    public function addRoleScope(RoleScope $roleScope)
-    {
-        $this->roleScopes->add($roleScope);
-    }
-    
-    /**
-     * @param RoleScope $roleScope
-     * @throws \RuntimeException if the roleScope could not be removed.
+     * @throws RuntimeException if the roleScope could not be removed.
      */
     public function removeRoleScope(RoleScope $roleScope)
     {
         $result = $this->roleScopes->removeElement($roleScope);
-        if ($result === FALSE) {
-            throw new \RuntimeException(sprintf("The roleScope '%s' could not be removed, "
-                    . "aborting.", spl_object_hash($roleScope)));
+
+        if (false === $result) {
+            throw new RuntimeException(sprintf("The roleScope '%s' could not be removed, "
+                    . 'aborting.', spl_object_hash($roleScope)));
         }
     }
-    
+
     /**
-     * @return string[]
-     */
-    public function getFlags()
-    {
-        return $this->flags;
-    }
-    
-    /**
-     * @param array $flags
      * @return $this
      */
     public function setFlags(array $flags)
     {
         $this->flags = $flags;
-        
+
         return $this;
     }
-    
-    /**
-     * Test that a role scope is associated only once
-     * with the permission group
-     * 
-     * @param ExecutionContextInterface $context
-     */
-    public function isRoleScopePresentOnce(ExecutionContextInterface $context) 
-    {
-        $roleScopesId = array_map(function(RoleScope $roleScope) {
-                    return $roleScope->getId();
-                }, 
-                $this->getRoleScopes()->toArray());
-        $countedIds = array_count_values($roleScopesId);
-        
-        foreach ($countedIds as $id => $nb) {
-            if ($nb > 1) {
-                $context->buildViolation("A permission is already present "
-                        . "for the same role and scope")
-                        ->addViolation();
-            }
-        }
-    }
 
+    /**
+     * @param $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 91ce46e17..484a9e322 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
@@ -7,37 +16,35 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * PostalCode
+ * PostalCode.
  *
  * @ORM\Entity
  * @ORM\Table(
  *     name="chill_main_postal_code",
  *     indexes={@ORM\Index(
- *          name="search_name_code",
- *          columns={"code", "label"}
- * )})
- * @ORM\HasLifecycleCallbacks()
- *
+ *         name="search_name_code",
+ *         columns={"code", "label"}
+ *     )})
+ *     @ORM\HasLifecycleCallbacks
  */
 class PostalCode
 {
     /**
-     * @var integer
+     * This is an internal column which is populated by database.
      *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     * @groups({"write", "read"})
+     * This column will ease the search operations
+     *
+     * @ORM\Column(type="text", options={"default": ""})
      */
-    private $id;
+    private string $canonical = '';
 
     /**
-     * @var string
+     * @var Point
      *
-     * @ORM\Column(type="string", length=255, name="label")
-     * @groups({"write", "read"})
+     * @ORM\Column(type="point", nullable=true)
+     * @groups({"read"})
      */
-    private $name;
+    private $center;
 
     /**
      * @var string
@@ -56,7 +63,25 @@ class PostalCode
     private $country;
 
     /**
-     * @var integer
+     * @var int
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"write", "read"})
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255, name="label")
+     * @groups({"write", "read"})
+     */
+    private $name;
+
+    /**
+     * @var int
      *
      * @ORM\Column(name="origin", type="integer", nullable=true)
      * @groups({"write", "read"})
@@ -69,7 +94,7 @@ class PostalCode
      * @ORM\Column(type="string", length=255, nullable=true)
      * @groups({"read"})
      */
-    private $refPostalCodeId;
+    private $postalCodeSource;
 
     /**
      * @var string
@@ -77,68 +102,45 @@ class PostalCode
      * @ORM\Column(type="string", length=255, nullable=true)
      * @groups({"read"})
      */
-    private $postalCodeSource;
+    private $refPostalCodeId;
+
+    public function getCenter(): ?Point
+    {
+        return $this->center;
+    }
 
     /**
-     * @var Point
+     * Get code.
      *
-     * @ORM\Column(type="point", nullable=true)
-     * @groups({"read"})
+     * @return string
      */
-    private $center;
+    public function getCode()
+    {
+        return $this->code;
+    }
 
     /**
-     * Get id
+     * Get country.
      *
-     * @return integer
+     * @return Country
+     */
+    public function getCountry()
+    {
+        return $this->country;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
      */
     public function getId()
     {
         return $this->id;
     }
 
-
     /**
-     * Set origin
-     *
-     * @param int $origin
-     *
-     * @return PostalCode
-     */
-    public function setOrigin($origin)
-    {
-        $this->origin = $origin;
-
-        return $this;
-    }
-
-    /**
-     * Get origin
-     *
-     * @return int
-     */
-    public function getOrigin()
-    {
-        return $this->origin;
-    }
-
-
-    /**
-     * Set name
-     *
-     * @param string $name
-     *
-     * @return PostalCode
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
+     * Get name.
      *
      * @return string
      */
@@ -148,7 +150,34 @@ class PostalCode
     }
 
     /**
-     * Set code
+     * Get origin.
+     *
+     * @return int
+     */
+    public function getOrigin()
+    {
+        return $this->origin;
+    }
+
+    public function getPostalCodeSource(): ?string
+    {
+        return $this->postalCodeSource;
+    }
+
+    public function getRefPostalCodeId(): ?string
+    {
+        return $this->refPostalCodeId;
+    }
+
+    public function setCenter(?Point $center): self
+    {
+        $this->center = $center;
+
+        return $this;
+    }
+
+    /**
+     * Set code.
      *
      * @param string $code
      *
@@ -162,23 +191,13 @@ class PostalCode
     }
 
     /**
-     * Get code
-     *
-     * @return string
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Set country
+     * Set country.
      *
      * @param Country $country
      *
      * @return PostalCode
      */
-    public function setCountry(Country $country = null)
+    public function setCountry(?Country $country = null)
     {
         $this->country = $country;
 
@@ -186,30 +205,31 @@ class PostalCode
     }
 
     /**
-     * Get country
+     * Set name.
      *
-     * @return Country
+     * @param string $name
+     *
+     * @return PostalCode
      */
-    public function getCountry()
+    public function setName($name)
     {
-        return $this->country;
-    }
-
-    public function getRefPostalCodeId(): ?string
-    {
-        return $this->refPostalCodeId;
-    }
-
-    public function setRefPostalCodeId(?string $refPostalCodeId): self
-    {
-        $this->refPostalCodeId = $refPostalCodeId;
+        $this->name = $name;
 
         return $this;
     }
 
-    public function getPostalCodeSource(): ?string
+    /**
+     * Set origin.
+     *
+     * @param int $origin
+     *
+     * @return PostalCode
+     */
+    public function setOrigin($origin)
     {
-        return $this->postalCodeSource;
+        $this->origin = $origin;
+
+        return $this;
     }
 
     public function setPostalCodeSource(?string $postalCodeSource): self
@@ -219,16 +239,10 @@ class PostalCode
         return $this;
     }
 
-    public function getCenter(): ?Point
+    public function setRefPostalCodeId(?string $refPostalCodeId): self
     {
-        return $this->center;
-    }
-
-    public function setCenter(?Point $center): self
-    {
-        $this->center = $center;
+        $this->refPostalCodeId = $refPostalCodeId;
 
         return $this;
     }
 }
-
diff --git a/src/Bundle/ChillMainBundle/Entity/RoleScope.php b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
index 7842267a9..a9a65799d 100644
--- a/src/Bundle/ChillMainBundle/Entity/RoleScope.php
+++ b/src/Bundle/ChillMainBundle/Entity/RoleScope.php
@@ -1,126 +1,88 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="role_scopes")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class RoleScope
 {
     /**
-     * @var integer
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
-    
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     */
-    private $role;
-    
-    /**
-     * @var Scope
-     *
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\MainBundle\Entity\Scope",
-     *     inversedBy="roleScopes")
-     * @ORM\JoinColumn(nullable=true, name="scope_id")
-     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
-     */
-    private $scope;
-    
+    private ?int $id = null;
+
     /**
      * @var Collection
      *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\PermissionsGroup",
-     *     mappedBy="roleScopes")
+     * mappedBy="roleScopes")
      */
     private $permissionsGroups;
-    
-    
+
     /**
-     * RoleScope constructor.
+     * @ORM\Column(type="string", length=255)
      */
-    public function __construct() {
-        $this->new = true;
+    private ?string $role = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\MainBundle\Entity\Scope",
+     * inversedBy="roleScopes")
+     * @ORM\JoinColumn(nullable=true, name="scope_id")
+     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
+     */
+    private ?Scope $scope = null;
+
+    public function __construct()
+    {
         $this->permissionsGroups = new ArrayCollection();
     }
-    
-    /**
-     * @return int
-     */
-    public function getId()
+
+    public function getId(): ?int
     {
         return $this->id;
     }
 
-    /**
-     * @return string
-     */
-    public function getRole()
+    public function getRole(): ?string
     {
         return $this->role;
     }
 
-    /**
-     * @return Scope
-     */
-    public function getScope()
+    public function getScope(): ?Scope
     {
         return $this->scope;
     }
-    
-    /**
-     * @param type $role
-     * @return RoleScope
-     */
-    public function setRole($role)
+
+    public function setRole(?string $role = null): self
     {
         $this->role = $role;
 
         return $this;
     }
 
-    /**
-     * @param Scope $scope
-     * @return RoleScope
-     */
-    public function setScope(Scope $scope = null)
+    public function setScope(?Scope $scope = null): self
     {
         $this->scope = $scope;
-        
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php
index 2e75c5791..72ac0ad01 100644
--- a/src/Bundle/ChillMainBundle/Entity/Scope.php
+++ b/src/Bundle/ChillMainBundle/Entity/Scope.php
@@ -1,73 +1,60 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
-use Chill\MainBundle\Entity\RoleScope;
-use Symfony\Component\Serializer\Annotation\Groups;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Context;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="scopes")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  * @DiscriminatorMap(typeProperty="type", mapping={
- *    "scope"=Scope::class
+ *     "scope": Scope::class
  * })
  */
 class Scope
 {
     /**
-     * @var integer
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * translatable names
+     * translatable names.
      *
-     * @var array
-     *
-     * @ORM\Column(type="json_array")
-     * @Groups({"read"})
+     * @ORM\Column(type="json")
+     * @Groups({"read", "docgen:read"})
+     * @Context({"is-translatable": true}, groups={"docgen:read"})
      */
-    private $name = [];
+    private array $name = [];
 
     /**
      * @var Collection
      *
      * @ORM\OneToMany(
      *     targetEntity="Chill\MainBundle\Entity\RoleScope",
-     *     mappedBy="scope")
+     * mappedBy="scope")
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
     private $roleScopes;
 
-
     /**
      * Scope constructor.
      */
@@ -76,45 +63,40 @@ class Scope
         $this->roleScopes = new ArrayCollection();
     }
 
-    /**
-     * @return int
-     */
-    public function getId()
+    public function addRoleScope(RoleScope $roleScope): self
     {
-        return $this->id;
-    }
+        $this->roleScopes->add($roleScope);
 
-    /**
-     * @return array
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param $name
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
         return $this;
     }
 
     /**
-     * @return Collection
+     * @return int
      */
-    public function getRoleScopes()
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    public function getRoleScopes(): Collection
     {
         return $this->roleScopes;
     }
 
     /**
-     * @param RoleScope $roleScope
+     * @param $name
+     *
+     * @return $this
      */
-    public function addRoleScope(RoleScope $roleScope)
+    public function setName(array $name): self
     {
-        $this->roleScopes->add($roleScope);
+        $this->name = $name;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 41d6db40c..de9d1199c 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -1,53 +1,84 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
-use Chill\MainBundle\Entity\UserJob;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use RuntimeException;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use function in_array;
 
 /**
- * User
+ * User.
  *
  * @ORM\Entity
  * @ORM\Table(name="users")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
- * @DiscriminatorMap(typeProperty="type", mapping={
- *    "user"=User::class
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "user": User::class
  * })
  */
-class User implements AdvancedUserInterface {
-
+class User implements AdvancedUserInterface
+{
     /**
-     * @var integer
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    protected $id;
+    protected ?int $id = null;
 
     /**
-     * @var string
+     * Array where SAML attributes's data are stored.
      *
-     * @ORM\Column(type="string", length=80)
+     * @ORM\Column(type="json", nullable=true)
      */
-    private $username;
+    private array $attributes;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Location::class)
+     */
+    private ?Location $currentLocation = null;
 
     /**
      * @var string
      *
+     * @ORM\Column(type="string", length=150, nullable=true)
+     */
+    private ?string $email = null;
+
+    /**
      * @ORM\Column(
      *     type="string",
-     *     length=80,
-     *     unique=true,
-     *     nullable=true)
+     *     length=150,
+     *     nullable=true,
+     * unique=true)
      */
-    private $usernameCanonical;
+    private ?string $emailCanonical = null;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $enabled = true;
+
+    /**
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
+     * inversedBy="users")
+     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
+     */
+    private Collection $groupCenters;
 
     /**
      * @ORM\Column(type="string", length=200)
@@ -55,89 +86,52 @@ class User implements AdvancedUserInterface {
     private string $label = '';
 
     /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=150, nullable=true)
-     */
-    private $email;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(
-     *     type="string",
-     *     length=150,
-     *     nullable=true,
-     *     unique=true)
-     */
-    private $emailCanonical;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="string", length=255)
-     */
-    private $password;
-
-    /**
-     * @var string
-     * @internal must be set to null if we use bcrypt
-     *
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
-    private $salt = null;
-
-    /**
-     * @var boolean
-     *
      * @ORM\Column(type="boolean")
      *      sf4 check: in yml was false by default !?
      */
-    private $locked = true;
+    private bool $locked = true;
 
     /**
-     * @var boolean
-     *
-     * @ORM\Column(type="boolean")
-     */
-    private $enabled = true;
-
-    /**
-     * @var Collection
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\MainBundle\Entity\GroupCenter",
-     *     inversedBy="users")
-     * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
-     */
-    private $groupCenters;
-
-    /**
-     * Array where SAML attributes's data are stored
-     * @var array
-     *
-     * @ORM\Column(type="json_array", nullable=true)
-     */
-    private $attributes;
-
-    /**
-     * @var Center|null
      * @ORM\ManyToOne(targetEntity=Center::class)
      */
     private ?Center $mainCenter = null;
 
     /**
-     * @var Scope|null
      * @ORM\ManyToOne(targetEntity=Scope::class)
      */
     private ?Scope $mainScope = null;
 
     /**
-     * @var UserJob|null
+     * @ORM\Column(type="string", length=255)
+     */
+    private string $password = '';
+
+    /**
+     * @internal must be set to null if we use bcrypt
+     *
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private ?string $salt = null;
+
+    /**
      * @ORM\ManyToOne(targetEntity=UserJob::class)
      */
     private ?UserJob $userJob = null;
 
+    /**
+     * @ORM\Column(type="string", length=80)
+     */
+    private string $username = '';
+
+    /**
+     * @ORM\Column(
+     *     type="string",
+     *     length=80,
+     *     unique=true,
+     * nullable=true)
+     */
+    private ?string $usernameCanonical = null;
+
     /**
      * User constructor.
      */
@@ -155,109 +149,48 @@ class User implements AdvancedUserInterface {
     }
 
     /**
-     * Get id
+     * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
      *
-     * @return integer
+     * @return \Chill\MainBundle\Entity\User
      */
-    public function getId()
+    public function addGroupCenter(GroupCenter $groupCenter)
     {
-        return $this->id;
-    }
-
-    /**
-     * Set username
-     *
-     * @param string $name
-     * @return Agent
-     */
-    public function setUsername($name)
-    {
-        $this->username = $name;
-
-        if (empty($this->getLabel())) {
-            $this->setLabel($name);
-        }
+        $this->groupCenters->add($groupCenter);
 
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getUsername()
+    public function eraseCredentials()
     {
-        return $this->username;
     }
 
     /**
-     */
-    public function eraseCredentials() {}
-
-    /**
+     * Get attributes.
+     *
      * @return array
      */
-    public function getRoles()
+    public function getAttributes()
     {
-        return array('ROLE_USER');
+        if (null === $this->attributes) {
+            $this->attributes = [];
+        }
+
+        return $this->attributes;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getSalt()
+    public function getCurrentLocation(): ?Location
     {
-        return $this->salt;
-    }
-
-    /**
-     * @param $usernameCanonical
-     * @return $this
-     */
-    public function setUsernameCanonical($usernameCanonical)
-    {
-        $this->usernameCanonical = $usernameCanonical;
-
-        return $this;
+        return $this->currentLocation;
     }
 
     /**
      * @return string
      */
-    public function getUsernameCanonical()
-    {
-        return $this->usernameCanonical;
-    }
-
-    /**
-     * @param $email
-     * @return $this
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail()
+    public function getEmail(): ?string
     {
         return $this->email;
     }
 
-    /**
-     * @param $emailCanonical
-     * @return $this
-     */
-    public function setEmailCanonical($emailCanonical)
-    {
-        $this->emailCanonical = $emailCanonical;
-
-        return $this;
-    }
-
     /**
      * @return string
      */
@@ -267,14 +200,36 @@ class User implements AdvancedUserInterface {
     }
 
     /**
-     * @param $password
-     * @return $this
+     * @return GroupCenter
      */
-    function setPassword($password)
+    public function getGroupCenters()
     {
-        $this->password =  $password;
+        return $this->groupCenters;
+    }
 
-        return $this;
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getLabel(): string
+    {
+        return $this->label;
+    }
+
+    public function getMainCenter(): ?Center
+    {
+        return $this->mainCenter;
+    }
+
+    public function getMainScope(): ?Scope
+    {
+        return $this->mainScope;
     }
 
     /**
@@ -285,14 +240,38 @@ class User implements AdvancedUserInterface {
         return $this->password;
     }
 
-    /**
-     * @param $salt
-     * @return $this
-     */
-    function setSalt($salt)
+    public function getRoles(): array
     {
-        $this->salt = $salt;
-        return $this;
+        return ['ROLE_USER'];
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getSalt()
+    {
+        return $this->salt;
+    }
+
+    public function getUserJob(): ?UserJob
+    {
+        return $this->userJob;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUsernameCanonical()
+    {
+        return $this->usernameCanonical;
     }
 
     /**
@@ -327,46 +306,6 @@ class User implements AdvancedUserInterface {
         return $this->enabled;
     }
 
-    /**
-     * @param bool $enabled
-     */
-    public function setEnabled($enabled)
-    {
-        $this->enabled = $enabled;
-
-        return $this;
-    }
-
-    /**
-     * @return GroupCenter
-     */
-    public function getGroupCenters()
-    {
-        return $this->groupCenters;
-    }
-
-    /**
-     * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
-     * @return \Chill\MainBundle\Entity\User
-     */
-    public function addGroupCenter(GroupCenter $groupCenter)
-    {
-        $this->groupCenters->add($groupCenter);
-        return $this;
-    }
-
-    /**
-     * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
-     * @throws \RuntimeException if the groupCenter is not in the collection
-     */
-    public function removeGroupCenter(GroupCenter $groupCenter)
-    {
-        if ($this->groupCenters->removeElement($groupCenter) === FALSE) {
-            throw new \RuntimeException(sprintf("The groupCenter could not be removed, "
-                    . "it seems not to be associated with the user. Aborting."));
-        }
-    }
-
     /**
      * This function check that groupCenter are present only once. The validator
      * use this function to avoid a user to be associated to the same groupCenter
@@ -374,12 +313,12 @@ class User implements AdvancedUserInterface {
      */
     public function isGroupCenterPresentOnce(ExecutionContextInterface $context)
     {
-        $groupCentersIds = array();
-        foreach ($this->getGroupCenters() as $groupCenter) {
-            if (in_array($groupCenter->getId(), $groupCentersIds)) {
-                $context->buildViolation("The user has already those permissions")
-                        ->addViolation();
+        $groupCentersIds = [];
 
+        foreach ($this->getGroupCenters() as $groupCenter) {
+            if (in_array($groupCenter->getId(), $groupCentersIds, true)) {
+                $context->buildViolation('The user has already those permissions')
+                    ->addViolation();
             } else {
                 $groupCentersIds[] = $groupCenter->getId();
             }
@@ -387,7 +326,20 @@ class User implements AdvancedUserInterface {
     }
 
     /**
-     * Set attributes
+     * @param \Chill\MainBundle\Entity\GroupCenter $groupCenter
+     *
+     * @throws RuntimeException if the groupCenter is not in the collection
+     */
+    public function removeGroupCenter(GroupCenter $groupCenter)
+    {
+        if ($this->groupCenters->removeElement($groupCenter) === false) {
+            throw new RuntimeException('The groupCenter could not be removed, '
+                    . 'it seems not to be associated with the user. Aborting.');
+        }
+    }
+
+    /**
+     * Set attributes.
      *
      * @param array $attributes
      *
@@ -400,89 +352,123 @@ class User implements AdvancedUserInterface {
         return $this;
     }
 
+    public function setCurrentLocation(?Location $currentLocation): User
+    {
+        $this->currentLocation = $currentLocation;
+
+        return $this;
+    }
+
     /**
-     * Get attributes
+     * @param $email
      *
-     * @return array
+     * @return $this
      */
-    public function getAttributes()
+    public function setEmail($email)
     {
-        if ($this->attributes === null) {
-            $this->attributes = [];
-        }
+        $this->email = $email;
 
-        return $this->attributes;
+        return $this;
     }
 
     /**
-     * @return string
+     * @param $emailCanonical
+     *
+     * @return $this
      */
-    public function getLabel(): string
+    public function setEmailCanonical($emailCanonical)
     {
-        return $this->label;
+        $this->emailCanonical = $emailCanonical;
+
+        return $this;
+    }
+
+    public function setEnabled(bool $enabled)
+    {
+        $this->enabled = $enabled;
+
+        return $this;
     }
 
-    /**
-     * @param string $label
-     * @return User
-     */
     public function setLabel(string $label): User
     {
         $this->label = $label;
+
         return $this;
     }
 
-    /**
-     * @return Center|null
-     */
-    public function getMainCenter(): ?Center
-    {
-        return $this->mainCenter;
-    }
-
-    /**
-     * @param Center|null $mainCenter
-     * @return User
-     */
     public function setMainCenter(?Center $mainCenter): User
     {
         $this->mainCenter = $mainCenter;
+
         return $this;
     }
 
-    /**
-     * @return Scope|null
-     */
-    public function getMainScope(): ?Scope
-    {
-        return $this->mainScope;
-    }
-
-    /**
-     * @param Scope|null $mainScope
-     * @return User
-     */
     public function setMainScope(?Scope $mainScope): User
     {
         $this->mainScope = $mainScope;
+
         return $this;
     }
 
     /**
-     * @return UserJob|null
+     * @param $password
+     *
+     * @return $this
      */
-    public function getUserJob(): ?UserJob
+    public function setPassword($password)
     {
-        return $this->userJob;
+        $this->password = $password;
+
+        return $this;
     }
 
     /**
-     * @param UserJob|null $userJob
-     * @return User
+     * @param $salt
+     *
+     * @return $this
      */
+    public function setSalt($salt)
+    {
+        $this->salt = $salt;
+
+        return $this;
+    }
+
     public function setUserJob(?UserJob $userJob): User
     {
         $this->userJob = $userJob;
+
+        return $this;
+    }
+
+    /**
+     * Set username.
+     *
+     * @param string $name
+     *
+     * @return Agent
+     */
+    public function setUsername($name)
+    {
+        $this->username = $name;
+
+        if (empty($this->getLabel())) {
+            $this->setLabel($name);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param $usernameCanonical
+     *
+     * @return $this
+     */
+    public function setUsernameCanonical($usernameCanonical)
+    {
+        $this->usernameCanonical = $usernameCanonical;
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php
index 411d5c40f..5f0bea45d 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserJob.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
@@ -9,36 +18,31 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Entity
  * @ORM\Table("chill_main_user_job")
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *     "user_job"=UserJob::class
- *     })
+ *     "user_job": UserJob::class
+ * })
  */
 class UserJob
 {
+    /**
+     * @ORM\Column(name="active", type="boolean")
+     */
+    protected bool $active = true;
 
     /**
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     protected ?int $id = null;
 
     /**
      * @var array|string[]A
      * @ORM\Column(name="label", type="json")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     protected array $label = [];
 
-    /**
-     * @var bool
-     * @ORM\Column(name="active", type="boolean")
-     */
-    protected bool $active = true;
-
-    /**
-     * @return int|null
-     */
     public function getId(): ?int
     {
         return $this->id;
@@ -52,31 +56,25 @@ class UserJob
         return $this->label;
     }
 
-    /**
-     * @param array|string[] $label
-     * @return UserJob
-     */
-    public function setLabel(array $label): UserJob
-    {
-        $this->label = $label;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
     public function isActive(): bool
     {
         return $this->active;
     }
 
-    /**
-     * @param bool $active
-     * @return UserJob
-     */
     public function setActive(bool $active): UserJob
     {
         $this->active = $active;
+
+        return $this;
+    }
+
+    /**
+     * @param array|string[] $label
+     */
+    public function setLabel(array $label): UserJob
+    {
+        $this->label = $label;
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
index db65600bd..244d3ba14 100644
--- a/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/AggregatorInterface.php
@@ -1,69 +1,50 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
+use Closure;
+
 /**
- * Interface for Aggregators. 
- * 
+ * Interface for Aggregators.
+ *
  * Aggregators gather result of a query. Most of the time, it will add
  * a GROUP BY clause.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 interface AggregatorInterface extends ModifierInterface
-{ 
-    /**
-     * give the list of keys the current export added to the queryBuilder in 
-     * self::initiateQuery
-     * 
-     * Example: if your query builder will contains `SELECT count(id) AS count_id ...`,
-     * this function will return `array('count_id')`.
-     * 
-     * @param mixed[] $data the data from the export's form (added by self::buildForm)
-     */
-    public function getQueryKeys($data);
-    
+{
     /**
      * get a callable which will be able to transform the results into
      * viewable and understable string.
-     * 
-     * The callable will have only one argument: the `value` to translate. 
-     * 
+     *
+     * The callable will have only one argument: the `value` to translate.
+     *
      * The callable should also be able to return a key `_header`, which
-     * will contains the header of the column. 
-     * 
-     * The string returned **must** be already translated if necessary, 
+     * will contains the header of the column.
+     *
+     * The string returned **must** be already translated if necessary,
      * **with an exception** for the string returned for `_header`.
-     * 
-     * Example : 
-     * 
+     *
+     * Example :
+     *
      * ```
      * protected $translator;
-     * 
+     *
      * public function getLabels($key, array $values, $data)
      * {
      *      return function($value) {
      *          case $value
      *          {
-     *              case '_header' : 
-     *                  return 'my header not translated'; 
+     *              case '_header' :
+     *                  return 'my header not translated';
      *              case true:
      *                  return $this->translator->trans('true');
      *              case false:
@@ -74,17 +55,28 @@ interface AggregatorInterface extends ModifierInterface
      *          }
      * }
      * ```
-     * 
-     * **Note:** Why each string must be translated with an exception for 
+     *
+     * **Note:** Why each string must be translated with an exception for
      * the `_header` ? For performance reasons: most of the value will be number
      * which do not need to be translated, or value already translated in
      * database. But the header must be, in every case, translated.
-     * 
+     *
      * @param string $key The column key, as added in the query
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
      * @param mixed $data The data from the export's form (as defined in `buildForm`
-     * @return \Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     *
+     * @return Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, $data);
 
+    /**
+     * give the list of keys the current export added to the queryBuilder in
+     * self::initiateQuery.
+     *
+     * Example: if your query builder will contains `SELECT count(id) AS count_id ...`,
+     * this function will return `array('count_id')`.
+     *
+     * @param mixed[] $data the data from the export's form (added by self::buildForm)
+     */
+    public function getQueryKeys($data);
 }
diff --git a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
index ea82175e9..734939b7c 100644
--- a/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/DirectExportInterface.php
@@ -1,37 +1,36 @@
 <?php
-/*
- * 
- */
-namespace Chill\MainBundle\Export;
-
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
- * 
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Export;
+
+use Symfony\Component\Security\Core\Role\Role;
+
 interface DirectExportInterface extends ExportElementInterface
 {
-
     /**
-     * get a description, which will be used in UI (and translated)
-     *
-     * @return string
-     */
-    public function getDescription();
-
-    /**
-     * Generate the export
-     *
-     * @param array $acl
-     * @param array $data
+     * Generate the export.
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function generate(array $acl, array $data = []);
 
     /**
-     * authorized role
+     * get a description, which will be used in UI (and translated).
+     *
+     * @return string
+     */
+    public function getDescription();
+
+    /**
+     * authorized role.
      *
      * @return \Symfony\Component\Security\Core\Role\Role
      */
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
index d1498be31..0e4457764 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementInterface.php
@@ -1,47 +1,33 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * The common methods between different object used to build export (i.e. : ExportInterface,
- * FilterInterface, AggregatorInterface)
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * FilterInterface, AggregatorInterface).
  */
 interface ExportElementInterface
 {
     /**
-     * get a title, which will be used in UI (and translated)
-     * 
+     * Add a form to collect data from the user.
+     */
+    public function buildForm(FormBuilderInterface $builder);
+
+    /**
+     * get a title, which will be used in UI (and translated).
+     *
      * @return string
      */
     public function getTitle();
-    
-        
-    /**
-     * Add a form to collect data from the user.
-     * 
-     * @param FormBuilderInterface $builder
-     */
-    public function buildForm(FormBuilderInterface $builder);
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
index cbc2f3881..c2e13d25e 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementValidatedInterface.php
@@ -1,46 +1,37 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Add a validation method to validate data collected by Export Element
- * 
+ * Add a validation method to validate data collected by Export Element.
+ *
  * Implements this interface on other `ExportElementInterface` to validate
  * the form submitted by users.
- * 
+ *
  * **note**: When this interface is implemented on filters or aggregators,
  * the form is validated **only** if the filter/aggregator is `enabled` by the
  * user.
- * 
- * @link http://symfony.com/doc/current/validation/custom_constraint.html#class-constraint-validator Example of building violations
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @see http://symfony.com/doc/current/validation/custom_constraint.html#class-constraint-validator Example of building violations
  */
 interface ExportElementValidatedInterface
 {
     /**
      * validate the form's data and, if required, build a contraint
      * violation on the data.
-     * 
+     *
      * @param mixed $data the data, as returned by the user
-     * @param ExecutionContextInterface $context
      */
     public function validateForm($data, ExecutionContextInterface $context);
 }
diff --git a/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php b/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php
index 077272c9b..b43d2d267 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportElementsProviderInterface.php
@@ -1,30 +1,22 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 /**
  * Interface to provide export elements dynamically.
- * 
- * The typical use case is providing exports or aggregators depending on 
+ *
+ * The typical use case is providing exports or aggregators depending on
  * dynamic data. Example: providing exports for reports, reports depending
  * on data stored in database.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 interface ExportElementsProviderInterface
 {
diff --git a/src/Bundle/ChillMainBundle/Export/ExportInterface.php b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
index c260649d1..419d9b250 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
@@ -1,143 +1,70 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 
 /**
  * Interface for Export.
- * 
- * An export is a class which will initiate a query for an export. 
- * 
- * **Note** : the report implementing this class will be modified by 
+ *
+ * An export is a class which will initiate a query for an export.
+ *
+ * **Note** : the report implementing this class will be modified by
  * both filters **and** aggregators. If the report does not support
  * aggregation, use `ListInterface`.
  *
  * @example Chill\PersonBundle\Export\CountPerson an example of implementation
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 interface ExportInterface extends ExportElementInterface
 {
-    /**
-     * Return the Export's type. This will inform _on what_ export will apply. 
-     * Most of the type, it will be a string which references an entity.
-     * 
-     * Example of types : Chill\PersonBundle\Export\Declarations::PERSON_TYPE
-     * 
-     * @return string
-     */
-    public function getType();
-    
-    /**
-     * A description, which will be used in the UI to explain what the export does.
-     * This description will be translated.
-     * 
-     * @return string
-     */
-    public function getDescription();
-    
-    /**
-     * The initial query, which will be modified by ModifiersInterface 
-     * (i.e. AggregatorInterface, FilterInterface).
-     * 
-     * This query should take into account the `$acl` and restrict result only to
-     * what the user is allowed to see. (Do not show personal data the user
-     * is not allowed to see).
-     * 
-     * The returned object should be an instance of QueryBuilder or NativeQuery.
-     * 
-     * @param array $requiredModifiers
-     * @param array $acl an array where each row has a `center` key containing the Chill\MainBundle\Entity\Center, and `circles` keys containing the reachable circles. Example: `array( array('center' => $centerA, 'circles' => array($circleA, $circleB) ) )`
-     * @param array $data the data from the form, if any
-     * @return QueryBuilder|\Doctrine\ORM\NativeQuery the query to execute. 
-     */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = array());
-    
-    /**
-     * Inform which ModifiersInterface (i.e. AggregatorInterface, FilterInterface)
-     * are allowed. The modifiers should be an array of types the _modifier_ apply on 
-     * (@see ModifiersInterface::applyOn()).
-     * 
-     * @return string[]
-     */
-    public function supportsModifiers();
-    
-    /**
-     * Return the required Role to execute the Export.
-     * 
-     * @return \Symfony\Component\Security\Core\Role\Role
-     * 
-     */
-    public function requiredRole();
-    
     /**
      * Return which formatter type is allowed for this report.
-     * 
+     *
      * @return string[]
      */
     public function getAllowedFormattersTypes();
-    
+
     /**
-     * give the list of keys the current export added to the queryBuilder in 
-     * self::initiateQuery
-     * 
-     * Example: if your query builder will contains `SELECT count(id) AS count_id ...`,
-     * this function will return `array('count_id')`.
-     * 
-     * @param mixed[] $data the data from the export's form (added by self::buildForm)
+     * A description, which will be used in the UI to explain what the export does.
+     * This description will be translated.
+     *
+     * @return string
      */
-    public function getQueryKeys($data);
-    
-    /**
-     * Return the results of the query builder.
-     * 
-     * @param QueryBuilder|\Doctrine\ORM\NativeQuery $query
-     * @param mixed[] $data the data from the export's fomr (added by self::buildForm)
-     * @return mixed[] an array of results
-     */
-    public function getResult($query, $data);
-    
-        
+    public function getDescription();
+
     /**
      * transform the results to viewable and understable string.
-     * 
-     * The callable will have only one argument: the `value` to translate. 
-     * 
+     *
+     * The callable will have only one argument: the `value` to translate.
+     *
      * The callable should also be able to return a key `_header`, which
-     * will contains the header of the column. 
-     * 
-     * The string returned **must** be already translated if necessary, 
+     * will contains the header of the column.
+     *
+     * The string returned **must** be already translated if necessary,
      * **with an exception** for the string returned for `_header`.
-     * 
-     * Example : 
-     * 
+     *
+     * Example :
+     *
      * ```
      * protected $translator;
-     * 
+     *
      * public function getLabels($key, array $values, $data)
      * {
      *      return function($value) {
      *          case $value
      *          {
-     *              case '_header' : 
-     *                  return 'my header not translated'; 
+     *              case '_header' :
+     *                  return 'my header not translated';
      *              case true:
      *                  return $this->translator->trans('true');
      *              case false:
@@ -148,18 +75,81 @@ interface ExportInterface extends ExportElementInterface
      *          }
      * }
      * ```
-     * 
-     * **Note:** Why each string must be translated with an exception for 
+     *
+     * **Note:** Why each string must be translated with an exception for
      * the `_header` ? For performance reasons: most of the value will be number
      * which do not need to be translated, or value already translated in
      * database. But the header must be, in every case, translated.
-     * 
-     * 
+     *
      * @param string $key The column key, as added in the query
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
      * @param mixed $data The data from the export's form (as defined in `buildForm`
-     * @return \Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     *
+     * @return Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, $data);
 
+    /**
+     * give the list of keys the current export added to the queryBuilder in
+     * self::initiateQuery.
+     *
+     * Example: if your query builder will contains `SELECT count(id) AS count_id ...`,
+     * this function will return `array('count_id')`.
+     *
+     * @param mixed[] $data the data from the export's form (added by self::buildForm)
+     */
+    public function getQueryKeys($data);
+
+    /**
+     * Return the results of the query builder.
+     *
+     * @param \Doctrine\ORM\NativeQuery|QueryBuilder $query
+     * @param mixed[] $data the data from the export's fomr (added by self::buildForm)
+     *
+     * @return mixed[] an array of results
+     */
+    public function getResult($query, $data);
+
+    /**
+     * Return the Export's type. This will inform _on what_ export will apply.
+     * Most of the type, it will be a string which references an entity.
+     *
+     * Example of types : Chill\PersonBundle\Export\Declarations::PERSON_TYPE
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * The initial query, which will be modified by ModifiersInterface
+     * (i.e. AggregatorInterface, FilterInterface).
+     *
+     * This query should take into account the `$acl` and restrict result only to
+     * what the user is allowed to see. (Do not show personal data the user
+     * is not allowed to see).
+     *
+     * The returned object should be an instance of QueryBuilder or NativeQuery.
+     *
+     * @param array $acl an array where each row has a `center` key containing the Chill\MainBundle\Entity\Center, and `circles` keys containing the reachable circles. Example: `array( array('center' => $centerA, 'circles' => array($circleA, $circleB) ) )`
+     * @param array $data the data from the form, if any
+     *
+     * @return \Doctrine\ORM\NativeQuery|QueryBuilder the query to execute.
+     */
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []);
+
+    /**
+     * Return the required Role to execute the Export.
+     *
+     * @return \Symfony\Component\Security\Core\Role\Role
+     */
+    public function requiredRole();
+
+    /**
+     * Inform which ModifiersInterface (i.e. AggregatorInterface, FilterInterface)
+     * are allowed. The modifiers should be an array of types the _modifier_ apply on
+     * (@see ModifiersInterface::applyOn()).
+     *
+     * @return string[]
+     */
+    public function supportsModifiers();
 }
diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index d3ec7eabf..6c0d3bd8b 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -1,154 +1,173 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Psr\Log\LoggerInterface;
+use Chill\MainBundle\Form\Type\Export\ExportType;
+use Chill\MainBundle\Form\Type\Export\PickCenterType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Form\Type\Export\PickCenterType;
+use Generator;
+use InvalidArgumentException;
+use LogicException;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
-use Chill\MainBundle\Form\Type\Export\ExportType;
-use Chill\MainBundle\Export\ListInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use UnexpectedValueException;
+use function array_key_exists;
+use function count;
+use function get_class;
+use function gettype;
+use function in_array;
 
 /**
  * Collects all agregators, filters and export from
  * the installed bundle, and performs the export logic.
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ExportManager
 {
     /**
-     * The collected filters, injected by DI
-     *
-     * @var FilterInterface[]
-     */
-    private $filters = array();
-    
-    /**
-     * The collected aggregators, injected by DI
+     * The collected aggregators, injected by DI.
      *
      * @var AggregatorInterface[]
      */
-    private $aggregators = array();
-    
+    private $aggregators = [];
+
     /**
-     * Collected Exports, injected by DI
+     * @var AuthorizationChecker
+     */
+    private $authorizationChecker;
+
+    /**
+     * @var AuthorizationHelper
+     */
+    private $authorizationHelper;
+
+    /**
+     * @var EntityManagerInterface
+     */
+    private $em;
+
+    /**
+     * Collected Exports, injected by DI.
      *
      * @var ExportInterface[]
      */
-    private $exports = array();
-    
+    private $exports = [];
+
     /**
-     * Collected Formatters, injected by DI
+     * The collected filters, injected by DI.
+     *
+     * @var FilterInterface[]
+     */
+    private $filters = [];
+
+    /**
+     * Collected Formatters, injected by DI.
      *
      * @var FormatterInterface[]
      */
-    private $formatters = array();
-    
+    private $formatters = [];
+
     /**
-     * a logger 
+     * a logger.
      *
      * @var LoggerInterface
      */
     private $logger;
-    
+
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    private $em;
-    
-    /**
-     *
-     * @var AuthorizationChecker
-     */
-    private $authorizationChecker;
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    private $authorizationHelper;
-    
-    /**
-     *
      * @var \Symfony\Component\Security\Core\User\UserInterface
      */
     private $user;
-    
+
     public function __construct(
-            LoggerInterface $logger, 
-            EntityManagerInterface $em,
-            AuthorizationCheckerInterface $authorizationChecker, 
-            AuthorizationHelper $authorizationHelper,
-            TokenStorageInterface $tokenStorage)
-    {
+        LoggerInterface $logger,
+        EntityManagerInterface $em,
+        AuthorizationCheckerInterface $authorizationChecker,
+        AuthorizationHelper $authorizationHelper,
+        TokenStorageInterface $tokenStorage
+    ) {
         $this->logger = $logger;
         $this->em = $em;
         $this->authorizationChecker = $authorizationChecker;
         $this->authorizationHelper = $authorizationHelper;
         $this->user = $tokenStorage->getToken()->getUser();
     }
-    
+
     /**
-     * add a Filter
-     * 
-     * @internal Normally used by the dependency injection
-     * 
-     * @param FilterInterface $filter
-     * @param string $alias
+     * Return a \Generator containing filter which support type. If `$centers` is
+     * not null, restrict the given filters to the center the user have access to.
+     *
+     * if $centers is null, the function will returns all filters where the user
+     * has access in every centers he can reach (if the user can use the filter F in
+     * center A, but not in center B, the filter F will not be returned)
+     *
+     * @param \Chill\MainBundle\Entity\Center[] $centers the centers where the user have access to
+     *
+     * @return FilterInterface[] a \Generator that contains filters. The key is the filter's alias
      */
-    public function addFilter(FilterInterface $filter, $alias)
+    public function &getFiltersApplyingOn(ExportInterface $export, ?array $centers = null)
     {
-        $this->filters[$alias] = $filter;
+        foreach ($this->filters as $alias => $filter) {
+            if (in_array($filter->applyOn(), $export->supportsModifiers(), true)
+                    && $this->isGrantedForElement($filter, $export, $centers)) {
+                yield $alias => $filter;
+            }
+        }
     }
-    
+
     /**
-     * add an aggregator
-     * 
+     * Return a \Generator containing aggregators supported by the given export.
+     *
+     * @internal This class check the interface implemented by export, and, if ´ListInterface´ is used, return an empty array
+     *
+     * @return AggregatorInterface[] a \Generator that contains aggretagors. The key is the filter's alias
+     */
+    public function &getAggregatorsApplyingOn(ExportInterface $export, ?array $centers = null)
+    {
+        if ($export instanceof ListInterface) {
+            return;
+        }
+
+        foreach ($this->aggregators as $alias => $aggregator) {
+            if (in_array($aggregator->applyOn(), $export->supportsModifiers(), true)
+                    && $this->isGrantedForElement($aggregator, $export, $centers)) {
+                yield $alias => $aggregator;
+            }
+        }
+    }
+
+    /**
+     * add an aggregator.
+     *
      * @internal used by DI
-     * 
-     * @param AggregatorInterface $aggregator
+     *
      * @param string $alias
      */
     public function addAggregator(AggregatorInterface $aggregator, $alias)
     {
         $this->aggregators[$alias] = $aggregator;
     }
-    
+
     /**
-     * add an export
-     * 
+     * add an export.
+     *
      * @internal used by DI
-     * 
-     * @param ExportInterface|DirectExportInterface $export
+     *
+     * @param DirectExportInterface|ExportInterface $export
      * @param type $alias
      */
     public function addExport($export, $alias)
@@ -156,30 +175,21 @@ class ExportManager
         if ($export instanceof ExportInterface || $export instanceof DirectExportInterface) {
             $this->exports[$alias] = $export;
         } else {
-            throw new \InvalidArgumentException(sprintf("The export with alias %s "
-                . "does not implements %s or %s.", $alias, ExportInterface::class, 
-                DirectExportInterface::class));
+            throw new InvalidArgumentException(sprintf(
+                'The export with alias %s '
+                . 'does not implements %s or %s.',
+                $alias,
+                ExportInterface::class,
+                DirectExportInterface::class
+            ));
         }
     }
-    
-    /**
-     * add a formatter
-     * 
-     * @internal used by DI
-     * 
-     * @param FormatterInterface $formatter
-     * @param type $alias
-     */
-    public function addFormatter(FormatterInterface $formatter, $alias)
-    {
-        $this->formatters[$alias] = $formatter;
-    }
-    
+
     public function addExportElementsProvider(ExportElementsProviderInterface $provider, $prefix)
     {
         foreach ($provider->getExportElements() as $suffix => $element) {
-            $alias = $prefix.'_'.$suffix;
-            
+            $alias = $prefix . '_' . $suffix;
+
             if ($element instanceof ExportInterface) {
                 $this->addExport($element, $alias);
             } elseif ($element instanceof FilterInterface) {
@@ -189,33 +199,190 @@ class ExportManager
             } elseif ($element instanceof FormatterInterface) {
                 $this->addFormatter($element, $alias);
             } else {
-                throw new \LogicException("This element ".\get_class($element)." "
-                    . "is not an instance of export element");
+                throw new LogicException('This element ' . get_class($element) . ' '
+                    . 'is not an instance of export element');
             }
         }
     }
-    
+
+    /**
+     * add a Filter.
+     *
+     * @internal Normally used by the dependency injection
+     *
+     * @param string $alias
+     */
+    public function addFilter(FilterInterface $filter, $alias)
+    {
+        $this->filters[$alias] = $filter;
+    }
+
+    /**
+     * add a formatter.
+     *
+     * @internal used by DI
+     *
+     * @param type $alias
+     */
+    public function addFormatter(FormatterInterface $formatter, $alias)
+    {
+        $this->formatters[$alias] = $formatter;
+    }
+
+    /**
+     * Generate a response which contains the requested data.
+     *
+     * @param string $exportAlias
+     * @param mixed[] $data
+     *
+     * @return Response
+     */
+    public function generate($exportAlias, array $pickedCentersData, array $data, array $formatterData)
+    {
+        $export = $this->getExport($exportAlias);
+        //$qb = $this->em->createQueryBuilder();
+        $centers = $this->getPickedCenters($pickedCentersData);
+
+        if ($export instanceof DirectExportInterface) {
+            return $export->generate(
+                $this->buildCenterReachableScopes($centers, $export),
+                $data[ExportType::EXPORT_KEY]
+            );
+        }
+
+        $query = $export->initiateQuery(
+            $this->retrieveUsedModifiers($data),
+            $this->buildCenterReachableScopes($centers, $export),
+            $data[ExportType::EXPORT_KEY]
+        );
+
+        if ($query instanceof \Doctrine\ORM\NativeQuery) {
+            // throw an error if the export require other modifier, which is
+            // not allowed when the export return a `NativeQuery`
+            if (count($export->supportsModifiers()) > 0) {
+                throw new LogicException("The export with alias `{$exportAlias}` return "
+                        . 'a `\\Doctrine\\ORM\\NativeQuery` and supports modifiers, which is not '
+                        . 'allowed. Either the method `supportsModifiers` should return an empty '
+                        . 'array, or return a `Doctrine\\ORM\\QueryBuilder`');
+            }
+        } elseif ($query instanceof QueryBuilder) {
+            //handle filters
+            $this->handleFilters($export, $query, $data[ExportType::FILTER_KEY], $centers);
+
+            //handle aggregators
+            $this->handleAggregators($export, $query, $data[ExportType::AGGREGATOR_KEY], $centers);
+
+            $this->logger->debug('current query is ' . $query->getDQL(), [
+                'class' => self::class, 'function' => __FUNCTION__,
+            ]);
+        } else {
+            throw new UnexpectedValueException('The method `intiateQuery` should return '
+                    . 'a `\\Doctrine\\ORM\\NativeQuery` or a `Doctrine\\ORM\\QueryBuilder` '
+                    . 'object.');
+        }
+
+        $result = $export->getResult($query, $data[ExportType::EXPORT_KEY]);
+
+        if (!is_iterable($result)) {
+            throw new UnexpectedValueException(
+                sprintf(
+                    'The result of the export should be an iterable, %s given',
+                    gettype($result)
+                )
+            );
+        }
+
+        /** @var FormatterInterface $formatter */
+        $formatter = $this->getFormatter($this->getFormatterAlias($data));
+        $filtersData = [];
+        $aggregatorsData = [];
+
+        if ($query instanceof QueryBuilder) {
+            $aggregators = $this->retrieveUsedAggregators($data[ExportType::AGGREGATOR_KEY]);
+
+            foreach ($aggregators as $alias => $aggregator) {
+                $aggregatorsData[$alias] = $data[ExportType::AGGREGATOR_KEY][$alias]['form'];
+            }
+        }
+
+        $filters = $this->retrieveUsedFilters($data[ExportType::FILTER_KEY]);
+
+        foreach ($filters as $alias => $filter) {
+            $filtersData[$alias] = $data[ExportType::FILTER_KEY][$alias]['form'];
+        }
+
+        return $formatter->getResponse(
+            $result,
+            $formatterData,
+            $exportAlias,
+            $data[ExportType::EXPORT_KEY],
+            $filtersData,
+            $aggregatorsData
+        );
+    }
+
+    /**
+     * @param string $alias
+     *
+     * @throws RuntimeException if the aggregator is not known
+     *
+     * @return AggregatorInterface
+     */
+    public function getAggregator($alias)
+    {
+        if (!array_key_exists($alias, $this->aggregators)) {
+            throw new RuntimeException("The aggregator with alias {$alias} is not known.");
+        }
+
+        return $this->aggregators[$alias];
+    }
+
+    public function getAggregators(array $aliases)
+    {
+        foreach ($aliases as $alias) {
+            yield $alias => $this->getAggregator($alias);
+        }
+    }
+
     /**
-     * 
      * @return string[] the existing type for known exports
      */
     public function getExistingExportsTypes()
     {
-        $existingTypes = array();
-        
-        foreach($this->exports as $export) {
-            if (!in_array($export->getType(), $existingTypes)) {
-                array_push($existingTypes, $export->getType());
+        $existingTypes = [];
+
+        foreach ($this->exports as $export) {
+            if (!in_array($export->getType(), $existingTypes, true)) {
+                $existingTypes[] = $export->getType();
             }
         }
-        
+
         return $existingTypes;
     }
-    
+
+    /**
+     * Return an export by his alias.
+     *
+     * @param string $alias
+     *
+     * @throws RuntimeException
+     *
+     * @return ExportInterface
+     */
+    public function getExport($alias)
+    {
+        if (!array_key_exists($alias, $this->exports)) {
+            throw new RuntimeException("The export with alias {$alias} is not known.");
+        }
+
+        return $this->exports[$alias];
+    }
+
     /**
      * Return all exports. The exports's alias are the array's keys.
-     * 
-     * @param boolean $whereUserIsGranted if true (default), restrict to user which are granted the right to execute the export
+     *
+     * @param bool $whereUserIsGranted if true (default), restrict to user which are granted the right to execute the export
+     *
      * @return ExportInterface[] an array where export's alias are keys
      */
     public function getExports($whereUserIsGranted = true)
@@ -230,16 +397,18 @@ class ExportManager
             }
         }
     }
-    
+
     /**
      * Get all exports grouped in an array.
-     * 
+     *
      * @param bool $whereUserIsGranted
+     *
      * @return array where keys are the groups's name and value is an array of exports
      */
     public function getExportsGrouped($whereUserIsGranted = true): array
     {
-        $groups = [ '_' => [] ];
+        $groups = ['_' => []];
+
         foreach ($this->getExports($whereUserIsGranted) as $alias => $export) {
             if ($export instanceof GroupedExportInterface) {
                 $groups[$export->getGroup()][$alias] = $export;
@@ -247,512 +416,346 @@ class ExportManager
                 $groups['_'][$alias] = $export;
             }
         }
-        
+
         return $groups;
     }
-    
+
     /**
-     * Return an export by his alias
-     * 
-     * @param string $alias
-     * @return ExportInterface
-     * @throws \RuntimeException
-     */
-    public function getExport($alias)
-    {
-        if (!array_key_exists($alias, $this->exports)) {
-            throw new \RuntimeException("The export with alias $alias is not known.");
-        }
-        
-        return $this->exports[$alias];
-    }
-    
-    /**
-     * 
      * @param string $alias
+     *
+     * @throws RuntimeException if the filter is not known
+     *
      * @return FilterInterface
-     * @throws \RuntimeException if the filter is not known
      */
     public function getFilter($alias)
     {
         if (!array_key_exists($alias, $this->filters)) {
-            throw new \RuntimeException("The filter with alias $alias is not known.");
+            throw new RuntimeException("The filter with alias {$alias} is not known.");
         }
-        
+
         return $this->filters[$alias];
     }
-    
+
     /**
-     * get all filters
-     * 
-     * @param \Generator $aliases
+     * get all filters.
+     *
+     * @param Generator $aliases
      */
     public function getFilters(array $aliases)
     {
-        foreach($aliases as $alias) {
+        foreach ($aliases as $alias) {
             yield $alias => $this->getFilter($alias);
         }
     }
-    
-    /**
-     * 
-     * @param string $alias
-     * @return AggregatorInterface
-     * @throws \RuntimeException if the aggregator is not known
-     */
-    public function getAggregator($alias)
-    {
-        if (!array_key_exists($alias, $this->aggregators)) {
-            throw new \RuntimeException("The aggregator with alias $alias is not known.");
-        }
-        
-        return $this->aggregators[$alias];
-    }
-    
-    public function getAggregators(array $aliases)
-    {
-        foreach ($aliases as $alias) {
-            yield $alias => $this->getAggregator($alias);
-        }
-    }
-    
+
     public function getFormatter($alias)
     {
         if (!array_key_exists($alias, $this->formatters)) {
-            throw new \RuntimeException("The formatter with alias $alias is not known.");
+            throw new RuntimeException("The formatter with alias {$alias} is not known.");
         }
-        
+
         return $this->formatters[$alias];
     }
-    
-    /**
-     * Get all formatters which supports one of the given types.
-     * 
-     * 
-     * @param array $types
-     * @return \Generator
-     */
-    public function getFormattersByTypes(array $types)
-    {
-        foreach ($this->formatters as $alias => $formatter) {
-            if (in_array($formatter->getType(), $types)) {
-                yield $alias => $formatter;
-            }
-        }
-    }
-    
-    
-    /**
-     * Return a \Generator containing filter which support type. If `$centers` is
-     * not null, restrict the given filters to the center the user have access to.
-     * 
-     * if $centers is null, the function will returns all filters where the user 
-     * has access in every centers he can reach (if the user can use the filter F in
-     * center A, but not in center B, the filter F will not be returned)
-     * 
-     * @param \Chill\MainBundle\Entity\Center[] $centers the centers where the user have access to
-     * @return FilterInterface[] a \Generator that contains filters. The key is the filter's alias
-     */
-    public function &getFiltersApplyingOn(ExportInterface $export, array $centers = null)
-    {
-        foreach ($this->filters as $alias => $filter) {
-            if (in_array($filter->applyOn(), $export->supportsModifiers()) 
-                    && $this->isGrantedForElement($filter, $export, $centers)) {
-                yield $alias => $filter;
-            }
-        }
-    }
-    
-    /**
-     * Return true if the current user has access to the ExportElement for every
-     * center, false if the user hasn't access to element for at least one center.
-     * 
-     * @param \Chill\MainBundle\Export\ExportElementInterface $element
-     * @param ExportInterface|DirectExportInterface $export
-     * @param array|null $centers, if null, the function take into account all the reachables centers for the current user and the role given by element::requiredRole
-     * @return boolean
-     */
-    public function isGrantedForElement(ExportElementInterface $element, ExportElementInterface $export = NULL, array $centers = null)
-    {
-        if ($element instanceof ExportInterface || $element instanceof DirectExportInterface) {
-            $role = $element->requiredRole();
-        } elseif ($element instanceof ModifierInterface ) {
-            if (is_null($element->addRole())) {
-                if (is_null($export)) {
-                    throw new \LogicException("The export should not be null: as the "
-                            . "ModifierInstance element is not an export, we should "
-                            . "be aware of the export to determine which role is required");
-                } else {
-                    $role = $export->requiredRole();
-                }
-            } else {
-                $role = $element->addRole();
-            }
-        } else {
-            throw new \LogicException("The element is not an ModifiersInterface or "
-                    . "an ExportInterface.");
-        }
-        
-        if ($centers === null) {
-            $centers = $this->authorizationHelper->getReachableCenters($this->user, 
-                            $role);
-        }
-        
-        if (count($centers) === 0) {
-            return false;
-        }
-        
-        foreach($centers as $center) {
-            if ($this->authorizationChecker->isGranted($role->getRole(), $center) === false) {
-                //debugging
-                $this->logger->debug('user has no access to element', array(
-                    'method' => __METHOD__,  
-                    'type' => get_class($element), 
-                    'center' => $center->getName(),
-                    'role' => $role->getRole()
-                ));
-                
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    /**
-     * Return a \Generator containing aggregators supported by the given export
-     * 
-     * @internal This class check the interface implemented by export, and, if ´ListInterface´ is used, return an empty array
-     * @return AggregatorInterface[] a \Generator that contains aggretagors. The key is the filter's alias
-     */
-    public function &getAggregatorsApplyingOn(ExportInterface $export, array $centers = null)
-    {
-        if ($export instanceof ListInterface) {
-            
-            return;
-        }
-        
-        foreach ($this->aggregators as $alias => $aggregator) {
-            if (in_array($aggregator->applyOn(), $export->supportsModifiers()) && 
-                    $this->isGrantedForElement($aggregator, $export, $centers)) {
-                yield $alias => $aggregator;
-            }
-        }
-    }
-    
-    /**
-     * Generate a response which contains the requested data.
-     * 
-     * @param string $exportAlias
-     * @param mixed[] $data
-     * @return Response
-     */
-    public function generate($exportAlias, array $pickedCentersData, array $data, array $formatterData)
-    {
-        $export = $this->getExport($exportAlias);
-        //$qb = $this->em->createQueryBuilder();
-        $centers = $this->getPickedCenters($pickedCentersData);
-        
-        if ($export instanceof DirectExportInterface) {
-            return $export->generate(
-                $this->buildCenterReachableScopes($centers, $export),
-                $data[ExportType::EXPORT_KEY]
-                );
-        }
-        
-        $query = $export->initiateQuery(
-                $this->retrieveUsedModifiers($data), 
-                $this->buildCenterReachableScopes($centers, $export),
-                $data[ExportType::EXPORT_KEY]
-                );
-        
-        if ($query instanceof \Doctrine\ORM\NativeQuery) {
-            // throw an error if the export require other modifier, which is 
-            // not allowed when the export return a `NativeQuery`
-            if (count($export->supportsModifiers()) > 0) {
-                throw new \LogicException("The export with alias `$exportAlias` return "
-                        . "a `\Doctrine\ORM\NativeQuery` and supports modifiers, which is not "
-                        . "allowed. Either the method `supportsModifiers` should return an empty "
-                        . "array, or return a `Doctrine\ORM\QueryBuilder`");
-            }
-        } elseif ($query instanceof QueryBuilder) {
-            //handle filters
-            $this->handleFilters($export, $query, $data[ExportType::FILTER_KEY], $centers);
 
-            //handle aggregators
-            $this->handleAggregators($export, $query, $data[ExportType::AGGREGATOR_KEY], $centers);
-            
-            $this->logger->debug('current query is '.$query->getDQL(), array(
-                'class' => self::class, 'function' => __FUNCTION__
-            ));
-        } else {
-            throw new \UnexpectedValueException("The method `intiateQuery` should return "
-                    . "a `\Doctrine\ORM\NativeQuery` or a `Doctrine\ORM\QueryBuilder` "
-                    . "object.");
-        }
-        
-        $result = $export->getResult($query, $data[ExportType::EXPORT_KEY]);
-        
-        if (!is_iterable($result)) {
-            throw new \UnexpectedValueException(
-                    sprintf(
-                            'The result of the export should be an iterable, %s given',
-                            gettype($result)
-                            )
-                    );
-        }
-        
-        /* @var $formatter FormatterInterface */
-        $formatter = $this->getFormatter($this->getFormatterAlias($data));
-        $filtersData = array();
-        $aggregatorsData = array();
-        
-        if ($query instanceof QueryBuilder) {
-            $aggregators = $this->retrieveUsedAggregators($data[ExportType::AGGREGATOR_KEY]);
-            
-            foreach($aggregators as $alias => $aggregator) {
-                $aggregatorsData[$alias] = $data[ExportType::AGGREGATOR_KEY][$alias]['form'];
-            }
-        }
-        
-        $filters = $this->retrieveUsedFilters($data[ExportType::FILTER_KEY]);
-        
-        foreach($filters as $alias => $filter) {
-            $filtersData[$alias] = $data[ExportType::FILTER_KEY][$alias]['form'];
-        }
-        
-        return $formatter->getResponse(
-              $result, 
-              $formatterData, 
-              $exportAlias, 
-              $data[ExportType::EXPORT_KEY],
-              $filtersData, 
-              $aggregatorsData);
-    }
-    
     /**
-     * build the array required for defining centers and circles in the initiate 
-     * queries of ExportElementsInterfaces
-     * 
-     * @param \Chill\MainBundle\Entity\Center[] $centers
-     */
-    private function buildCenterReachableScopes(array $centers, ExportElementInterface $element) {
-        $r = array();
-        
-        foreach($centers as $center) {
-            $r[] = array(
-                'center' => $center,
-                'circles' => $this->authorizationHelper->getReachableScopes($this->user, 
-                        $element->requiredRole(), $center)
-            );
-        }
-        
-        return $r;
-    }
-    
-    /**
-     * get the aggregators typse used in the form export data
-     * 
-     * @param array $data the data from the export form
-     * @return string[]
-     */
-    public function getUsedAggregatorsAliases(array $data)
-    {
-        $aggregators = $this->retrieveUsedAggregators($data[ExportType::AGGREGATOR_KEY]);
-        
-        return array_keys(iterator_to_array($aggregators));
-    }
-    
-    /**
-     * get the formatter alias from the form export data
-     * 
+     * get the formatter alias from the form export data.
+     *
      * @param array $data the data from the export form
      * @string the formatter alias|null
      */
     public function getFormatterAlias(array $data)
     {
         if (array_key_exists(ExportType::PICK_FORMATTER_KEY, $data)) {
-           return $data[ExportType::PICK_FORMATTER_KEY]['alias'];
+            return $data[ExportType::PICK_FORMATTER_KEY]['alias'];
         }
 
         return null;
     }
-    
+
+    /**
+     * Get all formatters which supports one of the given types.
+     *
+     * @return Generator
+     */
+    public function getFormattersByTypes(array $types)
+    {
+        foreach ($this->formatters as $alias => $formatter) {
+            if (in_array($formatter->getType(), $types, true)) {
+                yield $alias => $formatter;
+            }
+        }
+    }
+
     /**
      * Get the Center picked by the user for this export. The data are
-     * extracted from the PickCenterType data
-     * 
+     * extracted from the PickCenterType data.
+     *
      * @param array $data the data from a PickCenterType
+     *
      * @return \Chill\MainBundle\Entity\Center[] the picked center
      */
     public function getPickedCenters(array $data)
     {
         return $data;
     }
-    
+
     /**
-     * parse the data to retrieve the used filters and aggregators
-     * 
-     * @param mixed $data
+     * get the aggregators typse used in the form export data.
+     *
+     * @param array $data the data from the export form
+     *
      * @return string[]
      */
-    private function retrieveUsedModifiers($data)
+    public function getUsedAggregatorsAliases(array $data)
     {
-        if ($data === null) {
-            return [];
-        }
-        
-        $usedTypes = array_merge(
-                $this->retrieveUsedFiltersType($data[ExportType::FILTER_KEY]),
-                $this->retrieveUsedAggregatorsType($data[ExportType::AGGREGATOR_KEY])
-                );
-        
-        $this->logger->debug('Required types are '.implode(', ', $usedTypes), 
-                array('class' => self::class, 'function' => __FUNCTION__));
-        
-        return array_unique($usedTypes);
+        $aggregators = $this->retrieveUsedAggregators($data[ExportType::AGGREGATOR_KEY]);
+
+        return array_keys(iterator_to_array($aggregators));
     }
-    
+
     /**
-     * Retrieve the filter used in this export.
-     * 
-     * @param mixed $data the data from the `filters` key of the ExportType
-     * @return array an array with types
+     * Return true if the current user has access to the ExportElement for every
+     * center, false if the user hasn't access to element for at least one center.
+     *
+     * @param \Chill\MainBundle\Export\ExportElementInterface $element
+     * @param DirectExportInterface|ExportInterface $export
+     *
+     * @return bool
      */
-    private function retrieveUsedFiltersType($data)
+    public function isGrantedForElement(ExportElementInterface $element, ?ExportElementInterface $export = null, ?array $centers = null)
     {
-        if ($data === null) {
-            return [];
-        }
-        
-        $usedTypes = array();
-        foreach($data as $alias => $filterData) {
-            if ($filterData['enabled'] == true){
-                $filter = $this->getFilter($alias);
-                if (!in_array($filter->applyOn(), $usedTypes)) {
-                    array_push($usedTypes, $filter->applyOn());
+        if ($element instanceof ExportInterface || $element instanceof DirectExportInterface) {
+            $role = $element->requiredRole();
+        } elseif ($element instanceof ModifierInterface) {
+            if (null === $element->addRole()) {
+                if (null === $export) {
+                    throw new LogicException('The export should not be null: as the '
+                            . 'ModifierInstance element is not an export, we should '
+                            . 'be aware of the export to determine which role is required');
                 }
+                $role = $export->requiredRole();
+            } else {
+                $role = $element->addRole();
             }
+        } else {
+            throw new LogicException('The element is not an ModifiersInterface or '
+                    . 'an ExportInterface.');
         }
-        
-        return $usedTypes;
-    }
-    
-    /**
-     * 
-     * @param mixed $data
-     * @return string[]
-     */
-    private function retrieveUsedAggregatorsType($data)
-    {
-        if ($data === null) {
-            return [];
-        }
-        
-        $usedTypes = array();
-        foreach($this->retrieveUsedAggregators($data) as $alias => $aggregator) {
-            if (!in_array($aggregator->applyOn(), $usedTypes)) {
-                array_push($usedTypes, $aggregator->applyOn());
-            }
-        }
-        
-        return $usedTypes;
-    }
-    
-    /**
-     * 
-     * @param mixed $data
-     * @return AggregatorInterface[]
-     */
-    private function retrieveUsedAggregators($data)
-    {
-        if ($data === null) {
-            return [];
-        }
-        
-        foreach ($data as $alias => $aggregatorData) {
-            if ($aggregatorData['enabled'] === true){
-                yield $alias => $this->getAggregator($alias);
-            }
-        }
-    }
-    
-    /**
-     * 
-     * @param type $data the data from the filter key of the ExportType
-     */
-    private function retrieveUsedFilters($data) 
-    {
-        if ($data === null) {
-            return [];
-        }
-        
-        foreach ($data as $alias => $filterData) {
-            if ($filterData['enabled'] === true) {
-                yield $alias => $this->getFilter($alias);
-            }
-        }
-    }
-    
-    /**
-     * alter the query with selected filters.
-     * 
-     * This function check the acl.
-     * 
-     * @param ExportInterface $export
-     * @param QueryBuilder $qb
-     * @param mixed $data the data under the initial 'filters' data
-     * @param \Chill\MainBundle\Entity\Center[] $centers the picked centers
-     * @throw UnauthorizedHttpException if the user is not authorized
-     */
-    private function handleFilters(
-            ExportInterface $export, 
-            QueryBuilder $qb, 
-            $data, 
-            array $centers)
-    {
-        $filters = $this->retrieveUsedFilters($data);
-                
-        foreach($filters as $alias => $filter) {
-            if ($this->isGrantedForElement($filter, $export, $centers) === false) {
-                throw new UnauthorizedHttpException("You are not authorized to "
-                        . "use the filter ".$filter->getTitle());
-            }
-            
-            $formData = $data[$alias];
-
-            $this->logger->debug('alter query by filter '.$alias, array(
-                'class' => self::class, 'function' => __FUNCTION__
-            ));
-            $filter->alterQuery($qb, $formData['form']);
 
+        if (null === $centers) {
+            $centers = $this->authorizationHelper->getReachableCenters(
+                $this->user,
+                $role->getRole(),
+            );
         }
+
+        if (count($centers) === 0) {
+            return false;
+        }
+
+        foreach ($centers as $center) {
+            if ($this->authorizationChecker->isGranted($role->getRole(), $center) === false) {
+                //debugging
+                $this->logger->debug('user has no access to element', [
+                    'method' => __METHOD__,
+                    'type' => get_class($element),
+                    'center' => $center->getName(),
+                    'role' => $role->getRole(),
+                ]);
+
+                return false;
+            }
+        }
+
+        return true;
     }
-    
+
     /**
-     * Alter the query with selected aggregators
-     * 
+     * build the array required for defining centers and circles in the initiate
+     * queries of ExportElementsInterfaces.
+     *
+     * @param \Chill\MainBundle\Entity\Center[] $centers
+     */
+    private function buildCenterReachableScopes(array $centers, ExportElementInterface $element)
+    {
+        $r = [];
+
+        foreach ($centers as $center) {
+            $r[] = [
+                'center' => $center,
+                'circles' => $this->authorizationHelper->getReachableScopes(
+                    $this->user,
+                    $element->requiredRole()->getRole(),
+                    $center
+                ),
+            ];
+        }
+
+        return $r;
+    }
+
+    /**
+     * Alter the query with selected aggregators.
+     *
      * Check for acl. If an user is not authorized to see an aggregator, throw an
      * UnauthorizedException.
-     * 
-     * @param ExportInterface $export
-     * @param QueryBuilder $qb
+     *
      * @param type $data
-     * @param \Chill\MainBundle\Entity\Center[] $centers the picked centers
      * @throw UnauthorizedHttpException if the user is not authorized
      */
     private function handleAggregators(
-            ExportInterface $export, 
-            QueryBuilder $qb, 
-            $data, 
-            array $center)
-    {
+        ExportInterface $export,
+        QueryBuilder $qb,
+        $data,
+        array $center
+    ) {
         $aggregators = $this->retrieveUsedAggregators($data);
-        
+
         foreach ($aggregators as $alias => $aggregator) {
             $formData = $data[$alias];
             $aggregator->alterQuery($qb, $formData['form']);
         }
     }
-    
+
+    /**
+     * alter the query with selected filters.
+     *
+     * This function check the acl.
+     *
+     * @param mixed $data the data under the initial 'filters' data
+     * @param \Chill\MainBundle\Entity\Center[] $centers the picked centers
+     * @throw UnauthorizedHttpException if the user is not authorized
+     */
+    private function handleFilters(
+        ExportInterface $export,
+        QueryBuilder $qb,
+        $data,
+        array $centers
+    ) {
+        $filters = $this->retrieveUsedFilters($data);
+
+        foreach ($filters as $alias => $filter) {
+            if ($this->isGrantedForElement($filter, $export, $centers) === false) {
+                throw new UnauthorizedHttpException('You are not authorized to '
+                        . 'use the filter ' . $filter->getTitle());
+            }
+
+            $formData = $data[$alias];
+
+            $this->logger->debug('alter query by filter ' . $alias, [
+                'class' => self::class, 'function' => __FUNCTION__,
+            ]);
+            $filter->alterQuery($qb, $formData['form']);
+        }
+    }
+
+    /**
+     * @param mixed $data
+     *
+     * @return AggregatorInterface[]
+     */
+    private function retrieveUsedAggregators($data)
+    {
+        if (null === $data) {
+            return [];
+        }
+
+        foreach ($data as $alias => $aggregatorData) {
+            if (true === $aggregatorData['enabled']) {
+                yield $alias => $this->getAggregator($alias);
+            }
+        }
+    }
+
+    /**
+     * @param mixed $data
+     *
+     * @return string[]
+     */
+    private function retrieveUsedAggregatorsType($data)
+    {
+        if (null === $data) {
+            return [];
+        }
+
+        $usedTypes = [];
+
+        foreach ($this->retrieveUsedAggregators($data) as $alias => $aggregator) {
+            if (!in_array($aggregator->applyOn(), $usedTypes, true)) {
+                $usedTypes[] = $aggregator->applyOn();
+            }
+        }
+
+        return $usedTypes;
+    }
+
+    /**
+     * @param type $data the data from the filter key of the ExportType
+     */
+    private function retrieveUsedFilters($data)
+    {
+        if (null === $data) {
+            return [];
+        }
+
+        foreach ($data as $alias => $filterData) {
+            if (true === $filterData['enabled']) {
+                yield $alias => $this->getFilter($alias);
+            }
+        }
+    }
+
+    /**
+     * Retrieve the filter used in this export.
+     *
+     * @param mixed $data the data from the `filters` key of the ExportType
+     *
+     * @return array an array with types
+     */
+    private function retrieveUsedFiltersType($data)
+    {
+        if (null === $data) {
+            return [];
+        }
+
+        $usedTypes = [];
+
+        foreach ($data as $alias => $filterData) {
+            if (true === $filterData['enabled']) {
+                $filter = $this->getFilter($alias);
+
+                if (!in_array($filter->applyOn(), $usedTypes, true)) {
+                    $usedTypes[] = $filter->applyOn();
+                }
+            }
+        }
+
+        return $usedTypes;
+    }
+
+    /**
+     * parse the data to retrieve the used filters and aggregators.
+     *
+     * @param mixed $data
+     *
+     * @return string[]
+     */
+    private function retrieveUsedModifiers($data)
+    {
+        if (null === $data) {
+            return [];
+        }
+
+        $usedTypes = array_merge(
+            $this->retrieveUsedFiltersType($data[ExportType::FILTER_KEY]),
+            $this->retrieveUsedAggregatorsType($data[ExportType::AGGREGATOR_KEY])
+        );
+
+        $this->logger->debug(
+            'Required types are ' . implode(', ', $usedTypes),
+            ['class' => self::class, 'function' => __FUNCTION__]
+        );
+
+        return array_unique($usedTypes);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/FilterInterface.php b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
index b644ae8a7..0b27f1cf1 100644
--- a/src/Bundle/ChillMainBundle/Export/FilterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
@@ -1,70 +1,57 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
-
 /**
- * Interface for filters. 
- * 
- * Filter will filter result on the query initiated by Export. Most of the time, 
- * it will add a `WHERE` clause on this query.
- * 
- * Filters should not add column in `SELECT` clause.
- * 
+ * Interface for filters.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Filter will filter result on the query initiated by Export. Most of the time,
+ * it will add a `WHERE` clause on this query.
+ *
+ * Filters should not add column in `SELECT` clause.
  */
 interface FilterInterface extends ModifierInterface
 {
-    
-    const STRING_FORMAT = 'string';
-    
+    public const STRING_FORMAT = 'string';
+
     /**
      * Describe the filtering action.
-     * 
-     * The description will be inserted in report to remains to the user the 
+     *
+     * The description will be inserted in report to remains to the user the
      * filters applyied on this report.
-     * 
-     * Should return a statement about the filtering action, like : 
-     * "filtering by date: from xxxx-xx-xx to xxxx-xx-xx" or 
+     *
+     * Should return a statement about the filtering action, like :
+     * "filtering by date: from xxxx-xx-xx to xxxx-xx-xx" or
      * "filtering by nationality: only Germany, France"
-     * 
+     *
      * The format will be determined by the $format. Currently, only 'string' is
-     * supported, later some 'html' will be added. The filter should always 
+     * supported, later some 'html' will be added. The filter should always
      * implement the 'string' format and fallback to it if other format are used.
-     * 
+     *
      * If no i18n is necessery, or if the filter translate the string by himself,
      * this function should return a string. If the filter does not do any translation,
-     * the return parameter should be an array, where 
-     * 
-     * - the first element is the string, 
+     * the return parameter should be an array, where
+     *
+     * - the first element is the string,
      * - and the second an array of parameters (may be an empty array)
      * - the 3rd the domain (optional)
      * - the 4th the locale (optional)
-     * 
+     *
      * Example: `array('my string with %parameter%', ['%parameter%' => 'good news'], 'mydomain', 'mylocale')`
-     * 
+     *
      * @param array $data
      * @param string $format the format
-     * @return string|array a string with the data or, if translatable, an array where first element is string, second elements is an array of arguments
+     *
+     * @return array|string a string with the data or, if translatable, an array where first element is string, second elements is an array of arguments
      */
     public function describeAction($data, $format = 'string');
-
 }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
index e77556a43..914fa15c3 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
@@ -1,95 +1,74 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export\Formatter;
 
-use Chill\MainBundle\Export\ExportInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Chill\MainBundle\Export\FormatterInterface;
+use LogicException;
+use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-
-// command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
+use function array_slice;
+use function call_user_func;
+use function count;
+use function is_array;
 
 /**
+ * Command to get the report with curl:
+ *   curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff.
  *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @deprecated this formatter is not used any more.
  */
 class CSVFormatter implements FormatterInterface
 {
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    protected $result;
-
-    protected $formatterData;
-
-    protected $export;
-
     protected $aggregators;
 
-    protected $exportData;
-
     protected $aggregatorsData;
 
-    protected $filtersData;
+    protected $export;
 
-    protected $labels;
+    protected $exportData;
 
     /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
 
+    protected $filtersData;
 
-    public function __construct(TranslatorInterface $translator,
-          ExportManager $manager)
-    {
+    protected $formatterData;
+
+    protected $labels;
+
+    protected $result;
+
+    protected TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        ExportManager $manager
+    ) {
         $this->translator = $translator;
         $this->exportManager = $manager;
     }
 
-    public function getType()
-    {
-        return 'tabular';
-    }
-
-    public function getName()
-    {
-        return 'Comma separated values (CSV)';
-    }
-
     /**
-     *
      * @uses appendAggregatorForm
-     * @param FormBuilderInterface $builder
-     * @param type $exportAlias
-     * @param array $aggregatorAliases
+     *
+     * @param mixed $exportAlias
      */
     public function buildForm(FormBuilderInterface $builder, $exportAlias, array $aggregatorAliases)
     {
@@ -97,58 +76,61 @@ class CSVFormatter implements FormatterInterface
         $nb = count($aggregatorAliases);
 
         foreach ($aggregators as $alias => $aggregator) {
-            $builderAggregator = $builder->create($alias, FormType::class, array(
-               'label' => $aggregator->getTitle(),
-               'block_name' => '_aggregator_placement_csv_formatter'
-            ));
+            $builderAggregator = $builder->create($alias, FormType::class, [
+                'label' => $aggregator->getTitle(),
+                'block_name' => '_aggregator_placement_csv_formatter',
+            ]);
             $this->appendAggregatorForm($builderAggregator, $nb);
             $builder->add($builderAggregator);
         }
     }
 
-    /**
-     * append a form line by aggregator on the formatter form.
-     *
-     * This form allow to choose the aggregator position (row or column) and
-     * the ordering
-     *
-     * @param FormBuilderInterface $builder
-     * @param string $nbAggregators
-     */
-    private function appendAggregatorForm(FormBuilderInterface $builder, $nbAggregators)
+    public function gatherFiltersDescriptions()
     {
-        $builder->add('order', ChoiceType::class, array(
-           'choices' => array_combine(
-                 range(1, $nbAggregators),
-                 range(1, $nbAggregators)
-                 ),
-           'multiple' => false,
-           'expanded' => false
-        ));
+        $descriptions = [];
 
-        $builder->add('position', ChoiceType::class, array(
-           'choices' => array(
-              'row' => 'r',
-              'column' => 'c'
-           ),
-           'multiple' => false,
-           'expanded' => false
-        ));
+        foreach ($this->filtersData as $key => $filterData) {
+            $statement = $this->exportManager
+                ->getFilter($key)
+                ->describeAction($filterData);
+
+            if (null === $statement) {
+                continue;
+            }
+
+            if (is_array($statement)) {
+                $descriptions[] = $this->translator->trans(
+                    $statement[0],
+                    $statement[1],
+                    $statement[2] ?? null,
+                    $statement[3] ?? null
+                );
+            } else {
+                $descriptions[] = $statement;
+            }
+        }
+
+        return $descriptions;
+    }
+
+    public function getName()
+    {
+        return 'Comma separated values (CSV)';
     }
 
     public function getResponse(
-          $result,
-          $formatterData,
-          $exportAlias,
-          array $exportData,
-          array $filtersData,
-          array $aggregatorsData
+        $result,
+        $formatterData,
+        $exportAlias,
+        array $exportData,
+        array $filtersData,
+        array $aggregatorsData
     ) {
         $this->result = $result;
         $this->orderingHeaders($formatterData);
         $this->export = $this->exportManager->getExport($exportAlias);
         $this->aggregators = iterator_to_array($this->exportManager
-                ->getAggregators(array_keys($aggregatorsData)));
+            ->getAggregators(array_keys($aggregatorsData)));
         $this->exportData = $exportData;
         $this->aggregatorsData = $aggregatorsData;
         $this->labels = $this->gatherLabels();
@@ -164,67 +146,101 @@ class CSVFormatter implements FormatterInterface
         return $response;
     }
 
-    /**
-     * ordering aggregators, preserving key association.
-     *
-     * This function do not mind about position.
-     *
-     * If two aggregators have the same order, the second given will be placed
-     * after.  This is not significant for the first ordering.
-     *
-     * @param type $formatterData
-     * @return type
-     */
-    protected function orderingHeaders($formatterData)
+    public function getType()
     {
-        $this->formatterData = $formatterData;
-        uasort($this->formatterData, function($a, $b) {
+        return 'tabular';
+    }
 
-            return ($a['order'] <= $b['order'] ? -1 : 1);
-        });
+    protected function gatherLabels()
+    {
+        return array_merge(
+            $this->gatherLabelsFromAggregators(),
+            $this->gatherLabelsFromExport()
+        );
+    }
+
+    protected function gatherLabelsFromAggregators()
+    {
+        $labels = [];
+        /* @var $aggretator \Chill\MainBundle\Export\AggregatorInterface */
+        foreach ($this->aggregators as $alias => $aggregator) {
+            $keys = $aggregator->getQueryKeys($this->aggregatorsData[$alias]);
+
+            // gather data in an array
+            foreach ($keys as $key) {
+                $values = array_map(static function ($row) use ($key, $alias) {
+                    if (!array_key_exists($key, $row)) {
+                        throw new LogicException("the key '" . $key . "' is declared by "
+                                . "the aggregator with alias '" . $alias . "' but is not "
+                                . 'present in results');
+                    }
+
+                    return $row[$key];
+                }, $this->result);
+                $labels[$key] = $aggregator->getLabels(
+                    $key,
+                    array_unique($values),
+                    $this->aggregatorsData[$alias]
+                );
+            }
+        }
+
+        return $labels;
+    }
+
+    protected function gatherLabelsFromExport()
+    {
+        $labels = [];
+        $export = $this->export;
+        $keys = $this->export->getQueryKeys($this->exportData);
+
+        foreach ($keys as $key) {
+            $values = array_map(static function ($row) use ($key, $export) {
+                if (!array_key_exists($key, $row)) {
+                    throw new LogicException("the key '" . $key . "' is declared by "
+                                . "the export with title '" . $export->getTitle() . "' but is not "
+                                . 'present in results');
+                }
+
+                return $row[$key];
+            }, $this->result);
+            $labels[$key] = $this->export->getLabels(
+                $key,
+                array_unique($values),
+                $this->exportData
+            );
+        }
+
+        return $labels;
     }
 
     protected function generateContent()
     {
+        $line = null;
         $rowKeysNb = count($this->getRowHeaders());
         $columnKeysNb = count($this->getColumnHeaders());
         $resultsKeysNb = count($this->export->getQueryKeys($this->exportData));
         $results = $this->getOrderedResults();
-        /* @var $columnHeaders string[] the column headers associations */
-        $columnHeaders = array();
-        /* @var $data string[] the data of the csv file */
-        $contentData = array();
-        $content = array();
-
-        function findColumnPosition(&$columnHeaders, $columnToFind) {
-            $i = 0;
-            foreach($columnHeaders as $set) {
-                if ($set === $columnToFind) {
-                    return $i;
-                }
-                $i++;
-            }
-
-            //we didn't find it, adding the column
-            $columnHeaders[] = $columnToFind;
-
-            return $i++;
-        }
+        /** @var string[] $columnHeaders the column headers associations */
+        $columnHeaders = [];
+        /** @var string[] $data the data of the csv file */
+        $contentData = [];
+        $content = [];
 
         // create a file pointer connected to the output stream
-        $output = fopen('php://output', 'w');
+        $output = fopen('php://output', 'wb');
 
         //title
-        fputcsv($output, array($this->translator->trans($this->export->getTitle())));
+        fputcsv($output, [$this->translator->trans($this->export->getTitle())]);
         //blank line
-        fputcsv($output, array(""));
+        fputcsv($output, ['']);
 
         // add filtering description
-        foreach($this->gatherFiltersDescriptions() as $desc) {
-            fputcsv($output, array($desc));
+        foreach ($this->gatherFiltersDescriptions() as $desc) {
+            fputcsv($output, [$desc]);
         }
         // blank line
-        fputcsv($output, array(""));
+        fputcsv($output, ['']);
 
         // iterate on result to : 1. populate row headers, 2. populate column headers, 3. add result
         foreach ($results as $row) {
@@ -242,46 +258,47 @@ class CSVFormatter implements FormatterInterface
             }
 
             // add the column headers
-            /* @var $columns string[] the column for this row */
+            /** @var string[] $columns the column for this row */
             $columns = array_slice($row, $rowKeysNb, $columnKeysNb);
-            $columnPosition = findColumnPosition($columnHeaders, $columns);
+            $columnPosition = $this->findColumnPosition($columnHeaders, $columns);
 
             //fill with blank at the position given by the columnPosition + nbRowHeaders
-            for ($i=0; $i < $columnPosition; $i++) {
+            for ($i = 0; $i < $columnPosition; ++$i) {
                 if (!isset($line[$rowKeysNb + $i])) {
-                    $line[$rowKeysNb + $i] = "";
+                    $line[$rowKeysNb + $i] = '';
                 }
             }
 
-            $resultData = array_slice($row, $resultsKeysNb*-1);
-            foreach($resultData as $data) {
+            $resultData = array_slice($row, $resultsKeysNb * -1);
+
+            foreach ($resultData as $data) {
                 $line[] = $data;
             }
-
         }
 
         // we add  the last line
         $contentData[] = $line;
 
         //column title headers
-        for ($i=0; $i < $columnKeysNb; $i++) {
+        for ($i = 0; $i < $columnKeysNb; ++$i) {
             $line = array_fill(0, $rowKeysNb, '');
 
-            foreach($columnHeaders as $set) {
+            foreach ($columnHeaders as $set) {
                 $line[] = $set[$i];
             }
 
             $content[] = $line;
         }
 
-
         //row title headers
-        $headerLine = array();
-        foreach($this->getRowHeaders() as $headerKey) {
+        $headerLine = [];
+
+        foreach ($this->getRowHeaders() as $headerKey) {
             $headerLine[] = array_key_exists('_header', $this->labels[$headerKey]) ?
                     $this->labels[$headerKey]['_header'] : '';
         }
-        foreach($this->export->getQueryKeys($this->exportData) as $key) {
+
+        foreach ($this->export->getQueryKeys($this->exportData) as $key) {
             $headerLine[] = array_key_exists('_header', $this->labels[$key]) ?
                     $this->labels[$key]['_header'] : '';
         }
@@ -289,10 +306,11 @@ class CSVFormatter implements FormatterInterface
         unset($headerLine); //free memory
 
         //generate CSV
-        foreach($content as $line) {
+        foreach ($content as $line) {
             fputcsv($output, $line);
         }
-        foreach($contentData as $line) {
+
+        foreach ($contentData as $line) {
             fputcsv($output, $line);
         }
 
@@ -302,10 +320,82 @@ class CSVFormatter implements FormatterInterface
         return $text;
     }
 
+    protected function getColumnHeaders()
+    {
+        return $this->getPositionnalHeaders('c');
+    }
+
+    protected function getRowHeaders()
+    {
+        return $this->getPositionnalHeaders('r');
+    }
+
+    /**
+     * ordering aggregators, preserving key association.
+     *
+     * This function do not mind about position.
+     *
+     * If two aggregators have the same order, the second given will be placed
+     * after.  This is not significant for the first ordering.
+     */
+    protected function orderingHeaders(array $formatterData)
+    {
+        $this->formatterData = $formatterData;
+        uasort(
+            $this->formatterData,
+            static fn (array $a, array $b): int => ($a['order'] <= $b['order'] ? -1 : 1)
+        );
+    }
+
+    /**
+     * append a form line by aggregator on the formatter form.
+     *
+     * This form allow to choose the aggregator position (row or column) and
+     * the ordering
+     *
+     * @param string $nbAggregators
+     */
+    private function appendAggregatorForm(FormBuilderInterface $builder, $nbAggregators)
+    {
+        $builder->add('order', ChoiceType::class, [
+            'choices' => array_combine(
+                range(1, $nbAggregators),
+                range(1, $nbAggregators)
+            ),
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+
+        $builder->add('position', ChoiceType::class, [
+            'choices' => [
+                'row' => 'r',
+                'column' => 'c',
+            ],
+            'multiple' => false,
+            'expanded' => false,
+        ]);
+    }
+
+    private function findColumnPosition(&$columnHeaders, $columnToFind): int
+    {
+        $i = 0;
+
+        foreach ($columnHeaders as $set) {
+            if ($set === $columnToFind) {
+                return $i;
+            }
+            ++$i;
+        }
+
+        //we didn't find it, adding the column
+        $columnHeaders[] = $columnToFind;
+
+        return $i++;
+    }
 
     private function getOrderedResults()
     {
-        $r = array();
+        $r = [];
         $results = $this->result;
         $labels = $this->labels;
         $rowKeys = $this->getRowHeaders();
@@ -314,9 +404,9 @@ class CSVFormatter implements FormatterInterface
         $headers = array_merge($rowKeys, $columnKeys);
 
         foreach ($results as $row) {
-            $line = array();
-            foreach ($headers as $key) {
+            $line = [];
 
+            foreach ($headers as $key) {
                 $line[] = call_user_func($labels[$key], $row[$key]);
             }
 
@@ -333,31 +423,22 @@ class CSVFormatter implements FormatterInterface
         return $r;
     }
 
-
-    protected function getRowHeaders()
-    {
-        return $this->getPositionnalHeaders('r');
-    }
-
-    protected function getColumnHeaders()
-    {
-        return $this->getPositionnalHeaders('c');
-    }
-
     /**
-     *
      * @param string $position may be 'c' (column) or 'r' (row)
+     *
+     * @throws RuntimeException
+     *
      * @return string[]
-     * @throws \RuntimeException
      */
     private function getPositionnalHeaders($position)
     {
-        $headers = array();
-        foreach($this->formatterData as $alias => $data) {
+        $headers = [];
+
+        foreach ($this->formatterData as $alias => $data) {
             if (!array_key_exists($alias, $this->aggregatorsData)) {
-                throw new \RuntimeException("the formatter wants to use the "
-                        . "aggregator with alias $alias, but the export do not "
-                        . "contains data about it");
+                throw new RuntimeException('the formatter wants to use the '
+                        . "aggregator with alias {$alias}, but the export do not "
+                        . 'contains data about it');
             }
 
             $aggregator = $this->aggregators[$alias];
@@ -369,95 +450,4 @@ class CSVFormatter implements FormatterInterface
 
         return $headers;
     }
-
-    /**
-     *
-     * @param mixed $result
-     * @param \Chill\MainBundle\Export\AggregatorInterface[] $aggregators
-     */
-    protected function gatherLabels()
-    {
-        return array_merge(
-                $this->gatherLabelsFromAggregators(),
-                $this->gatherLabelsFromExport()
-                );
-    }
-
-    protected function gatherLabelsFromAggregators()
-    {
-        $labels = array();
-        /* @var $aggretator \Chill\MainBundle\Export\AggregatorInterface */
-        foreach ($this->aggregators as $alias => $aggregator) {
-            $keys = $aggregator->getQueryKeys($this->aggregatorsData[$alias]);
-
-            // gather data in an array
-            foreach($keys as $key) {
-                $values = array_map(function($row) use ($key, $alias) {
-                    if (!array_key_exists($key, $row)) {
-                        throw new \LogicException("the key '".$key."' is declared by "
-                                . "the aggregator with alias '".$alias."' but is not "
-                                . "present in results");
-                    }
-
-                    return $row[$key];
-                }, $this->result);
-                $labels[$key] = $aggregator->getLabels($key, array_unique($values),
-                        $this->aggregatorsData[$alias]);
-            }
-        }
-
-        return $labels;
-    }
-
-    protected function gatherLabelsFromExport()
-    {
-        $labels = array();
-        $export = $this->export;
-        $keys = $this->export->getQueryKeys($this->exportData);
-
-        foreach($keys as $key) {
-            $values = array_map(function($row) use ($key, $export) {
-                    if (!array_key_exists($key, $row)) {
-                        throw new \LogicException("the key '".$key."' is declared by "
-                                . "the export with title '".$export->getTitle()."' but is not "
-                                . "present in results");
-                    }
-
-                    return $row[$key];
-                }, $this->result);
-            $labels[$key] = $this->export->getLabels($key, array_unique($values),
-                    $this->exportData);
-        }
-
-        return $labels;
-    }
-
-    public function gatherFiltersDescriptions()
-    {
-        $descriptions = array();
-
-        foreach($this->filtersData as $key => $filterData) {
-
-            $statement = $this->exportManager
-                    ->getFilter($key)
-                    ->describeAction($filterData);
-
-            if ($statement === null) {
-                continue;
-            }
-
-            if (is_array($statement)) {
-                $descriptions[] = $this->translator->trans(
-                        $statement[0],
-                        $statement[1],
-                        isset($statement[2]) ? $statement[2] : null,
-                        isset($statement[3]) ? $statement[3] : null);
-            } else {
-                $descriptions[] = $statement;
-            }
-        }
-
-        return $descriptions;
-    }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index b3d004819..94c8c5ee3 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -1,68 +1,61 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export\Formatter;
 
-use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Export\FormatterInterface;
+use LogicException;
+use OutOfBoundsException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_key_exists;
+use function array_keys;
+use function array_map;
+use function count;
+use function implode;
 
 // command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
 
 /**
- * Create a CSV List for the export
- *
- * @author Champs-Libres <info@champs-libres.coop>
+ * Create a CSV List for the export.
  */
 class CSVListFormatter implements FormatterInterface
 {
-    
+    protected $exportAlias;
+
+    protected $exportData;
+
     /**
-     * This variable cache the labels internally
-     *
-     * @var string[]
-     */
-    protected $labelsCache = null;
-    
-    protected $result = null;
-    
-    protected $exportAlias = null;
-    
-    protected $exportData = null;
-    
-    protected $formatterData = null;
-    
-    /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
-    
+
+    protected $formatterData;
+
     /**
+     * This variable cache the labels internally.
      *
+     * @var string[]
+     */
+    protected $labelsCache;
+
+    protected $result;
+
+    /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
 
     public function __construct(TranslatorInterface $translatorInterface, ExportManager $exportManager)
     {
@@ -70,152 +63,130 @@ class CSVListFormatter implements FormatterInterface
         $this->exportManager = $exportManager;
     }
 
-
-    public function getType()
-    {
-        return FormatterInterface::TYPE_LIST;
+    /**
+     * build a form, which will be used to collect data required for the execution
+     * of this formatter.
+     *
+     * @uses appendAggregatorForm
+     *
+     * @param type $exportAlias
+     */
+    public function buildForm(
+        FormBuilderInterface $builder,
+        $exportAlias,
+        array $aggregatorAliases
+    ) {
+        $builder->add('numerotation', ChoiceType::class, [
+            'choices' => [
+                'yes' => true,
+                'no' => false,
+            ],
+            'expanded' => true,
+            'multiple' => false,
+            'label' => 'Add a number on first column',
+            'data' => true,
+        ]);
     }
-    
+
     public function getName()
     {
         return 'CSV vertical list';
     }
-    
+
     /**
-     * build a form, which will be used to collect data required for the execution
-     * of this formatter.
-     * 
-     * @uses appendAggregatorForm
-     * @param FormBuilderInterface $builder
-     * @param type $exportAlias
-     * @param array $aggregatorAliases
-     */
-    public function buildForm(
-        FormBuilderInterface $builder, 
-        $exportAlias, 
-        array $aggregatorAliases
-    ){
-        $builder->add('numerotation', ChoiceType::class, array(
-            'choices' => array(
-                'yes' => true,
-                'no'  => false
-            ),
-            'expanded' => true,
-            'multiple' => false,
-            'label' => "Add a number on first column",
-            'data' => true
-        ));
-    }
-    
-    /**
-     * Generate a response from the data collected on differents ExportElementInterface
-     * 
+     * Generate a response from the data collected on differents ExportElementInterface.
+     *
      * @param mixed[] $result The result, as given by the ExportInterface
      * @param mixed[] $formatterData collected from the current form
      * @param string $exportAlias the id of the current export
      * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
      * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
     public function getResponse(
-        $result, 
-        $formatterData, 
-        $exportAlias, 
-        array $exportData, 
-        array $filtersData, 
+        $result,
+        $formatterData,
+        $exportAlias,
+        array $exportData,
+        array $filtersData,
         array $aggregatorsData
     ) {
         $this->result = $result;
         $this->exportAlias = $exportAlias;
         $this->exportData = $exportData;
         $this->formatterData = $formatterData;
-        
-        $output = fopen('php://output', 'w');
-        
+
+        $output = fopen('php://output', 'wb');
+
         $this->prepareHeaders($output);
-        
+
         $i = 1;
+
         foreach ($result as $row) {
-            $line = array();
-            
-            if ($this->formatterData['numerotation'] === true) {
+            $line = [];
+
+            if (true === $this->formatterData['numerotation']) {
                 $line[] = $i;
             }
-            
+
             foreach ($row as $key => $value) {
                 $line[] = $this->getLabel($key, $value);
             }
-            
+
             fputcsv($output, $line);
-            
-            $i++;
+
+            ++$i;
         }
-        
+
         $csvContent = stream_get_contents($output);
         fclose($output);
-        
+
         $response = new Response();
         $response->setStatusCode(200);
         $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
         //$response->headers->set('Content-Disposition','attachment; filename="export.csv"');
 
         $response->setContent($csvContent);
-        
+
         return $response;
     }
-    
-    /**
-     * add the headers to the csv file
-     * 
-     * @param resource $output
-     */
-    protected function prepareHeaders($output)
+
+    public function getType()
     {
-        $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
-        // we want to keep the order of the first row. So we will iterate on the first row of the results
-        $first_row = count($this->result) > 0 ? $this->result[0] : array();
-        $header_line = array();
-        
-        if ($this->formatterData['numerotation'] === true) {
-                $header_line[] = $this->translator->trans('Number');
-        }
-        
-        foreach ($first_row as $key => $value) {
-            $header_line[] = $this->translator->trans(
-                $this->getLabel($key, '_header'));
-        }
-        
-        if (count($header_line) > 0) {
-            fputcsv($output, $header_line);
-        }
+        return FormatterInterface::TYPE_LIST;
     }
-    
+
     /**
-     * Give the label corresponding to the given key and value. 
-     * 
+     * Give the label corresponding to the given key and value.
+     *
      * @param string $key
      * @param string $value
+     *
+     * @throws LogicException if the label is not found
+     *
      * @return string
-     * @throws \LogicException if the label is not found
      */
     protected function getLabel($key, $value)
     {
-        
-        if ($this->labelsCache === null) { 
+        if (null === $this->labelsCache) {
             $this->prepareCacheLabels();
         }
-        
-        if (!\array_key_exists($key, $this->labelsCache)){
-            throw new \OutOfBoundsException(sprintf("The key \"%s\" "
-                . "is not present in the list of keys handled by "
-                . "this query. Check your `getKeys` and `getLabels` "
-                . "methods. Available keys are %s.", $key, 
-                \implode(", ", \array_keys($this->labelsCache))));
+
+        if (!array_key_exists($key, $this->labelsCache)) {
+            throw new OutOfBoundsException(sprintf(
+                'The key "%s" '
+                . 'is not present in the list of keys handled by '
+                . 'this query. Check your `getKeys` and `getLabels` '
+                . 'methods. Available keys are %s.',
+                $key,
+                implode(', ', array_keys($this->labelsCache))
+            ));
         }
-        
+
         return $this->labelsCache[$key]($value);
     }
-    
+
     /**
      * Prepare the label cache which will be used by getLabel. This function
      * should be called only once in the generation lifecycle.
@@ -224,14 +195,39 @@ class CSVListFormatter implements FormatterInterface
     {
         $export = $this->exportManager->getExport($this->exportAlias);
         $keys = $export->getQueryKeys($this->exportData);
-        
-        foreach($keys as $key) {
+
+        foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = \array_map(function ($v) use ($key) { return $v[$key]; }, $this->result);
+            $values = array_map(static function ($v) use ($key) { return $v[$key]; }, $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
     }
-    
-    
+
+    /**
+     * add the headers to the csv file.
+     *
+     * @param resource $output
+     */
+    protected function prepareHeaders($output)
+    {
+        $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
+        // we want to keep the order of the first row. So we will iterate on the first row of the results
+        $first_row = count($this->result) > 0 ? $this->result[0] : [];
+        $header_line = [];
+
+        if (true === $this->formatterData['numerotation']) {
+            $header_line[] = $this->translator->trans('Number');
+        }
+
+        foreach ($first_row as $key => $value) {
+            $header_line[] = $this->translator->trans(
+                $this->getLabel($key, '_header')
+            );
+        }
+
+        if (count($header_line) > 0) {
+            fputcsv($output, $header_line);
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
index 7d3087752..7e3334340 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
@@ -1,126 +1,109 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export\Formatter;
 
-use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Export\FormatterInterface;
+use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_map;
+use function count;
 
 /**
- * Create a CSV List for the export where the header are printed on the 
+ * Create a CSV List for the export where the header are printed on the
  * first column, and the result goes from left to right.
- *
- * @author Champs-Libres <info@champs-libres.coop>
  */
 class CSVPivotedListFormatter implements FormatterInterface
 {
-    
+    protected $exportAlias;
+
+    protected $exportData;
+
     /**
-     * This variable cache the labels internally
-     *
-     * @var string[]
-     */
-    protected $labelsCache = null;
-    
-    protected $result = null;
-    
-    protected $exportAlias = null;
-    
-    protected $exportData = null;
-    
-    protected $formatterData = null;
-    
-    /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
-    
+
+    protected $formatterData;
+
     /**
+     * This variable cache the labels internally.
      *
+     * @var string[]
+     */
+    protected $labelsCache;
+
+    protected $result;
+
+    /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
-
 
     public function __construct(TranslatorInterface $translatorInterface, ExportManager $exportManager)
     {
         $this->translator = $translatorInterface;
         $this->exportManager = $exportManager;
     }
-    
-    public function getType()
-    {
-        return FormatterInterface::TYPE_LIST;
+
+    /**
+     * build a form, which will be used to collect data required for the execution
+     * of this formatter.
+     *
+     * @uses appendAggregatorForm
+     *
+     * @param type $exportAlias
+     */
+    public function buildForm(
+        FormBuilderInterface $builder,
+        $exportAlias,
+        array $aggregatorAliases
+    ) {
+        $builder->add('numerotation', ChoiceType::class, [
+            'choices' => [
+                'yes' => true,
+                'no' => false,
+            ],
+            'expanded' => true,
+            'multiple' => false,
+            'label' => 'Add a number on first column',
+            'data' => true,
+        ]);
     }
-    
+
     public function getName()
     {
         return 'CSV horizontal list';
     }
-    
+
     /**
-     * build a form, which will be used to collect data required for the execution
-     * of this formatter.
-     * 
-     * @uses appendAggregatorForm
-     * @param FormBuilderInterface $builder
-     * @param type $exportAlias
-     * @param array $aggregatorAliases
-     */
-    public function buildForm(
-        FormBuilderInterface $builder, 
-        $exportAlias, 
-        array $aggregatorAliases
-    ){
-        $builder->add('numerotation', ChoiceType::class, array(
-            'choices' => array(
-                'yes' => true,
-                'no'  => false
-            ),
-            'expanded' => true,
-            'multiple' => false,
-            'label' => "Add a number on first column",
-            'data' => true
-        ));
-    }
-    
-    /**
-     * Generate a response from the data collected on differents ExportElementInterface
-     * 
+     * Generate a response from the data collected on differents ExportElementInterface.
+     *
      * @param mixed[] $result The result, as given by the ExportInterface
      * @param mixed[] $formatterData collected from the current form
      * @param string $exportAlias the id of the current export
      * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
      * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
     public function getResponse(
-        $result, 
-        $formatterData, 
-        $exportAlias, 
-        array $exportData, 
+        $result,
+        $formatterData,
+        $exportAlias,
+        array $exportData,
         array $filtersData,
         array $aggregatorsData
     ) {
@@ -128,85 +111,70 @@ class CSVPivotedListFormatter implements FormatterInterface
         $this->exportAlias = $exportAlias;
         $this->exportData = $exportData;
         $this->formatterData = $formatterData;
-        
-        $output = fopen('php://output', 'w');
-        
+
+        $output = fopen('php://output', 'wb');
+
         $i = 1;
-        $lines = array();
+        $lines = [];
         $this->prepareHeaders($lines);
-        
+
         foreach ($result as $row) {
             $j = 0;
-            
-            if ($this->formatterData['numerotation'] === true) {
+
+            if (true === $this->formatterData['numerotation']) {
                 $lines[$j][] = $i;
-                $j++;
+                ++$j;
             }
-            
+
             foreach ($row as $key => $value) {
                 $lines[$j][] = $this->getLabel($key, $value);
-                $j++;
+                ++$j;
             }
-            $i++;
+            ++$i;
         }
-        
+
         //adding the lines to the csv output
-        foreach($lines as $line) {
+        foreach ($lines as $line) {
             fputcsv($output, $line);
         }
-        
+
         $csvContent = stream_get_contents($output);
         fclose($output);
-        
+
         $response = new Response();
         $response->setStatusCode(200);
         $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
-        $response->headers->set('Content-Disposition','attachment; filename="export.csv"');
+        $response->headers->set('Content-Disposition', 'attachment; filename="export.csv"');
 
         $response->setContent($csvContent);
-        
+
         return $response;
     }
-    
-    /**
-     * add the headers to lines array
-     * 
-     * @param array $lines the lines where the header will be added
-     */
-    protected function prepareHeaders(array &$lines)
+
+    public function getType()
     {
-        $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
-        // we want to keep the order of the first row. So we will iterate on the first row of the results
-        $first_row = count($this->result) > 0 ? $this->result[0] : array();
-        $header_line = array();
-        
-        if ($this->formatterData['numerotation'] === true) {
-                $lines[] = array($this->translator->trans('Number'));
-        }
-        
-        foreach ($first_row as $key => $value) {
-            $lines[] = array($this->getLabel($key, '_header'));
-        }
+        return FormatterInterface::TYPE_LIST;
     }
-    
+
     /**
-     * Give the label corresponding to the given key and value. 
-     * 
+     * Give the label corresponding to the given key and value.
+     *
      * @param string $key
      * @param string $value
+     *
+     * @throws LogicException if the label is not found
+     *
      * @return string
-     * @throws \LogicException if the label is not found
      */
     protected function getLabel($key, $value)
     {
-        
-        if ($this->labelsCache === null) { 
+        if (null === $this->labelsCache) {
             $this->prepareCacheLabels();
         }
-        
+
         return $this->labelsCache[$key]($value);
     }
-    
+
     /**
      * Prepare the label cache which will be used by getLabel. This function
      * should be called only once in the generation lifecycle.
@@ -215,14 +183,33 @@ class CSVPivotedListFormatter implements FormatterInterface
     {
         $export = $this->exportManager->getExport($this->exportAlias);
         $keys = $export->getQueryKeys($this->exportData);
-        
-        foreach($keys as $key) {
+
+        foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = \array_map(function ($v) use ($key) { return $v[$key]; }, $this->result);
+            $values = array_map(static function ($v) use ($key) { return $v[$key]; }, $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
     }
-    
-    
+
+    /**
+     * add the headers to lines array.
+     *
+     * @param array $lines the lines where the header will be added
+     */
+    protected function prepareHeaders(array &$lines)
+    {
+        $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
+        // we want to keep the order of the first row. So we will iterate on the first row of the results
+        $first_row = count($this->result) > 0 ? $this->result[0] : [];
+        $header_line = [];
+
+        if (true === $this->formatterData['numerotation']) {
+            $lines[] = [$this->translator->trans('Number')];
+        }
+
+        foreach ($first_row as $key => $value) {
+            $lines[] = [$this->getLabel($key, '_header')];
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index d14ecb9ad..590e79a41 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -1,96 +1,43 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <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\MainBundle\Export\Formatter;
-
-use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\MainBundle\Export\ExportManager;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 /**
+ * Chill is a software for social workers
  *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Export\Formatter;
+
+use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Export\FormatterInterface;
+use LogicException;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_map;
+use function array_merge;
+use function array_multisort;
+use function array_unique;
+use function call_user_func;
+use function count;
+use function fopen;
+use function is_array;
+use function stream_get_contents;
+use function sys_get_temp_dir;
+use function tempnam;
+use function unlink;
+
 class SpreadSheetFormatter implements FormatterInterface
 {
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     *
-     * @var ExportManager
-     */
-    protected $exportManager;
-
-    /**
-     * The result, as returned by the export
-     *
-     * replaced when `getResponse` is called.
-     *
-     * @var type
-     */
-    protected $result;
-
-    /**
-     *
-     * replaced when `getResponse` is called.
-     *
-     * @var type
-     */
-    protected $formatterData;
-
-    /**
-     * The export
-     *
-     * replaced when `getResponse` is called.
-     *
-     * @var \Chill\MainBundle\Export\ExportInterface
-     */
-    protected $export;
-
-    /**
-     *
-     * replaced when `getResponse` is called.
-     *
-     * @var type
-     */
-    //protected $aggregators;
-
-    /**
-     * array containing value of export form
-     *
-     * replaced when `getResponse` is called.
-     *
-     * @var array
-     */
-    protected $exportData;
-
     /**
      * an array where keys are the aggregators aliases and
-     * values are the data
+     * values are the data.
      *
      * replaced when `getResponse` is called.
      *
@@ -99,7 +46,36 @@ class SpreadSheetFormatter implements FormatterInterface
     protected $aggregatorsData;
 
     /**
+     * The export.
      *
+     * replaced when `getResponse` is called.
+     *
+     * @var \Chill\MainBundle\Export\ExportInterface
+     */
+    protected $export;
+
+    /**
+     * replaced when `getResponse` is called.
+     *
+     * @var type
+     */
+    //protected $aggregators;
+
+    /**
+     * array containing value of export form.
+     *
+     * replaced when `getResponse` is called.
+     *
+     * @var array
+     */
+    protected $exportData;
+
+    /**
+     * @var ExportManager
+     */
+    protected $exportManager;
+
+    /**
      * replaced when `getResponse` is called.
      *
      * @var array
@@ -107,7 +83,22 @@ class SpreadSheetFormatter implements FormatterInterface
     protected $filtersData;
 
     /**
+     * replaced when `getResponse` is called.
      *
+     * @var type
+     */
+    protected $formatterData;
+
+    /**
+     * The result, as returned by the export.
+     *
+     * replaced when `getResponse` is called.
+     *
+     * @var type
+     */
+    protected $result;
+
+    /**
      * replaced when `getResponse` is called.
      *
      * @var array
@@ -115,12 +106,17 @@ class SpreadSheetFormatter implements FormatterInterface
     //protected $labels;
 
     /**
-     * temporary file to store spreadsheet
+     * temporary file to store spreadsheet.
      *
      * @var string
      */
     protected $tempfile;
 
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
     /**
      * cache for displayable result.
      *
@@ -137,7 +133,7 @@ class SpreadSheetFormatter implements FormatterInterface
     /**
      * Whethe `cacheDisplayableResult` is initialized or not.
      *
-     * @var boolean
+     * @var bool
      */
     private $cacheDisplayableResultIsInitialized = false;
 
@@ -147,58 +143,35 @@ class SpreadSheetFormatter implements FormatterInterface
         $this->exportManager = $exportManager;
     }
 
-
     public function buildForm(
         FormBuilderInterface $builder,
         $exportAlias,
         array $aggregatorAliases
     ) {
         // choosing between formats
-        $builder->add('format', ChoiceType::class, array(
-            'choices' => array(
+        $builder->add('format', ChoiceType::class, [
+            'choices' => [
                 'OpenDocument Format (.ods) (LibreOffice, ...)' => 'ods',
                 'Microsoft Excel 2007-2013 XML (.xlsx) (Microsoft Excel, LibreOffice)' => 'xlsx',
-                'Comma separated values (.csv)' => 'csv'
-            ),
-            'placeholder' => 'Choose the format'
-        ));
+                'Comma separated values (.csv)' => 'csv',
+            ],
+            'placeholder' => 'Choose the format',
+        ]);
 
         // ordering aggregators
         $aggregators = $this->exportManager->getAggregators($aggregatorAliases);
         $nb = count($aggregatorAliases);
 
         foreach ($aggregators as $alias => $aggregator) {
-            $builderAggregator = $builder->create($alias, FormType::class, array(
-               'label' => $aggregator->getTitle(),
-               'block_name' => '_aggregator_placement_spreadsheet_formatter'
-            ));
+            $builderAggregator = $builder->create($alias, FormType::class, [
+                'label' => $aggregator->getTitle(),
+                'block_name' => '_aggregator_placement_spreadsheet_formatter',
+            ]);
             $this->appendAggregatorForm($builderAggregator, $nb);
             $builder->add($builderAggregator);
         }
     }
 
-    /**
-     * append a form line by aggregator on the formatter form.
-     *
-     * This form allow to choose the aggregator position (row or column) and
-     * the ordering
-     *
-     * @param FormBuilderInterface $builder
-     * @param string $nbAggregators
-     */
-    private function appendAggregatorForm(FormBuilderInterface $builder, $nbAggregators)
-    {
-        $builder->add('order', ChoiceType::class, array(
-           'choices' => array_combine(
-                 range(1, $nbAggregators),
-                 range(1, $nbAggregators)
-                 ),
-           'multiple' => false,
-           'expanded' => false
-        ));
-
-    }
-
     public function getName()
     {
         return 'SpreadSheet (xlsx, ods)';
@@ -221,69 +194,123 @@ class SpreadSheetFormatter implements FormatterInterface
         $this->aggregatorsData = $aggregatorsData;
 
         // reset cache
-        $this->cacheDisplayableResult = array();
+        $this->cacheDisplayableResult = [];
         $this->cacheDisplayableResultIsInitialized = false;
 
         $response = new Response();
-        $response->headers->set('Content-Type',
-            $this->getContentType($this->formatterData['format']));
+        $response->headers->set(
+            'Content-Type',
+            $this->getContentType($this->formatterData['format'])
+        );
 
-        $this->tempfile = \tempnam(\sys_get_temp_dir(), '');
-        $this->generatecontent();
+        $this->tempfile = tempnam(sys_get_temp_dir(), '');
+        $this->generateContent();
 
-        $f = \fopen($this->tempfile, 'r');
-        $response->setContent(\stream_get_contents($f));
+        $f = fopen($this->tempfile, 'rb');
+        $response->setContent(stream_get_contents($f));
         fclose($f);
 
         // remove the temp file from disk
-        \unlink($this->tempfile);
+        unlink($this->tempfile);
 
         return $response;
     }
 
-    /**
-     * Generate the content and write it to php://temp
-     */
-    protected function generateContent()
+    public function getType()
     {
-        list($spreadsheet, $worksheet) = $this->createSpreadsheet();
+        return 'tabular';
+    }
 
-        $this->addTitleToWorkSheet($worksheet);
-        $line = $this->addFiltersDescription($worksheet);
+    protected function addContentTable(
+        Worksheet $worksheet,
+        $sortedResults,
+        $line
+    ) {
+        $worksheet->fromArray(
+            $sortedResults,
+            null,
+            'A' . $line
+        );
 
-        // at this point, we are going to sort retsults for an easier manipulation
-        list($sortedResult, $exportKeys, $aggregatorKeys, $globalKeys) =
-            $this->sortResult();
-
-        $line = $this->addHeaders($worksheet, $globalKeys, $line);
-
-        $line = $this->addContentTable($worksheet, $sortedResult, $line);
-
-        switch ($this->formatterData['format'])
-        {
-            case 'ods':
-                $writer = \PhpOffice\PhpSpreadsheet\IOFactory
-                    ::createWriter($spreadsheet, 'Ods');
-                break;
-            case 'xlsx':
-                $writer = \PhpOffice\PhpSpreadsheet\IOFactory
-                    ::createWriter($spreadsheet, 'Xlsx');
-                break;
-            case 'csv':
-                $writer = \PhpOffice\PhpSpreadsheet\IOFactory
-                    ::createWriter($spreadsheet, 'Csv');
-                break;
-            default:
-                // this should not happen
-                // throw an exception to ensure that the error is catched
-                throw new \LogicException();
-        }
-
-        $writer->save($this->tempfile);
+        return $line + count($sortedResults) + 1;
     }
 
     /**
-     * Create a spreadsheet and a working worksheet
+     * Add filter description since line 3.
+     *
+     * return the line number after the last description
+     *
+     * @return int the line number after the last description
+     */
+    protected function addFiltersDescription(Worksheet &$worksheet)
+    {
+        $line = 3;
+
+        foreach ($this->filtersData as $alias => $data) {
+            $filter = $this->exportManager->getFilter($alias);
+            $description = $filter->describeAction($data, 'string');
+
+            if (is_array($description)) {
+                $description = $this->translator
+                    ->trans(
+                        $description[0],
+                        $description[1] ?? []
+                    );
+            }
+
+            $worksheet->setCellValue('A' . $line, $description);
+            ++$line;
+        }
+
+        return $line;
+    }
+
+    /**
+     * add headers to worksheet.
+     *
+     * return the line number where the next content (i.e. result) should
+     * be appended.
+     *
+     * @param int $line
+     *
+     * @return int
+     */
+    protected function addHeaders(
+        Worksheet &$worksheet,
+        array $globalKeys,
+        $line
+    ) {
+        // get the displayable form of headers
+        $displayables = [];
+
+        foreach ($globalKeys as $key) {
+            $displayables[] = $this->translator->trans(
+                $this->getDisplayableResult($key, '_header')
+            );
+        }
+
+        // add headers on worksheet
+        $worksheet->fromArray(
+            $displayables,
+            null,
+            'A' . $line
+        );
+
+        return $line + 1;
+    }
+
+    /**
+     * Add the title to the worksheet and merge the cell containing
+     * the title.
+     */
+    protected function addTitleToWorkSheet(Worksheet &$worksheet)
+    {
+        $worksheet->setCellValue('A1', $this->getTitle());
+        $worksheet->mergeCells('A1:G1');
+    }
+
+    /**
+     * Create a spreadsheet and a working worksheet.
      *
      * @return array where 1st member is spreadsheet, 2nd is worksheet
      */
@@ -301,46 +328,176 @@ class SpreadSheetFormatter implements FormatterInterface
     }
 
     /**
-     * Add the title to the worksheet and merge the cell containing
-     * the title
-     *
-     * @param Worksheet $worksheet
+     * Generate the content and write it to php://temp.
      */
-    protected function addTitleToWorkSheet(Worksheet &$worksheet)
+    protected function generateContent()
     {
-        $worksheet->setCellValue('A1', $this->getTitle());
-        $worksheet->mergeCells('A1:G1');
+        [$spreadsheet, $worksheet] = $this->createSpreadsheet();
+
+        $this->addTitleToWorkSheet($worksheet);
+        $line = $this->addFiltersDescription($worksheet);
+
+        // at this point, we are going to sort retsults for an easier manipulation
+        [$sortedResult, $exportKeys, $aggregatorKeys, $globalKeys] =
+            $this->sortResult();
+
+        $line = $this->addHeaders($worksheet, $globalKeys, $line);
+
+        $line = $this->addContentTable($worksheet, $sortedResult, $line);
+
+        switch ($this->formatterData['format']) {
+            case 'ods':
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Ods');
+
+                break;
+
+            case 'xlsx':
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx');
+
+                break;
+
+            case 'csv':
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Csv');
+
+                break;
+
+            default:
+                // this should not happen
+                // throw an exception to ensure that the error is catched
+                throw new LogicException();
+        }
+
+        $writer->save($this->tempfile);
     }
 
     /**
-     * Add filter description since line 3.
+     * get an array of aggregator keys. The keys are sorted as asked
+     * by user in the form.
      *
-     * return the line number after the last description
-     *
-     * @param Worksheet $worksheet
-     * @return int the line number after the last description
+     * @return string[] an array containing the keys of aggregators
      */
-    protected function addFiltersDescription(Worksheet &$worksheet)
+    protected function getAggregatorKeysSorted()
     {
-        $line = 3;
+        // empty array for aggregators keys
+        $keys = [];
+        // this association between key and aggregator alias will be used
+        // during sorting
+        $aggregatorKeyAssociation = [];
 
-        foreach ($this->filtersData as $alias => $data) {
-            $filter = $this->exportManager->getFilter($alias);
-            $description = $filter->describeAction($data, 'string');
-
-            if (is_array($description)) {
-                $description = $this->translator
-                    ->trans(
-                        $description[0],
-                        isset($description[1]) ? $description[1] : []
-                        );
+        foreach ($this->aggregatorsData as $alias => $data) {
+            $aggregator = $this->exportManager->getAggregator($alias);
+            $aggregatorsKeys = $aggregator->getQueryKeys($data);
+            // append the keys from aggregator to the $keys existing array
+            $keys = array_merge($keys, $aggregatorsKeys);
+            // append the key with the alias, which will be use later for sorting
+            foreach ($aggregatorsKeys as $key) {
+                $aggregatorKeyAssociation[$key] = $alias;
             }
-
-            $worksheet->setCellValue('A'.$line, $description);
-            $line ++;
         }
 
-        return $line;
+        // sort the result using the form
+        usort($keys, function ($a, $b) use ($aggregatorKeyAssociation) {
+            $A = $this->formatterData[$aggregatorKeyAssociation[$a]]['order'];
+            $B = $this->formatterData[$aggregatorKeyAssociation[$b]]['order'];
+
+            if ($A === $B) {
+                return 0;
+            }
+
+            if ($A > $B) {
+                return 1;
+            }
+
+            return -1;
+        });
+
+        return $keys;
+    }
+
+    protected function getContentType($format)
+    {
+        switch ($format) {
+            case 'csv':
+                return 'text/csv';
+
+            case 'ods':
+                return 'application/vnd.oasis.opendocument.spreadsheet';
+
+            case 'xlsx':
+                return 'application/vnd.openxmlformats-officedocument.'
+                . 'spreadsheetml.sheet';
+        }
+    }
+
+    /**
+     * Get the displayable result.
+     *
+     * @param string $key
+     * @param string $value
+     *
+     * @return string
+     */
+    protected function getDisplayableResult($key, $value)
+    {
+        if (false === $this->cacheDisplayableResultIsInitialized) {
+            $this->initializeCache($key);
+        }
+
+        return call_user_func($this->cacheDisplayableResult[$key], $value);
+    }
+
+    protected function getTitle()
+    {
+        return $this->translator->trans($this->export->getTitle());
+    }
+
+    protected function initializeCache($key)
+    {
+        /*
+         * this function follows the following steps :
+         *
+         * 1. associate all keys used in result with their export element
+         *    (export or aggregator) and data;
+         * 2. associate all keys used in result with all the possible values :
+         *    this array will be necessary to call `getLabels`
+         * 3. store the `callable` in an associative array, in cache
+         */
+        // 1. create an associative array with key and export / aggregator
+        $keysExportElementAssociation = [];
+        // keys for export
+        foreach ($this->export->getQueryKeys($this->exportData) as $key) {
+            $keysExportElementAssociation[$key] = [$this->export,
+                $this->exportData, ];
+        }
+        // keys for aggregator
+        foreach ($this->aggregatorsData as $alias => $data) {
+            $aggregator = $this->exportManager->getAggregator($alias);
+
+            foreach ($aggregator->getQueryKeys($data) as $key) {
+                $keysExportElementAssociation[$key] = [$aggregator, $data];
+            }
+        }
+
+        // 2. collect all the keys before iteration
+        $keys = array_keys($keysExportElementAssociation);
+
+        $allValues = [];
+        // store all the values in an array
+        foreach ($this->result as $row) {
+            foreach ($keys as $key) {
+                $allValues[$key][] = $row[$key];
+            }
+        }
+
+        // 3. iterate on `keysExportElementAssociation` to store the callable
+        // in cache
+        foreach ($keysExportElementAssociation as $key => [$element, $data]) {
+            $this->cacheDisplayableResult[$key] =
+                $element->getLabels($key, array_unique($allValues[$key]), $data);
+        }
+
+        // the cache is initialized !
+        $this->cacheDisplayableResultIsInitialized = true;
     }
 
     /**
@@ -348,8 +505,7 @@ class SpreadSheetFormatter implements FormatterInterface
      *  - 0 => sorted results
      *  - 1 => export keys
      *  - 2 => aggregator keys
-     *  - 3 => global keys (aggregator keys and export keys)
-     *
+     *  - 3 => global keys (aggregator keys and export keys).
      *
      * Example, assuming that the result contains two aggregator keys :
      *
@@ -378,7 +534,6 @@ class SpreadSheetFormatter implements FormatterInterface
      *  array( 5, 6, 4 )
      * )
      * ```
-     *
      */
     protected function sortResult()
     {
@@ -386,198 +541,40 @@ class SpreadSheetFormatter implements FormatterInterface
         $exportKeys = $this->export->getQueryKeys($this->exportData);
         $aggregatorKeys = $this->getAggregatorKeysSorted();
 
-        $globalKeys = \array_merge($aggregatorKeys, $exportKeys);
+        $globalKeys = array_merge($aggregatorKeys, $exportKeys);
 
-        $sortedResult = \array_map(function ($row) use ($globalKeys) {
-                $newRow = array();
+        $sortedResult = array_map(function ($row) use ($globalKeys) {
+            $newRow = [];
 
-                foreach ($globalKeys as $key) {
-                    $newRow[] = $this->getDisplayableResult($key, $row[$key]);
-                }
+            foreach ($globalKeys as $key) {
+                $newRow[] = $this->getDisplayableResult($key, $row[$key]);
+            }
 
-                return $newRow;
-            }, $this->result);
+            return $newRow;
+        }, $this->result);
 
-        \array_multisort($sortedResult);
+        array_multisort($sortedResult);
 
-        return array($sortedResult, $exportKeys, $aggregatorKeys, $globalKeys);
+        return [$sortedResult, $exportKeys, $aggregatorKeys, $globalKeys];
     }
 
     /**
-     * get an array of aggregator keys. The keys are sorted as asked
-     * by user in the form.
+     * append a form line by aggregator on the formatter form.
      *
-     * @return string[] an array containing the keys of aggregators
+     * This form allow to choose the aggregator position (row or column) and
+     * the ordering
+     *
+     * @param string $nbAggregators
      */
-    protected function getAggregatorKeysSorted()
+    private function appendAggregatorForm(FormBuilderInterface $builder, $nbAggregators)
     {
-        // empty array for aggregators keys
-        $keys = array();
-        // this association between key and aggregator alias will be used
-        // during sorting
-        $aggregatorKeyAssociation = array();
-
-        foreach ($this->aggregatorsData as $alias => $data) {
-            $aggregator = $this->exportManager->getAggregator($alias);
-            $aggregatorsKeys = $aggregator->getQueryKeys($data);
-            // append the keys from aggregator to the $keys existing array
-            $keys = \array_merge($keys, $aggregatorsKeys);
-            // append the key with the alias, which will be use later for sorting
-            foreach ($aggregatorsKeys as $key) {
-                $aggregatorKeyAssociation[$key] = $alias;
-            }
-        }
-
-        // sort the result using the form
-        usort($keys, function ($a, $b) use ($aggregatorKeyAssociation) {
-            $A = $this->formatterData[$aggregatorKeyAssociation[$a]]['order'];
-            $B = $this->formatterData[$aggregatorKeyAssociation[$b]]['order'];
-
-            if ($A === $B) {
-                return 0;
-            } elseif ($A > $B) {
-                return 1;
-            } else {
-                return -1;
-            }
-
-        });
-
-        return $keys;
-    }
-
-    /**
-     * add headers to worksheet
-     *
-     * return the line number where the next content (i.e. result) should
-     * be appended.
-     *
-     * @param Worksheet $worksheet
-     * @param array $aggregatorKeys
-     * @param array $exportKeys
-     * @param int $line
-     * @return int
-     */
-    protected function addHeaders(
-        Worksheet &$worksheet,
-        array $globalKeys,
-        $line
-    ) {
-        // get the displayable form of headers
-        $displayables = array();
-        foreach ($globalKeys as $key) {
-            $displayables[] = $this->translator->trans(
-                $this->getDisplayableResult($key, '_header')
-                );
-        }
-
-        // add headers on worksheet
-        $worksheet->fromArray(
-            $displayables,
-            NULL,
-            'A'.$line);
-
-        return $line + 1;
-    }
-
-    protected function addContentTable(Worksheet $worksheet,
-        $sortedResults,
-        $line
-    ) {
-        $worksheet->fromArray(
-            $sortedResults,
-            NULL,
-            'A'.$line);
-
-        return $line + count($sortedResults) + 1;
-    }
-
-    protected function getTitle()
-    {
-        return $this->translator->trans($this->export->getTitle());
-    }
-
-    /**
-     * Get the displayable result.
-     *
-     * @param string $key
-     * @param string $value
-     * @return string
-     */
-    protected function getDisplayableResult($key, $value)
-    {
-        if ($this->cacheDisplayableResultIsInitialized === false) {
-            $this->initializeCache($key);
-        }
-
-        return call_user_func($this->cacheDisplayableResult[$key], $value);
-    }
-
-    protected function initializeCache($key)
-    {
-        /*
-         * this function follows the following steps :
-         *
-         * 1. associate all keys used in result with their export element
-         *    (export or aggregator) and data;
-         * 2. associate all keys used in result with all the possible values :
-         *    this array will be necessary to call `getLabels`
-         * 3. store the `callable` in an associative array, in cache
-         */
-        // 1. create an associative array with key and export / aggregator
-        $keysExportElementAssociation = array();
-        // keys for export
-        foreach ($this->export->getQueryKeys($this->exportData) as $key) {
-            $keysExportElementAssociation[$key] = [$this->export,
-                $this->exportData];
-        }
-        // keys for aggregator
-        foreach ($this->aggregatorsData as $alias => $data) {
-            $aggregator = $this->exportManager->getAggregator($alias);
-
-            foreach ($aggregator->getQueryKeys($data) as $key) {
-                $keysExportElementAssociation[$key] = [$aggregator, $data];
-            }
-        }
-
-        // 2. collect all the keys before iteration
-        $keys = array_keys($keysExportElementAssociation);
-
-        $allValues = array();
-        // store all the values in an array
-        foreach ($this->result as $row) {
-            foreach ($keys as $key) {
-                $allValues[$key][] = $row[$key];
-            }
-        }
-
-        // 3. iterate on `keysExportElementAssociation` to store the callable
-        // in cache
-        foreach ($keysExportElementAssociation as $key => list($element, $data)) {
-            $this->cacheDisplayableResult[$key] =
-                $element->getLabels($key, \array_unique($allValues[$key]), $data);
-        }
-
-        // the cache is initialized !
-        $this->cacheDisplayableResultIsInitialized = true;
-    }
-
-    protected function getContentType($format)
-    {
-        switch ($format)
-        {
-            case 'csv':
-                return 'text/csv';
-            case 'ods':
-                return 'application/vnd.oasis.opendocument.spreadsheet';
-            case 'xlsx':
-                return 'application/vnd.openxmlformats-officedocument.'
-                . 'spreadsheetml.sheet';
-        }
-    }
-
-    public function getType()
-    {
-        return 'tabular';
+        $builder->add('order', ChoiceType::class, [
+            'choices' => array_combine(
+                range(1, $nbAggregators),
+                range(1, $nbAggregators)
+            ),
+            'multiple' => false,
+            'expanded' => false,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index 221375f0b..e31535602 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -1,163 +1,160 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export\Formatter;
 
-use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Chill\MainBundle\Export\FormatterInterface;
+use DateTimeInterface;
+use LogicException;
+use OutOfBoundsException;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_key_exists;
+use function array_keys;
+use function array_map;
+use function count;
+use function fopen;
+use function implode;
+use function stream_get_contents;
+use function sys_get_temp_dir;
+use function tempnam;
+use function unlink;
 
 // command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
 
 /**
- * Create a CSV List for the export
- *
- * @author Champs-Libres <info@champs-libres.coop>
+ * Create a CSV List for the export.
  */
 class SpreadsheetListFormatter implements FormatterInterface
 {
+    protected $exportAlias;
+
+    protected $exportData;
+
     /**
-     * This variable cache the labels internally
-     *
-     * @var string[]
-     */
-    protected $labelsCache = null;
-    
-    protected $result = null;
-    
-    protected $exportAlias = null;
-    
-    protected $exportData = null;
-    
-    protected $formatterData = null;
-    
-    /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
-    
+
+    protected $formatterData;
+
     /**
+     * This variable cache the labels internally.
      *
+     * @var string[]
+     */
+    protected $labelsCache;
+
+    protected $result;
+
+    /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
-
 
     public function __construct(TranslatorInterface $translatorInterface, ExportManager $exportManager)
     {
         $this->translator = $translatorInterface;
         $this->exportManager = $exportManager;
     }
-    
-    public function getType()
-    {
-        return FormatterInterface::TYPE_LIST;
-    }
-    
+
     /**
      * build a form, which will be used to collect data required for the execution
      * of this formatter.
-     * 
+     *
      * @uses appendAggregatorForm
-     * @param FormBuilderInterface $builder
+     *
      * @param type $exportAlias
-     * @param array $aggregatorAliases
      */
     public function buildForm(
-        FormBuilderInterface $builder, 
-        $exportAlias, 
+        FormBuilderInterface $builder,
+        $exportAlias,
         array $aggregatorAliases
-    ){
+    ) {
         $builder
-            ->add('format', ChoiceType::class, array(
-                'choices' => array(
+            ->add('format', ChoiceType::class, [
+                'choices' => [
                     'OpenDocument Format (.ods) (LibreOffice, ...)' => 'ods',
-                    'Microsoft Excel 2007-2013 XML (.xlsx) (Microsoft Excel, LibreOffice)' => 'xlsx'
-                ),
-                'placeholder' => 'Choose the format'
-            ))
-            ->add('numerotation', ChoiceType::class, array(
-                'choices' => array(
+                    'Microsoft Excel 2007-2013 XML (.xlsx) (Microsoft Excel, LibreOffice)' => 'xlsx',
+                ],
+                'placeholder' => 'Choose the format',
+            ])
+            ->add('numerotation', ChoiceType::class, [
+                'choices' => [
                     'yes' => true,
-                    'no'  => false
-                ),
+                    'no' => false,
+                ],
                 'expanded' => true,
                 'multiple' => false,
-                'label' => "Add a number on first column",
-                'data' => true
-        ));
+                'label' => 'Add a number on first column',
+                'data' => true,
+            ]);
     }
-    
+
     public function getName()
     {
         return 'Spreadsheet list formatter (.xlsx, .ods)';
     }
-    
+
     /**
-     * Generate a response from the data collected on differents ExportElementInterface
-     * 
+     * Generate a response from the data collected on differents ExportElementInterface.
+     *
      * @param mixed[] $result The result, as given by the ExportInterface
      * @param mixed[] $formatterData collected from the current form
      * @param string $exportAlias the id of the current export
      * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
      * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
     public function getResponse(
-        $result, 
-        $formatterData, 
-        $exportAlias, 
-        array $exportData, 
-        array $filtersData, 
+        $result,
+        $formatterData,
+        $exportAlias,
+        array $exportData,
+        array $filtersData,
         array $aggregatorsData
     ) {
         $this->result = $result;
         $this->exportAlias = $exportAlias;
         $this->exportData = $exportData;
         $this->formatterData = $formatterData;
-        
+
         $spreadsheet = new Spreadsheet();
         $worksheet = $spreadsheet->getActiveSheet();
-        
+
         $this->prepareHeaders($worksheet);
-        
+
         $i = 1;
+
         foreach ($result as $row) {
-            $line = array();
-            
-            if ($this->formatterData['numerotation'] === true) {
-                $worksheet->setCellValue('A'.($i+1), (string) $i);
+            $line = [];
+
+            if (true === $this->formatterData['numerotation']) {
+                $worksheet->setCellValue('A' . ($i + 1), (string) $i);
             }
-            
+
             $a = $this->formatterData['numerotation'] ? 'B' : 'A';
+
             foreach ($row as $key => $value) {
-                $row = $a.($i+1);
-                if ($value instanceof \DateTimeInterface) {
+                $row = $a . ($i + 1);
+
+                if ($value instanceof DateTimeInterface) {
                     $worksheet->setCellValue($row, Date::PHPToExcel($value));
                     $worksheet->getStyle($row)
                         ->getNumberFormat()
@@ -165,105 +162,90 @@ class SpreadsheetListFormatter implements FormatterInterface
                 } else {
                     $worksheet->setCellValue($row, $this->getLabel($key, $value));
                 }
-                $a ++;
+                ++$a;
             }
-            
-            $i++;
+
+            ++$i;
         }
 
-        switch ($this->formatterData['format'])
-        {
+        switch ($this->formatterData['format']) {
             case 'ods':
-                $writer = \PhpOffice\PhpSpreadsheet\IOFactory
-                    ::createWriter($spreadsheet, 'Ods');
-                $contentType = "application/vnd.oasis.opendocument.spreadsheet";
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Ods');
+                $contentType = 'application/vnd.oasis.opendocument.spreadsheet';
+
                 break;
+
             case 'xlsx':
-                $writer = \PhpOffice\PhpSpreadsheet\IOFactory
-                    ::createWriter($spreadsheet, 'Xlsx');
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Xlsx');
                 $contentType = 'application/vnd.openxmlformats-officedocument.'
                     . 'spreadsheetml.sheet';
+
                 break;
+
             case 'csv':
-                $writer = \PhpOffice\PhpSpreadsheet\IOFactory
-                    ::createWriter($spreadsheet, 'Csv');
+                $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Csv');
                 $contentType = 'text/csv';
+
                 break;
+
             default:
                 // this should not happen
                 // throw an exception to ensure that the error is catched
-                throw new \OutOfBoundsException("The format ".$this->formatterData['format'].
-                    " is not supported");
+                throw new OutOfBoundsException('The format ' . $this->formatterData['format'] .
+                    ' is not supported');
         }
-        
+
         $response = new Response();
         $response->headers->set('content-type', $contentType);
-        
-        $tempfile = \tempnam(\sys_get_temp_dir(), '');
+
+        $tempfile = tempnam(sys_get_temp_dir(), '');
         $writer->save($tempfile);
-        
-        $f = \fopen($tempfile, 'r');
-        $response->setContent(\stream_get_contents($f));
+
+        $f = fopen($tempfile, 'rb');
+        $response->setContent(stream_get_contents($f));
         fclose($f);
 
         // remove the temp file from disk
-        \unlink($tempfile);
-        
+        unlink($tempfile);
+
         return $response;
     }
-    
-    /**
-     * add the headers to the csv file
-     * 
-     * @param Worksheet $worksheet
-     */
-    protected function prepareHeaders(Worksheet $worksheet)
+
+    public function getType()
     {
-        $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
-        // we want to keep the order of the first row. So we will iterate on the first row of the results
-        $first_row = count($this->result) > 0 ? $this->result[0] : array();
-        $header_line = array();
-        
-        if ($this->formatterData['numerotation'] === true) {
-                $header_line[] = $this->translator->trans('Number');
-        }
-        
-        foreach ($first_row as $key => $value) {
-            $header_line[] = $this->translator->trans(
-                $this->getLabel($key, '_header'));
-        }
-        
-        if (count($header_line) > 0) {
-            $worksheet->fromArray($header_line, NULL, 'A1');
-        }
+        return FormatterInterface::TYPE_LIST;
     }
-    
+
     /**
-     * Give the label corresponding to the given key and value. 
-     * 
+     * Give the label corresponding to the given key and value.
+     *
      * @param string $key
      * @param string $value
+     *
+     * @throws LogicException if the label is not found
+     *
      * @return string
-     * @throws \LogicException if the label is not found
      */
     protected function getLabel($key, $value)
     {
-        
-        if ($this->labelsCache === null) { 
+        if (null === $this->labelsCache) {
             $this->prepareCacheLabels();
         }
-        
-        if (!\array_key_exists($key, $this->labelsCache)){
-            throw new \OutOfBoundsException(sprintf("The key \"%s\" "
-                . "is not present in the list of keys handled by "
-                . "this query. Check your `getKeys` and `getLabels` "
-                . "methods. Available keys are %s.", $key, 
-                \implode(", ", \array_keys($this->labelsCache))));
+
+        if (!array_key_exists($key, $this->labelsCache)) {
+            throw new OutOfBoundsException(sprintf(
+                'The key "%s" '
+                . 'is not present in the list of keys handled by '
+                . 'this query. Check your `getKeys` and `getLabels` '
+                . 'methods. Available keys are %s.',
+                $key,
+                implode(', ', array_keys($this->labelsCache))
+            ));
         }
-        
+
         return $this->labelsCache[$key]($value);
     }
-    
+
     /**
      * Prepare the label cache which will be used by getLabel. This function
      * should be called only once in the generation lifecycle.
@@ -272,14 +254,37 @@ class SpreadsheetListFormatter implements FormatterInterface
     {
         $export = $this->exportManager->getExport($this->exportAlias);
         $keys = $export->getQueryKeys($this->exportData);
-        
-        foreach($keys as $key) {
+
+        foreach ($keys as $key) {
             // get an array with all values for this key if possible
-            $values = \array_map(function ($v) use ($key) { return $v[$key]; }, $this->result);
+            $values = array_map(static function ($v) use ($key) { return $v[$key]; }, $this->result);
             // store the label in the labelsCache property
             $this->labelsCache[$key] = $export->getLabels($key, $values, $this->exportData);
         }
     }
-    
-    
+
+    /**
+     * add the headers to the csv file.
+     */
+    protected function prepareHeaders(Worksheet $worksheet)
+    {
+        $keys = $this->exportManager->getExport($this->exportAlias)->getQueryKeys($this->exportData);
+        // we want to keep the order of the first row. So we will iterate on the first row of the results
+        $first_row = count($this->result) > 0 ? $this->result[0] : [];
+        $header_line = [];
+
+        if (true === $this->formatterData['numerotation']) {
+            $header_line[] = $this->translator->trans('Number');
+        }
+
+        foreach ($first_row as $key => $value) {
+            $header_line[] = $this->translator->trans(
+                $this->getLabel($key, '_header')
+            );
+        }
+
+        if (count($header_line) > 0) {
+            $worksheet->fromArray($header_line, null, 'A1');
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
index c507a594f..2e4e569fc 100644
--- a/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FormatterInterface.php
@@ -1,71 +1,60 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 interface FormatterInterface
 {
-    const TYPE_TABULAR = 'tabular';
-    const TYPE_LIST = 'list';
-    
-    public function getType();
-    
-    public function getName();
-    
+    public const TYPE_LIST = 'list';
+
+    public const TYPE_TABULAR = 'tabular';
+
     /**
      * build a form, which will be used to collect data required for the execution
      * of this formatter.
-     * 
+     *
      * @uses appendAggregatorForm
-     * @param FormBuilderInterface $builder
-     * @param String $exportAlias Alias of the export which is being executed. An export gets the data and implements the \Chill\MainBundle\Export\ExportInterface
+     *
+     * @param string $exportAlias Alias of the export which is being executed. An export gets the data and implements the \Chill\MainBundle\Export\ExportInterface
      * @param Array(String) $aggregatorAliases Array of the aliases of the aggregators. An aggregator do the "group by" on the data. $aggregatorAliases
      */
     public function buildForm(
-          FormBuilderInterface $builder, 
-          $exportAlias, 
-          array $aggregatorAliases
-          );
-    
+        FormBuilderInterface $builder,
+        $exportAlias,
+        array $aggregatorAliases
+    );
+
+    public function getName();
+
     /**
-     * Generate a response from the data collected on differents ExportElementInterface
-     * 
+     * Generate a response from the data collected on differents ExportElementInterface.
+     *
      * @param mixed[] $result The result, as given by the ExportInterface
      * @param mixed[] $formatterData collected from the current form
      * @param string $exportAlias the id of the current export
      * @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
      * @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     *
      * @return \Symfony\Component\HttpFoundation\Response The response to be shown
      */
     public function getResponse(
-          $result, 
-          $formatterData, 
-          $exportAlias, 
-          array $exportData, 
-          array $filtersData, 
-          array $aggregatorsData
-          );
-    
+        $result,
+        $formatterData,
+        $exportAlias,
+        array $exportData,
+        array $filtersData,
+        array $aggregatorsData
+    );
+
+    public function getType();
 }
diff --git a/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php b/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php
index 9330fd32b..6a0e7722a 100644
--- a/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/GroupedExportInterface.php
@@ -1,14 +1,21 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 /**
- * Add a grouping option to exports. 
- * 
- * **usage**: the exports will be grouped under the key given by the `getGroup` 
- * method. 
+ * Add a grouping option to exports.
+ *
+ * **usage**: the exports will be grouped under the key given by the `getGroup`
+ * method.
  */
 interface GroupedExportInterface
 {
diff --git a/src/Bundle/ChillMainBundle/Export/ListInterface.php b/src/Bundle/ChillMainBundle/Export/ListInterface.php
index 2baab8565..496415e3b 100644
--- a/src/Bundle/ChillMainBundle/Export/ListInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ListInterface.php
@@ -1,17 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 /**
  * Define methods to export list.
- * 
- * This interface is a specification of export interface 
+ *
+ * This interface is a specification of export interface
  * and should be used when the export does not supports aggregators
  * (and list does not support aggregation on their data).
- * 
+ *
  * When used, the `ExportManager` will not handle aggregator for this class.
  */
 interface ListInterface extends ExportInterface
 {
-
 }
diff --git a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
index e0633a1f1..1265f52c4 100644
--- a/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ModifierInterface.php
@@ -1,58 +1,48 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Export;
 
 use Doctrine\ORM\QueryBuilder;
 
 /**
  * Modifiers modify the export's query.
- * 
- * Known subclasses : AggregatorInterface and FilterInterface
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Known subclasses : AggregatorInterface and FilterInterface
  */
 interface ModifierInterface extends ExportElementInterface
 {
     /**
-     * The role required for executing this Modifier
-     * 
+     * The role required for executing this Modifier.
+     *
      * If null, will used the ExportInterface::requiredRole role from
      * the current executing export.
-     * 
-     * @return NULL|\Symfony\Component\Security\Core\Role\Role A role required to execute this ModifiersInterface
+     *
+     * @return \Symfony\Component\Security\Core\Role\Role|null A role required to execute this ModifiersInterface
      */
     public function addRole();
-    
+
     /**
-     * On which type of Export this ModifiersInterface may apply.
-     * 
-     * @return string the type on which the Modifiers apply
-     */
-    public function applyOn();
-    
-    /**
-     * Alter the query initiated by the export, to add the required statements 
-     * (`GROUP BY`, `SELECT`, `WHERE`)
-     * 
+     * Alter the query initiated by the export, to add the required statements
+     * (`GROUP BY`, `SELECT`, `WHERE`).
+     *
      * @param QueryBuilder $qb the QueryBuilder initiated by the Export (and eventually modified by other Modifiers)
      * @param mixed[] $data the data from the Form (builded by buildForm)
      */
     public function alterQuery(QueryBuilder $qb, $data);
+
+    /**
+     * On which type of Export this ModifiersInterface may apply.
+     *
+     * @return string the type on which the Modifiers apply
+     */
+    public function applyOn();
 }
diff --git a/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php b/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
index a70a34b31..e1d94728e 100644
--- a/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
+++ b/src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
@@ -1,59 +1,44 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Search\SearchProvider;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Search\SearchProvider;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AdvancedSearchType extends AbstractType
 {
     /**
-     *
      * @var SearchProvider
      */
     protected $searchProvider;
-    
+
     public function __construct(SearchProvider $searchProvider)
     {
         $this->searchProvider = $searchProvider;
     }
 
-    
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $this->searchProvider
             ->getHasAdvancedFormByName($options['search_service'])
-            ->createSearchForm($builder)
-            ;
+            ->createSearchForm($builder);
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setRequired('search_service')
-            ->setAllowedTypes('search_service', [ 'string' ])
-            ;
+            ->setAllowedTypes('search_service', ['string']);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/CenterType.php b/src/Bundle/ChillMainBundle/Form/CenterType.php
index 9ab037304..494df50e9 100644
--- a/src/Bundle/ChillMainBundle/Form/CenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/CenterType.php
@@ -1,23 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class CenterType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TextType::class)
-        ;
+            ->add('name', TextType::class);
     }
 
     /**
@@ -25,17 +29,16 @@ class CenterType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\MainBundle\Entity\Center'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\MainBundle\Entity\Center',
+        ]);
     }
 
     /**
      * @return string
      */
-     public function getBlockPrefix()
+    public function getBlockPrefix()
     {
-     return 'chill_mainbundle_center';
-     }
-     
+        return 'chill_mainbundle_center';
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
index dfc2caa1f..7e0702de1 100644
--- a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+++ b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
@@ -1,82 +1,68 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\ChoiceLoader;
 
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
-use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
-use Chill\MainBundle\Repository\PostalCodeRepository;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Repository\PostalCodeRepository;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use function call_user_func;
 
 /**
- * Class PostalCodeChoiceLoader
- *
- * @package Chill\MainBundle\Form\ChoiceLoader
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Class PostalCodeChoiceLoader.
  */
 class PostalCodeChoiceLoader implements ChoiceLoaderInterface
 {
-    /**
-     * @var PostalCodeRepository
-     */
-    protected $postalCodeRepository;
-    
     /**
      * @var array
      */
     protected $lazyLoadedPostalCodes = [];
-    
+
+    /**
+     * @var PostalCodeRepository
+     */
+    protected $postalCodeRepository;
+
     /**
      * PostalCodeChoiceLoader constructor.
-     *
-     * @param PostalCodeRepository $postalCodeRepository
      */
     public function __construct(PostalCodeRepository $postalCodeRepository)
     {
         $this->postalCodeRepository = $postalCodeRepository;
     }
-    
+
     /**
      * @param null $value
-     * @return ChoiceListInterface
      */
     public function loadChoiceList($value = null): ChoiceListInterface
     {
-        $list = new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
-            $this->lazyLoadedPostalCodes, 
-            function(PostalCode $pc = null) use ($value) {
-                return \call_user_func($value, $pc);
-            });
-        
-        return $list;
+        return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
+            $this->lazyLoadedPostalCodes,
+            static function (?PostalCode $pc = null) use ($value) {
+                return call_user_func($value, $pc);
+            }
+        );
     }
-    
+
     /**
-     * @param array $values
      * @param null $value
+     *
      * @return array
      */
     public function loadChoicesForValues(array $values, $value = null)
     {
         $choices = [];
-        
-        foreach($values as $value) {
+
+        foreach ($values as $value) {
             if (empty($value)) {
                 $choices[] = null;
             } else {
@@ -86,27 +72,28 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface
 
         return $choices;
     }
-    
+
     /**
-     * @param array $choices
      * @param null $value
+     *
      * @return array|string[]
      */
     public function loadValuesForChoices(array $choices, $value = null)
     {
         $values = [];
-        
+
         foreach ($choices as $choice) {
-            if (NULL === $choice) {
+            if (null === $choice) {
                 $values[] = null;
+
                 continue;
             }
-            
-            $id = \call_user_func($value, $choice);
+
+            $id = call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedPostalCodes[$id] = $choice;
         }
-        
+
         return $values;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
index 36383f7e3..73a61c998 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
@@ -1,68 +1,72 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\DataMapper;
 
-use Symfony\Component\Form\DataMapperInterface;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
-use Symfony\Component\Form\FormInterface;
+use Iterator;
+use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Form\FormInterface;
 
 /**
  * Add a data mapper to Address.
- * 
+ *
  * If the address is incomplete, the data mapper returns null
  */
 class AddressDataMapper implements DataMapperInterface
 {
     /**
-     * 
      * @param Address $address
-     * @param \Iterator $forms
+     * @param Iterator $forms
      */
     public function mapDataToForms($address, $forms)
     {
-        if (NULL === $address) {
+        if (null === $address) {
             return;
         }
-        
+
         if (!$address instanceof Address) {
             throw new UnexpectedTypeException($address, Address::class);
         }
-        
+
         foreach ($forms as $key => $form) {
             /** @var FormInterface $form */
             switch ($key) {
                 case 'streetAddress1':
                     $form->setData($address->getStreetAddress1());
+
                     break;
+
                 case 'streetAddress2':
                     $form->setData($address->getStreetAddress2());
+
                     break;
+
                 case 'postCode':
                     $form->setData($address->getPostcode());
+
                     break;
+
                 case 'validFrom':
                     $form->setData($address->getValidFrom());
+
                     break;
+
                 case 'isNoAddress':
                     $form->setData($address->isNoAddress());
+
                     break;
+
                 default:
                     break;
             }
@@ -70,8 +74,7 @@ class AddressDataMapper implements DataMapperInterface
     }
 
     /**
-     * 
-     * @param \Iterator $forms
+     * @param Iterator $forms
      * @param Address $address
      */
     public function mapFormsToData($forms, &$address)
@@ -79,40 +82,53 @@ class AddressDataMapper implements DataMapperInterface
         if (!$address instanceof Address) {
             $address = new Address();
         }
-        
+
         $isNoAddress = false;
+
         foreach ($forms as $key => $form) {
-            if ($key === 'isNoAddress') {
+            if ('isNoAddress' === $key) {
                 $isNoAddress = $form->get('isNoAddress')->getData();
             }
         }
-        
+
         foreach ($forms as $key => $form) {
             /** @var FormInterface $form */
-            switch($key) {
+            switch ($key) {
                 case 'postCode':
                     if (!$form->getData() instanceof PostalCode && !$isNoAddress) {
                         $address = null;
+
                         return;
                     }
                     $address->setPostcode($form->getData());
+
                     break;
+
                 case 'streetAddress1':
                     if (empty($form->getData()) && !$isNoAddress) {
                         $address = null;
+
                         return;
                     }
                     $address->setStreetAddress1($form->getData());
+
                     break;
+
                 case 'streetAddress2':
                     $address->setStreetAddress2($form->getData());
+
                     break;
+
                 case 'validFrom':
                     $address->setValidFrom($form->getData());
+
                     break;
+
                 case 'isNoAddress':
                     $address->setIsNoAddress($form->getData());
+
                     break;
+
                 default:
                     break;
             }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
index 816f62827..7284b9b3a 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
@@ -1,10 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\DataMapper;
 
 use Chill\MainBundle\Entity\Scope;
 use Symfony\Component\Form\DataMapperInterface;
-use Symfony\Component\Form\FormInterface;
 
 class ScopePickerDataMapper implements DataMapperInterface
 {
@@ -13,7 +21,7 @@ class ScopePickerDataMapper implements DataMapperInterface
      */
     private $scope;
 
-    public function __construct(Scope $scope = null)
+    public function __construct(?Scope $scope = null)
     {
         $this->scope = $scope;
     }
@@ -24,6 +32,7 @@ class ScopePickerDataMapper implements DataMapperInterface
 
         if ($this->scope instanceof Scope) {
             $forms['scope']->setData($this->scope);
+
             return;
         }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
index 43fab6f62..776a8d80c 100644
--- a/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
+++ b/src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php
@@ -1,36 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Event;
 
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CustomizeFormEvent extends \Symfony\Component\EventDispatcher\Event
 {
-    const NAME = 'chill_main.customize_form';
-
-    protected string $type;
+    public const NAME = 'chill_main.customize_form';
 
     protected FormBuilderInterface $builder;
 
+    protected string $type;
+
     public function __construct(string $type, FormBuilderInterface $builder)
     {
         $this->type = $type;
         $this->builder = $builder;
     }
 
-    /**
-     * @return string
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return FormBuilderInterface
-     */
     public function getBuilder(): FormBuilderInterface
     {
         return $this->builder;
     }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/LocationFormType.php b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
index 83d1c4242..ecb4a76ea 100644
--- a/src/Bundle/ChillMainBundle/Form/LocationFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/LocationFormType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\LocationType as EntityLocationType;
@@ -14,32 +23,26 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class LocationFormType extends AbstractType
 {
+    private TranslatableStringHelper $translatableStringHelper;
 
-    // private TranslatableStringHelper $translatableStringHelper;
-
-    // /**
-    //  * @param TranslatableStringHelper $translatableStringHelper
-    //  */
-    // public function __construct(TranslatableStringHelper $translatableStringHelper)
-    // {
-    //     $this->translatableStringHelper = $translatableStringHelper;
-    // }
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
         $builder
             ->add('locationType', EntityType::class, [
                 'class' => EntityLocationType::class,
-                'choice_attr' => function (EntityLocationType $entity) {
+                'choice_attr' => static function (EntityLocationType $entity) {
                     return [
                         'data-address' => $entity->getAddressRequired(),
                         'data-contact' => $entity->getContactData(),
                     ];
                 },
                 'choice_label' => function (EntityLocationType $entity) {
-                    //return $this->translatableStringHelper->localize($entity->getTitle()); //TODO not working. Cannot pass smthg in the constructor
-                    return $entity->getTitle()['fr'];
+                    return $this->translatableStringHelper->localize($entity->getTitle());
                 },
             ])
             ->add('name', TextType::class)
@@ -53,25 +56,27 @@ final class LocationFormType extends AbstractType
                 'use_valid_to' => false,
                 'mapped' => false,
             ])
-            ->add('active', ChoiceType::class,
-            [
-                'choices' => [
-                    'Yes' => true,
-                    'No' => false
-                ],
-                'expanded' => true
-            ]);
+            ->add(
+                'active',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Yes' => true,
+                        'No' => false,
+                    ],
+                    'expanded' => true,
+                ]
+            );
     }
 
-
     /**
      * @param OptionsResolverInterface $resolver
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\MainBundle\Entity\Location'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\MainBundle\Entity\Location',
+        ]);
     }
 
     /**
@@ -81,5 +86,4 @@ final class LocationFormType extends AbstractType
     {
         return 'chill_mainbundle_location';
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/LocationTypeType.php b/src/Bundle/ChillMainBundle/Form/LocationTypeType.php
index dded13327..aa096b3e6 100644
--- a/src/Bundle/ChillMainBundle/Form/LocationTypeType.php
+++ b/src/Bundle/ChillMainBundle/Form/LocationTypeType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\LocationType;
@@ -12,43 +21,70 @@ final class LocationTypeType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('title', TranslatableStringFormType::class,
-        [
-           'label' => 'Name',
-        ])
-        ->add('availableForUsers', ChoiceType::class,
-        [
-            'choices' => [
-                'Yes' => true,
-                'No' => false
-            ],
-            'expanded' => true
-        ])
-        ->add('addressRequired', ChoiceType::class,
-        [
-            'choices' => [
-                'optional' => LocationType::STATUS_OPTIONAL,
-                'required' => LocationType::STATUS_REQUIRED,
-                'never' => LocationType::STATUS_NEVER,
-            ],
-            'expanded' => true
-        ])
-        ->add('contactData', ChoiceType::class,
-        [
-            'choices' => [
-                'optional' => LocationType::STATUS_OPTIONAL,
-                'required' => LocationType::STATUS_REQUIRED,
-                'never' => LocationType::STATUS_NEVER,
-            ],
-            'expanded' => true
-        ])
-        ->add('active', ChoiceType::class,
-        [
-            'choices' => [
-                'Yes' => true,
-                'No' => false
-            ],
-            'expanded' => true
-        ]);
+        $builder->add(
+            'title',
+            TranslatableStringFormType::class,
+            [
+                'label' => 'Name',
+            ]
+        )
+            ->add(
+                'availableForUsers',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Yes' => true,
+                        'No' => false,
+                    ],
+                    'expanded' => true,
+                ]
+            )
+            ->add(
+                'addressRequired',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'optional' => LocationType::STATUS_OPTIONAL,
+                        'required' => LocationType::STATUS_REQUIRED,
+                        'never' => LocationType::STATUS_NEVER,
+                    ],
+                    'expanded' => true,
+                ]
+            )
+            ->add(
+                'contactData',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'optional' => LocationType::STATUS_OPTIONAL,
+                        'required' => LocationType::STATUS_REQUIRED,
+                        'never' => LocationType::STATUS_NEVER,
+                    ],
+                    'expanded' => true,
+                ]
+            )
+            ->add(
+                'active',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Yes' => true,
+                        'No' => false,
+                    ],
+                    'expanded' => true,
+                ]
+            )
+            ->add(
+                'defaultFor',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'none' => null,
+                        'person' => LocationType::DEFAULT_FOR_PERSON,
+                        'thirdparty' => LocationType::DEFAULT_FOR_3PARTY,
+                    ],
+                    'expanded' => true,
+                ]
+            );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
index d9b4ab730..e798a262e 100644
--- a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
+++ b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
@@ -1,75 +1,66 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Form\Utils\PermissionsGroupFlagProvider;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\MainBundle\Form\Utils\PermissionsGroupFlagProvider;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use function array_combine;
+use function array_merge;
+use function count;
 
 class PermissionsGroupType extends AbstractType
 {
+    public const FLAG_SCOPE = 'permissions_group';
+
     /**
-     *
      * @var PermissionsGroupFlagProvider[]
      */
     protected $flagProviders = [];
-    
-    const FLAG_SCOPE = 'permissions_group';
-    
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('name', TextType::class)
-        ;
-        
-        $flags = $this->getFlags();
-        
-        if (count($flags) > 0) {
-            $builder
-                ->add('flags', ChoiceType::class, [
-                    'choices' => \array_combine($flags, $flags),
-                    'multiple' => true,
-                    'expanded' => true,
-                    'required' => false
-                ]);
-        }
-    }
-    
-    /**
-     * 
-     * @return array
-     */
-    protected function getFlags(): array
-    {
-        $flags = [];
-        
-        foreach ($this->flagProviders as $flagProvider) {
-            $flags = \array_merge($flags, $flagProvider->getPermissionsGroupFlags());
-        }
-        
-        return $flags;
-    }
-    
+
     public function addFlagProvider(PermissionsGroupFlagProvider $provider)
     {
         $this->flagProviders[] = $provider;
     }
 
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TextType::class);
+
+        $flags = $this->getFlags();
+
+        if (count($flags) > 0) {
+            $builder
+                ->add('flags', ChoiceType::class, [
+                    'choices' => array_combine($flags, $flags),
+                    'multiple' => true,
+                    'expanded' => true,
+                    'required' => false,
+                ]);
+        }
+    }
+
     /**
      * @param OptionsResolverInterface $resolver
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\MainBundle\Entity\PermissionsGroup'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\MainBundle\Entity\PermissionsGroup',
+        ]);
     }
 
     /**
@@ -79,4 +70,15 @@ class PermissionsGroupType extends AbstractType
     {
         return 'chill_mainbundle_permissionsgroup';
     }
+
+    protected function getFlags(): array
+    {
+        $flags = [];
+
+        foreach ($this->flagProviders as $flagProvider) {
+            $flags = array_merge($flags, $flagProvider->getPermissionsGroupFlags());
+        }
+
+        return $flags;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/ScopeType.php b/src/Bundle/ChillMainBundle/Form/ScopeType.php
index 12eb9fec4..c0c08ffbf 100644
--- a/src/Bundle/ChillMainBundle/Form/ScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/ScopeType.php
@@ -1,23 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ScopeType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TranslatableStringFormType::class)
-        ;
+            ->add('name', TranslatableStringFormType::class);
     }
 
     /**
@@ -25,9 +29,9 @@ class ScopeType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\MainBundle\Entity\Scope'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\MainBundle\Entity\Scope',
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Form/Type/AddressType.php b/src/Bundle/ChillMainBundle/Form/Type/AddressType.php
index f17721881..24872650f 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/AddressType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/AddressType.php
@@ -1,36 +1,26 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Form\Type\PostalCodeType;
-use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\DataMapper\AddressDataMapper;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * A type to create/update Address entity
+ * A type to create/update Address entity.
  *
  * Options:
  *
@@ -45,25 +35,27 @@ class AddressType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-              ->add('street', TextType::class, array(
-                 'required' => !$options['has_no_address'] // true if has no address is false
-              ))
-              ->add('streetNumber', TextType::class, array(
-                 'required' => false
-              ))
-              ->add('postCode', PostalCodeType::class, array(
-                 'label' => 'Postal code',
-                 'placeholder' => 'Choose a postal code',
-                 'required' => !$options['has_no_address'] // true if has no address is false
-              ))
-            ;
+            ->add('street', TextType::class, [
+                'required' => !$options['has_no_address'], // true if has no address is false
+            ])
+            ->add('streetNumber', TextType::class, [
+                'required' => false,
+            ])
+            ->add('postCode', PostalCodeType::class, [
+                'label' => 'Postal code',
+                'placeholder' => 'Choose a postal code',
+                'required' => !$options['has_no_address'], // true if has no address is false
+            ]);
 
         if ($options['has_valid_from']) {
             $builder
-              ->add('validFrom', ChillDateType::class, array(
-                'required' => true,
-                 )
-              );
+                ->add(
+                    'validFrom',
+                    ChillDateType::class,
+                    [
+                        'required' => true,
+                    ]
+                );
         }
 
         if ($options['has_no_address']) {
@@ -72,13 +64,13 @@ class AddressType extends AbstractType
                     'required' => true,
                     'choices' => [
                         'address.consider homeless' => true,
-                        'address.real address' => false
+                        'address.real address' => false,
                     ],
-                    'label' => 'address.address_homeless'
+                    'label' => 'address.address_homeless',
                 ]);
         }
 
-        if ($options['null_if_empty'] === TRUE) {
+        if (true === $options['null_if_empty']) {
             $builder->setDataMapper(new AddressDataMapper());
         }
     }
@@ -95,7 +87,6 @@ class AddressType extends AbstractType
             ->setAllowedTypes('has_no_address', 'bool')
             ->setDefined('null_if_empty')
             ->setDefault('null_if_empty', false)
-            ->setAllowedTypes('null_if_empty', 'bool')
-            ;
+            ->setAllowedTypes('null_if_empty', 'bool');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php b/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
index 8de9134f1..3391fc845 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
@@ -1,37 +1,28 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\DataTransformer\ScopeTransformer;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormEvent;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Form\Type\DataTransformer\ScopeTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * Trait to add an input with reachable scope for a given center and role.
@@ -78,75 +69,72 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
  *
  *  }
  * ```
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
  */
 trait AppendScopeChoiceTypeTrait
 {
-    /**
-     * Append a scope choice field, with the scopes reachable by given
-     * user for the given role and center.
-     *
-     * The field is added on event FormEvents::PRE_SET_DATA
-     *
-     * @param FormBuilderInterface $builder
-     * @param Role $role
-     * @param Center $center
-     * @param User $user
-     * @param AuthorizationHelper $authorizationHelper
-     * @param TranslatableStringHelper $translatableStringHelper
-     * @param string $name
-     */
-    protected function appendScopeChoices(FormBuilderInterface $builder,
-            Role $role, Center $center, User $user,
-            AuthorizationHelper $authorizationHelper,
-            TranslatableStringHelper $translatableStringHelper,
-            ObjectManager $om, $name = 'scope')
-    {
-        $reachableScopes = $authorizationHelper
-              ->getReachableScopes($user, $role, $center);
-
-        $choices = array();
-        foreach($reachableScopes as $scope) {
-            $choices[$scope->getId()] = $translatableStringHelper
-                  ->localize($scope->getName());
-        }
-
-        $dataTransformer = new ScopeTransformer($om);
-
-        $builder->addEventListener(FormEvents::PRE_SET_DATA,
-                function (FormEvent $event) use ($choices, $name, $dataTransformer, $builder) {
-                    $form = $event->getForm();
-                    $form->add(
-                            $builder
-                            ->create($name, ChoiceType::class, array(
-                                'choices' => array_combine(array_values($choices),array_keys($choices)),
-                                'auto_initialize' => false
-                                )
-                            )
-                            ->addModelTransformer($dataTransformer)
-                            ->getForm()
-                    );
-                });
-    }
-
     /**
      * Append a `role` and `center` option to the form.
      *
      * The allowed types are :
      * - Chill\MainBundle\Entity\Center for center
      * - Symfony\Component\Security\Core\Role\Role for role
-     *
-     * @param OptionsResolver $resolver
      */
     public function appendScopeChoicesOptions(OptionsResolver $resolver)
     {
         $resolver
-              ->setRequired(array('center', 'role'))
-              ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
-              ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
-              ;
+            ->setRequired(['center', 'role'])
+            ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
+            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role');
     }
 
+    /**
+     * Append a scope choice field, with the scopes reachable by given
+     * user for the given role and center.
+     *
+     * The field is added on event FormEvents::PRE_SET_DATA
+     *
+     * @param string $name
+     */
+    protected function appendScopeChoices(
+        FormBuilderInterface $builder,
+        Role $role,
+        Center $center,
+        User $user,
+        AuthorizationHelper $authorizationHelper,
+        TranslatableStringHelper $translatableStringHelper,
+        ObjectManager $om,
+        $name = 'scope'
+    ) {
+        $reachableScopes = $authorizationHelper
+            ->getReachableScopes($user, $role, $center);
+
+        $choices = [];
+
+        foreach ($reachableScopes as $scope) {
+            $choices[$scope->getId()] = $translatableStringHelper
+                ->localize($scope->getName());
+        }
+
+        $dataTransformer = new ScopeTransformer($om);
+
+        $builder->addEventListener(
+            FormEvents::PRE_SET_DATA,
+            static function (FormEvent $event) use ($choices, $name, $dataTransformer, $builder) {
+                $form = $event->getForm();
+                $form->add(
+                    $builder
+                        ->create(
+                            $name,
+                            ChoiceType::class,
+                            [
+                                'choices' => array_combine(array_values($choices), array_keys($choices)),
+                                'auto_initialize' => false,
+                            ]
+                        )
+                        ->addModelTransformer($dataTransformer)
+                        ->getForm()
+                );
+            }
+        );
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
index 2b20dbd98..88d5d3ce0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php
@@ -1,40 +1,42 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormInterface;
 
 /**
- * Available options :
+ * Available options :.
  *
  * - `button_add_label`
  * - `button_remove_label`
  * - `identifier`: an identifier to identify the kind of collecton. Useful if some
  *  javascript should be launched associated to `add_entry`, `remove_entry` events.
  * - `empty_collection_explain`
- *
- *
  */
 class ChillCollectionType extends AbstractType
 {
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['button_add_label'] = $options['button_add_label'];
+        $view->vars['button_remove_label'] = $options['button_remove_label'];
+        $view->vars['allow_delete'] = (int) $options['allow_delete'];
+        $view->vars['allow_add'] = (int) $options['allow_add'];
+        $view->vars['identifier'] = $options['identifier'];
+        $view->vars['empty_collection_explain'] = $options['empty_collection_explain'];
+    }
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
@@ -46,16 +48,6 @@ class ChillCollectionType extends AbstractType
             ]);
     }
 
-    public function buildView(FormView $view, FormInterface $form, array $options)
-    {
-        $view->vars['button_add_label'] = $options['button_add_label'];
-        $view->vars['button_remove_label'] = $options['button_remove_label'];
-        $view->vars['allow_delete'] = (int) $options['allow_delete'];
-        $view->vars['allow_add'] = (int) $options['allow_add'];
-        $view->vars['identifier'] = $options['identifier'];
-        $view->vars['empty_collection_explain'] = $options['empty_collection_explain'];
-    }
-
     public function getParent()
     {
         return \Symfony\Component\Form\Extension\Core\Type\CollectionType::class;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
index 07adc0cb8..f0d9d5eae 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
@@ -1,20 +1,14 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
@@ -23,11 +17,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Display the date in a date picker.
- * 
+ *
  * Extends the symfony `Symfony\Component\Form\Extension\Core\Type\DateType`
  * to automatically create a date picker.
- *
- * @author Mathieu Jaumotte <jaum_mathieu@collectifs.net>
  */
 class ChillDateTimeType extends AbstractType
 {
@@ -39,10 +31,9 @@ class ChillDateTimeType extends AbstractType
             ->setDefault('time_widget', 'choice')
             ->setDefault('minutes', range(0, 59, 5))
             ->setDefault('hours', range(8, 22))
-            ->setDefault('html5', true)
-            ;
+            ->setDefault('html5', true);
     }
-    
+
     public function getParent()
     {
         return DateTimeType::class;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php
index 8502febbb..1b7f51115 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillDateType.php
@@ -1,20 +1,14 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
@@ -23,11 +17,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Display the date in a date picker.
- * 
+ *
  * Extends the symfony `Symfony\Component\Form\Extension\Core\Type\DateType`
  * to automatically create a date picker.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ChillDateType extends AbstractType
 {
@@ -35,10 +27,9 @@ class ChillDateType extends AbstractType
     {
         $resolver
             ->setDefault('widget', 'single_text')
-            ->setDefault('html5', true)
-            ;
+            ->setDefault('html5', true);
     }
-    
+
     public function getParent()
     {
         return DateType::class;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
index 37c436f7c..18bfd885b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
@@ -1,45 +1,40 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Create a Textarea
- * 
- * By default, add a WYSIWYG editor.
- * 
- * Options:
- * 
- * * `disable_editor`: set true to disable editor
+ * Create a Textarea.
  *
+ * By default, add a WYSIWYG editor.
+ *
+ * Options:
+ *
+ * * `disable_editor`: set true to disable editor
  */
 final class ChillTextareaType extends AbstractType
 {
-    public function getParent()
+    public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        return TextareaType::class;
+        if (!$options['disable_editor']) {
+            $view->vars['attr']['ckeditor'] = true;
+        }
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
@@ -47,11 +42,9 @@ final class ChillTextareaType extends AbstractType
             ->setDefault('disable_editor', false)
             ->setAllowedTypes('disable_editor', 'bool');
     }
-    
-    public function buildView(FormView $view, FormInterface $form, array $options)
+
+    public function getParent()
     {
-        if (!$options['disable_editor']) {
-            $view->vars['attr']['ckeditor'] = true;
-        }
+        return TextareaType::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
index afcd061e6..3adca5eca 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
@@ -1,26 +1,19 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use DateTime;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -47,15 +40,14 @@ class CommentType extends AbstractType
             ->add('comment', ChillTextareaType::class, [
                 'disable_editor' => $options['disable_editor'],
                 'label' => $options['label'],
-            ])
-        ;
+            ]);
 
         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
             $data = $event->getForm()->getData();
             $comment = $event->getData() ?? ['comment' => ''];
 
-            if ($data->getComment() !== $comment['comment']) {
-                $data->setDate(new \DateTime());
+            if (null !== $data && $data->getComment() !== $comment['comment']) {
+                $data->setDate(new DateTime());
                 $data->setUserId($this->user->getId());
                 $event->getForm()->setData($data);
             }
@@ -65,7 +57,8 @@ class CommentType extends AbstractType
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars = array_replace(
-            $view->vars, [
+            $view->vars,
+            [
                 'hideLabel' => true,
             ]
         );
@@ -78,7 +71,7 @@ class CommentType extends AbstractType
             ->setAllowedTypes('disable_editor', 'bool')
             ->setDefaults([
                 'data_class' => CommentEmbeddable::class,
-                'disable_editor' => false
+                'disable_editor' => false,
             ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
index 0fe628401..1398a8ce2 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedGroupCenterType.php
@@ -1,54 +1,39 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-
-use Chill\MainBundle\Entity\PermissionsGroup;
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\PermissionsGroup;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ComposedGroupCenterType extends AbstractType
 {
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('permissionsgroup', EntityType::class, array(
+        $builder->add('permissionsgroup', EntityType::class, [
             'class' => 'Chill\MainBundle\Entity\PermissionsGroup',
-            'choice_label' => function(PermissionsGroup $group) {
+            'choice_label' => static function (PermissionsGroup $group) {
                 return $group->getName();
-            }
-        ))->add('center', EntityType::class, array(
+            },
+        ])->add('center', EntityType::class, [
             'class' => 'Chill\MainBundle\Entity\Center',
-            'choice_label' => function(Center $center) {
+            'choice_label' => static function (Center $center) {
                 return $center->getName();
-            }
-        ))
-            ;
+            },
+        ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -60,5 +45,4 @@ class ComposedGroupCenterType extends AbstractType
     {
         return 'composed_groupcenter';
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
index c06394845..bf5e2d4f8 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
@@ -1,71 +1,53 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\RoleProvider;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
 
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use function in_array;
 
 /**
  * Form to Edit/create a role scope. If the role scope does not
  * exists in the database, he is generated.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
  */
 class ComposedRoleScopeType extends AbstractType
 {
     /**
-     *
-     * @var string[]
-     */
-    private $roles = array();
-
-    /**
-     *
-     * @var string[]
-     */
-    private $rolesWithoutScope = array();
-
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    private $translatableStringHelper;
-
-    /**
-     *
      * @var RoleProvider
      */
     private $roleProvider;
 
+    /**
+     * @var string[]
+     */
+    private $roles = [];
+
+    /**
+     * @var string[]
+     */
+    private $rolesWithoutScope = [];
+
+    /**
+     * @var TranslatableStringHelper
+     */
+    private $translatableStringHelper;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
         RoleProvider $roleProvider
@@ -83,40 +65,39 @@ class ComposedRoleScopeType extends AbstractType
         $rolesWithoutScopes = $this->rolesWithoutScope;
 
         //build roles
-        $values = array();
+        $values = [];
+
         foreach ($this->roles as $role) {
             $values[$role] = $role;
         }
 
         $builder
-            ->add('role', ChoiceType::class, array(
-               'choices' => array_combine(array_values($values),array_keys($values)),
-               'placeholder' => 'Choose amongst roles',
-               'choice_attr' => function($role) use ($rolesWithoutScopes) {
-                    if (in_array($role, $rolesWithoutScopes)) {
-                        return array('data-has-scope' => '0');
-                    } else {
-                        return array('data-has-scope' => '1');
+            ->add('role', ChoiceType::class, [
+                'choices' => array_combine(array_values($values), array_keys($values)),
+                'placeholder' => 'Choose amongst roles',
+                'choice_attr' => static function ($role) use ($rolesWithoutScopes) {
+                    if (in_array($role, $rolesWithoutScopes, true)) {
+                        return ['data-has-scope' => '0'];
                     }
-               },
-               'group_by' => function($role, $key, $index) {
+
+                    return ['data-has-scope' => '1'];
+                },
+                'group_by' => function ($role, $key, $index) {
                     return $this->roleProvider->getRoleTitle($role);
-               }
-            ))
-            ->add('scope', EntityType::class, array(
+                },
+            ])
+            ->add('scope', EntityType::class, [
                 'class' => 'ChillMainBundle:Scope',
-                'choice_label' => function(Scope $scope) use ($translatableStringHelper) {
+                'choice_label' => static function (Scope $scope) use ($translatableStringHelper) {
                     return $translatableStringHelper->localize($scope->getName());
                 },
                 'required' => false,
-                'data' => null
-            ));
-
+                'data' => null,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('data_class', 'Chill\MainBundle\Entity\RoleScope');
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
index 1931ded47..76f217df6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/AddressToIdDataTransformer.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Repository\AddressRepository;
@@ -17,16 +26,16 @@ final class AddressToIdDataTransformer implements DataTransformerInterface
 
     public function reverseTransform($value)
     {
-        if (NULL === $value || '' === $value) {
+        if (null === $value || '' === $value) {
             return null;
         }
 
         $address = $this->addressRepository->find($value);
 
-        if (NULL === $address) {
-            $failure = new TransformationFailedException(sprintf("Address with id %s does not exists", $value));
+        if (null === $address) {
+            $failure = new TransformationFailedException(sprintf('Address with id %s does not exists', $value));
             $failure
-                ->setInvalidMessage("The given {{ value }} is not a valid address id", [ '{{ value }}' => $value]);
+                ->setInvalidMessage('The given {{ value }} is not a valid address id', ['{{ value }}' => $value]);
 
             throw $failure;
         }
@@ -36,7 +45,7 @@ final class AddressToIdDataTransformer implements DataTransformerInterface
 
     public function transform($value)
     {
-        if (NULL === $value) {
+        if (null === $value) {
             return '';
         }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
index c088edeba..a0f609d46 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php
@@ -1,36 +1,29 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Repository\CenterRepository;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Traversable;
+use function count;
 
 class CenterTransformer implements DataTransformerInterface
 {
     private CenterRepository $centerRepository;
+
     private bool $multiple = false;
 
     public function __construct(
@@ -43,57 +36,63 @@ class CenterTransformer implements DataTransformerInterface
 
     public function reverseTransform($id)
     {
-        if ($id === NULL) {
+        if (null === $id) {
             if ($this->multiple) {
                 return new ArrayCollection();
-            } else {
-                return NULL;
             }
+
+            return null;
         }
 
+        $ids = [];
+
         if ($this->multiple) {
-            $ids = \explode(',', $id);
+            $ids = explode(',', $id);
         } else {
             $ids[] = (int) $id;
         }
 
         $centers = $this
             ->centerRepository
-            ->findBy(['id' => $ids ]);
+            ->findBy(['id' => $ids]);
 
         if ([] === $centers || count($ids) > count($centers)) {
             throw new TransformationFailedException(sprintf(
-                    'No center found for one of those ids: %s', implode(',', $ids)));
+                'No center found for one of those ids: %s',
+                implode(',', $ids)
+            ));
         }
 
         if ($this->multiple) {
             return new ArrayCollection($centers);
-        } else {
-            return $centers[0];
         }
+
+        return $centers[0];
     }
 
     public function transform($center)
     {
-        if ($center === NULL) {
+        if (null === $center) {
             return '';
         }
 
         if ($this->multiple) {
             if (!is_iterable($center)) {
-                throw new UnexpectedTypeException($center, \Traversable::class);
+                throw new UnexpectedTypeException($center, Traversable::class);
             }
             $ids = [];
+
             foreach ($center as $c) {
                 $ids[] = $c->getId();
             }
 
             return implode(',', $ids);
-        } else {
-            if (!$center instanceof Center) {
-                throw new UnexpectedTypeException($center, Center::class);
-            }
-            return (string) $center->getId();
         }
+
+        if (!$center instanceof Center) {
+            throw new UnexpectedTypeException($center, Center::class);
+        }
+
+        return (string) $center->getId();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
index 29a81447c..f41223d17 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
@@ -1,92 +1,84 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
+use DateInterval;
+use Exception;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class DateIntervalTransformer implements DataTransformerInterface
 {
-    /**
-     * 
-     * @param \DateInterval $value
-     * @throws UnexpectedTypeException
-     */
+    public function reverseTransform($value)
+    {
+        if (empty($value) || empty($value['n'])) {
+            return null;
+        }
+
+        $string = 'P' . $value['n'] . $value['unit'];
+
+        try {
+            return new DateInterval($string);
+        } catch (Exception $e) {
+            throw new TransformationFailedException(
+                'Could not transform value into DateInterval',
+                1542,
+                $e
+            );
+        }
+    }
+
     public function transform($value)
     {
         if (empty($value)) {
             return null;
         }
-        
-        if (!$value instanceof \DateInterval) {
-            throw new UnexpectedTypeException($value, \DateInterval::class);
+
+        if (!$value instanceof DateInterval) {
+            throw new UnexpectedTypeException($value, DateInterval::class);
         }
-        
-        if ($value->d > 0) {
+
+        if (0 < $value->d) {
             // we check for weeks (weeks are converted to 7 days)
             if ($value->d % 7 === 0) {
                 return [
                     'n' => $value->d / 7,
-                    'unit' => 'W'
-                    ];
-            } else {
-                return [
-                    'n' => $value->d,
-                    'unit' => 'D'
+                    'unit' => 'W',
                 ];
             }
-        } elseif ($value->m > 0) {
+
+            return [
+                'n' => $value->d,
+                'unit' => 'D',
+            ];
+        }
+
+        if (0 < $value->m) {
             return [
                 'n' => $value->m,
-                'unit' => 'M'
+                'unit' => 'M',
             ];
-        } elseif ($value->y > 0) {
+        }
+
+        if (0 < $value->y) {
             return [
                 'n' => $value->y,
-                'unit' => 'Y'
+                'unit' => 'Y',
             ];
         }
-        
-        throw new TransformationFailedException('the date interval does not '
-            . 'contains any days, months or years');
-    }
 
-    public function reverseTransform($value)
-    {
-        if (empty($value) or empty($value['n'])) {
-            return null;
-        }
-        
-        $string = 'P'.$value['n'].$value['unit'];
-        
-        try {
-            return new \DateInterval($string);
-        } catch (\Exception $e) {
-            throw new TransformationFailedException("Could not transform value "
-                . "into DateInterval", 1542, $e);
-        }
-        
-        
+        throw new TransformationFailedException(
+            'The date interval does not contains any days, months or years.'
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
index 00ee26fff..48ef5cdf0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
@@ -1,37 +1,26 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
-use Symfony\Component\Form\DataTransformerInterface;
-use Symfony\Component\Form\Exception\TransformationFailedException;
-use Doctrine\Persistence\ObjectManager;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\DataTransformerInterface;
 
 class MultipleObjectsToIdTransformer implements DataTransformerInterface
 {
-    private EntityManagerInterface $em;
-
     private ?string $class;
 
+    private EntityManagerInterface $em;
+
     public function __construct(EntityManagerInterface $em, ?string $class = null)
     {
         $this->em = $em;
@@ -39,28 +28,12 @@ class MultipleObjectsToIdTransformer implements DataTransformerInterface
     }
 
     /**
-    * Transforms an object (use) to a string (id).
-    *
-    * @param array $array
-    * @return ArrayCollection
-    */
-    public function transform($array)
-    {
-        $ret = array();
-
-        foreach ($array as $el) {
-            $ret[] = ($el->getId());
-        }
-
-        return $ret;
-    }
- 
-    /**
-    * Transforms a string (id) to an object (item).
-    *
-    * @param string $id
-    * @return ArrayCollection
-    */
+     * Transforms a string (id) to an object (item).
+     *
+     * @param mixed $array
+     *
+     * @return ArrayCollection
+     */
     public function reverseTransform($array)
     {
         $ret = new ArrayCollection();
@@ -72,6 +45,25 @@ class MultipleObjectsToIdTransformer implements DataTransformerInterface
                     ->find($el)
             );
         }
+
         return $ret;
     }
-}
\ No newline at end of file
+
+    /**
+     * Transforms an object (use) to a string (id).
+     *
+     * @param array $array
+     *
+     * @return ArrayCollection
+     */
+    public function transform($array)
+    {
+        $ret = [];
+
+        foreach ($array as $el) {
+            $ret[] = ($el->getId());
+        }
+
+        return $ret;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
index 82cdf6c21..145ab0441 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
@@ -1,36 +1,26 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Doctrine\Persistence\ObjectManager;
 
 class ObjectToIdTransformer implements DataTransformerInterface
 {
-    private EntityManagerInterface $em;
-
     private ?string $class;
 
+    private EntityManagerInterface $em;
+
     public function __construct(EntityManagerInterface $em, ?string $class = null)
     {
         $this->em = $em;
@@ -38,26 +28,13 @@ class ObjectToIdTransformer implements DataTransformerInterface
     }
 
     /**
-     * Transforms an object to a string (id)
-     *
-     * @param  Object|null $Object
-     * @return string
-     */
-    public function transform($object)
-    {
-        if (!$object) {
-            return "";
-        }
-
-        return $object->getId();
-    }
-
-    /**
-     * Transforms a string (id) to an object
+     * Transforms a string (id) to an object.
      *
      * @param  string $id
-     * @return Object|null
+     *
      * @throws TransformationFailedException if object is not found.
+     *
+     * @return object|null
      */
     public function reverseTransform($id)
     {
@@ -67,13 +44,28 @@ class ObjectToIdTransformer implements DataTransformerInterface
 
         $object = $this->em
             ->getRepository($this->class)
-            ->find($id)
-        ;
+            ->find($id);
 
-        if (! $object) {
+        if (!$object) {
             throw new TransformationFailedException();
         }
 
         return $object;
     }
-}
\ No newline at end of file
+
+    /**
+     * Transforms an object to a string (id).
+     *
+     * @param mixed $object
+     *
+     * @return string
+     */
+    public function transform($object)
+    {
+        if (!$object) {
+            return '';
+        }
+
+        return $object->getId();
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
index bd1185333..5f6c3ed65 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php
@@ -1,30 +1,20 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\Scope;
-use Symfony\Component\Form\DataTransformerInterface;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Form\Exception\TransformationFailedException;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
 
 class ScopeTransformer implements DataTransformerInterface
 {
@@ -35,19 +25,10 @@ class ScopeTransformer implements DataTransformerInterface
         $this->em = $em;
     }
 
-    public function transform($scope)
-    {
-        if ($scope === NULL) {
-            return NULL;
-        }
-
-        return $scope->getId();
-    }
-
     public function reverseTransform($id)
     {
-        if ($id == NULL) {
-            return NULL;
+        if (null === $id) {
+            return null;
         }
 
         $scope = $this
@@ -55,12 +36,20 @@ class ScopeTransformer implements DataTransformerInterface
             ->getRepository(Scope::class)
             ->find($id);
 
-        if ($scope === NULL) {
-            throw new TransformationFailedException(sprintf("The scope with id "
+        if (null === $scope) {
+            throw new TransformationFailedException(sprintf('The scope with id '
                     . "'%d' were not found", $id));
         }
 
         return $scope;
     }
 
+    public function transform($scope)
+    {
+        if (null === $scope) {
+            return null;
+        }
+
+        return $scope->getId();
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
index 5879bc525..66ae4d846 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DateIntervalType.php
@@ -1,40 +1,38 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\DataTransformer\DateIntervalTransformer;
-use Symfony\Component\Validator\Constraints\GreaterThan;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
-
 
 /**
- * Show a dateInterval type
- * 
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\Type;
+
+use Chill\MainBundle\Form\Type\DataTransformer\DateIntervalTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\GreaterThan;
+use function array_diff;
+use function array_values;
+use function count;
+use function implode;
+use function is_array;
+
+/**
+ * Show a dateInterval type.
+ *
  * Options:
- * 
- * - `unit_choices`: an array of available units choices. 
- * 
- * The oiriginal `unit_choices` are : 
+ *
+ * - `unit_choices`: an array of available units choices.
+ *
+ * The oiriginal `unit_choices` are :
  * ```
  * [
  *      'Days' => 'D',
@@ -43,11 +41,11 @@ use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
  *      'Years' => 'Y'
  * ]
  * ```
- * 
+ *
  * You can remove one or more entries:
- * 
+ *
  * ```
- * $builder        
+ * $builder
  *      ->add('duration', DateIntervalType::class, array(
  *          'unit_choices' => [
  *              'Years' => 'Y',
@@ -55,7 +53,6 @@ use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
  *      ]
  * ));
  * ```
- *
  */
 class DateIntervalType extends AbstractType
 {
@@ -66,18 +63,17 @@ class DateIntervalType extends AbstractType
                 'scale' => 0,
                 'constraints' => [
                     new GreaterThan([
-                        'value' => 0
-                    ])
-                ]
+                        'value' => 0,
+                    ]),
+                ],
             ])
             ->add('unit', ChoiceType::class, [
                 'choices' => $options['unit_choices'],
-            ])
-            ;
-        
+            ]);
+
         $builder->addModelTransformer(new DateIntervalTransformer());
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
@@ -86,23 +82,24 @@ class DateIntervalType extends AbstractType
                 'Days' => 'D',
                 'Weeks' => 'W',
                 'Months' => 'M',
-                'Years' => 'Y'
+                'Years' => 'Y',
             ])
-            ->setAllowedValues('unit_choices', function($values) {
-                if (FALSE === is_array($values)) {
-                    throw new InvalidOptionsException("The value `unit_choice` should be an array");
+            ->setAllowedValues('unit_choices', static function ($values) {
+                if (false === is_array($values)) {
+                    throw new InvalidOptionsException('The value `unit_choice` should be an array');
                 }
-                
-                $diff = \array_diff(\array_values($values), ['D', 'W', 'M', 'Y']);
-                if (count($diff) == 0) {
-                    return true;
-                } else {
-                    throw new InvalidOptionsException(sprintf("The values of the "
-                        . "units should be 'D', 'W', 'M', 'Y', those are invalid: %s",
-                        \implode(', ', $diff)));
-                }
-            })
-            ;
-    }
 
+                $diff = array_diff(array_values($values), ['D', 'W', 'M', 'Y']);
+
+                if (count($diff) === 0) {
+                    return true;
+                }
+
+                throw new InvalidOptionsException(sprintf(
+                    'The values of the '
+                        . "units should be 'D', 'W', 'M', 'Y', those are invalid: %s",
+                    implode(', ', $diff)
+                ));
+            });
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
index dd2125546..9a5d97083 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
@@ -1,40 +1,24 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Export;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-use Chill\MainBundle\Export\ExportManager;
-
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AggregatorType extends AbstractType
 {
-
     public function __construct()
     {
     }
@@ -45,30 +29,27 @@ class AggregatorType extends AbstractType
         $aggregator = $exportManager->getAggregator($options['aggregator_alias']);
 
         $builder
-                ->add('enabled', CheckboxType::class, array(
-                    'value' => true,
-                    'required' => false,
-                    'data' => false
-                ));
+            ->add('enabled', CheckboxType::class, [
+                'value' => true,
+                'required' => false,
+                'data' => false,
+            ]);
 
-        $filterFormBuilder = $builder->create('form', FormType::class, array(
-                    'compound' => true,
-                    'required' => false,
-                    'error_bubbling' => false
-            ));
+        $filterFormBuilder = $builder->create('form', FormType::class, [
+            'compound' => true,
+            'required' => false,
+            'error_bubbling' => false,
+        ]);
         $aggregator->buildForm($filterFormBuilder);
 
         $builder->add($filterFormBuilder);
-
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('aggregator_alias')
-                ->setRequired('export_manager')
-                ->setDefault('compound', true)
-                ->setDefault('error_bubbling', false)
-                ;
+            ->setRequired('export_manager')
+            ->setDefault('compound', true)
+            ->setDefault('error_bubbling', false);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
index 24dd63dd3..4b0c0694b 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
@@ -1,57 +1,38 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Export;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Chill\MainBundle\Form\Type\Export\AggregatorType;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint;
-use Chill\MainBundle\Export\ExportElementWithValidationInterface;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ExportType extends AbstractType
 {
+    public const AGGREGATOR_KEY = 'aggregators';
+
+    public const EXPORT_KEY = 'export';
+
+    public const FILTER_KEY = 'filters';
+
+    public const PICK_FORMATTER_KEY = 'pick_formatter';
+
     /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
 
-    const FILTER_KEY = 'filters';
-    const AGGREGATOR_KEY = 'aggregators';
-    const PICK_FORMATTER_KEY = 'pick_formatter';
-    const EXPORT_KEY = 'export';
-
     public function __construct(ExportManager $exportManager)
     {
         $this->exportManager = $exportManager;
@@ -61,12 +42,11 @@ class ExportType extends AbstractType
     {
         $export = $this->exportManager->getExport($options['export_alias']);
 
-        $exportOptions = array(
+        $exportOptions = [
             'compound' => true,
-            'constraints' => array(
-
-            )
-        );
+            'constraints' => [
+            ],
+        ];
 
         // add a contraint if required by export
         $exportBuilder = $builder->create(self::EXPORT_KEY/*, FormType::class, $exportOptions*/);
@@ -78,66 +58,65 @@ class ExportType extends AbstractType
         if ($export instanceof \Chill\MainBundle\Export\ExportInterface) {
             //add filters
             $filters = $this->exportManager->getFiltersApplyingOn($export, $options['picked_centers']);
-            $filterBuilder = $builder->create(self::FILTER_KEY, FormType::class, array('compound' => true));
+            $filterBuilder = $builder->create(self::FILTER_KEY, FormType::class, ['compound' => true]);
 
-            foreach($filters as $alias => $filter) {
-                $filterBuilder->add($alias, FilterType::class, array(
+            foreach ($filters as $alias => $filter) {
+                $filterBuilder->add($alias, FilterType::class, [
                     'filter_alias' => $alias,
                     'export_manager' => $this->exportManager,
                     'label' => $filter->getTitle(),
-                    'constraints' => array(
-                        new ExportElementConstraint(['element' => $filter])
-                    )
-                ));
+                    'constraints' => [
+                        new ExportElementConstraint(['element' => $filter]),
+                    ],
+                ]);
             }
 
             $builder->add($filterBuilder);
 
             //add aggregators
             $aggregators = $this->exportManager
-                    ->getAggregatorsApplyingOn($export, $options['picked_centers']);
-            $aggregatorBuilder = $builder->create(self::AGGREGATOR_KEY, FormType::class,
-                    array('compound' => true));
+                ->getAggregatorsApplyingOn($export, $options['picked_centers']);
+            $aggregatorBuilder = $builder->create(
+                self::AGGREGATOR_KEY,
+                FormType::class,
+                ['compound' => true]
+            );
 
-            foreach($aggregators as $alias => $aggregator) {
-                $aggregatorBuilder->add($alias, AggregatorType::class, array(
+            foreach ($aggregators as $alias => $aggregator) {
+                $aggregatorBuilder->add($alias, AggregatorType::class, [
                     'aggregator_alias' => $alias,
                     'export_manager' => $this->exportManager,
                     'label' => $aggregator->getTitle(),
-                    'constraints' => array(
-                        new ExportElementConstraint(['element' => $aggregator])
-                    )
-                ));
+                    'constraints' => [
+                        new ExportElementConstraint(['element' => $aggregator]),
+                    ],
+                ]);
             }
 
             $builder->add($aggregatorBuilder);
         }
 
         // add export form
-        $exportBuilder = $builder->create(self::EXPORT_KEY, FormType::class, array('compound' => true));
+        $exportBuilder = $builder->create(self::EXPORT_KEY, FormType::class, ['compound' => true]);
         $this->exportManager->getExport($options['export_alias'])
-              ->buildForm($exportBuilder);
+            ->buildForm($exportBuilder);
         $builder->add($exportBuilder);
 
         if ($export instanceof \Chill\MainBundle\Export\ExportInterface) {
-            $builder->add(self::PICK_FORMATTER_KEY, PickFormatterType::class, array(
-                'export_alias' => $options['export_alias']
-            ));
+            $builder->add(self::PICK_FORMATTER_KEY, PickFormatterType::class, [
+                'export_alias' => $options['export_alias'],
+            ]);
         }
-
     }
 
-
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setRequired(array('export_alias', 'picked_centers'))
-                ->setAllowedTypes('export_alias', array('string'))
-                ->setDefault('compound', true)
-                ->setDefault('constraints', array(
-                    //new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
-                ))
-                ;
-
+        $resolver->setRequired(['export_alias', 'picked_centers'])
+            ->setAllowedTypes('export_alias', ['string'])
+            ->setDefault('compound', true)
+            ->setDefault('constraints', [
+                //new \Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraint()
+            ]);
     }
 
     public function getParent()
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
index 21f1bcd48..8612dd690 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
@@ -1,42 +1,25 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Export;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\MainBundle\Export\ExportManager;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Chill\MainBundle\Export\ExportElementWithValidationInterface;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class FilterType extends AbstractType
 {
-    const ENABLED_FIELD = 'enabled';
+    public const ENABLED_FIELD = 'enabled';
 
     public function __construct()
     {
@@ -44,35 +27,31 @@ class FilterType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
         $exportManager = $options['export_manager'];
         $filter = $exportManager->getFilter($options['filter_alias']);
 
         $builder
-                ->add(self::ENABLED_FIELD, CheckboxType::class, array(
-                    'value' => true,
-                    'data' => false,
-                    'required' => false
-                ));
+            ->add(self::ENABLED_FIELD, CheckboxType::class, [
+                'value' => true,
+                'data' => false,
+                'required' => false,
+            ]);
 
-        $filterFormBuilder = $builder->create('form', FormType::class, array(
+        $filterFormBuilder = $builder->create('form', FormType::class, [
             'compound' => true,
             'error_bubbling' => false,
             'required' => false,
-            ));
+        ]);
         $filter->buildForm($filterFormBuilder);
 
         $builder->add($filterFormBuilder);
-
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired('filter_alias')
-                ->setRequired('export_manager')
-                ->setDefault('compound', true)
-                ->setDefault('error_bubbling', false)
-                ;
+            ->setRequired('export_manager')
+            ->setDefault('compound', true)
+            ->setDefault('error_bubbling', false);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php
index 023822d12..c7c87e949 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/FormatterType.php
@@ -1,59 +1,47 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Export;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class FormatterType extends AbstractType
 {
     /**
-     *
      * @var ExportManager
      */
     protected $exportManager;
-    
-    public function __construct(ExportManager $manager) 
+
+    public function __construct(ExportManager $manager)
     {
         $this->exportManager = $manager;
     }
-    
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setRequired(array('formatter_alias', 'export_alias', 
-            'aggregator_aliases'));
-    }
-    
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $formatter = $this->exportManager->getFormatter($options['formatter_alias']);
-        
-        $formatter->buildForm($builder, $options['export_alias'], 
-                $options['aggregator_aliases']);
+
+        $formatter->buildForm(
+            $builder,
+            $options['export_alias'],
+            $options['aggregator_aliases']
+        );
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setRequired(['formatter_alias', 'export_alias',
+            'aggregator_aliases', ]);
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index 7f7143a4e..daf33eb57 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -1,182 +1,178 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Export;
 
+use Chill\MainBundle\Center\GroupingCenterInterface;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Export\ExportManager;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Center\GroupingCenterInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\CallbackTransformer;
-use Doctrine\Common\Collections\Collection;
+use function array_intersect;
+use function array_key_exists;
+use function array_merge;
+use function array_unique;
+use function count;
+use function in_array;
 
 /**
- * Pick centers amongst available centers for the user
- *
+ * Pick centers amongst available centers for the user.
  */
 class PickCenterType extends AbstractType
 {
+    public const CENTERS_IDENTIFIERS = 'c';
+
     /**
-     *
-     * @var \Symfony\Component\Security\Core\User\UserInterface
-     */
-    protected $user;
-    
-    /**
-     *
-     * @var ExportManager
-     */
-    protected $exportManager;
-    
-    /**
-     *
-     * @var GroupingCenterInterface[]
-     */
-    protected $groupingCenters = [];
-    
-    const CENTERS_IDENTIFIERS = 'c';
-    
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
-    public function __construct(TokenStorageInterface $tokenStorage, 
-          ExportManager $exportManager, AuthorizationHelper $authorizationHelper)
-    {
+
+    /**
+     * @var ExportManager
+     */
+    protected $exportManager;
+
+    /**
+     * @var GroupingCenterInterface[]
+     */
+    protected $groupingCenters = [];
+
+    /**
+     * @var \Symfony\Component\Security\Core\User\UserInterface
+     */
+    protected $user;
+
+    public function __construct(
+        TokenStorageInterface $tokenStorage,
+        ExportManager $exportManager,
+        AuthorizationHelper $authorizationHelper
+    ) {
         $this->exportManager = $exportManager;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;
     }
-    
-    
-    public function configureOptions(OptionsResolver $resolver)
+
+    public function addGroupingCenter(GroupingCenterInterface $grouping)
     {
-        $resolver->setRequired('export_alias')
-              ;
+        $this->groupingCenters[md5($grouping->getName())] = $grouping;
     }
-    
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $export = $this->exportManager->getExport($options['export_alias']);
-        $centers = $this->authorizationHelper->getReachableCenters($this->user, 
-              $export->requiredRole());
-        
-        $builder->add(self::CENTERS_IDENTIFIERS, EntityType::class, array(
-           'class' => 'ChillMainBundle:Center',
-           'query_builder' => function(EntityRepository $er) use ($centers) {
+        $centers = $this->authorizationHelper->getReachableCenters(
+            $this->user,
+            $export->requiredRole()
+        );
+
+        $builder->add(self::CENTERS_IDENTIFIERS, EntityType::class, [
+            'class' => 'ChillMainBundle:Center',
+            'query_builder' => static function (EntityRepository $er) use ($centers) {
                 $qb = $er->createQueryBuilder('c');
-                $ids = array_map(function(Center $el) { return $el->getId(); }, 
-                      $centers);
+                $ids = array_map(
+                    static function (Center $el) { return $el->getId(); },
+                    $centers
+                );
+
                 return $qb->where($qb->expr()->in('c.id', $ids));
-           }, 
-           'multiple' => true,
-           'expanded' => true,
-           'choice_label' => function(Center $c) { return $c->getName(); },
-           'data' => count($this->groupingCenters) > 0 ? null : $centers
-        ));
-           
+            },
+            'multiple' => true,
+            'expanded' => true,
+            'choice_label' => static function (Center $c) { return $c->getName(); },
+            'data' => count($this->groupingCenters) > 0 ? null : $centers,
+        ]);
+
         if (count($this->groupingCenters) > 0) {
             $groupingBuilder = $builder->create('g', null, [
-                'compound' => true
+                'compound' => true,
             ]);
 
             foreach ($this->groupingCenters as $key => $gc) {
                 $choices = $this->buildChoices($centers, $gc);
-                
+
                 if (count($choices) > 0) {
                     $groupingBuilder->add($key, ChoiceType::class, [
                         'choices' => $choices,
                         'multiple' => true,
                         'expanded' => true,
                         'label' => $gc->getName(),
-                        'required' => false
+                        'required' => false,
                     ]);
                 }
             }
-            
+
             if ($groupingBuilder->count() > 0) {
                 $builder->add($groupingBuilder);
             }
         }
-        
+
         $builder->addModelTransformer(new CallbackTransformer(
-            function($data) use ($centers) { return $this->transform($data, $centers); }, 
-            function($data) use ($centers) { return $this->reverseTransform($data, $centers); }
-            ));
+            function ($data) use ($centers) { return $this->transform($data, $centers); },
+            function ($data) use ($centers) { return $this->reverseTransform($data, $centers); }
+        ));
     }
-    
-    public function addGroupingCenter(GroupingCenterInterface $grouping)
+
+    public function configureOptions(OptionsResolver $resolver)
     {
-        $this->groupingCenters[md5($grouping->getName())] = $grouping;
+        $resolver->setRequired('export_alias');
     }
-    
+
     protected function buildChoices($reachablesCenters, GroupingCenterInterface $gc)
     {
         $result = [];
-        
+
         foreach ($gc->getGroups() as $group) {
             foreach ($gc->getCentersForGroup($group) as $center) {
-                if (\in_array($center, $reachablesCenters)) {
+                if (in_array($center, $reachablesCenters, true)) {
                     $result[$group] = $group;
                 }
             }
         }
-        
+
         return $result;
     }
-    
+
+    protected function reverseTransform($data, $centers)
+    {
+        $picked = $data[self::CENTERS_IDENTIFIERS]
+            instanceof \Doctrine\Common\Collections\Collection ?
+                $data[self::CENTERS_IDENTIFIERS]->toArray()
+                :
+                $data[self::CENTERS_IDENTIFIERS];
+
+        if (array_key_exists('g', $data)) {
+            foreach ($data['g'] as $gcid => $group) {
+                $picked =
+                    array_merge(
+                        array_intersect(
+                            $this->groupingCenters[$gcid]->getCentersForGroup($group),
+                            $centers
+                        ),
+                        $picked
+                    );
+            }
+        }
+
+        return array_unique($picked);
+    }
+
     protected function transform($data, $centers)
     {
         return $data;
     }
-    
-    protected function reverseTransform($data, $centers)
-    {
-        $picked = $data[self::CENTERS_IDENTIFIERS] 
-            instanceof \Doctrine\Common\Collections\Collection ? 
-                $data[self::CENTERS_IDENTIFIERS]->toArray()
-                :
-                $data[self::CENTERS_IDENTIFIERS];
-        
-        if (\array_key_exists('g', $data)) {
-            foreach($data['g'] as $gcid => $group) {
-                $picked = 
-                    \array_merge(
-                        \array_intersect(
-                            $this->groupingCenters[$gcid] ->getCentersForGroup($group), 
-                            $centers
-                            ),
-                        $picked
-                        )
-                    ;
-            }
-        }
-        
-        return \array_unique($picked);
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
index 44726d915..2b1c8e093 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickFormatterType.php
@@ -1,36 +1,25 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Export;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-
 use Chill\MainBundle\Export\ExportManager;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Choose a formatter amongst the available formatters
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Choose a formatter amongst the available formatters.
  */
 class PickFormatterType extends AbstractType
 {
@@ -45,26 +34,26 @@ class PickFormatterType extends AbstractType
     {
         $export = $this->exportManager->getExport($options['export_alias']);
         $allowedFormatters = $this->exportManager
-                ->getFormattersByTypes($export->getAllowedFormattersTypes());
+            ->getFormattersByTypes($export->getAllowedFormattersTypes());
 
         //build choices
-        $choices = array();
-        foreach($allowedFormatters as $alias => $formatter) {
+        $choices = [];
+
+        foreach ($allowedFormatters as $alias => $formatter) {
             $choices[$formatter->getName()] = $alias;
         }
 
-        $builder->add('alias', ChoiceType::class, array(
+        $builder->add('alias', ChoiceType::class, [
             'choices' => $choices,
             'multiple' => false,
-            'placeholder' => 'Choose a format'
-        ));
+            'placeholder' => 'Choose a format',
+        ]);
 
         //$builder->get('type')->addModelTransformer($transformer);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setRequired(array('export_alias'));
+        $resolver->setRequired(['export_alias']);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index 3976625a1..488246a50 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -1,12 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\Listing;
 
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SearchType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\RequestStack;
+use function array_combine;
+use function array_map;
+use function count;
 
 final class FilterOrderType extends \Symfony\Component\Form\AbstractType
 {
@@ -25,31 +40,73 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
         if ($helper->hasSearchBox()) {
             $builder->add('q', SearchType::class, [
                 'label' => false,
-                'required' => false
+                'required' => false,
             ]);
         }
 
+        $checkboxesBuilder = $builder->create('checkboxes', null, ['compound' => true]);
+
+        foreach ($helper->getCheckboxes() as $name => $c) {
+            $choices = array_combine(
+                array_map(static function ($c, $t) {
+                    if (null !== $t) {
+                        return $t;
+                    }
+
+                    return $c;
+                }, $c['choices'], $c['trans']),
+                $c['choices']
+            );
+
+            $checkboxesBuilder->add($name, ChoiceType::class, [
+                'choices' => $choices,
+                'expanded' => true,
+                'multiple' => true,
+            ]);
+        }
+
+        if (0 < count($helper->getCheckboxes())) {
+            $builder->add($checkboxesBuilder);
+        }
+
         foreach ($this->requestStack->getCurrentRequest()->query->getIterator() as $key => $value) {
-            switch($key) {
+            switch ($key) {
                 case 'q':
+                case 'checkboxes' . $key:
                     break;
+
                 case 'page':
                     $builder->add($key, HiddenType::class, [
-                        'data' => 1
+                        'data' => 1,
                     ]);
+
                     break;
+
                 default:
                     $builder->add($key, HiddenType::class, [
-                        'data' => $value
+                        'data' => $value,
                     ]);
+
                     break;
             }
         }
     }
 
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        /** @var FilterOrderHelper $helper */
+        $helper = $options['helper'];
+        $view->vars['has_search_box'] = $helper->hasSearchBox();
+        $view->vars['checkboxes'] = [];
+
+        foreach ($helper->getCheckboxes() as $name => $c) {
+            $view->vars['checkboxes'][$name] = [];
+        }
+    }
+
     public function configureOptions(\Symfony\Component\OptionsResolver\OptionsResolver $resolver)
     {
-       $resolver->setRequired('helper')
-           ->setAllowedTypes('helper', FilterOrderHelper::class);
+        $resolver->setRequired('helper')
+            ->setAllowedTypes('helper', FilterOrderHelper::class);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
index e613fdf65..647c45553 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickAddressType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Address;
@@ -11,6 +20,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function uniqid;
 
 /**
  * Form type for picking an address.
@@ -33,6 +43,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 final class PickAddressType extends AbstractType
 {
     private AddressToIdDataTransformer $addressToIdDataTransformer;
+
     private TranslatorInterface $translator;
 
     public function __construct(
@@ -50,7 +61,7 @@ final class PickAddressType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['uniqid'] = $view->vars['attr']['data-input-address'] =\uniqid('input_address_');
+        $view->vars['uniqid'] = $view->vars['attr']['data-input-address'] = uniqid('input_address_');
         $view->vars['attr']['data-use-valid-from'] = (int) $options['use_valid_from'];
         $view->vars['attr']['data-use-valid-to'] = (int) $options['use_valid_to'];
         $view->vars['attr']['data-button-text-create'] = $this->translator->trans($options['button_text_create']);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
index 07c3d5c67..5ccf217a0 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickCenterType.php
@@ -1,56 +1,48 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
 use Chill\MainBundle\Repository\CenterRepository;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use RuntimeException;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Security\Core\Security;
+use function array_merge;
+use function array_values;
+use function count;
 
 /**
- * Pick a center
+ * Pick a center.
  *
  * For a given role and, eventually, scopes, show a dropdown (if more than
  * one reachable center) or a HiddenType (if one or zero center).
- *
- *
  */
 class PickCenterType extends AbstractType
 {
     protected AuthorizationHelperInterface $authorizationHelper;
 
-    protected Security $security;
-
     protected CenterRepository $centerRepository;
 
+    protected Security $security;
+
     public function __construct(
         AuthorizationHelperInterface $authorizationHelper,
         Security $security,
@@ -61,13 +53,64 @@ class PickCenterType extends AbstractType
         $this->centerRepository = $centerRepository;
     }
 
+    /**
+     * add a data transformer if user can reach only one center.
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $centers = $this->getReachableCenters($options['role'], $options['scopes']);
+
+        if (count($centers) <= 1) {
+            $multiple = $options['choice_options']['multiple'] ?? false;
+            $builder->add('center', HiddenType::class);
+            $builder->get('center')->addModelTransformer(
+                new CenterTransformer($this->centerRepository, $multiple)
+            );
+        } else {
+            $builder->add(
+                'center',
+                EntityType::class,
+                array_merge(
+                    $options['choice_options'],
+                    [
+                        'class' => Center::class,
+                        'choices' => $centers,
+                    ]
+                )
+            );
+        }
+
+        $builder
+            ->addModelTransformer(new CallbackTransformer(
+                static function ($data) {
+                    if (null === $data) {
+                        return ['center' => null];
+                    }
+
+                    return ['center' => $data];
+                },
+                static function ($data) {
+                    return $data['center'];
+                }
+            ));
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['is_hidden'] = count($this->getReachableCenters(
+            $options['role'],
+            $options['scopes']
+        )) <= 1;
+    }
+
     /**
      * return a 'hidden' field if only one center is available.
      *
      * Return a 'choice' field if more than one center is available.
      *
+     * @throws RuntimeException if the user is not associated with any center
+     *
      * @return string
-     * @throws \RuntimeException if the user is not associated with any center
      */
     /*
     public function getParent()
@@ -80,71 +123,26 @@ class PickCenterType extends AbstractType
             return EntityType::class;
         }
     }
-    */
+     */
 
     /**
      * configure default options, i.e. add choices if user can reach multiple
      * centers.
-     *
-     * @param OptionsResolver $resolver
      */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setDefault('class', Center::class)
             ->setRequired('role')
-            ->setAllowedTypes('role', [ 'string' ])
+            ->setAllowedTypes('role', ['string'])
             ->setDefault('scopes', [])
             ->setAllowedTypes('scopes', ['iterable'])
-            ->setDefault('choice_options', [])
-            ;
+            ->setDefault('choice_options', []);
         /*
             ->setDefault('choices', $this->reachableCenters)
             ->setDefault('placeholder', 'Pick a center')
             ;
-        */
-    }
-
-    /**
-     * add a data transformer if user can reach only one center
-     *
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $centers = $this->getReachableCenters($options['role'], $options['scopes']);
-
-        if (count($centers) <= 1) {
-            $multiple = $options['choice_options']['multiple'] ?? false;
-            $builder->add('center', HiddenType::class);
-            $builder->get('center')->addModelTransformer(
-               new CenterTransformer($this->centerRepository, $multiple)
-            );
-        } else {
-            $builder->add('center', EntityType::class,
-                \array_merge(
-                    $options['choice_options'],
-                    [
-                        'class' => Center::class,
-                        'choices' => $centers
-                    ]
-                )
-            );
-        }
-
-        $builder
-            ->addModelTransformer(new CallbackTransformer(
-                function($data) {
-                    if (NULL === $data) {
-                        return ['center' => null];
-                    }
-                    return ['center' => $data];
-                },
-                function($data) {
-                    return $data['center'];
-                }
-            ));
+         */
     }
 
     private function getReachableCenters(string $role, iterable $scopes): array
@@ -152,23 +150,17 @@ class PickCenterType extends AbstractType
         if (0 < count($scopes)) {
             $centers = [];
 
-            foreach($scopes as $scope) {
+            foreach ($scopes as $scope) {
                 foreach ($this->authorizationHelper
-                             ->getReachableCenters($this->security->getUser(), $role, $scope) as $center) {
+                    ->getReachableCenters($this->security->getUser(), $role, $scope) as $center) {
                     $centers[spl_object_hash($center)] = $center;
                 }
             }
 
-            return \array_values($centers);
-        } else {
-           return $this->authorizationHelper
-               ->getReachableCenters($this->security->getUser(), $role);
+            return array_values($centers);
         }
-    }
 
-    public function buildView(FormView $view, FormInterface $form, array $options)
-    {
-        $view->vars['is_hidden'] = count($this->getReachableCenters($options['role'],
-            $options['scopes'])) <= 1;
+        return $this->authorizationHelper
+            ->getReachableCenters($this->security->getUser(), $role);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
index 1c1242a5a..debd56ad4 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
@@ -1,67 +1,52 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * A form to pick between PostalCode
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * A form to pick between PostalCode.
  */
 class PostalCodeType extends AbstractType
 {
     /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
-     * @var UrlGeneratorInterface
-     */
-    protected $urlGenerator;
-    
-    /**
-     *
      * @var PostalCodeChoiceLoader
      */
     protected $choiceLoader;
-    
+
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
 
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
+
     public function __construct(
         TranslatableStringHelper $helper,
         UrlGeneratorInterface $urlGenerator,
@@ -74,27 +59,6 @@ class PostalCodeType extends AbstractType
         $this->translator = $translator;
     }
 
-
-    public function getParent()
-    {
-        return EntityType::class;
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        // create a local copy for usage in Closure
-        $helper = $this->translatableStringHelper;
-        $resolver
-            ->setDefault('class', PostalCode::class)
-            ->setDefault('choice_label', function(PostalCode $code) use ($helper) {
-                return $code->getCode().' '.$code->getName().' ['.
-                      $helper->localize($code->getCountry()->getName()).']';
-           })
-           ->setDefault('choice_loader', $this->choiceLoader)
-           ->setDefault('placeholder', 'Select a postal code')
-        ;
-    }
-    
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['attr']['data-postal-code'] = 'data-postal-code';
@@ -107,4 +71,22 @@ class PostalCodeType extends AbstractType
         $view->vars['attr']['data-searching-label'] = $this->translator->trans('select2.searching');
     }
 
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        // create a local copy for usage in Closure
+        $helper = $this->translatableStringHelper;
+        $resolver
+            ->setDefault('class', PostalCode::class)
+            ->setDefault('choice_label', static function (PostalCode $code) use ($helper) {
+                return $code->getCode() . ' ' . $code->getName() . ' [' .
+                      $helper->localize($code->getCountry()->getName()) . ']';
+            })
+            ->setDefault('choice_loader', $this->choiceLoader)
+            ->setDefault('placeholder', 'Select a postal code');
+    }
+
+    public function getParent()
+    {
+        return EntityType::class;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index ebf474657..4aa8948ec 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -1,21 +1,14 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Center;
@@ -23,9 +16,8 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
 use Chill\MainBundle\Repository\ScopeRepository;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -36,6 +28,9 @@ use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Security;
+use function array_map;
+use function count;
 
 /**
  * Allow to pick amongst available scope for the current
@@ -45,47 +40,49 @@ use Symfony\Component\Security\Core\Role\Role;
  *
  * - `center`: the center of the entity
  * - `role`  : the role of the user
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ScopePickerType extends AbstractType
 {
+    protected AuthorizationHelperInterface $authorizationHelper;
+
     /**
-     * @var AuthorizationHelper
+     * @var ScopeRepository
      */
-    protected $authorizationHelper;
+    protected $scopeRepository;
+
+    protected Security $security;
 
     /**
      * @var TokenStorageInterface
      */
     protected $tokenStorage;
 
-    /**
-     * @var ScopeRepository
-     */
-    protected $scopeRepository;
-
     /**
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
     public function __construct(
-        AuthorizationHelper $authorizationHelper,
+        AuthorizationHelperInterface $authorizationHelper,
         TokenStorageInterface $tokenStorage,
         ScopeRepository $scopeRepository,
+        Security $security,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
         $this->scopeRepository = $scopeRepository;
+        $this->security = $security;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $query = $this->buildAccessibleScopeQuery($options['center'], $options['role']);
-        $items = $query->getQuery()->execute();
+        $items = $this->authorizationHelper->getReachableScopes(
+            $this->security->getUser(),
+            $options['role']->getRole(),
+            $options['center']
+        );
 
         if (1 !== count($items)) {
             $builder->add('scope', EntityType::class, [
@@ -94,9 +91,7 @@ class ScopePickerType extends AbstractType
                 'choice_label' => function (Scope $c) {
                     return $this->translatableStringHelper->localize($c->getName());
                 },
-                'query_builder' => function () use ($options) {
-                    return $this->buildAccessibleScopeQuery($options['center'], $options['role']);
-                },
+                'choices' => $items,
             ]);
             $builder->setDataMapper(new ScopePickerDataMapper());
         } else {
@@ -110,7 +105,8 @@ class ScopePickerType extends AbstractType
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars = array_replace(
-            $view->vars, [
+            $view->vars,
+            [
                 'hideLabel' => true,
             ]
         );
@@ -121,19 +117,23 @@ class ScopePickerType extends AbstractType
         $resolver
           // create `center` option
             ->setRequired('center')
-            ->setAllowedTypes('center', [Center::class])
+            ->setAllowedTypes('center', [Center::class, 'array', 'null'])
           // create ``role` option
             ->setRequired('role')
             ->setAllowedTypes('role', ['string', Role::class]);
     }
 
     /**
+     * @param array|Center|Center[] $center
+     * @param string $role
+     *
      * @return \Doctrine\ORM\QueryBuilder
      */
-    protected function buildAccessibleScopeQuery(Center $center, Role $role)
+    protected function buildAccessibleScopeQuery($center, $role)
     {
         $roles = $this->authorizationHelper->getParentRoles($role);
         $roles[] = $role;
+        $centers = $center instanceof Center ? [$center] : $center;
 
         $qb = $this->scopeRepository->createQueryBuilder('s');
         $qb
@@ -142,14 +142,14 @@ class ScopePickerType extends AbstractType
             ->join('rs.permissionsGroups', 'pg')
             ->join('pg.groupCenters', 'gc')
           // add center constraint
-            ->where($qb->expr()->eq('IDENTITY(gc.center)', ':center'))
-            ->setParameter('center', $center->getId())
+            ->where($qb->expr()->in('IDENTITY(gc.center)', ':centers'))
+            ->setParameter('centers', array_map(static fn (Center $c) => $c->getId(), $centers))
           // role constraints
             ->andWhere($qb->expr()->in('rs.role', ':roles'))
             ->setParameter('roles', $roles)
           // user contraint
-          ->andWhere(':user MEMBER OF gc.users')
-          ->setParameter('user', $this->tokenStorage->getToken()->getUser());
+            ->andWhere(':user MEMBER OF gc.users')
+            ->setParameter('user', $this->tokenStorage->getToken()->getUser());
 
         return $qb;
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
index faadb3154..ae5ab075e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2ChoiceType.php
@@ -1,36 +1,34 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Extends choice to allow adding select2 library on widget
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Extends choice to allow adding select2 library on widget.
  */
 class Select2ChoiceType extends AbstractType
 {
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'attr' => ['class' => 'select2 '],
+            ]
+        );
+    }
+
     public function getBlockPrefix()
     {
         return 'select2_choice';
@@ -40,12 +38,4 @@ class Select2ChoiceType extends AbstractType
     {
         return ChoiceType::class;
     }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-              array(
-                  'attr' => array('class' => 'select2 '),
-              ));
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
index 617d1afce..bed90ad18 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
@@ -1,67 +1,84 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Form\Type\Select2ChoiceType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use const SORT_FLAG_CASE;
+use const SORT_STRING;
 
 /**
- * Extends choice to allow adding select2 library on widget
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc.ducobu@champs-libres.coop>
+ * Extends choice to allow adding select2 library on widget.
  */
 class Select2CountryType extends AbstractType
 {
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
+    protected ParameterBagInterface $parameterBag;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    protected TranslatableStringHelper $translatableStringHelper;
 
-    /**
-     * @var ObjectManager
-     */
-    private $em;
+    private ObjectManager $em;
+
+    private RequestStack $requestStack;
 
     public function __construct(
         RequestStack $requestStack,
         ObjectManager $em,
-        TranslatableStringHelper $translatableStringHelper
-        )
-    {
+        TranslatableStringHelper $translatableStringHelper,
+        ParameterBagInterface $parameterBag
+    ) {
         $this->requestStack = $requestStack;
         $this->em = $em;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->parameterBag = $parameterBag;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $transformer = new ObjectToIdTransformer($this->em, 'Chill\MainBundle\Entity\Country');
+        $builder->addModelTransformer($transformer);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $countries = $this->em->getRepository('Chill\MainBundle\Entity\Country')->findAll();
+        $choices = [];
+        $preferredCountries = $this->parameterBag->get('chill_main.available_countries');
+        $preferredChoices = [];
+
+        foreach ($countries as $c) {
+            $choices[$c->getId()] = $this->translatableStringHelper->localize($c->getName());
+        }
+
+        foreach ($preferredCountries as $pc) {
+            foreach ($countries as $c) {
+                if ($c->getCountryCode() === $pc) {
+                    $preferredChoices[$c->getId()] = $this->translatableStringHelper->localize($c->getName());
+                }
+            }
+        }
+
+        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+
+        $resolver->setDefaults([
+            'class' => 'Chill\MainBundle\Entity\Country',
+            'choices' => array_combine(array_values($choices), array_keys($choices)),
+            'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
+        ]);
     }
 
     public function getBlockPrefix()
@@ -69,32 +86,8 @@ class Select2CountryType extends AbstractType
         return 'select2_chill_country';
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $transformer = new ObjectToIdTransformer($this->em,'Chill\MainBundle\Entity\Country');
-        $builder->addModelTransformer($transformer);
-    }
-
     public function getParent()
     {
         return Select2ChoiceType::class;
     }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
-        $countries = $this->em->getRepository('Chill\MainBundle\Entity\Country')->findAll();
-        $choices = array();
-
-        foreach ($countries as $c) {
-            $choices[$c->getId()] = $this->translatableStringHelper->localize($c->getName());
-        }
-
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
-
-        $resolver->setDefaults(array(
-           'class' => 'Chill\MainBundle\Entity\Country',
-           'choices' => array_combine(array_values($choices),array_keys($choices))
-        ));
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
index e72bf0d8e..b4db6393e 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
@@ -1,36 +1,32 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 
 /**
- * Extends choice to allow adding select2 library on widget
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Extends choice to allow adding select2 library on widget.
  */
 class Select2EntityType extends AbstractType
 {
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->replaceDefaults(
+            ['attr' => ['class' => 'select2 ']]
+        );
+    }
+
     public function getBlockPrefix()
     {
         return 'select2_entity';
@@ -40,11 +36,4 @@ class Select2EntityType extends AbstractType
     {
         return EntityType::class;
     }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->replaceDefaults(
-              array('attr' => array('class' => 'select2 '))
-              );
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
index 2c8dea857..9fad2bdb3 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
@@ -1,64 +1,80 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Form\Type\DataTransformer\MultipleObjectsToIdTransformer;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Form\Type\Select2ChoiceType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\Persistence\ObjectManager;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use const SORT_FLAG_CASE;
+use const SORT_STRING;
 
 /**
- * Extends choice to allow adding select2 library on widget for languages (multiple)
+ * Extends choice to allow adding select2 library on widget for languages (multiple).
  */
 class Select2LanguageType extends AbstractType
 {
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
+    protected ParameterBagInterface $parameterBag;
 
-    /**
-     * @var ObjectManager
-     */
-    private $em;
+    protected TranslatableStringHelper $translatableStringHelper;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    private ObjectManager $em;
+
+    private RequestStack $requestStack;
 
     public function __construct(
         RequestStack $requestStack,
         ObjectManager $em,
-        TranslatableStringHelper $translatableStringHelper
-        )
-    {
+        TranslatableStringHelper $translatableStringHelper,
+        ParameterBagInterface $parameterBag
+    ) {
         $this->requestStack = $requestStack;
         $this->em = $em;
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->parameterBag = $parameterBag;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $transformer = new MultipleObjectsToIdTransformer($this->em, 'Chill\MainBundle\Entity\Language');
+        $builder->addModelTransformer($transformer);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $languages = $this->em->getRepository('Chill\MainBundle\Entity\Language')->findAll();
+        $preferredLanguages = $this->parameterBag->get('chill_main.available_languages');
+        $choices = [];
+        $preferredChoices = [];
+
+        foreach ($languages as $l) {
+            $choices[$l->getId()] = $this->translatableStringHelper->localize($l->getName());
+        }
+
+        foreach ($preferredLanguages as $l) {
+            $preferredChoices[$l] = $choices[$l];
+        }
+
+        asort($choices, SORT_STRING | SORT_FLAG_CASE);
+
+        $resolver->setDefaults([
+            'class' => 'Chill\MainBundle\Entity\Language',
+            'choices' => array_combine(array_values($choices), array_keys($choices)),
+            'preferred_choices' => array_combine(array_values($preferredChoices), array_keys($preferredChoices)),
+        ]);
     }
 
     public function getBlockPrefix()
@@ -66,32 +82,8 @@ class Select2LanguageType extends AbstractType
         return 'select2_chill_language';
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $transformer = new MultipleObjectsToIdTransformer($this->em,'Chill\MainBundle\Entity\Language');
-        $builder->addModelTransformer($transformer);
-    }
-
     public function getParent()
     {
         return Select2ChoiceType::class;
     }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
-        $languages = $this->em->getRepository('Chill\MainBundle\Entity\Language')->findAll();
-        $choices = array();
-
-        foreach ($languages as $l) {
-            $choices[$l->getId()] = $this->translatableStringHelper->localize($l->getName());
-        }
-
-        asort($choices, SORT_STRING | SORT_FLAG_CASE);
-
-        $resolver->setDefaults(array(
-           'class' => 'Chill\MainBundle\Entity\Language',
-           'choices' => array_combine(array_values($choices),array_keys($choices))
-        ));
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
index 18a0a6e9f..3f44a4e97 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
 /*
@@ -7,25 +16,35 @@ namespace Chill\MainBundle\Form\Type;
  */
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Translation\Translator;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use function in_array;
 
 class TranslatableStringFormType extends AbstractType
 {
     private $availableLanguages;  // The langauges availaible
+
     private $frameworkTranslatorFallback; // The langagues used for the translation
 
-    public function __construct(array $availableLanguages, Translator $translator) {
+    public function __construct(array $availableLanguages, Translator $translator)
+    {
         $this->availableLanguages = $availableLanguages;
         $this->frameworkTranslatorFallback = $translator->getFallbackLocales();
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options) {
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
         foreach ($this->availableLanguages as $lang) {
-            $builder->add($lang, TextType::class,
-                array('required' => (in_array($lang,
-                      $this->frameworkTranslatorFallback))));
+            $builder->add(
+                $lang,
+                TextType::class,
+                ['required' => (in_array(
+                    $lang,
+                    $this->frameworkTranslatorFallback,
+                    true
+                ))]
+            );
         }
     }
 
diff --git a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
index fece2d6d4..0141438f6 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php
@@ -1,35 +1,28 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserACLAwareRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Repository\UserRepository;
-use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\Security\Core\Role\Role;
 
-
 /**
  * Pick a user available for the given role and center.
  *
@@ -37,69 +30,66 @@ use Symfony\Component\Security\Core\Role\Role;
  *
  * - `role`  : the role the user can reach
  * - `center`: the center a user can reach
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class UserPickerType extends AbstractType
 {
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
     /**
-     *
      * @var TokenStorageInterface
      */
     protected $tokenStorage;
 
+    protected UserACLAwareRepositoryInterface $userACLAwareRepository;
+
     protected UserRepository $userRepository;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
-        UserRepository $userRepository
+        UserRepository $userRepository,
+        UserACLAwareRepositoryInterface $userACLAwareRepository
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
         $this->userRepository = $userRepository;
+        $this->userACLAwareRepository = $userACLAwareRepository;
     }
 
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             // create `center` option
             ->setRequired('center')
-            ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class ])
+            ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class, 'null', 'array'])
             // create ``role` option
             ->setRequired('role')
-            ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class ])
-            ;
+            ->setAllowedTypes('role', ['string', \Symfony\Component\Security\Core\Role\Role::class]);
 
         $resolver
             ->setDefault('having_permissions_group_flag', null)
             ->setAllowedTypes('having_permissions_group_flag', ['string', 'null'])
             ->setDefault('class', User::class)
             ->setDefault('placeholder', 'Choose an user')
-            ->setDefault('choice_label', function(User $u) {
+            ->setDefault('choice_label', static function (User $u) {
                 return $u->getUsername();
             })
-            ->setNormalizer('choices', function(Options $options) {
-                
-                $users = $this->authorizationHelper
-                    ->findUsersReaching($options['role'], $options['center']);
-                
-                if (NULL !== $options['having_permissions_group_flag']) {
+            ->setDefault('scope', null)
+            ->setAllowedTypes('scope', [Scope::class, 'array', 'null'])
+            ->setNormalizer('choices', function (Options $options) {
+                $users = $this->userACLAwareRepository
+                    ->findUsersByReachedACL($options['role']->getRole(), $options['center'], $options['scope'], true);
+
+                if (null !== $options['having_permissions_group_flag']) {
                     return $this->userRepository
-                        ->findUsersHavingFlags($options['having_permissions_group_flag'], $users)
-                        ;
+                        ->findUsersHavingFlags($options['having_permissions_group_flag'], $users);
                 }
-                
+
                 return $users;
-            })
-            ;
+            });
     }
 
     public function getParent()
diff --git a/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php b/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php
new file mode 100644
index 000000000..4bdf61604
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserCurrentLocationType extends AbstractType
+{
+    private LocationRepository $locationRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper, LocationRepository $locationRepository)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->locationRepository = $locationRepository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('currentLocation', EntityType::class, [
+                'class' => Location::class,
+                'choices' => $this->locationRepository->findByPublicLocations(),
+                'choice_label' => function (Location $entity) {
+                    return $entity->getName() ?
+                        $entity->getName() . ' (' . $this->translatableStringHelper->localize($entity->getLocationType()->getTitle()) . ')' :
+                        $this->translatableStringHelper->localize($entity->getLocationType()->getTitle());
+                },
+                'placeholder' => 'Pick a location',
+                'required' => false,
+            ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/UserJobType.php b/src/Bundle/ChillMainBundle/Form/UserJobType.php
index eec718261..74d69bd07 100644
--- a/src/Bundle/ChillMainBundle/Form/UserJobType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserJobType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
@@ -13,15 +22,13 @@ class UserJobType extends \Symfony\Component\Form\AbstractType
         $builder
             ->add('label', TranslatableStringFormType::class, [
                 'label' => 'Label',
-                'required' => true
+                'required' => true,
             ])
             ->add('active', ChoiceType::class, [
                 'choices' => [
                     'Active' => true,
-                    'Inactive' => false
-                ]
-            ])
-            ;
+                    'Inactive' => false,
+                ],
+            ]);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
index 4486b5643..d2e60c1ef 100644
--- a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php
@@ -1,104 +1,104 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Regex;
-use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraints\Callback;
-use Psr\Log\LoggerInterface;
 
 class UserPasswordType extends AbstractType
 {
     /**
-     *
-     * @var UserPasswordEncoderInterface
-     */
-    protected $passwordEncoder;
-    
-    /**
-     *
      * @var LoggerInterface
      */
     protected $chillLogger;
-    
+
+    /**
+     * @var UserPasswordEncoderInterface
+     */
+    protected $passwordEncoder;
+
     public function __construct(
-        UserPasswordEncoderInterface $passwordEncoder, 
+        UserPasswordEncoderInterface $passwordEncoder,
         LoggerInterface $chillLogger
     ) {
         $this->passwordEncoder = $passwordEncoder;
         $this->chillLogger = $chillLogger;
     }
 
-    
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('new_password', RepeatedType::class, array(
+            ->add('new_password', RepeatedType::class, [
                 'type' => PasswordType::class,
                 'required' => false,
-                'options' => array(),
-                'first_options' => array(
-                    'label' => 'Password'
-                ),
-                'second_options' => array(
-                    'label' => 'Repeat the password'
-                ),
-                'invalid_message' => "The password fields must match",
-                'constraints' => array(
-                    new Length(array(
+                'options' => [],
+                'first_options' => [
+                    'label' => 'Password',
+                ],
+                'second_options' => [
+                    'label' => 'Repeat the password',
+                ],
+                'invalid_message' => 'The password fields must match',
+                'constraints' => [
+                    new Length([
                         'min' => 9,
-                        'minMessage' => 'The password must be greater than {{ limit }} characters'
-                        )),
+                        'minMessage' => 'The password must be greater than {{ limit }} characters',
+                    ]),
                     new NotBlank(),
-                    new Regex(array(
-                        'pattern' => "/((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!,;:+\"'-\/{}~=µ\(\)£]).{6,})/",
-                        'message' => "The password must contains one letter, one "
-                        . "capitalized letter, one number and one special character "
-                        . "as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed."
-                        ))
-                )
-            ))
+                    new Regex([
+                        'pattern' => "/((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!,;:+\"'-\\/{}~=µ\\(\\)£]).{6,})/",
+                        'message' => 'The password must contains one letter, one '
+                        . 'capitalized letter, one number and one special character '
+                        . "as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
+                    ]),
+                ],
+            ])
             ->add('actual_password', PasswordType::class, [
                 'label' => 'Your actual password',
                 'mapped' => false,
                 'constraints' => [
                     new Callback([
-                        'callback' => function($password, ExecutionContextInterface $context, $payload) use ($options) {
-                            if (TRUE === $this->passwordEncoder->isPasswordValid($options['user'], $password)) {
+                        'callback' => function ($password, ExecutionContextInterface $context, $payload) use ($options) {
+                            if (true === $this->passwordEncoder->isPasswordValid($options['user'], $password)) {
                                 return;
                             }
-                            
+
                             // password problem :-)
                             $this->chillLogger
-                                ->notice("incorrect password when trying to change password", [
-                                    'username' => $options['user']->getUsername()
+                                ->notice('incorrect password when trying to change password', [
+                                    'username' => $options['user']->getUsername(),
                                 ]);
                             $context->addViolation('Incorrect password');
-                        }
-                    ])
-                ]
-            ])
-        ;
+                        },
+                    ]),
+                ],
+            ]);
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setRequired('user')
-            ->setAllowedTypes('user', \Chill\MainBundle\Entity\User::class)
-            ;
+            ->setAllowedTypes('user', \Chill\MainBundle\Entity\User::class);
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index bf056cec5..58f053ac1 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
@@ -9,41 +18,32 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Regex;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
-
-use Chill\MainBundle\Form\UserPasswordType;
 
 class UserType extends AbstractType
 {
     private TranslatableStringHelper $translatableStringHelper;
 
-    /**
-     * @param TranslatableStringHelper $translatableStringHelper
-     */
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('username')
             ->add('email', EmailType::class, [
-                'required' => true
+                'required' => true,
             ])
             ->add('label', TextType::class)
             ->add('mainCenter', EntityType::class, [
@@ -51,12 +51,12 @@ class UserType extends AbstractType
                 'required' => false,
                 'placeholder' => 'Choose a main center',
                 'class' => Center::class,
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('c');
                     $qb->addOrderBy('c.name');
 
                     return $qb;
-                }
+                },
             ])
             ->add('mainScope', EntityType::class, [
                 'label' => 'Main scope',
@@ -75,47 +75,47 @@ class UserType extends AbstractType
                 'choice_label' => function (UserJob $c) {
                     return $this->translatableStringHelper->localize($c->getLabel());
                 },
-            ])
-            ;
+            ]);
+
         if ($options['is_creation']) {
-            $builder->add('plainPassword', RepeatedType::class, array(
+            $builder->add('plainPassword', RepeatedType::class, [
                 'mapped' => false,
                 'type' => PasswordType::class,
                 'required' => false,
-                'options' => array(),
-                'first_options' => array(
-                    'label' => 'Password'
-                ),
-                'second_options' => array(
-                    'label' => 'Repeat the password'
-                ),
-                'invalid_message' => "The password fields must match",
-                'constraints' => array(
-                    new Length(array(
+                'options' => [],
+                'first_options' => [
+                    'label' => 'Password',
+                ],
+                'second_options' => [
+                    'label' => 'Repeat the password',
+                ],
+                'invalid_message' => 'The password fields must match',
+                'constraints' => [
+                    new Length([
                         'min' => 9,
-                        'minMessage' => 'The password must be greater than {{ limit }} characters'
-                        )),
+                        'minMessage' => 'The password must be greater than {{ limit }} characters',
+                    ]),
                     new NotBlank(),
-                    new Regex(array(
-                        'pattern' => "/((?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!,;:+\"'-\/{}~=µ\(\)£]).{6,})/",
-                        'message' => "The password must contains one letter, one "
-                        . "capitalized letter, one number and one special character "
-                        . "as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed."
-                        ))
-                )
-            ));
-
+                    new Regex([
+                        'pattern' => "/((?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%!,;:+\"'-\\/{}~=µ\\(\\)£]).{6,})/",
+                        'message' => 'The password must contains one letter, one '
+                        . 'capitalized letter, one number and one special character '
+                        . "as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.",
+                    ]),
+                ],
+            ]);
         } else {
-            $builder->add($builder
-                    ->create('enabled', ChoiceType::class, array(
-                        'choices' => array(
+            $builder->add(
+                $builder
+                    ->create('enabled', ChoiceType::class, [
+                        'choices' => [
                             'Disabled, the user is not allowed to login' => 0,
-                            'Enabled, the user is active' => 1
-                        ),
+                            'Enabled, the user is active' => 1,
+                        ],
                         'expanded' => false,
                         'multiple' => false,
-                        ))
-                );
+                    ])
+            );
         }
     }
 
@@ -124,14 +124,13 @@ class UserType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\MainBundle\Entity\User'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\MainBundle\Entity\User',
+        ]);
 
         $resolver
-                ->setDefaults(array('is_creation' => false))
-                ->addAllowedValues('is_creation', array(true, false))
-                ;
+            ->setDefaults(['is_creation' => false])
+            ->addAllowedValues('is_creation', [true, false]);
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php b/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php
index 39ddb62d5..f4a91f100 100644
--- a/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php
+++ b/src/Bundle/ChillMainBundle/Form/Utils/PermissionsGroupFlagProvider.php
@@ -1,17 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Utils;
 
-/**
- *
- * 
- */
 interface PermissionsGroupFlagProvider
 {
     /**
-     * Return an array of flags
-     * 
+     * Return an array of flags.
+     *
      * @return string[] an array. Keys are ignored.
      */
     public function getPermissionsGroupFlags(): array;
diff --git a/src/Bundle/ChillMainBundle/Notification/Mailer.php b/src/Bundle/ChillMainBundle/Notification/Mailer.php
index 73debaae5..84382b4fb 100644
--- a/src/Bundle/ChillMainBundle/Notification/Mailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Mailer.php
@@ -1,92 +1,81 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Notification;
 
 use Chill\MainBundle\Entity\User;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Mailer\MailerInterface;
+use Swift_Mailer;
+use Swift_Message;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Twig\Environment;
+use function call_user_func;
 
 /**
  * Class Mailer
  * Classe d'aide pour l'envoi de notification.
- * 
- * Héberge toutes les méthodes pour ré-écrire les URL en fonction de la langue de l'utilisateur.
  *
- * @package Chill\MainBundle\Notification
+ * Héberge toutes les méthodes pour ré-écrire les URL en fonction de la langue de l'utilisateur.
  */
 class Mailer
 {
+    /**
+     * @var Swift_Mailer
+     */
+    protected $forcedMailer;
+
     /**
      * @var LoggerInterface
      */
     protected $logger;
-    
+
     /**
-     * @var \Twig\Environment
-     */
-    protected $twig;
-    
-    /**
-     * @var \Swift_Mailer
+     * @var Swift_Mailer
      */
     protected $mailer;
-    
-    /**
-     * @var \Swift_Mailer 
-     */
-    protected $forcedMailer;
-    
-    /**
-     * @var RouterInterface
-     */
-    protected $router;
-    
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
+
     /**
      * @var array
      */
     protected $routeParameters;
-    
+
+    /**
+     * @var RouterInterface
+     */
+    protected $router;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    /**
+     * @var \Twig\Environment
+     */
+    protected $twig;
+
     /**
      * Mailer constructor.
      *
-     * @param LoggerInterface $logger
-     * @param Environment $twig
-     * @param \Swift_Mailer $mailer
-     * @param RouterInterface $router
-     * @param TranslatorInterface $translator
      * @param $routeParameters
      */
     public function __construct(
-        LoggerInterface $logger, 
+        LoggerInterface $logger,
         Environment $twig,
-        \Swift_Mailer $mailer,
+        Swift_Mailer $mailer,
         // due to bug https://github.com/symfony/swiftmailer-bundle/issues/127
         // \Swift_Transport $mailerTransporter,
         RouterInterface $router,
-        TranslatorInterface $translator, 
+        TranslatorInterface $translator,
         $routeParameters
     ) {
         $this->logger = $logger;
@@ -97,60 +86,40 @@ class Mailer
         $this->translator = $translator;
         $this->routeParameters = $routeParameters;
     }
-    
+
     /**
-     * Envoie une notification à un utilisateur. 
-     * 
-     * @param \User $to
-     * @param array $subject Subject of the message [ 0 => $message (required), 1 => $parameters (optional), 3 => $domain (optional) ]
-     * @param array $bodies The bodies. An array where keys are the contentType and values the bodies
-     * @param callable $callback a callback to customize the message (add attachment, etc.)
+     * @param $template
+     *
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     *
+     * @return string
      */
-    public function sendNotification(
-        $recipient,
-        array $subject,
-        array $bodies,
-        callable $callback = null,
-        $force = false
-        )
+    public function renderContentToUser(User $to, $template, array $parameters = [])
     {
-        $fromEmail = $this->routeParameters['from_email'];
-        $fromName   = $this->routeParameters['from_name'];
-        $to = $recipient instanceof User ? $recipient->getEmail() : $recipient;
-        
-        $subjectI18n = $this->translator->trans(
-            $subject[0], 
-            $subject[1] ?? [], 
-            $subject[2] ?? null
-        );
-        
-        $message = (new \Swift_Message($subjectI18n))
-            ->setFrom($fromEmail, $fromName)
-            ->setTo($to)
-            ;
-        
-        foreach ($bodies as $contentType => $content) {
-            $message->setBody($content, $contentType);
-        }
-        
-        if ($callback !== null) {
-            \call_user_func($callback, $message);
-        }
-        
-        $this->logger->info("[notification] Sending notification", [
-            'to' => $message->getTo(),
-            'subject' => $message->getSubject()
-        ]);
-        
-        $this->sendMessage($message, $force);
+        $context = $this->router->getContext();
+        $previousHost = $context->getHost();
+        $previousScheme = $context->getScheme();
+
+        $context->setHost($this->routeParameters['host']);
+        $context->setScheme($this->routeParameters['scheme']);
+
+        $content = $this->twig->render($template, $parameters);
+
+        // reset the host
+        $context->setHost($previousHost);
+        $context->setScheme($previousScheme);
+
+        return $content;
     }
-    
+
     /**
-     * @param \Swift_Message $message
      * @param $force
+     *
      * @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface
      */
-    public function sendMessage(\Swift_Message $message, $force)
+    public function sendMessage(Swift_Message $message, $force)
     {
         if ($force) {
             $this->forcedMailer->send($message);
@@ -158,31 +127,50 @@ class Mailer
             $this->mailer->send($message);
         }
     }
-    
+
     /**
-     * @param User $to
-     * @param $template
-     * @param array $parameters
-     * @return string
-     * @throws \Twig\Error\LoaderError
-     * @throws \Twig\Error\RuntimeError
-     * @throws \Twig\Error\SyntaxError
+     * Envoie une notification à un utilisateur.
+     *
+     * @param array $subject Subject of the message [ 0 => $message (required), 1 => $parameters (optional), 3 => $domain (optional) ]
+     * @param array $bodies The bodies. An array where keys are the contentType and values the bodies
+     * @param callable $callback a callback to customize the message (add attachment, etc.)
+     * @param mixed $recipient
+     * @param mixed $force
      */
-    public function renderContentToUser(User $to, $template, array $parameters = array())
-    {
-        $context = $this->router->getContext();
-        $previousHost = $context->getHost();
-        $previousScheme = $context->getScheme();
-        
-        $context->setHost($this->routeParameters['host']);
-        $context->setScheme($this->routeParameters['scheme']);
-        
-        $content = $this->twig->render($template, $parameters);
-        
-        // reset the host
-        $context->setHost($previousHost);
-        $context->setScheme($previousScheme);
-        
-        return $content;
+    public function sendNotification(
+        $recipient,
+        array $subject,
+        array $bodies,
+        ?callable $callback = null,
+        $force = false
+    ) {
+        $fromEmail = $this->routeParameters['from_email'];
+        $fromName = $this->routeParameters['from_name'];
+        $to = $recipient instanceof User ? $recipient->getEmail() : $recipient;
+
+        $subjectI18n = $this->translator->trans(
+            $subject[0],
+            $subject[1] ?? [],
+            $subject[2] ?? null
+        );
+
+        $message = (new Swift_Message($subjectI18n))
+            ->setFrom($fromEmail, $fromName)
+            ->setTo($to);
+
+        foreach ($bodies as $contentType => $content) {
+            $message->setBody($content, $contentType);
+        }
+
+        if (null !== $callback) {
+            call_user_func($callback, $message);
+        }
+
+        $this->logger->info('[notification] Sending notification', [
+            'to' => $message->getTo(),
+            'subject' => $message->getSubject(),
+        ]);
+
+        $this->sendMessage($message, $force);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php b/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php
index d6f383b73..048dfc02f 100644
--- a/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php
+++ b/src/Bundle/ChillMainBundle/Notification/NotificationRenderer.php
@@ -1,10 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Notification;
 
+use Chill\ActivityBundle\Notification\ActivityNotificationRenderer;
 use Chill\MainBundle\Entity\Notification;
 use Chill\PersonBundle\Notification\AccompanyingPeriodNotificationRenderer;
-use Chill\ActivityBundle\Notification\ActivityNotificationRenderer;
+use Exception;
 
 final class NotificationRenderer
 {
@@ -12,8 +22,8 @@ final class NotificationRenderer
 
     public function __construct(
         AccompanyingPeriodNotificationRenderer $accompanyingPeriodNotificationRenderer,
-        ActivityNotificationRenderer $activityNotificationRenderer)
-    {
+        ActivityNotificationRenderer $activityNotificationRenderer
+    ) {
         // TODO configure automatically
         // TODO CREER UNE INTERFACE POUR ETRE SUR QUE LES RENDERERS SONT OK
 
@@ -21,17 +31,6 @@ final class NotificationRenderer
         $this->renderers[] = $activityNotificationRenderer;
     }
 
-    private function getRenderer(Notification $notification)
-    {
-        foreach ($this->renderers as $renderer) {
-            if($renderer->supports($notification)) {
-                return $renderer;
-            }
-        }
-
-        throw new \Exception('No renderer for '. $notification);
-    }
-
     public function getTemplate(Notification $notification)
     {
         return $this->getRenderer($notification)->getTemplate();
@@ -41,4 +40,15 @@ final class NotificationRenderer
     {
         return $this->getRenderer($notification)->getTemplateData($notification);
     }
+
+    private function getRenderer(Notification $notification)
+    {
+        foreach ($this->renderers as $renderer) {
+            if ($renderer->supports($notification)) {
+                return $renderer;
+            }
+        }
+
+        throw new Exception('No renderer for ' . $notification);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
index 2cfb45d4a..3a236f5c1 100644
--- a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
+++ b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
 use Twig\Environment;
@@ -27,41 +16,37 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
- * add twig function to render pagination
- *
- * @author Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * add twig function to render pagination.
  */
 class ChillItemsPerPageTwig extends AbstractExtension
 {
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction(
+                'chill_items_per_page',
+                [$this, 'paginationRender'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
+            ),
+        ];
+    }
+
     public function getName()
     {
         return 'chill_items_per_page';
     }
 
-    public function getFunctions()
-    {
-        return array(
-           new TwigFunction(
-                 'chill_items_per_page',
-                 array($this, 'paginationRender'),
-                 array(
-                    'needs_environment' => true,
-                    'is_safe' => ['html']
-                 )
-            )
-        );
-    }
-
     public function paginationRender(
-          Environment $env,
-          PaginatorInterface $paginator,
-          $template = '@ChillMain/Pagination/items_per_page.html.twig'
+        Environment $env,
+        PaginatorInterface $paginator,
+        $template = '@ChillMain/Pagination/items_per_page.html.twig'
     ) {
-
-        return $env->render($template, array(
-           'paginator' => $paginator,
-           'current' => $paginator->getItemsPerPage()
-        ));
+        return $env->render($template, [
+            'paginator' => $paginator,
+            'current' => $paginator->getItemsPerPage(),
+        ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
index 4917216a1..ed540b0c2 100644
--- a/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
+++ b/src/Bundle/ChillMainBundle/Pagination/ChillPaginationTwig.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2016, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
 use Twig\Environment;
@@ -27,54 +16,56 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
- * add twig function to render pagination
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * add twig function to render pagination.
  */
 class ChillPaginationTwig extends AbstractExtension
 {
-    const LONG_TEMPLATE = '@ChillMain/Pagination/long.html.twig';
-    const SHORT_TEMPLATE = '@ChillMain/Pagination/short.html.twig';
-    
+    public const LONG_TEMPLATE = '@ChillMain/Pagination/long.html.twig';
+
+    public const SHORT_TEMPLATE = '@ChillMain/Pagination/short.html.twig';
+
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction(
+                'chill_pagination',
+                [$this, 'paginationRender'],
+                [
+                    'needs_environment' => true,
+                    'is_safe' => ['html'],
+                ]
+            ),
+        ];
+    }
+
     public function getName()
     {
         return 'chill_pagination';
     }
-    
-    public function getFunctions()
-    {
-        return array(
-           new TwigFunction(
-                 'chill_pagination',  
-                 array($this, 'paginationRender'),
-                 array(
-                    'needs_environment' => true,
-                    'is_safe' => ['html']
-                 )
-            )
-        );
-    }
-    
+
     public function paginationRender(
-          Environment $env,
-          PaginatorInterface $paginator, 
-          $template = '@ChillMain/Pagination/long.html.twig'
+        Environment $env,
+        PaginatorInterface $paginator,
+        $template = '@ChillMain/Pagination/long.html.twig'
     ) {
         switch ($template) {
             case 'long':
                 $t = self::LONG_TEMPLATE;
+
                 break;
+
             case 'short':
                 $t = self::SHORT_TEMPLATE;
+
                 break;
+
             default:
                 $t = $template;
         }
-        
-        return $env->render($t, array(
-           'paginator' => $paginator,
-           'current' => $paginator->getCurrentPage()->getNumber()
-        ));
+
+        return $env->render($t, [
+            'paginator' => $paginator,
+            'current' => $paginator->getCurrentPage()->getNumber(),
+        ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/Page.php b/src/Bundle/ChillMainBundle/Pagination/Page.php
index e6b3943ed..c93af4508 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Page.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Page.php
@@ -1,84 +1,70 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
- * a page is an element of a pagination
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * a page is an element of a pagination.
  */
 class Page implements PageInterface
 {
     /**
-     *
-     * @var UrlGeneratorInterface
-     */
-    protected $urlGenerator;
-    
-    /**
-     * the number of the current page
-     *
-     * @var int
-     */
-    protected $number;
-    
-    /**
-     * The route for the current page
-     *
-     * @var string
-     */
-    protected $route;
-    
-    /**
-     * Parameters for the route to the current page
-     *
-     * @var array
-     */
-    protected $routeParameters;
-    
-    /**
-     * the number of item per page
+     * the number of item per page.
      *
      * @var int
      */
     protected $itemPerPage;
-    
+
     /**
-     * The number of items in the whole iteration
+     * the number of the current page.
+     *
+     * @var int
+     */
+    protected $number;
+
+    /**
+     * The route for the current page.
+     *
+     * @var string
+     */
+    protected $route;
+
+    /**
+     * Parameters for the route to the current page.
+     *
+     * @var array
+     */
+    protected $routeParameters;
+
+    /**
+     * The number of items in the whole iteration.
      *
      * @var int
      */
     protected $totalItems;
 
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
 
     public function __construct(
-          $number, 
-          $itemPerPage,
-          UrlGeneratorInterface $urlGenerator,
-          $route,
-          array $routeParameters,
-          $totalItems
+        $number,
+        $itemPerPage,
+        UrlGeneratorInterface $urlGenerator,
+        $route,
+        array $routeParameters,
+        $totalItems
     ) {
         $this->urlGenerator = $urlGenerator;
         $this->number = $number;
@@ -87,7 +73,7 @@ class Page implements PageInterface
         $this->routeParameters = $routeParameters;
         $this->totalItems = $totalItems;
     }
-    
+
     public function generateUrl()
     {
         return $this->urlGenerator->generate($this->route, $this->routeParameters);
@@ -101,7 +87,7 @@ class Page implements PageInterface
     public function getLastItemNumber()
     {
         $last = $this->number * $this->itemPerPage - 1;
-        
+
         return $last < $this->totalItems ? $last : $this->totalItems;
     }
 
@@ -109,5 +95,4 @@ class Page implements PageInterface
     {
         return $this->number;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
index 26add87fa..d7da19708 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PageGenerator.php
@@ -1,50 +1,32 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
+use Iterator;
+
 /**
- * PageGenerator associated with a Paginator
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * PageGenerator associated with a Paginator.
  */
-class PageGenerator implements \Iterator
+class PageGenerator implements Iterator
 {
-    /**
-     *
-     * @var Paginator
-     */
-    protected $paginator;
-    
-    /**
-     *
-     * @var int
-     */
-    protected $current = 1;
-    
-    public function __construct(Paginator $paginator) 
+    protected int $current = 1;
+
+    protected Paginator $paginator;
+
+    public function __construct(Paginator $paginator)
     {
-        $this->paginator = $paginator;;
+        $this->paginator = $paginator;
     }
-    
+
     public function current()
     {
         return $this->paginator->getPage($current);
@@ -57,7 +39,7 @@ class PageGenerator implements \Iterator
 
     public function next()
     {
-        $this->current++;
+        ++$this->current;
     }
 
     public function rewind()
@@ -67,7 +49,7 @@ class PageGenerator implements \Iterator
 
     public function valid()
     {
-        return $this->current > 0 
-              && $this->current <= $this->paginator->countPages();
+        return 0 < $this->current
+              && $this->paginator->countPages() >= $this->current;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/PageInterface.php b/src/Bundle/ChillMainBundle/Pagination/PageInterface.php
index aa87c289c..acca7301c 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PageInterface.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PageInterface.php
@@ -1,43 +1,31 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
 /**
- * Represents a page included in a pagination
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Represents a page included in a pagination.
  */
 interface PageInterface
 {
     public function generateUrl();
-    
+
+    public function getFirstItemNumber();
+
+    public function getLastItemNumber();
+
     /**
      * get the page number.
-     * 
-     * The first page number is 1. 
+     *
+     * The first page number is 1.
      */
     public function getNumber();
-    
-    public function getFirstItemNumber();
-    
-    public function getLastItemNumber();
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/Paginator.php b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
index 82577d078..54fa36084 100644
--- a/src/Bundle/ChillMainBundle/Pagination/Paginator.php
+++ b/src/Bundle/ChillMainBundle/Pagination/Paginator.php
@@ -1,104 +1,92 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
+use RuntimeException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
-
 /**
  * Standard paginator class.
  *
  * Represent a set of paginated pages;
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
  */
 class Paginator implements PaginatorInterface
 {
     /**
-     * The number of total items
-     *
-     * @var int
-     */
-    protected $totalItems;
-    
-    /**
-     * the number of items on a single page
-     *
-     * @var int
-     */
-    protected $itemPerPage;
-    /**
-     * The number of the current page
+     * The number of the current page.
      *
      * @var int
      */
     protected $currentPageNumber;
-    
+
     /**
-     * the route of the pages
+     * the number of items on a single page.
      *
-     * @var string
+     * @var int
      */
-    protected $route;
-    
+    protected $itemPerPage;
+
     /**
-     * the parameters of the route
-     *
-     * @var string[]
-     */
-    protected $routeParameters;
-    
-    /**
-     * the generator for url
-     *
-     * @var UrlGeneratorInterface
-     */
-    protected $urlGenerator;
-    
-    /**
-     * the key in the GET parameter to indicate the page number in
-     * generated routes
-     *
-     * @var string
-     */
-    protected $pageKey;
-    
-    /**
-     * the key in the GET parameter to indicate the number of item per page
+     * the key in the GET parameter to indicate the number of item per page.
      *
      * @var string
      */
     protected $itemPerPageKey;
 
+    /**
+     * the key in the GET parameter to indicate the page number in
+     * generated routes.
+     *
+     * @var string
+     */
+    protected $pageKey;
+
+    /**
+     * the route of the pages.
+     *
+     * @var string
+     */
+    protected $route;
+
+    /**
+     * the parameters of the route.
+     *
+     * @var string[]
+     */
+    protected $routeParameters;
+
+    /**
+     * The number of total items.
+     *
+     * @var int
+     */
+    protected $totalItems;
+
+    /**
+     * the generator for url.
+     *
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
 
     public function __construct(
-          $totalItems,
-          $itemPerPage,
-          $currentPageNumber,
-          $route,
-          array $routeParameters,
-          UrlGeneratorInterface $urlGenerator,
-          $pageKey,
-          $itemPerPageKey
+        $totalItems,
+        $itemPerPage,
+        $currentPageNumber,
+        $route,
+        array $routeParameters,
+        UrlGeneratorInterface $urlGenerator,
+        $pageKey,
+        $itemPerPageKey
     ) {
         $this->totalItems = $totalItems;
         $this->itemPerPage = $itemPerPage;
@@ -115,8 +103,26 @@ class Paginator implements PaginatorInterface
         return $this->countPages();
     }
 
+    public function countPages()
+    {
+        if (0 === $this->itemPerPage) {
+            return 1;
+        }
+
+        if (0 === $this->totalItems) {
+            return 1;
+        }
+
+        $nb = floor($this->totalItems / $this->itemPerPage);
+
+        if ($this->totalItems % $this->itemPerPage > 0) {
+            ++$nb;
+        }
+
+        return 0 === $nb ? 1 : (int) $nb;
+    }
+
     /**
-     *
      * @return \Chill\MainBundle\Pagination\Page
      */
     public function getCurrentPage()
@@ -128,68 +134,78 @@ class Paginator implements PaginatorInterface
     {
         return $this->getCurrentPage()->getFirstItemNumber();
     }
-    
-    public function isCurrentPage(PageInterface $page)
-    {
-        return $page->getNumber() === $this->currentPageNumber;
-    }
 
-        public function getItemsPerPage()
+    public function getItemsPerPage()
     {
         return $this->itemPerPage;
     }
-    
-    public function setItemsPerPage($itemPerPage)
-    {
-        $this->itemPerPage = $itemPerPage;
-    }
-
-        public function getTotalItems()
-    {
-        return $this->totalItems;
-    }
-
-    public function countPages()
-    {
-        $nb = floor($this->totalItems / $this->itemPerPage);
-        
-        if ($this->totalItems % $this->itemPerPage > 0) {
-            $nb++;
-        }
-        
-        return $nb == 0 ? 1 : (int) $nb;
-    }
 
     /**
+     * @throws RuntimeException if the next page does not exists
      *
      * @return \Chill\MainBundle\Pagination\Page
-     * @throws \RuntimeException if the next page does not exists
      */
     public function getNextPage()
     {
         if (!$this->hasNextPage()) {
-            throw new \RuntimeException("this page has no next page");
+            throw new RuntimeException('this page has no next page');
         }
-        
+
         return $this->getPage($this->currentPageNumber + 1);
     }
 
     /**
+     * @param type $number
+     *
+     * @return \Chill\MainBundle\Pagination\Page
+     */
+    public function getPage($number)
+    {
+        if (!$this->hasPage($number)) {
+            throw new RuntimeException("The page with number {$number} does not "
+                  . 'exists');
+        }
+
+        return new Page(
+            $number,
+            $this->itemPerPage,
+            $this->urlGenerator,
+            $this->route,
+            array_merge($this->routeParameters, [
+                $this->pageKey => $number,
+                $this->itemPerPageKey => $this->itemPerPage,
+            ]),
+            $this->totalItems
+        );
+    }
+
+    public function getPagesGenerator()
+    {
+        for ($i = 1; $this->countPages() >= $i; ++$i) {
+            yield $this->getPage($i);
+        }
+    }
+
+    /**
+     * @throws RuntimeException if the next page does not exists
      *
      * @return \Chill\MainBundle\Pagination\Page
-     * @throws \RuntimeException if the next page does not exists
      */
     public function getPreviousPage()
     {
         if (!$this->hasPreviousPage()) {
-            throw new \RuntimeException("this page has no previous page");
+            throw new RuntimeException('this page has no previous page');
         }
-        
+
         return $this->getPage($this->currentPageNumber - 1);
     }
 
+    public function getTotalItems()
+    {
+        return $this->totalItems;
+    }
+
     /**
-     *
      * @return bool
      */
     public function hasNextPage()
@@ -197,51 +213,31 @@ class Paginator implements PaginatorInterface
         return $this->hasPage($this->currentPageNumber + 1);
     }
 
+    public function hasPage($number)
+    {
+        if (0 === $this->totalItems) {
+            return 1 === $number;
+        }
+
+        return 0 < $number
+              && $this->countPages() >= $number;
+    }
+
     /**
-     *
      * @return bool
      */
     public function hasPreviousPage()
     {
         return $this->hasPage($this->currentPageNumber - 1);
     }
-    
-    public function hasPage($number)
+
+    public function isCurrentPage(PageInterface $page)
     {
-        return $number > 0 and
-              $number <= $this->countPages();
+        return $page->getNumber() === $this->currentPageNumber;
     }
 
-    
-    /**
-     *
-     * @param type $number
-     * @return \Chill\MainBundle\Pagination\Page
-     */
-    public function getPage($number) {
-        if (!$this->hasPage($number)) {
-            throw new \RuntimeException("The page with number $number does not "
-                  . "exists");
-        }
-        
-        return new Page(
-              $number,
-              $this->itemPerPage,
-              $this->urlGenerator,
-              $this->route,
-              array_merge($this->routeParameters, array(
-                 $this->pageKey => $number,
-                 $this->itemPerPageKey => $this->itemPerPage
-              )),
-              $this->totalItems
-              );
-    }
-
-    public function getPagesGenerator()
+    public function setItemsPerPage($itemPerPage)
     {
-        for ($i = 1; $i <= $this->countPages(); $i++) {
-            yield $this->getPage($i);
-        }
+        $this->itemPerPage = $itemPerPage;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index c386a9757..e02729287 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -1,36 +1,30 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
-use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
- * Create paginator instances
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Create paginator instances.
  */
 class PaginatorFactory
 {
+    public const DEFAULT_CURRENT_PAGE_KEY = 'page';
+
+    public const DEFAULT_ITEM_PER_NUMBER_KEY = 'item_per_page';
+
+    public const DEFAULT_PAGE_NUMBER = 1;
+
     /**
      * the default item per page. This may be overriden by
      * the request or inside the paginator.
@@ -38,38 +32,33 @@ class PaginatorFactory
      * @var int
      */
     private $itemPerPage;
-    
+
     /**
-     * the router and generator for url
-     *
-     * @var RouterInterface
-     */
-    private $router;
-    
-    /**
-     * the request stack
+     * the request stack.
      *
      * @var RequestStack
      */
     private $requestStack;
-    
-    const DEFAULT_CURRENT_PAGE_KEY = 'page';
-    const DEFAULT_ITEM_PER_NUMBER_KEY = 'item_per_page';
-    const DEFAULT_PAGE_NUMBER = 1;
-    
-    
+
+    /**
+     * the router and generator for url.
+     *
+     * @var RouterInterface
+     */
+    private $router;
+
     public function __construct(
-          RequestStack $requestStack,
-          RouterInterface $router,
-          $itemPerPage = 20
+        RequestStack $requestStack,
+        RouterInterface $router,
+        $itemPerPage = 20
     ) {
         $this->itemPerPage = $itemPerPage;
         $this->requestStack = $requestStack;
         $this->router = $router;
     }
-    
+
     /**
-     * create a paginator instance
+     * create a paginator instance.
      *
      * The default route and route parameters are the current ones. If set,
      * thos route are overriden.
@@ -77,70 +66,70 @@ class PaginatorFactory
      * @param int $totalItems
      * @param string|null $route the specific route to use in pages
      * @param array|null $routeParameters the specific route parameters to use in pages
+     *
      * @return PaginatorInterface
      */
     public function create(
-          $totalItems,
-          $route = null,
-          array $routeParameters = null
+        $totalItems,
+        $route = null,
+        ?array $routeParameters = null
     ) {
-        
         return new Paginator(
-              $totalItems,
-              $this->getCurrentItemsPerPage(),
-              $this->getCurrentPageNumber(),
-              $route === null ? $this->getCurrentRoute() : $route,
-              $routeParameters === null ? $this->getCurrentRouteParameters() :
+            $totalItems,
+            $this->getCurrentItemsPerPage(),
+            $this->getCurrentPageNumber(),
+            null === $route ? $this->getCurrentRoute() : $route,
+            null === $routeParameters ? $this->getCurrentRouteParameters() :
                  $routeParameters,
-              $this->router,
-              self::DEFAULT_CURRENT_PAGE_KEY,
-              self::DEFAULT_ITEM_PER_NUMBER_KEY);
+            $this->router,
+            self::DEFAULT_CURRENT_PAGE_KEY,
+            self::DEFAULT_ITEM_PER_NUMBER_KEY
+        );
     }
-    
-    /**
-     *
-     * @return int
-     */
-    public function getCurrentPageNumber()
-    {
-        return $this->requestStack
-              ->getCurrentRequest()
-              ->query
-              ->getInt(self::DEFAULT_CURRENT_PAGE_KEY, self::DEFAULT_PAGE_NUMBER);
-    }
-    
+
     public function getCurrentItemsPerPage()
     {
         return $this->requestStack
-              ->getCurrentRequest()
-              ->query
-              ->getInt(self::DEFAULT_ITEM_PER_NUMBER_KEY, $this->itemPerPage);
+            ->getCurrentRequest()
+            ->query
+            ->getInt(self::DEFAULT_ITEM_PER_NUMBER_KEY, $this->itemPerPage);
     }
-    
+
     public function getCurrentPageFirstItemNumber()
     {
         return ($this->getCurrentPageNumber() - 1) *
             $this->getCurrentItemsPerPage();
     }
-    
+
+    /**
+     * @return int
+     */
+    public function getCurrentPageNumber()
+    {
+        return $this->requestStack
+            ->getCurrentRequest()
+            ->query
+            ->getInt(self::DEFAULT_CURRENT_PAGE_KEY, self::DEFAULT_PAGE_NUMBER);
+    }
+
     protected function getCurrentRoute()
     {
         $request = $this->requestStack->getCurrentRequest();
-        
+
         return $request->get('_route');
     }
-    
+
     protected function getCurrentRouteParameters()
     {
         return array_merge(
-              $this->router->getContext()->getParameters(),
+            $this->router->getContext()->getParameters(),
               // get the route parameters
               $this->requestStack
-                ->getCurrentRequest()
-                ->attributes->get('_route_params'),
+                  ->getCurrentRequest()
+                  ->attributes->get('_route_params'),
               // get the query parameters
               $this->requestStack
-                ->getCurrentRequest()->query->all()
-            );
+                  ->getCurrentRequest()->query->all()
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
index b9ee9c8a6..bf7130516 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorInterface.php
@@ -1,27 +1,22 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Pagination;
 
+use Countable;
+use Generator;
+use RuntimeException;
+
 /**
- * Represent a set of numbered pages
+ * Represent a set of numbered pages.
  *
  * Allow to calculate and render pagination for a set of pages.
  *
@@ -29,108 +24,108 @@ namespace Chill\MainBundle\Pagination;
  * into pages. Each page is numbered and count a given number of item per page.
  *
  * The first page number is 1, although the first result number is 0.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-interface PaginatorInterface extends \Countable
+interface PaginatorInterface extends Countable
 {
-    /**
-     * get the number of results for this paginator
-     *
-     * @return int
-     */
-    public function getTotalItems();
-    
-    /**
-     * get the first result for the current page
-     *
-     * @return int
-     */
-    public function getCurrentPageFirstItemNumber();
-      
-    /*
-     * get the number of items per page
-     */
-    public function getItemsPerPage();
-   
-    /*
-     * set the number of items per page
-     */ 
-    public function setItemsPerPage($itemsPerPage);
-    
     /**
      * get the number of pages for this pagination.
      *
      * @return int
      */
     public function countPages();
-    
+
     /**
-     * get the current page
+     * get the current page.
      *
      * @return PageInterface
      */
     public function getCurrentPage();
-    
+
     /**
-     * check if the given page is the current page
+     * get the first result for the current page.
      *
-     * @param \Chill\MainBundle\Pagination\PageInterface $page
-     * @return bool
+     * @return int
      */
-    public function isCurrentPage(PageInterface $page);
-    
+    public function getCurrentPageFirstItemNumber();
+
+    /*
+     * get the number of items per page
+     */
+    public function getItemsPerPage();
+
     /**
-     * check if the page with the given number exists
+     * get the next page.
      *
-     * @param int $number
-     */
-    public function hasPage($number);
-    
-    /**
-     * get page by his number
-     *
-     * @param int $number
-     * @throws \RuntimeException if the pagination has no page with specified number
-     */
-    public function getPage($number);
-    
-    /**
-     * get the next page
+     * @throws RuntimeException if the pagination has not next page
      *
      * @return PageInterface
-     * @throws \RuntimeException if the pagination has not next page
      */
     public function getNextPage();
-    
+
     /**
-     * get the previous page
+     * get page by his number.
+     *
+     * @param int $number
+     *
+     * @throws RuntimeException if the pagination has no page with specified number
+     */
+    public function getPage($number);
+
+    /**
+     * get a generator to generate pages.
+     *
+     * @return Generator which return PageInterface elements
+     */
+    public function getPagesGenerator();
+
+    /**
+     * get the previous page.
+     *
+     * @throws RuntimeException if the pagination has not previous page
      *
      * @return PageInterface
-     * @throws \RuntimeException if the pagination has not previous page
      */
     public function getPreviousPage();
-    
+
     /**
-     * check if the current page has a next page
+     * get the number of results for this paginator.
+     *
+     * @return int
+     */
+    public function getTotalItems();
+
+    /**
+     * check if the current page has a next page.
      *
      * @return bool
      */
     public function hasNextPage();
-    
+
     /**
-     * check if the current page has a page before
+     * check if the page with the given number exists.
+     *
+     * @param int $number
+     */
+    public function hasPage($number);
+
+    /**
+     * check if the current page has a page before.
      *
      * @return bool
      */
     public function hasPreviousPage();
-    
+
     /**
-     * get a generator to generate pages
+     * check if the given page is the current page.
      *
-     * @return \Generator which return PageInterface elements
+     * @param \Chill\MainBundle\Pagination\PageInterface $page
+     *
+     * @return bool
      */
-    public function getPagesGenerator();
-    
-    
+    public function isCurrentPage(PageInterface $page);
+
+    /*
+     * set the number of items per page
+     */
+    public function setItemsPerPage($itemsPerPage);
 }
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index c2ab59442..08243e560 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -1,28 +1,27 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Phonenumber;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Exception\ConnectException;
-use Psr\Log\LoggerInterface;
+use GuzzleHttp\Exception\ServerException;
 use Psr\Cache\CacheItemPoolInterface;
+use Psr\Log\LoggerInterface;
+use function array_key_exists;
+use function in_array;
+use function json_decode;
+use function preg_replace;
+use function strlen;
 
 /**
  * Helper to some task linked to phonenumber.
@@ -30,27 +29,26 @@ use Psr\Cache\CacheItemPoolInterface;
  * Currently, only Twilio is supported (https://www.twilio.com/lookup). A method
  * allow to check if the helper is configured for validation. This should be used
  * before doing some validation.
- *
- *
  */
 class PhonenumberHelper
 {
+    public const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
+
+    public const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
+
+    protected CacheItemPoolInterface $cachePool;
+
     /**
-     * Twilio client
-     */
-    protected Client $twilioClient;
-    
-    /**
-     * TRUE if the client is properly configured
+     * TRUE if the client is properly configured.
      */
     protected bool $isConfigured = false;
 
     protected LoggerInterface $logger;
 
-    protected CacheItemPoolInterface $cachePool;
-
-    const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
-    const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
+    /**
+     * Twilio client.
+     */
+    protected Client $twilioClient;
 
     public function __construct(
         CacheItemPoolInterface $cachePool,
@@ -60,107 +58,18 @@ class PhonenumberHelper
         $this->logger = $logger;
         $this->cachePool = $cachePool;
 
-        if (\array_key_exists('twilio_sid', $config)
+        if (array_key_exists('twilio_sid', $config)
             && !empty($config['twilio_sid'])
             && strlen($config['twilio_sid']) > 2
-            && \array_key_exists('twilio_secret', $config)
+            && array_key_exists('twilio_secret', $config)
             && !empty($config['twilio_secret'])
             && strlen($config['twilio_secret']) > 2
             ) {
-
             $this->twilioClient = new Client([
-                'auth' => [ $config['twilio_sid'], $config['twilio_secret'] ]
+                'auth' => [$config['twilio_sid'], $config['twilio_secret']],
             ]);
-            $this->isConfigured = TRUE;
+            $this->isConfigured = true;
         }
-
-    }
-
-    /**
-     * Return true if the validation is configured and available.
-     *
-     * @return bool
-     */
-    public function isPhonenumberValidationConfigured() : bool
-    {
-        return $this->isConfigured;
-    }
-
-    /**
-     * REturn true if the phoennumber is a mobile phone. Return always true
-     * if the validation is not configured.
-     *
-     * @param string $phonenumber
-     * @return bool
-     */
-    public function isValidPhonenumberMobile($phonenumber) : bool
-    {
-        if (FALSE === $this->isPhonenumberValidationConfigured()) {
-            return true;
-        }
-        
-        $validation = $this->performTwilioLookup($phonenumber);
-
-        if (NULL === $validation) {
-            return true;
-        }
-
-        return $validation === 'mobile';
-    }
-
-    /**
-     * Return true if the phonenumber is a landline or voip phone.  Return always true
-     * if the validation is not configured.
-     *
-     * @param string $phonenumber
-     * @return bool
-     */
-    public function isValidPhonenumberLandOrVoip($phonenumber) : bool
-    {
-        if (FALSE === $this->isPhonenumberValidationConfigured()) {
-            return true;
-        }
-        
-        $validation = $this->performTwilioLookup($phonenumber);
-
-        if (NULL === $validation) {
-            return true;
-        }
-
-        return \in_array($validation, [ 'landline', 'voip' ]);
-    }
-
-    /**
-     * Return true if the phonenumber is a landline or voip phone.  Return always true
-     * if the validation is not configured.
-     *
-     * @param string $phonenumber
-     * @return bool
-     */
-    public function isValidPhonenumberAny($phonenumber) : bool
-    {
-        if (FALSE === $this->isPhonenumberValidationConfigured()) {
-            return true;
-        }
-        $validation = $this->performTwilioLookup($phonenumber);
-;
-        if (NULL === $validation) {
-            return false;
-        }
-
-        return \in_array($validation, [ 'landline', 'voip', 'mobile' ]);
-    }
-
-    /**
-     * Get type (mobile, landline, ...) for phone number
-     *
-     * @param string $phonenumber
-     *
-     * @return string
-     */
-    public function getType(string $phonenumber): string
-    {
-        return $this->performTwilioLookup($phonenumber) ?? 'unknown';
     }
 
     public function format($phonenumber)
@@ -168,63 +77,139 @@ class PhonenumberHelper
         return $this->performTwilioFormat($phonenumber);
     }
 
+    /**
+     * Get type (mobile, landline, ...) for phone number.
+     */
+    public function getType(string $phonenumber): string
+    {
+        return $this->performTwilioLookup($phonenumber) ?? 'unknown';
+    }
+
+    /**
+     * Return true if the validation is configured and available.
+     */
+    public function isPhonenumberValidationConfigured(): bool
+    {
+        return $this->isConfigured;
+    }
+
+    /**
+     * Return true if the phonenumber is a landline or voip phone.  Return always true
+     * if the validation is not configured.
+     *
+     * @param string $phonenumber
+     */
+    public function isValidPhonenumberAny($phonenumber): bool
+    {
+        if (false === $this->isPhonenumberValidationConfigured()) {
+            return true;
+        }
+        $validation = $this->performTwilioLookup($phonenumber);
+
+        if (null === $validation) {
+            return false;
+        }
+
+        return in_array($validation, ['landline', 'voip', 'mobile'], true);
+    }
+
+    /**
+     * Return true if the phonenumber is a landline or voip phone.  Return always true
+     * if the validation is not configured.
+     *
+     * @param string $phonenumber
+     */
+    public function isValidPhonenumberLandOrVoip($phonenumber): bool
+    {
+        if (false === $this->isPhonenumberValidationConfigured()) {
+            return true;
+        }
+
+        $validation = $this->performTwilioLookup($phonenumber);
+
+        if (null === $validation) {
+            return true;
+        }
+
+        return in_array($validation, ['landline', 'voip'], true);
+    }
+
+    /**
+     * REturn true if the phoennumber is a mobile phone. Return always true
+     * if the validation is not configured.
+     *
+     * @param string $phonenumber
+     */
+    public function isValidPhonenumberMobile($phonenumber): bool
+    {
+        if (false === $this->isPhonenumberValidationConfigured()) {
+            return true;
+        }
+
+        $validation = $this->performTwilioLookup($phonenumber);
+
+        if (null === $validation) {
+            return true;
+        }
+
+        return 'mobile' === $validation;
+    }
+
     protected function performTwilioFormat($phonenumber)
     {
-        if (FALSE === $this->isPhonenumberValidationConfigured()) {
+        if (false === $this->isPhonenumberValidationConfigured()) {
             return $phonenumber;
         }
 
         // filter only number
-        $filtered = \preg_replace("/[^0-9]/", "", $phonenumber);
+        $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 
-        $item = $this->cachePool->getItem('pnum_format_nat_'.$filtered);
+        $item = $this->cachePool->getItem('pnum_format_nat_' . $filtered);
 
         if ($item->isHit()) {
             return $item->get();
         }
 
         try {
-            $response = $this->twilioClient->get(sprintf(self::FORMAT_URI, '+'.$filtered), [
+            $response = $this->twilioClient->get(sprintf(self::FORMAT_URI, '+' . $filtered), [
                 'http_errors' => true,
             ]);
-
-        } catch (ClientException $e)  {
+        } catch (ClientException $e) {
             $response = $e->getResponse();
-            $this->logger->error("[phonenumber helper] Could not format number "
-                . "due to client error", [
-                "message" => $response->getBody()->getContents(),
-                "status_code" => $response->getStatusCode(),
-                "phonenumber" => $phonenumber
-            ]);
+            $this->logger->error('[phonenumber helper] Could not format number '
+                . 'due to client error', [
+                    'message' => $response->getBody()->getContents(),
+                    'status_code' => $response->getStatusCode(),
+                    'phonenumber' => $phonenumber,
+                ]);
 
             return $phonenumber;
         } catch (ServerException $e) {
             $response = $e->getResponse();
-            $this->logger->error("[phonenumber helper] Could not format number "
-                . "due to server error", [
-                "message" => $response->getBody()->getContents(),
-                "status_code" => $response->getStatusCode(),
-                "phonenumber" => $phonenumber
-            ]);
+            $this->logger->error('[phonenumber helper] Could not format number '
+                . 'due to server error', [
+                    'message' => $response->getBody()->getContents(),
+                    'status_code' => $response->getStatusCode(),
+                    'phonenumber' => $phonenumber,
+                ]);
 
             return null;
         } catch (ConnectException $e) {
-            $this->logger->error("[phonenumber helper] Could not format number "
-                . "due to connect error", [
-                "message" => $e->getMessage(),
-                "phonenumber" => $phonenumber
-            ]);
+            $this->logger->error('[phonenumber helper] Could not format number '
+                . 'due to connect error', [
+                    'message' => $e->getMessage(),
+                    'phonenumber' => $phonenumber,
+                ]);
 
             return null;
         }
 
-        $format = \json_decode($response->getBody())->national_format;
+        $format = json_decode($response->getBody()->getContents())->national_format;
 
         $item
             ->set($format)
             // expires after 3d
-            ->expiresAfter(3600 * 24 * 3)
-            ;
+            ->expiresAfter(3600 * 24 * 3);
 
         $this->cachePool->save($item);
 
@@ -233,55 +218,54 @@ class PhonenumberHelper
 
     protected function performTwilioLookup($phonenumber)
     {
-        if (FALSE === $this->isPhonenumberValidationConfigured()) {
+        if (false === $this->isPhonenumberValidationConfigured()) {
             return null;
         }
 
         // filter only number
-        $filtered = \preg_replace("/[^0-9]/", "", $phonenumber);
+        $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 
-        $item = $this->cachePool->getItem('pnum_'.$filtered);
+        $item = $this->cachePool->getItem('pnum_' . $filtered);
 
         if ($item->isHit()) {
             //return $item->get();
         }
 
         try {
-            $response = $this->twilioClient->get(sprintf(self::LOOKUP_URI, '+'.$filtered), [
+            $response = $this->twilioClient->get(sprintf(self::LOOKUP_URI, '+' . $filtered), [
                 'http_errors' => true,
                 'query' => [
-                    'Type' => 'carrier'
-                ]
+                    'Type' => 'carrier',
+                ],
             ]);
-        } catch (ClientException $e)  {
+        } catch (ClientException $e) {
             return 'invalid';
         } catch (ServerException $e) {
             $response = $e->getResponse();
-            $this->logger->error("[phonenumber helper] Could not perform validation "
-                . "due to server error", [
-                "message" => $response->getBody()->getContents(),
-                "status_code" => $response->getStatusCode(),
-                "phonenumber" => $phonenumber
-            ]);
+            $this->logger->error('[phonenumber helper] Could not perform validation '
+                . 'due to server error', [
+                    'message' => $response->getBody()->getContents(),
+                    'status_code' => $response->getStatusCode(),
+                    'phonenumber' => $phonenumber,
+                ]);
 
             return null;
         } catch (ConnectException $e) {
-            $this->logger->error("[phonenumber helper] Could not format number "
-                . "due to connect error", [
-                "message" => $e->getMessage(),
-                "phonenumber" => $phonenumber
-            ]);
+            $this->logger->error('[phonenumber helper] Could not format number '
+                . 'due to connect error', [
+                    'message' => $e->getMessage(),
+                    'phonenumber' => $phonenumber,
+                ]);
 
             return null;
         }
 
-        $validation = \json_decode($response->getBody())->carrier->type;
+        $validation = json_decode($response->getBody()->getContents())->carrier->type;
 
         $item
             ->set($validation)
             // expires after 12h
-            ->expiresAfter(3600 * 12)
-            ;
+            ->expiresAfter(3600 * 12);
 
         $this->cachePool->save($item);
 
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
index 45bfceae0..414732263 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/Templating.php
@@ -1,52 +1,40 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Phonenumber;
 
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
-use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 
-/**
- * 
- *
- */
 class Templating extends AbstractExtension
 {
     /**
-     *
      * @var PhonenumberHelper
      */
     protected $phonenumberHelper;
-    
+
     public function __construct(PhonenumberHelper $phonenumberHelper)
     {
         $this->phonenumberHelper = $phonenumberHelper;
     }
 
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('chill_format_phonenumber', [$this, 'formatPhonenumber'])
-        ];
-    }
-    
     public function formatPhonenumber($phonenumber)
     {
         return $this->phonenumberHelper->format($phonenumber) ?? $phonenumber;
     }
+
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('chill_format_phonenumber', [$this, 'formatPhonenumber']),
+        ];
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
index a196d2b60..2ae13b2ac 100644
--- a/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
+++ b/src/Bundle/ChillMainBundle/Redis/ChillRedis.php
@@ -1,26 +1,21 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Redis;
 
 /**
- * Redis client configured by chill main
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-class ChillRedis extends \Redis
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Redis;
+
+use Redis;
+
+/**
+ * Redis client configured by chill main.
+ */
+class ChillRedis extends Redis
 {
 }
diff --git a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
index 51f2d2c6d..6d61c408c 100644
--- a/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
+++ b/src/Bundle/ChillMainBundle/Redis/RedisConnectionFactory.php
@@ -1,78 +1,59 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Redis;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-class RedisConnectionFactory implements EventSubscriberInterface
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Redis;
+
+use RuntimeException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+final class RedisConnectionFactory implements EventSubscriberInterface
 {
-    protected $host;
-    
-    protected $port;
-    
-    protected $timeout;
-    
-    /**
-     *
-     * @var Redis
-     */
-    protected $redis;
-    
+    private string $host;
+
+    private int $port;
+
+    private ChillRedis $redis;
+
+    private int $timeout;
+
     public function __construct($parameters)
     {
         $this->host = $parameters['host'];
-        $this->port = $parameters['port'];
-        $this->timeout = $parameters['timeout'];
+        $this->port = (int) $parameters['port'];
+        $this->timeout = (int) $parameters['timeout'];
+        $this->redis = new ChillRedis();
     }
-    
-    
+
+    public function create()
+    {
+        $result = $this->redis->connect($this->host, $this->port, $this->timeout);
+
+        if (false === $result) {
+            throw new RuntimeException('Could not connect to redis instance');
+        }
+
+        return $this->redis;
+    }
+
     public static function getSubscribedEvents(): array
     {
         return [
             'kernel.finish_request' => [
-                [ 'onKernelFinishRequest' ]
-            ]
+                ['onKernelFinishRequest'],
+            ],
         ];
     }
-    
-    public function create()
-    {
-        $redis = $this->redis = new ChillRedis();
-        
-        $result = $redis->connect($this->host, $this->port, $this->timeout);
-        
-        if (FALSE === $result) {
-            throw new \RuntimeException("Could not connect to redis instance");
-        }
-        
-        return $redis;
-    }
-    
+
     public function onKernelFinishRequest()
     {
-        if ($this->redis !== null) {
-            $this->redis->close();
-        }
+        $this->redis->close();
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index cf488f411..6be52ec85 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -1,39 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\AddressReference;
+use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Search\SearchApiQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\ResultSetMapping;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use RuntimeException;
+use function explode;
+use function implode;
+use function strtr;
+use function trim;
 
 final class AddressReferenceRepository implements ObjectRepository
 {
+    private EntityManagerInterface $entityManager;
+
     private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(AddressReference::class);
-    }
-
-    public function find($id, $lockMode = null, $lockVersion = null): ?AddressReference
-    {
-        return $this->repository->find($id, $lockMode, $lockVersion);
-    }
-
-    public function findOneBy(array $criteria, array $orderBy = null): ?AddressReference
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
-    /**
-     * @return AddressReference[]
-     */
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
+        $this->entityManager = $entityManager;
     }
 
     public function countAll(): int
@@ -44,15 +45,116 @@ final class AddressReferenceRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
+    public function countByPostalCodePattern(PostalCode $postalCode, string $pattern): int
+    {
+        $query = $this->buildQueryByPostalCodePattern($postalCode, $pattern);
+        $sql = $query->buildQuery(true);
+        $rsm = new ResultSetMapping();
+        $rsm->addScalarResult('c', 'c');
+
+        $nq = $this->entityManager->createNativeQuery($sql, $rsm)->setParameters($query->buildParameters(true));
+
+        return (int) $nq->getSingleResult()['c'];
+    }
+
+    public function find($id, $lockMode = null, $lockVersion = null): ?AddressReference
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
     /**
      * @return AddressReference[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return AddressReference[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    /**
+     * @return AddressReference[]|array
+     */
+    public function findByPostalCodePattern(PostalCode $postalCode, string $pattern, bool $simplify = false, int $start = 0, int $limit = 50): array
+    {
+        $query = $this->buildQueryByPostalCodePattern($postalCode, $pattern);
+
+        if (!$simplify) {
+            $rsm = new ResultSetMappingBuilder($this->entityManager);
+            $rsm->addRootEntityFromClassMetadata(AddressReference::class, 'cma');
+            $query->addSelectClause($rsm->generateSelectClause());
+        } else {
+            throw new RuntimeException('not implemented');
+        }
+
+        $sql = strtr(
+            $query->buildQuery() . 'ORDER BY pertinence DESC, lpad(streetnumber, 10, \'0\') ASC OFFSET ? LIMIT ? ',
+            // little hack for adding sql method to point
+            ['cma.point AS point' => 'ST_AsGeojson(cma.point) AS point']
+        );
+        $parameters = [...$query->buildParameters(), $start, $limit];
+
+        return $this->entityManager->createNativeQuery($sql, $rsm)
+            ->setParameters($parameters)
+            ->getResult();
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?AddressReference
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return AddressReference::class;
     }
+
+    private function buildQueryByPostalCodePattern(PostalCode $postalCode, string $pattern): SearchApiQuery
+    {
+        $pattern = trim($pattern);
+
+        if ('' === $pattern) {
+            throw new RuntimeException('the search pattern must not be empty');
+        }
+        $query = new SearchApiQuery();
+
+        $query
+            ->setFromClause('chill_main_address_reference cma')
+            ->andWhereClause('postcode_id = ?', [$postalCode->getId()]);
+
+        $pertinenceClause = ['STRICT_WORD_SIMILARITY(addresscanonical, UNACCENT(?))'];
+        $pertinenceArgs = [$pattern];
+        $orWhere = ['addresscanonical %>> UNACCENT(?)'];
+        $orWhereArgs = [$pattern];
+
+        foreach (explode(' ', $pattern) as $part) {
+            $part = trim($part);
+
+            if ('' === $part) {
+                continue;
+            }
+
+            $orWhere[] = "addresscanonical LIKE '%' || UNACCENT(LOWER(?)) || '%'";
+            $orWhereArgs[] = $part;
+            $pertinenceClause[] =
+                "(EXISTS (SELECT 1 FROM unnest(string_to_array(addresscanonical, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(?)))))::int";
+            $pertinenceClause[] =
+                '(addresscanonical LIKE UNACCENT(LOWER(?)))::int';
+            array_push($pertinenceArgs, $part, $part);
+        }
+        $query
+            ->setSelectPertinence(implode(' + ', $pertinenceClause), $pertinenceArgs)
+            ->andWhereClause(implode(' OR ', $orWhere), $orWhereArgs);
+
+        return $query;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
index 08e2da708..a6d739de4 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -19,16 +26,16 @@ final class AddressRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Address::class);
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?Address
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?Address
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return Address[]
      */
@@ -38,19 +45,23 @@ final class AddressRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return Address[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
-        return Address::class;
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Address
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    public function getClassName()
     {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
+        return Address::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
index 3cf8cf38b..554f39880 100644
--- a/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CenterRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -23,11 +30,6 @@ final class CenterRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?Center
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return Center[]
      */
@@ -37,14 +39,23 @@ final class CenterRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return Center[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Center
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return Center::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
index 2702784f0..3604f25d0 100644
--- a/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CivilityRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Civility;
@@ -38,5 +27,4 @@ class CivilityRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Civility::class);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
index 336768948..81bea648d 100644
--- a/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/CountryRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -23,11 +30,6 @@ final class CountryRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?Country
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return Country[]
      */
@@ -37,14 +39,23 @@ final class CountryRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return Country[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Country
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return Country::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
index 6faed8e47..f8b11ceac 100644
--- a/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -23,11 +30,6 @@ final class GroupCenterRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?GroupCenter
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return GroupCenter[]
      */
@@ -37,14 +39,23 @@ final class GroupCenterRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return GroupCenter[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?GroupCenter
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return GroupCenter::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
index f6a7ec284..88e00a6c4 100644
--- a/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LanguageRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -23,11 +30,6 @@ final class LanguageRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?Language
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return Language[]
      */
@@ -37,14 +39,23 @@ final class LanguageRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return Language[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Language
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return Language::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/LocationRepository.php b/src/Bundle/ChillMainBundle/Repository/LocationRepository.php
index 8e67fecea..253298d49 100644
--- a/src/Bundle/ChillMainBundle/Repository/LocationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LocationRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Location;
@@ -18,4 +27,14 @@ class LocationRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Location::class);
     }
+
+    /**
+     * fetch locations which are selectable for users.
+     *
+     * @return Location[]
+     */
+    public function findByPublicLocations()
+    {
+        return $this->findBy(['active' => true, 'availableForUsers' => true]);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php b/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php
index 80e2d020d..e8d5579d0 100644
--- a/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/LocationTypeRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\LocationType;
@@ -18,5 +27,4 @@ class LocationTypeRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, LocationType::class);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
index 5ffda75dc..4af19550c 100644
--- a/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
@@ -1,30 +1,22 @@
 <?php
 
-/*
- * Copyright (C) 2021 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
-use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Query;
+use Doctrine\Persistence\ObjectRepository;
 
 final class NotificationRepository implements ObjectRepository
 {
@@ -35,16 +27,18 @@ final class NotificationRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Notification::class);
     }
 
+    public function countAllForAttendee(User $addressee): int // TODO passer à attendees avec S
+    {
+        $query = $this->queryAllForAttendee($addressee, $countQuery = true);
+
+        return $query->getSingleScalarResult();
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?Notification
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?Notification
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return Notification[]
      */
@@ -54,19 +48,54 @@ final class NotificationRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return Notification[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findAllForAttendee(User $addressee, $limit = null, $offset = null): array // TODO passer à attendees avec S
+    {
+        $query = $this->queryAllForAttendee($addressee);
+
+        if ($limit) {
+            $query = $query->setMaxResults($limit);
+        }
+
+        if ($offset) {
+            $query = $query->setFirstResult($offset);
+        }
+
+        return $query->getResult();
+    }
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return Notification[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    private function queryAllForAttendee(User $addressee, bool $countQuery=False): Query
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Notification
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
+        return Notification::class;
+    }
+
+    private function queryAllForAttendee(User $addressee, bool $countQuery = false): Query
     {
         $qb = $this->repository->createQueryBuilder('n');
 
         $select = 'n';
-        if($countQuery) {
+
+        if ($countQuery) {
             $select = 'count(n)';
         }
 
@@ -78,37 +107,4 @@ final class NotificationRepository implements ObjectRepository
 
         return $qb->getQuery();
     }
-
-    /**
-     * @return int
-     */
-    public function  countAllForAttendee(User $addressee): int // TODO passer à attendees avec S
-    {
-        $query = $this->queryAllForAttendee($addressee, $countQuery=True);
-
-        return $query->getSingleScalarResult();
-    }
-
-
-    /**
-     * @return Notification[]
-     */
-    public function  findAllForAttendee(User $addressee, $limit = null, $offset = null): array // TODO passer à attendees avec S
-    {
-        $query = $this->queryAllForAttendee($addressee);
-
-        if($limit) {
-            $query = $query->setMaxResults($limit);
-        }
-
-        if($offset) {
-            $query = $query->setFirstResult($offset);
-        }
-
-        return $query->getResult();
-    }
-
-    public function getClassName() {
-        return Notification::class;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
index 0bb4c7bfd..18f8ff777 100644
--- a/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PermissionsGroupRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -23,11 +30,6 @@ final class PermissionsGroupRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?PermissionsGroup
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return PermissionsGroup[]
      */
@@ -37,14 +39,23 @@ final class PermissionsGroupRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return PermissionsGroup[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?PermissionsGroup
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return PermissionsGroup::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
index 0087c9aa9..02e63771b 100644
--- a/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php
@@ -1,21 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
 
+use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Search\SearchApiQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query\ResultSetMapping;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use RuntimeException;
 
 final class PostalCodeRepository implements ObjectRepository
 {
+    private EntityManagerInterface $entityManager;
+
     private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(PostalCode::class);
+        $this->entityManager = $entityManager;
+    }
+
+    public function countByPattern(string $pattern, ?Country $country): int
+    {
+        $query = $this->buildQueryByPattern($pattern, $country);
+        $sql = $query->buildQuery(true);
+        $rsm = new ResultSetMapping();
+        $rsm->addScalarResult('c', 'c');
+
+        $nq = $this->entityManager->createNativeQuery($sql, $rsm)
+            ->setParameters($query->buildParameters(true));
+
+        return (int) $nq->getSingleResult()['c'];
     }
 
     public function find($id, $lockMode = null, $lockVersion = null): ?PostalCode
@@ -23,11 +51,6 @@ final class PostalCodeRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?PostalCode
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return PostalCode[]
      */
@@ -37,14 +60,87 @@ final class PostalCodeRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return PostalCode[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findByPattern(string $pattern, ?Country $country, ?int $start = 0, ?int $limit = 50): array
+    {
+        $query = $this->buildQueryByPattern($pattern, $country);
+
+        $rsm = new ResultSetMappingBuilder($this->entityManager);
+        $rsm->addRootEntityFromClassMetadata(PostalCode::class, 'cmpc');
+        $query->addSelectClause($rsm->generateSelectClause());
+
+        $sql = strtr(
+            $query->buildQuery() . 'ORDER BY pertinence DESC, canonical ASC OFFSET ? LIMIT ? ',
+            // little hack for adding sql method to point
+            ['cmpc.center AS center' => 'ST_AsGeojson(cmpc.center) AS center']
+        );
+        $parameters = [...$query->buildParameters(), $start, $limit];
+
+        return $this->entityManager->createNativeQuery($sql, $rsm)
+            ->setParameters($parameters)
+            ->getResult();
+    }
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?PostalCode
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return PostalCode::class;
     }
+
+    private function buildQueryByPattern(string $pattern, ?Country $country): SearchApiQuery
+    {
+        $pattern = trim($pattern);
+
+        if ('' === $pattern) {
+            throw new RuntimeException('the search pattern must not be empty');
+        }
+        $query = new SearchApiQuery();
+
+        $query
+            ->setFromClause('chill_main_postal_code cmpc')
+            ->andWhereClause('cmpc.origin = 0');
+
+        if (null !== $country) {
+            $query->andWhereClause('cmpc.country_id = ?', [$country->getId()]);
+        }
+
+        $pertinenceClause = ['STRICT_WORD_SIMILARITY(canonical, UNACCENT(?))'];
+        $pertinenceArgs = [$pattern];
+        $orWhere = ['canonical %>> UNACCENT(?)'];
+        $orWhereArgs = [$pattern];
+
+        foreach (explode(' ', $pattern) as $part) {
+            $part = trim($part);
+
+            if ('' === $part) {
+                continue;
+            }
+
+            $orWhere[] = "canonical LIKE '%' || UNACCENT(LOWER(?)) || '%'";
+            $orWhereArgs[] = $part;
+            $pertinenceClause[] =
+                "(EXISTS (SELECT 1 FROM unnest(string_to_array(canonical, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(?)))))::int";
+            $pertinenceClause[] =
+                '(canonical LIKE UNACCENT(LOWER(?)))::int';
+            array_push($pertinenceArgs, $part, $part);
+        }
+        $query
+            ->setSelectPertinence(implode(' + ', $pertinenceClause), $pertinenceArgs)
+            ->andWhereClause(implode(' OR ', $orWhere), $orWhereArgs);
+
+        return $query;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
index 6996f384c..2475f9497 100644
--- a/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/RoleScopeRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -23,11 +30,6 @@ final class RoleScopeRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?RoleScope
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return RoleScope[]
      */
@@ -37,14 +39,23 @@ final class RoleScopeRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return RoleScope[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?RoleScope
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return RoleScope::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index e100000c4..5b3efe658 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
@@ -18,16 +25,16 @@ final class ScopeRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Scope::class);
     }
 
+    public function createQueryBuilder($alias, $indexBy = null)
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?Scope
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?Scope
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return Scope[]
      */
@@ -37,19 +44,23 @@ final class ScopeRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return Scope[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
-    
-    public function createQueryBuilder($alias, $indexBy = null)  
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?Scope
     {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
+        return $this->repository->findOneBy($criteria, $orderBy);
     }
 
-    public function getClassName() {
+    public function getClassName()
+    {
         return Scope::class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
new file mode 100644
index 000000000..6dc446111
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\ParentRoleHelper;
+use Doctrine\ORM\EntityManagerInterface;
+
+class UserACLAwareRepository implements UserACLAwareRepositoryInterface
+{
+    private EntityManagerInterface $em;
+
+    private ParentRoleHelper $parentRoleHelper;
+
+    public function __construct(ParentRoleHelper $parentRoleHelper, EntityManagerInterface $em)
+    {
+        $this->parentRoleHelper = $parentRoleHelper;
+        $this->em = $em;
+    }
+
+    public function findUsersByReachedACL(string $role, $center, $scope = null, bool $onlyEnabled = true): array
+    {
+        $parents = $this->parentRoleHelper->getParentRoles($role);
+        $parents[] = $role;
+
+        $qb = $this->em->createQueryBuilder();
+
+        $qb
+            ->select('u')
+            ->from(User::class, 'u')
+            ->join('u.groupCenters', 'gc')
+            ->join('gc.permissionsGroup', 'pg')
+            ->join('pg.roleScopes', 'rs')
+            ->where($qb->expr()->in('rs.role', $parents));
+
+        if ($onlyEnabled) {
+            $qb->andWhere($qb->expr()->eq('u.enabled', "'TRUE'"));
+        }
+
+        if (null !== $center) {
+            $centers = $center instanceof Center ? [$center] : $center;
+            $qb
+                ->andWhere($qb->expr()->in('gc.center', ':centers'))
+                ->setParameter('centers', $centers);
+        }
+
+        if (null !== $scope) {
+            $scopes = $scope instanceof Scope ? [$scope] : $scope;
+            $qb
+                ->andWhere($qb->expr()->in('rs.scope', ':scopes'))
+                ->setParameter('scopes', $scopes);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..206096b96
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Repository/UserACLAwareRepositoryInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+
+interface UserACLAwareRepositoryInterface
+{
+    /**
+     * Find the users reaching the given center and scope, for the given role.
+     *
+     * @param array|Center|Center[] $center
+     * @param array|Scope|Scope[]|null $scope
+     * @param bool $onlyActive true if get only active users
+     *
+     * @return User[]
+     */
+    public function findUsersByReachedACL(string $role, $center, $scope = null, bool $onlyActive = true): array;
+}
diff --git a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
index f19952c31..13eb9e481 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserJobRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Repository;
 
 use Chill\MainBundle\Entity\UserJob;
@@ -30,7 +39,10 @@ class UserJobRepository implements ObjectRepository
     }
 
     /**
-     * @return array|UserJob[]|object[]
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return array|object[]|UserJob[]
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
     {
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 825a1600e..00556702e 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -1,53 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 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;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use function count;
 
 final class UserRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
-
     private EntityManagerInterface $entityManager;
 
+    private EntityRepository $repository;
+
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->entityManager = $entityManager;
         $this->repository = $entityManager->getRepository(User::class);
     }
 
-    public function find($id, $lockMode = null, $lockVersion = null): ?User
-    {
-        return $this->repository->find($id, $lockMode, $lockVersion);
-    }
-
-    public function findOneBy(array $criteria, array $orderBy = null): ?User
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
-    /**
-     * @return User[]
-     */
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * @return User[]
-     */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
     public function countBy(array $criteria): int
     {
         return $this->repository->count($criteria);
@@ -58,18 +41,6 @@ final class UserRepository implements ObjectRepository
         return $this->countBy(['enabled' => true]);
     }
 
-    /**
-     * @return User[]|array
-     */
-    public function findByActive(array $orderBy = null, int $limit = null, int $offset = null): array
-    {
-        return $this->findBy(['enabled' => true], $orderBy, $limit, $offset);
-    }
-
-    public function getClassName() {
-        return User::class;
-    }
-
     public function countByUsernameOrEmail(string $pattern): int
     {
         $qb = $this->queryByUsernameOrEmail($pattern);
@@ -79,6 +50,38 @@ final class UserRepository implements ObjectRepository
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
 
+    public function find($id, $lockMode = null, $lockVersion = null): ?User
+    {
+        return $this->repository->find($id, $lockMode, $lockVersion);
+    }
+
+    /**
+     * @return User[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return User[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    /**
+     * @return array|User[]
+     */
+    public function findByActive(?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->findBy(['enabled' => true], $orderBy, $limit, $offset);
+    }
+
     public function findByUsernameOrEmail(string $pattern)
     {
         $qb = $this->queryByUsernameOrEmail($pattern);
@@ -86,6 +89,11 @@ final class UserRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?User
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
     public function findOneByUsernameOrEmail(string $pattern)
     {
         $qb = $this->queryByUsernameOrEmail($pattern);
@@ -94,28 +102,29 @@ final class UserRepository implements ObjectRepository
     }
 
     /**
-     * Get the users having a specific flags
+     * Get the users having a specific flags.
      *
      * If provided, only the users amongst "filtered users" are searched. This
      * allows to make a first search amongst users based on role and center
      * and, then filter those users having some flags.
      *
      * @param \Chill\MainBundle\Entity\User[] $amongstUsers
+     * @param mixed $flag
      */
     public function findUsersHavingFlags($flag, array $amongstUsers = []): array
     {
         $gcs = $this
             ->entityManager
             ->createQuery(
-                "SELECT DISTINCT gc " .
-                "FROM ".GroupCenter::class." gc " .
-                "JOIN gc.permissionsGroup pg " .
-                "WHERE " .
-                "JSONB_EXISTS_IN_ARRAY(pg.flags, :flag) = :true "
+                'SELECT DISTINCT gc ' .
+                'FROM ' . GroupCenter::class . ' gc ' .
+                'JOIN gc.permissionsGroup pg ' .
+                'WHERE ' .
+                'JSONB_EXISTS_IN_ARRAY(pg.flags, :flag) = :true '
             )
             ->setParameters([
                 'true' => true,
-                'flag' => $flag
+                'flag' => $flag,
             ])
             ->getResult();
 
@@ -131,14 +140,14 @@ final class UserRepository implements ObjectRepository
 
         $orx = $qb->expr()->orX();
 
-        foreach($gcs as $i => $gc) {
+        foreach ($gcs as $i => $gc) {
             $orx->add(':gc_' . $i . ' MEMBER OF u.groupCenters');
             $qb->setParameter('gc_' . $i, $gc);
         }
 
         $qb->andWhere($orx);
 
-        if ($amongstUsers !== []) {
+        if ([] !== $amongstUsers) {
             $qb
                 ->andWhere($qb->expr()->in('u', ':amongstUsers'))
                 ->setParameter('amongstUsers', $amongstUsers);
@@ -147,7 +156,12 @@ final class UserRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    protected function queryByUsernameOrEmail(string $pattern): QueryBuilder
+    public function getClassName()
+    {
+        return User::class;
+    }
+
+    private function queryByUsernameOrEmail(string $pattern): QueryBuilder
     {
         $qb = $this->entityManager->createQueryBuilder('u');
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 593cd49b4..e7f613bc8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -10,6 +10,9 @@
 // Chill buttons
 @import './scss/buttons';
 
+// Chill badges
+@import './scss/badge';
+
 // Chill forms
 @import './scss/forms';
 
@@ -202,9 +205,9 @@ footer.footer {
    }
 }
 
-
 /*
- *    SPECIFIC RULES
+ *    GENERIC MAIN STYLES
+ *    miscellaneous
  */
 
 /// titles
@@ -280,7 +283,6 @@ div.metadata {
 }
 
 /// chill help tooltip
-
 .chill-help-tooltip {
    &::before {
       content: '\f05a';
@@ -295,7 +297,6 @@ div.metadata {
 
 /// display definition list
 //  with dt and dd on same line
-
 dl.definition-inline {
    dd {
       display: inline;
@@ -317,6 +318,19 @@ dl.definition-inline {
    font-style: italic;
 }
 
+/// flash
+div#flashMessages {
+    margin-top: 20px;
+    .flash-notice {
+        margin-top: 10px;
+        margin-bottom: 10px;
+    }
+}
+
+/*
+ *    SPECIFIC RULES
+ */
+
 //// still used ?
 // move from chillmain.css, converted to sass
 
@@ -369,14 +383,6 @@ div#usefulbar {
    }
 }
 
-div#flashMessages {
-   margin-top: 20px;
-   .flash-notice {
-      margin-top: 10px;
-      margin-bottom: 10px;
-   }
-}
-
 .personName {
    font-variant: small-caps;
    text-transform: capitalize;
@@ -402,3 +408,11 @@ input.belgian_national_number {
    &.daily_counter {}
    &.control_digit {}
 }
+
+// replace abbr
+span.item-key {
+    font-variant: all-small-caps;
+    font-size: 90%;
+    background-color: #0000000a;
+    //text-decoration: dotted underline;
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss
new file mode 100644
index 000000000..4018e656b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss
@@ -0,0 +1,66 @@
+
+/// mixin used in this sheet
+@mixin remove_link {
+    cursor: pointer;
+    &:before {
+        font: normal normal normal 14px/1 ForkAwesome;
+        margin-left: 0.5em;
+        content: "\f00d";  // fa-times
+        color: var(--bs-danger);
+        text-decoration: none;
+    }
+}
+
+/*
+*  SUGGESTIONS LIST - A specific list of badges used to manage suggestions (with add/remove link)
+*  /!\ use bootstrap badge styles,
+*      cfr. src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss
+*/
+
+ul.list-suggest {
+    list-style-type: none;
+    padding-left: 0;
+    li > span {
+        white-space: normal;
+        text-align: start;
+        margin-bottom: 3px;
+    }
+    &.cols {
+        columns: 3;
+    }
+    &.inline {
+        li {
+            display: inline-block;
+            margin-right: 0.2em;
+        }
+    }
+    &.add-items {
+        li {
+            cursor: pointer;
+            & > span:before {
+                font: normal normal normal 14px/1 ForkAwesome;
+                margin-right: 0.5em;
+                content: "\f067"; // fa-plus
+                color: var(--bs-success);
+            }
+            & span:hover {
+                color: $chill-l-gray;
+            }
+        }
+    }
+    &.remove-items {
+        li {
+            a {
+                @include remove_link;
+            }
+        }
+    }
+}
+
+/// manage remove link if it isn't a list but a title
+/// (cfr. in Vue AccompanyingCourseWorkEdit)
+div.item-title {
+    a {
+        @include remove_link;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
index 8e3a9121b..20fe927a6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss
@@ -101,6 +101,10 @@ div.flex-table {
         div.item-row {
             flex-direction: row;
 
+            &.column { // exception
+                flex-direction: column
+            }
+
             div.item-col {
                 &:first-child {
                     flex-grow: 0; flex-shrink: 0; flex-basis: auto;
@@ -160,6 +164,12 @@ div.wrap-list {
             & > * {
                 padding-right: 1em;
             }
+
+            h3, h4 {
+                font-weight: 700;
+                font-size: 100%;
+                font-family: 'Open Sans';
+            }
         }
 
         div.wl-col.list {
@@ -171,6 +181,10 @@ div.wrap-list {
                 padding: 0em;
                 display: inline-block;
             }
+
+            blockquote.chill-user-quote {
+                margin: 0.7em 0;
+            }
         }
     }
 
@@ -183,7 +197,7 @@ div.wrap-list {
         div.wl-col.list {
             background-color: cyan;
 
-            p.wl-item {
+            .wl-item {
                 background-color: orange;
             }
         }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
new file mode 100644
index 000000000..96a95ad93
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js
@@ -0,0 +1,105 @@
+/**
+ * Generic api method that can be adapted to any fetch request
+ */
+ const makeFetch = (method, url, body) => {
+    return fetch(url, {
+        method: method,
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: (body !== null) ? JSON.stringify(body) : null
+    })
+    .then(response => {
+        if (response.ok) {
+            return response.json();
+        }
+
+        if (response.status === 422) {
+            return response.json().then(response => {
+                throw ValidationException(response)
+            });
+        }
+
+        if (response.status === 403) {
+            return response.json().then(() => {
+                throw AccessException();
+            });
+        }
+
+        throw {
+            name: 'Exception',
+            sta: response.status,
+            txt: response.statusText,
+            err: new Error(),
+            violations: response.body
+        };
+    });
+}
+
+/**
+ * Fetch results with certain parameters
+ */
+const _fetchAction = (page, uri, params) => {
+    const item_per_page = 50;
+    if (params === undefined) {
+        params = {};
+    }
+    let url = uri + '?' + new URLSearchParams({ item_per_page, page, ...params });
+
+    return fetch(url, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+    }).then(response => {
+        if (response.ok) { return response.json(); }
+        throw Error({ m: response.statusText });
+    });
+};
+
+const fetchResults = async (uri, params) => {
+    let promises = [],
+        page = 1;
+    let firstData = await _fetchAction(page, uri, params);
+
+    promises.push(Promise.resolve(firstData.results));
+
+    if (firstData.pagination.more) {
+        do {
+            page = ++page;
+            promises.push(_fetchAction(page, uri, params).then(r => Promise.resolve(r.results)));
+        } while (page * firstData.pagination.items_per_page < firstData.count)
+    }
+
+    return Promise.all(promises).then(values => values.flat());
+};
+
+const fetchScopes = () => {
+    return fetchResults('/api/1.0/main/scope.json');
+};
+
+
+/**
+ * Error objects to be thrown
+ */
+const ValidationException = (response) => {
+    const error = {};
+    error.name = 'ValidationException';
+    error.violations = response.violations.map((violation) => `${violation.title}`);
+
+    return error;
+}
+
+const AccessException = () => {
+    const error = {};
+    error.name = 'AccessException';
+    error.violations = ['You are no longer permitted to perform this action'];
+
+    return error;
+}
+
+export {
+    makeFetch,
+    fetchResults,
+    fetchScopes
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/download.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/download.js
index 625103ebe..dec8ba727 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/download.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/download.js
@@ -1,39 +1,39 @@
 
-const _fetchAction = (page, uri, params) => {
-    const item_per_page = 50;
-    if (params === undefined) {
-        params = {};
-    }
-    let url = uri + '?' + new URLSearchParams({ item_per_page, page, ...params });
+// const _fetchAction = (page, uri, params) => {
+//     const item_per_page = 50;
+//     if (params === undefined) {
+//         params = {};
+//     }
+//     let url = uri + '?' + new URLSearchParams({ item_per_page, page, ...params });
 
-    return fetch(url, {
-        method: 'GET',
-        headers: {
-            'Content-Type': 'application/json;charset=utf-8'
-        },
-    }).then(response => {
-        if (response.ok) { return response.json(); }
-        throw Error({ m: response.statusText });
-    });
-};
+//     return fetch(url, {
+//         method: 'GET',
+//         headers: {
+//             'Content-Type': 'application/json;charset=utf-8'
+//         },
+//     }).then(response => {
+//         if (response.ok) { return response.json(); }
+//         throw Error({ m: response.statusText });
+//     });
+// };
 
-const fetchResults = async (uri, params) => {
-    let promises = [],
-        page = 1;
-    let firstData = await _fetchAction(page, uri, params);
+// const fetchResults = async (uri, params) => {
+//     let promises = [],
+//         page = 1;
+//     let firstData = await _fetchAction(page, uri, params);
 
-    promises.push(Promise.resolve(firstData.results));
+//     promises.push(Promise.resolve(firstData.results));
 
-    if (firstData.pagination.more) {
-        do {
-            page = ++page;
-            promises.push(_fetchAction(page, uri, params).then(r => Promise.resolve(r.results)));
-        } while (page * firstData.pagination.items_per_page < firstData.count)
-    }
+//     if (firstData.pagination.more) {
+//         do {
+//             page = ++page;
+//             promises.push(_fetchAction(page, uri, params).then(r => Promise.resolve(r.results)));
+//         } while (page * firstData.pagination.items_per_page < firstData.count)
+//     }
 
-    return Promise.all(promises).then(values => values.flat());
-};
+//     return Promise.all(promises).then(values => values.flat());
+// };
 
-export {
-    fetchResults
-};
+// export {
+//     fetchResults
+// };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
index 4c4223d77..a155c84a2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/scope.js
@@ -1,9 +1,9 @@
-import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
+// import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
 
-const fetchScopes = () => {
-  return fetchResults('/api/1.0/main/scope.json');
-};
+// const fetchScopes = () => {
+//   return fetchResults('/api/1.0/main/scope.json');
+// };
 
-export {
-  fetchScopes
-};
+// export {
+//   fetchScopes
+// };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/index.js
index 34f3b80b5..88890ab40 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/index.js
@@ -1 +1,5 @@
-require("./show_hide.js");
\ No newline at end of file
+//require("./show_hide.js");
+
+import { ShowHide } from './show_hide.js'
+
+export { ShowHide }
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
index dd4dfd6db..ec6b796ec 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
@@ -134,4 +134,4 @@ var ShowHide = function(options) {
     };
 };
 
-export {ShowHide};
+export { ShowHide };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss
index 9d632026f..38998bfd5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss
@@ -4,3 +4,12 @@
  */
 
 
+/// A specific list of badges, use bootstrap badge styles
+/// cfr. src/Bundle/ChillMainBundle/Resources/public/chill/scss/badge.scss
+ul.list-suggest {
+    li > span {
+        @extend .badge;
+        @extend .bg-primary;
+    }
+}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js
index daff13a55..936587dec 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js
@@ -8,3 +8,43 @@ require('./bootstrap.scss');
 import Dropdown from 'bootstrap/js/src/dropdown';
 import Modal from 'bootstrap/js/dist/modal';
 import Collapse from 'bootstrap/js/src/collapse';
+import Carousel from 'bootstrap/js/src/carousel';
+
+//
+// ACHeaderSlider is a small slider used in banner of AccompanyingCourse Section
+// Initialize options, and show/hide controls in first/last slides
+//
+let ACHeaderSlider = document.querySelector('#ACHeaderSlider');
+if (ACHeaderSlider) {
+    let controlPrev = ACHeaderSlider.querySelector('button[data-bs-slide="prev"]'),
+        controlNext = ACHeaderSlider.querySelector('button[data-bs-slide="next"]'),
+        length = ACHeaderSlider.querySelectorAll('.carousel-item').length,
+        last = length-1,
+        carousel = new Carousel(ACHeaderSlider, {
+            interval: false,
+            wrap: false,
+            ride: false,
+            keyboard: false,
+            touch: true
+        })
+    ;
+    document.addEventListener('DOMContentLoaded', (e) => {
+        controlNext.classList.remove('visually-hidden');
+    });
+    ACHeaderSlider.addEventListener('slid.bs.carousel', (e) => {
+        //console.log('from slide', e.direction, e.relatedTarget, e.from, e.to );
+        switch (e.to) {
+            case 0:
+                controlPrev.classList.add('visually-hidden');
+                controlNext.classList.remove('visually-hidden');
+                break;
+            case last:
+                controlPrev.classList.remove('visually-hidden');
+                controlNext.classList.add('visually-hidden');
+                break;
+            default:
+                controlPrev.classList.remove('visually-hidden');
+                controlNext.classList.remove('visually-hidden');
+        }
+    })
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
index 62065b3ad..1dbc85dee 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js
@@ -16,7 +16,8 @@ const fetchCountries = () => {
 
 /**
 * Endpoint chill_api_single_postal_code__index
-* method GET, get Country Object
+* method GET, get Cities Object
+* @params {object} a country object
 * @returns {Promise} a promise containing all Postal Code objects filtered with country
 */
 const fetchCities = (country) => {
@@ -29,6 +30,40 @@ const fetchCities = (country) => {
       });
 };
 
+
+/**
+* Endpoint chill_main_postalcodeapi_search
+* method GET, get Cities Object
+* @params {string} search a search string
+* @params {object} country a country object
+* @returns {Promise} a promise containing all Postal Code objects filtered with country and a search string
+*/
+const searchCities = (search, country) => {
+   const url = `/api/1.0/main/postal-code/search.json?q=${search}&country=${country.id}`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+/**
+* Endpoint chill_main_addressreferenceapi_search
+* method GET, get AddressReference Object
+* @params {string} search a search string
+* @params {object} postalCode a postalCode object
+* @returns {Promise} a promise containing all Postal Code objects filtered with country and a search string
+*/
+const searchReferenceAddresses = (search, postalCode) => {
+   const url = `/api/1.0/main/address-reference/by-postal-code/${postalCode.id}/search.json?q=${search}`;
+   return fetch(url)
+      .then(response => {
+         if (response.ok) { return response.json(); }
+         throw Error('Error with request resource response');
+      });
+};
+
+
 /**
 * Endpoint chill_api_single_address_reference__index
 * method GET, get AddressReference Object
@@ -170,5 +205,7 @@ export {
    postAddress,
    patchAddress,
    postPostalCode,
-   getAddress
+   getAddress,
+   searchCities,
+   searchReferenceAddresses
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 7bf088fb6..ed1d14633 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -556,8 +556,8 @@ export default {
          this.entity.selected.address.distribution = this.context.edit ? this.entity.address.distribution: null;
          this.entity.selected.address.extra = this.context.edit ? this.entity.address.extra: null;
 
-         this.entity.selected.writeNew.address = this.context.edit;
-         this.entity.selected.writeNew.postcode = this.context.edit;
+         this.entity.selected.writeNew.address = this.context.edit && this.entity.address.addressReference === null && this.entity.address.street.length > 0
+         this.entity.selected.writeNew.postcode = false // NB: this used to be this.context.edit, but think it was erroneous;
          console.log('!! just set writeNew.postcode to', this.entity.selected.writeNew.postcode);
       },
 
@@ -569,7 +569,6 @@ export default {
       applyChanges()
       {
          console.log('apply changes');
-
          let newAddress = {
             'isNoAddress': this.entity.selected.isNoAddress,
             'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street,
@@ -588,6 +587,12 @@ export default {
             newAddress = Object.assign(newAddress, {
                'point': this.entity.selected.address.point.coordinates
             });
+         } else {
+            if (this.entity.selected.postcode.coordinates) {
+               newAddress = Object.assign(newAddress, {
+                  'point': this.entity.selected.postcode.coordinates
+               });
+            }
          }
 
          // add the address reference, if any
@@ -627,7 +632,6 @@ export default {
          if (!this.context.edit) {
             this.addNewAddress(newAddress)
                .then(payload => this.addressChangedCallback(payload));
-
          } else {
             this.updateAddress({
                addressId: this.context.addressId,
@@ -691,8 +695,7 @@ export default {
       *  Async PATCH transactions,
       *  then update existing address with backend datas when promise is resolved
       */
-      updateAddress(payload)
-      {
+      updateAddress(payload) {
          this.flag.loading = true;
 
          // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index ca2f5d634..c333961db 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -4,6 +4,10 @@
       <VueMultiselect
          id="addressSelector"
          v-model="value"
+         :placeholder="$t('select_address')"
+         :tag-placeholder="$t('create_address')"
+         :select-label="$t('press_enter_to_select')"
+         :deselect-label="$t('create_address')"
          @search-change="listenInputSearch"
          ref="addressSelector"
          @select="selectAddress"
@@ -14,8 +18,7 @@
          :taggable="true"
          :multiple="false"
          @tag="addAddress"
-         :placeholder="$t('select_address')"
-         :tagPlaceholder="$t('create_address')"
+         :loading="isLoading"
          :options="addresses">
       </VueMultiselect>
    </div>
@@ -46,14 +49,17 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
+import { searchReferenceAddresses, fetchReferenceAddresses } from '../../api.js';
+
 
 export default {
    name: 'AddressSelection',
    components: { VueMultiselect },
-   props: ['entity', 'updateMapCenter'],
+   props: ['entity', 'context', 'updateMapCenter'],
    data() {
       return {
-         value: null
+         value: this.context.edit ? this.entity.address.addressReference : null,
+         isLoading: false
       }
    },
    computed: {
@@ -105,6 +111,36 @@ export default {
       },
       listenInputSearch(query) {
          //console.log('listenInputSearch', query, this.isAddressSelectorOpen);
+         if (!this.entity.selected.writeNew.postcode) {
+            if (query.length > 2) {
+               this.isLoading = true;
+               searchReferenceAddresses(query, this.entity.selected.city).then(
+                  addresses => new Promise((resolve, reject) => {
+                     this.entity.loaded.addresses = addresses.results;
+                     this.isLoading = false;
+                     resolve();
+               }))
+               .catch((error) => {
+                  console.log(error); //TODO better error handling
+                  this.isLoading = false;
+               });
+            } else {
+               if (query.length === 0) { // Fetch all cities when suppressing the query
+                  this.isLoading = true;
+                  fetchReferenceAddresses(this.entity.selected.city).then(
+                     addresses => new Promise((resolve, reject) => {
+                        this.entity.loaded.addresses = addresses.results;
+                        this.isLoading = false;
+                        resolve();
+                  }))
+                  .catch((error) => {
+                     console.log(error);
+                     this.isLoading = false;
+                  });
+               }
+            }
+         }
+
          if (this.isAddressSelectorOpen) {
             this.$data.value = { text: query };
          } else if (this.isEnteredCustomAddress) {
@@ -141,7 +177,6 @@ export default {
          }
       },
       addAddress() {
-         console.log('addAddress: pass here ?? never, it seems');
          this.entity.selected.writeNew.address = true;
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index 3e3dd98d4..abd1cd8de 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -12,10 +12,13 @@
          label="value"
          :custom-label="transName"
          :placeholder="$t('select_city')"
+         :select-label="$t('press_enter_to_select')"
+         :deselect-label="$t('create_postal_code')"
          :taggable="true"
          :multiple="false"
          @tag="addPostcode"
          :tagPlaceholder="$t('create_postal_code')"
+         :loading="isLoading"
          :options="cities">
       </VueMultiselect>
    </div>
@@ -46,15 +49,17 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
+import { searchCities, fetchCities } from '../../api.js';
 
 export default {
    name: 'CitySelection',
    components: { VueMultiselect },
-   props: ['entity', 'focusOnAddress', 'updateMapCenter'],
+   props: ['entity', 'context', 'focusOnAddress', 'updateMapCenter'],
    emits: ['getReferenceAddresses'],
    data() {
       return {
-         value: null
+         value: this.context.edit ? this.entity.address.postcode : null,
+         isLoading: false
       }
    },
    computed: {
@@ -91,6 +96,15 @@ export default {
    },
    mounted() {
       console.log('writeNew.postcode', this.entity.selected.writeNew.postcode, 'in mounted');
+      if (this.context.edit) {
+         this.entity.selected.city = this.value;
+         this.entity.selected.postcode.name = this.value.name;
+         this.entity.selected.postcode.code = this.value.code;
+         this.$emit('getReferenceAddresses', this.value);
+         if (this.value.center) {
+            this.updateMapCenter(this.value.center);
+         }
+      }
    },
    methods: {
       transName(value) {
@@ -101,8 +115,8 @@ export default {
          this.entity.selected.city = value;
          this.entity.selected.postcode.name = value.name;
          this.entity.selected.postcode.code = value.code;
+         this.entity.selected.postcode.coordinates = value.center.coordinates;
          this.entity.selected.writeNew.postcode = false;
-         console.log('writeNew.postcode false, in selectCity');
          this.$emit('getReferenceAddresses', value);
          this.focusOnAddress();
          if (value.center) {
@@ -110,7 +124,33 @@ export default {
          }
       },
       listenInputSearch(query) {
-         //console.log('listenInputSearch', query, this.isCitySelectorOpen);
+         if (query.length > 2) {
+            this.isLoading = true;
+            searchCities(query, this.entity.selected.country).then(
+               cities => new Promise((resolve, reject) => {
+                  this.entity.loaded.cities = cities.results.filter(c => c.origin !== 3); // filter out user-defined cities
+                  this.isLoading = false;
+                  resolve();
+            }))
+            .catch((error) => {
+               console.log(error); //TODO better error handling
+               this.isLoading = false;
+            });
+         } else {
+            if (query.length === 0) { // Fetch all cities when suppressing the query
+               this.isLoading = true;
+               fetchCities(this.entity.selected.country).then(
+                  cities => new Promise((resolve, reject) => {
+                     this.entity.loaded.cities = cities.results.filter(c => c.origin !== 3); // filter out user-defined cities
+                     this.isLoading = false;
+                     resolve();
+               }))
+               .catch((error) => {
+                  console.log(error)
+                  this.isLoading = false;
+               });
+            }
+         }
          if (this.isCitySelectorOpen) {
             this.$data.value = { text: query };
          } else if (this.isEnteredCustomCity) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
index 2e6ec86a7..c15db8d2a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -9,6 +9,8 @@
          v-bind:placeholder="$t('select_country')"
          v-bind:options="sortedCountries"
          v-model="value"
+         :select-label="$t('press_enter_to_select')"
+         :deselect-label="$t('press_enter_to_remove')"
          @select="selectCountry">
       </VueMultiselect>
    </div>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 2129a69d1..af1263b43 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -30,6 +30,7 @@
 
             <city-selection
                v-bind:entity="entity"
+               v-bind:context="context"
                v-bind:focusOnAddress="focusOnAddress"
                v-bind:updateMapCenter="updateMapCenter"
                @getReferenceAddresses="$emit('getReferenceAddresses', selected.city)">
@@ -37,6 +38,7 @@
 
             <address-selection v-if="!isNoAddress"
                v-bind:entity="entity"
+               v-bind:context="context"
                v-bind:updateMapCenter="updateMapCenter">
             </address-selection>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 9d7185696..ab0032de6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -1,5 +1,7 @@
 const addressMessages = {
     fr: {
+        press_enter_to_select: 'Appuyer sur Entrée pour sélectionner',
+        press_enter_to_remove: 'Appuyer sur Entrée pour désélectionner',
         add_an_address_title: 'Créer une adresse',
         edit_an_address_title: 'Modifier une adresse',
         create_a_new_address: 'Créer une nouvelle adresse',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/mod_input_address_index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/mod_input_address_index.js
index ad4a648f5..cb7da6e07 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/mod_input_address_index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/mod_input_address_index.js
@@ -5,82 +5,89 @@ import App from './App.vue';
 
 const i18n = _createI18n(addressMessages);
 
-let inputs = document.querySelectorAll('input[type="hidden"][data-input-address]');
+const addAddressInput = (inputs) => {
+    console.log(inputs)
+    inputs.forEach(el => {
+        let
+            addressId = el.value,
+            uniqid = el.dataset.inputAddress,
+            container = el.parentNode.querySelector('div[data-input-address-container="' + uniqid + '"]'),
+            isEdit = addressId !== '',
+            addressIdInt = addressId !== '' ? parseInt(addressId) : null
+        ;
 
-const isNumeric = function(v) { return !isNaN(v); };
+        if (container === null) {
+            throw Error("no container");
+        }
+        console.log('useValidFrom',  el.dataset.useValidFrom === '1');
 
-inputs.forEach(el => {
-    let
-        addressId = el.value,
-        uniqid = el.dataset.inputAddress,
-        container = document.querySelector('div[data-input-address-container="' + uniqid + '"]'),
-        isEdit = addressId !== '',
-        addressIdInt = addressId !== '' ? parseInt(addressId) : null
-    ;
-
-    if (container === null) {
-        throw Error("no container");
-    }
-    console.log('useValidFrom',  el.dataset.useValidFrom === '1');
-
-    const app = createApp({
-        template: `<app v-bind:addAddress="this.addAddress" @address-created="associateToInput"></app>`,
-        data() {
-            return {
-                addAddress: {
-                    context: {
-                        // for legacy ? can be remove ?
-                        target: {
-                            name: 'input-address',
-                            id: addressIdInt,
-                        },
-                        edit: isEdit,
-                        addressId: addressIdInt,
-                    },
-                    options: {
-                        /// Options override default.
-                        /// null value take default component value defined in AddAddress data()
-                        button: {
-                            text: {
-                                create: el.dataset.buttonTextCreate || null,
-                                edit: el.dataset.buttonTextUpdate || null,
+        const app = createApp({
+            template: `<app v-bind:addAddress="this.addAddress" @address-created="associateToInput"></app>`,
+            data() {
+                return {
+                    addAddress: {
+                        context: {
+                            // for legacy ? can be remove ?
+                            target: {
+                                name: 'input-address',
+                                id: addressIdInt,
                             },
-                            size: null,
-                            displayText: true
+                            edit: isEdit,
+                            addressId: addressIdInt,
                         },
+                        options: {
+                            /// Options override default.
+                            /// null value take default component value defined in AddAddress data()
+                            button: {
+                                text: {
+                                    create: el.dataset.buttonTextCreate || null,
+                                    edit: el.dataset.buttonTextUpdate || null,
+                                },
+                                size: null,
+                                displayText: true
+                            },
 
-                        /// Modal title text if create or edit address (trans chain, see i18n)
-                        title: {
-                            create: null,
-                            edit: null,
-                        },
+                            /// Modal title text if create or edit address (trans chain, see i18n)
+                            title: {
+                                create: null,
+                                edit: null,
+                            },
 
-                        /// Display panes in Modal for step123
-                        openPanesInModal: true,
+                            /// Display panes in Modal for step123
+                            openPanesInModal: true,
 
-                        /// Display actions buttons of panes in a sticky-form-button navbar
-                        stickyActions: false,
-                        showMessageWhenNoAddress: true,
+                            /// Display actions buttons of panes in a sticky-form-button navbar
+                            stickyActions: false,
+                            showMessageWhenNoAddress: true,
 
-                        /// Use Date fields
-                        useDate: {
-                            validFrom: el.dataset.useValidFrom === '1' || false,  //boolean, default: false
-                            validTo: el.dataset.useValidTo === '1' || false,       //boolean, default: false
-                        },
+                            /// Use Date fields
+                            useDate: {
+                                validFrom: el.dataset.useValidFrom === '1' || false,  //boolean, default: false
+                                validTo: el.dataset.useValidTo === '1' || false,       //boolean, default: false
+                            },
 
-                        /// Don't display show renderbox Address: showPane display only a button
-                        onlyButton: false,
+                            /// Don't display show renderbox Address: showPane display only a button
+                            onlyButton: false,
+                        }
                     }
                 }
+            },
+            methods: {
+                associateToInput(payload) {
+                    el.value = payload.addressId;
+                }
             }
-        },
-        methods: {
-            associateToInput(payload) {
-                el.value = payload.addressId;
-            }
-        }
-    })
-        .use(i18n)
-        .component('app', App)
-        .mount(container);
-});
+        })
+            .use(i18n)
+            .component('app', App)
+            .mount(container);
+    });
+};
+
+document.addEventListener('DOMContentLoaded', (_e) =>
+    addAddressInput(document.querySelectorAll('input[type="hidden"][data-input-address]'))
+);
+
+window.addEventListener('collection-add-entry', (e) =>
+    addAddressInput(e.detail.entry.querySelectorAll('input[type="hidden"][data-input-address]'))
+);
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 237166e62..d64ae274e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -189,7 +189,7 @@ export default {
             // TODO i18n
             return `/fr/person/${id}/general`;
          } else if (type === 'thirdparty') {
-            return `/fr/thirdparty/thirdparty/${id}/show`;
+            return `/fr/3party/3party/${id}/view`;
          }
       }
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
new file mode 100644
index 000000000..5dd770328
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
@@ -0,0 +1,48 @@
+<template>
+
+    <span v-if="entity.type === 'person'" class="badge rounded-pill bg-person">
+        {{ $t('person') }}
+    </span>
+
+    <span v-if="entity.type === 'thirdparty'" class="badge rounded-pill bg-thirdparty">
+        <template v-if="options.displayLong !== true">
+            {{ $t('thirdparty.thirdparty')}}
+        </template>
+
+        <i class="fa fa-fw fa-user" v-if="entity.kind === 'child'"></i>
+        <i class="fa fa-fw fa-hospital-o" v-else-if="entity.kind === 'company'"></i>
+        <i class="fa fa-fw fa-user-md" v-else></i>
+
+        <template v-if="options.displayLong === true">
+            <span v-if="entity.kind === 'child'">{{ $t('thirdparty.child')}}</span>
+            <span v-else-if="entity.kind === 'company'">{{ $t('thirdparty.company')}}</span>
+            <span v-else>{{ $t('thirdparty.contact')}}</span>
+        </template>
+    </span>
+
+    <span v-if="entity.type === 'user'" class="badge rounded-pill bg-user">
+        {{ $t('user')}}
+    </span>
+
+</template>
+
+<script>
+export default {
+    name: "BadgeEntity",
+    props: ['options', 'entity'],
+    i18n: {
+        messages: {
+            fr: {
+                person: "Usager",
+                thirdparty: {
+                    thirdparty: "Tiers",
+                    child: "Personne de contact",
+                    company: "Personne morale",
+                    contact: "Personne physique",
+                },
+                user: 'TMS'
+            }
+        }
+    }
+}
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 5fe040e14..efdf62926 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -13,7 +13,6 @@ export default {
     methods : {
         toggleBlur: function(e){
             if(e.target.matches('.toggle')){
-                console.log(e);
                 e.target.previousElementSibling.classList.toggle("blur");
                 e.target.classList.toggle("fa-eye");
                 e.target.classList.toggle("fa-eye-slash");
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index c16b4c65d..4b998f98a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -45,7 +45,8 @@ const messages = {
          redirect: {
             person: "Quitter la page et ouvrir la fiche de l'usager",
             thirdparty: "Quitter la page et voir le tiers",
-         }
+         },
+         refresh: 'Rafraîchir'
       },
       nav: {
          next: "Suivant",
diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php
index 10886518a..4f0542aec 100644
--- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -1,13 +1,38 @@
-<?php                                                                                                                                                                                                              
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ChillMainBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ChillMainBundle/logs';
+    }
+
     public function registerBundles()
-    {   
-        return array(
+    {
+        return [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\MainBundle\ChillMainBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -18,28 +43,12 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
-            new Symfony\Bundle\DebugBundle\DebugBundle()
-        );
-    }   
+            new Symfony\Bundle\DebugBundle\DebugBundle(),
+        ];
+    }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
-    {   
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-    }   
-
-    /** 
-     * @return string
-     */
-    public function getCacheDir()
-    {   
-        return sys_get_temp_dir().'/ChillMainBundle/cache';
-    }   
-
-    /** 
-     * @return string
-     */
-    public function getLogDir()
-    {   
-        return sys_get_temp_dir().'/ChillMainBundle/logs';
-    }   
+    {
+        $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php
index 39dc0e2ba..ea351fb8a 100644
--- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -1,11 +1,20 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
-$loader = require __DIR__.'/../../../../../vendor/autoload.php';
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/config.yml b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/config.yml
index b16af4de1..530c29ee6 100644
--- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/config.yml
+++ b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/config.yml
@@ -39,3 +39,4 @@ assetic:
         
 chill_main:
     available_languages: [fr, en]
+    available_countries: [FR]
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index b1bdb8438..4d871404f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -12,13 +12,11 @@
     * extended_infos    bool    add extra informations (step, floor, etc.)
 
 #}
-{% macro raw(address, options) %}
+
+{% macro raw(address, options, streetLine) %}
+
     {% if address.street is not empty %}
-        <p class="street">{{ address.street }}
-            {% if address.streetNumber is not empty %}
-                <span class="streetnumber">{{ address.streetNumber }}</span>
-            {% endif %}
-        </p>
+        <p>{{ streetLine }}</p>
     {% endif %}
     {% if options['extended_infos'] %}
         {{ _self.extended(address, options) }}
@@ -56,14 +54,21 @@
     {% endif %}
 {% endmacro %}
 
-{% macro inline(address, options) %}
+{% macro inline(address, options, streetLine) %}
     {% if options['has_no_address'] == true and address.isNoAddress == true %}
+        {% if address.postCode is not empty %}
+            <p class="postcode">
+                <span class="code">{{ address.postCode.code }}</span>
+                <span class="name">{{ address.postCode.name }}</span>
+            </p>
+            <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+        {% endif %}
         <span class="noaddress">
             {{ 'address.consider homeless'|trans }}
         </span>
     {% else %}
         <span class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
-            {{ _self.raw(address, options) }}
+            {{ _self.raw(address, options, streetLine) }}
         </span>
     {% endif %}
     {{ _self.validity(address, options) }}
@@ -83,12 +88,16 @@
 {% endmacro %}
 
 
+{#
+    this enclose the rendering inside a "li", which ease the placement operation when the address
+    must be shown in such list
+#}
 {%- if render == 'list' -%}
     <li class="chill-entity entity-address">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
-        {{ _self.inline(address, options) }}
+        {{ _self.inline(address, options, streetLine) }}
     </li>
 {%- endif -%}
 
@@ -97,22 +106,32 @@
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
-        {{ _self.inline(address, options) }}
+        {{ _self.inline(address, options, streetLine) }}
     </span>
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
     <div class="chill-entity entity-address">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
+            {% if address.postCode is not empty %}
+            <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
+                <p class="postcode">
+                    <span class="code">{{ address.postCode.code }}</span>
+                    <span class="name">{{ address.postCode.name }}</span>
+                </p>
+                <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+            </div>    
+            {% endif %}
             <div class="noaddress">
                 {{ 'address.consider homeless'|trans }}
             </div>
+        
         {% else %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
                 {% if options['with_picto'] %}
                     <i class="fa fa-fw fa-map-marker"></i>
                 {% endif %}
-                {{ _self.raw(address, options) }}
+                {{ _self.raw(address, options, streetLine) }}
             </div>
         {% endif %}
         {{ _self.validity(address, options) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
index 074f3bb94..515685b9e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
@@ -1,12 +1,41 @@
 {{ form_start(form) }}
-    <div class="chill_filter_order container">
+    <div class="chill_filter_order container my-4">
         <div class="row">
-          <div class="col-md-12">
-              <div class="input-group mb-3">
-                  {{ form_widget(form.q)}}
-                  <button type="submit" class="btn btn-chill-l-gray"><i class="fa fa-search"></i></button>
+            {% if form.vars.has_search_box %}
+              <div class="col-md-12">
+                  <div class="input-group mb-3">
+                      {{ form_widget(form.q)}}
+                      <button type="submit" class="btn btn-chill-l-gray"><i class="fa fa-search"></i></button>
+                  </div>
               </div>
-          </div>
+            {% endif %}
         </div>
+        {% if form.checkboxes is defined %}
+            {% if form.checkboxes|length > 0 %}
+                {% for checkbox_name, options in form.checkboxes %}
+                    <div class="row gx-0">
+                        <div class="col-md-12">
+                            {% for c in form['checkboxes'][checkbox_name].children %}
+                                <div class="form-check form-check-inline">
+                                    {{ form_widget(c) }}
+                                    {{ form_label(c) }}
+                                </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                    {% if loop.last %}
+                        <div class="row gx-0">
+                            <div class="col-md-12">
+                                <ul class="record_actions">
+                                    <li>
+                                        <button type="submit" class="btn btn-misc"><i class="fa fa-filter"></i></button>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
+        {% endif %}
     </div>
 {{ form_end(form) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
index ec617c6c0..5402d5e89 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
@@ -11,6 +11,7 @@
 				<th>{{ 'Address required'|trans }}</th>
 				<th>{{ 'Contact data'|trans }}</th>
 				<th>{{ 'Active'|trans }}</th>
+				<th>{{ 'Default for'|trans }}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -33,6 +34,7 @@
 							<i class="fa fa-square-o"></i>
 						{%- endif -%}
 					</td>
+					<td>{{ entity.defaultFor|trans }}</td>
 					<td>
 						<ul class="record_actions">
 							<li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
new file mode 100644
index 000000000..b1990833c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
@@ -0,0 +1,21 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block title %}{{ 'Edit my current location'|trans }}{% endblock %}
+
+{% block content -%}
+    <div class="col-md-10 col-xxl">
+        <h1>{{ 'Edit my current location'|trans }}</h1>
+
+        {{ form_start(edit_form) }}
+        {{ form_row(edit_form.currentLocation) }}
+
+        <ul class="record_actions sticky-form-buttons">
+            <li>
+                {{ form_widget(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
+            </li>
+        </ul>
+
+        {{ form_end(edit_form) }}
+
+    </div>
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig
index 7ffec0bbd..6bec0975a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Util/confirmation_template.html.twig
@@ -8,7 +8,7 @@
 
 {{ form_start(form) }}
 
-<ul class="record_actions">
+<ul class="record_actions sticky-form-buttons">
     <li class="cancel">
         <a href="{{ path(cancel_route, cancel_parameters|default( { } ) ) }}" class="btn btn-cancel">
             {{ 'Cancel'|trans }}
@@ -18,5 +18,5 @@
         {{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-delete" } } ) }}
     </li>
 </ul>
-        
-{{ form_end(form) }}
\ No newline at end of file
+
+{{ form_end(form) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 1e78dbbe8..07b7970d8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -5,7 +5,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title>{{ installation.name }} - {% block title %}{% endblock %}</title>
+    <title>{{ installation.name }} - {% block title %}{{ 'Homepage'|trans }}{% endblock %}</title>
     <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
 
     {{ encore_entry_link_tags('mod_bootstrap') }}
@@ -68,6 +68,9 @@
                             <button type="submit" class="btn btn-lg btn-warning mt-3">
                                 <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
                             </button>
+                            <a class="btn btn-lg btn-misc mt-3" href="{{ path('chill_main_advanced_search_list') }}">
+                                <i class="fa fa-fw fa-search"></i> {{ 'Advanced search'|trans }}
+                            </a>
                         </center>
                     </form>
                 </div>
diff --git a/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php b/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
index b7a719073..bc16929b7 100644
--- a/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
+++ b/src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php
@@ -1,79 +1,51 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing\Loader;
 
 use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
- * Import routes from bundles
- * 
- * Routes must be defined in configuration, add an entry 
- * under `chill_main.routing.resources`
- * 
- * 
+ * Import routes from bundles.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Routes must be defined in configuration, add an entry
+ * under `chill_main.routing.resources`
  */
 class ChillRoutesLoader extends Loader
 {
-    private $routes;
-    
-   
-    
+    private array $routes;
+
     public function __construct(array $routes)
     {
         $this->routes = $routes;
+
+        parent::__construct();
     }
-    
-    /**
-     * {@inheritDoc}
-     * 
-     * @param type $resource
-     * @param type $type
-     * @return RouteCollection
-     */
+
     public function load($resource, $type = null)
     {
         $collection = new RouteCollection();
-        
-        foreach ($this->routes as $resource) {
+
+        foreach ($this->routes as $routeResource) {
             $collection->addCollection(
-                  $this->import($resource, NULL)
-                  );
+                $this->import($routeResource, null)
+            );
         }
-        
+
         return $collection;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @param type $resource
-     * @param type $type
-     * @return boolean
-     */
     public function supports($resource, $type = null)
     {
         return 'chill_routes' === $type;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
index 37f7ead40..23d4a5724 100644
--- a/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
+++ b/src/Bundle/ChillMainBundle/Routing/LocalMenuBuilderInterface.php
@@ -1,38 +1,28 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing;
 
 use Knp\Menu\MenuItem;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 interface LocalMenuBuilderInterface
 {
+    public function buildMenu($menuId, MenuItem $menu, array $parameters);
+
     /**
-     * return an array of menu ids
-     * 
-     * @internal this method is static to 1. keep all config in the class, 
+     * return an array of menu ids.
+     *
+     * @internal this method is static to 1. keep all config in the class,
      *      instead of tags arguments; 2. avoid a "supports" method, which could lead
      *      to parsing all instances to get only one or two working instance.
      */
     public static function getMenuIds(): array;
-    
-    public function buildMenu($menuId, MenuItem $menu, array $parameters);
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index 7f41dbf67..9bcc80ad2 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -1,35 +1,23 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 
-/**
- *
- *
- */
 class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
@@ -47,26 +35,26 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
         }
 
         $menu->addChild('Users and permissions', [
-                'route' => 'chill_main_admin_permissions'
-            ])
+            'route' => 'chill_main_admin_permissions',
+        ])
             ->setExtras([
                 'icons' => ['key'],
                 'order' => 200,
-                'explain' => "Configure permissions for users"
+                'explain' => 'Configure permissions for users',
             ]);
 
         $menu->addChild('Location and location type', [
-                'route' => 'chill_main_admin_locations'
-            ])
+            'route' => 'chill_main_admin_locations',
+        ])
             ->setExtras([
                 'icons' => ['key'],
                 'order' => 205,
-                'explain' => "Configure location and location type"
+                'explain' => 'Configure location and location type',
             ]);
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'admin_section', 'admin_index' ];
+        return ['admin_section', 'admin_index'];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
index 890c1b2ef..da1ce479b 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
@@ -1,28 +1,33 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Knp\Menu\MenuItem;
 
 class LocationMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
-
-    /**
-     * @inheritDoc
-     */
-    public static function getMenuIds(): array
-    {
-        return [ 'admin_location' ];
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild('Location type list', [
-            'route' => 'chill_crud_main_location_type_index'
+            'route' => 'chill_crud_main_location_type_index',
         ])->setExtras(['order' => 205]);
 
         $menu->addChild('Location list', [
-            'route' => 'chill_crud_main_location_index'
+            'route' => 'chill_crud_main_location_index',
         ])->setExtras(['order' => 206]);
     }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_location'];
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
index 470930820..6fab6b635 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
@@ -1,43 +1,47 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Knp\Menu\MenuItem;
 
 class PermissionMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
-
-    /**
-     * @inheritDoc
-     */
-    public static function getMenuIds(): array
-    {
-        return [ 'admin_permissions' ];
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild('Permissions group list', [
-            'route' => 'admin_permissionsgroup'
+            'route' => 'admin_permissionsgroup',
         ])->setExtras([
-                'order' => 300
-            ]);
+            'order' => 300,
+        ]);
 
         $menu->addChild('crud.admin_user.index.title', [
-            'route' => 'chill_crud_admin_user_index'
+            'route' => 'chill_crud_admin_user_index',
         ])->setExtras(['order' => 400]);
 
         $menu->addChild('List circles', [
-            'route' => 'admin_scope'
+            'route' => 'admin_scope',
         ])->setExtras(['order' => 200]);
 
         $menu->addChild('Center list', [
-            'route' => 'admin_center'
+            'route' => 'admin_center',
         ])->setExtras(['order' => 100]);
 
         $menu->addChild('User jobs', [
-            'route' => 'chill_crud_admin_user_job_index'
+            'route' => 'chill_crud_admin_user_job_index',
         ])->setExtras(['order' => 150]);
+    }
 
+    public static function getMenuIds(): array
+    {
+        return ['admin_permissions'];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
index b8619750c..9aae86e48 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
@@ -1,35 +1,24 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class SectionMenuBuilder
- *
- * @package Chill\MainBundle\Routing\MenuBuilder
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Class SectionMenuBuilder.
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
@@ -37,62 +26,56 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
     /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     /**
      * SectionMenuBuilder constructor.
-     *
-     * @param AuthorizationCheckerInterface $authorizationChecker
      */
     public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator)
     {
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
     }
-    
+
     /**
      * @param $menuId
-     * @param MenuItem $menu
-     * @param array $parameters
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Homepage'), [
-                'route' => 'chill_main_homepage'
-            ])
+            'route' => 'chill_main_homepage',
+        ])
             ->setExtras([
                 'icons' => ['home'],
-                'order' => 0
+                'order' => 0,
             ]);
 
         $menu->addChild($this->translator->trans('Global timeline'), [
             'route' => 'chill_center_timeline',
         ])
-            ->setExtras([
-                'order' => 10
-            ]
-        );
-        
+            ->setExtras(
+                [
+                    'order' => 10,
+                ]
+            );
+
         if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) {
             $menu->addChild($this->translator->trans('Export Menu'), [
-                'route' => 'chill_main_export_index'
+                'route' => 'chill_main_export_index',
             ])
-            ->setExtras([
-                'icons' => ['upload'],
-                'order' => 20
-            ]);
+                ->setExtras([
+                    'icons' => ['upload'],
+                    'order' => 20,
+                ]);
         }
     }
-    
-    /**
-     * @return array
-     */
+
     public static function getMenuIds(): array
     {
-        return [ 'section' ];
+        return ['section'];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
index 010f5609d..51758d979 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php
@@ -1,71 +1,74 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Routing\MenuBuilder;
-
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Routing\MenuBuilder;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Symfony\Component\Security\Core\Security;
+
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    public function __construct(TokenStorageInterface $tokenStorage)
+    private Security $security;
+
+    public function __construct(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
-    
+
     public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)
     {
-        if ($this->tokenStorage->getToken()->getUser() instanceof User) {
+        $user = $this->security->getUser();
+
+        if ($user instanceof User) {
+            if (null !== $user->getCurrentLocation()) {
+                $locationTextMenu = $user->getCurrentLocation()->getName();
+            } else {
+                $locationTextMenu = 'Set a location';
+            }
+
+            $menu
+                ->addChild(
+                    $locationTextMenu,
+                    ['route' => 'chill_main_user_currentlocation_edit']
+                )
+                ->setExtras([
+                    'order' => -9999999,
+                    'icon' => 'map-marker',
+                ]);
             $menu
                 ->addChild(
                     'Change password',
-                    [ 'route' => 'change_my_password']
+                    ['route' => 'change_my_password']
                 )
                 ->setExtras([
-                    'order' => 99999999998
+                    'order' => 99999999998,
                 ]);
         }
-            
+
         $menu
             ->addChild(
-                'Logout', 
+                'Logout',
                 [
-                    'route' => 'logout'
-            ])
+                    'route' => 'logout',
+                ]
+            )
             ->setExtras([
-                'order'=> 99999999999,
-                'icon' => 'power-off'
+                'order' => 99999999999,
+                'icon' => 'power-off',
             ]);
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'user' ];
+        return ['user'];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
index 0bcee4c81..a94cf41f3 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
@@ -1,51 +1,44 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing;
 
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RouterInterface;
 use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-
+use function array_key_exists;
+use function array_merge;
+use function array_values;
 
 /**
  * This class permit to build menu from the routing information
  * stored in each bundle.
- * 
- * how to must come here FIXME 
  *
- * @author julien
+ * how to must come here FIXME
  */
 class MenuComposer
 {
-    
-    /**
-     *
-     * @var RouterInterface
-     */
-    private $router;
-    
-    /**
-     *
-     * @var FactoryInterface
-     */
-    private $menuFactory;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    private $translator;
-    
-    /**
-     *
-     * @var 
-     */
-    private $localMenuBuilders = [];
-    
-    
-    function __construct(
+    private array $localMenuBuilders = [];
+
+    private FactoryInterface $menuFactory;
+
+    private RouteCollection $routeCollection;
+
+    private RouterInterface $router;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
         RouterInterface $router,
         FactoryInterface $menuFactory,
         TranslatorInterface $translator
@@ -55,35 +48,58 @@ class MenuComposer
         $this->translator = $translator;
     }
 
-    /**
-     * Set the route Collection
-     * This function is needed for testing purpose: routeCollection is not
-     * available as a service (RouterInterface is provided as a service and
-     * added to this class as paramater in __construct)
-     * 
-     * @param RouteCollection $routeCollection
-     */
-    public function setRouteCollection(RouteCollection $routeCollection)
+    public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId)
     {
-        $this->routeCollection = $routeCollection;
+        $this->localMenuBuilders[$menuId][] = $menuBuilder;
+    }
+
+    public function getMenuFor($menuId, array $parameters = [])
+    {
+        $routes = $this->getRoutesFor($menuId, $parameters);
+        $menu = $this->menuFactory->createItem($menuId);
+
+        // build menu from routes
+        foreach ($routes as $order => $route) {
+            $menu->addChild($this->translator->trans($route['label']), [
+                'route' => $route['key'],
+                'routeParameters' => $parameters['args'],
+                'order' => $order,
+            ])
+                ->setExtras([
+                    //'icon' => $route['icon'],
+                    // sf4 check: commented to avoid error: `An exception has been thrown during the rendering of a template ("Notice: Undefined index: icon").`
+                    'order' => $order,
+                ]);
+        }
+
+        if ($this->hasLocalMenuBuilder($menuId)) {
+            foreach ($this->localMenuBuilders[$menuId] as $builder) {
+                /* @var $builder LocalMenuBuilderInterface */
+                $builder->buildMenu($menuId, $menu, $parameters['args']);
+            }
+        }
+
+        $this->reorderMenu($menu);
+
+        return $menu;
     }
 
     /**
      * Return an array of routes added to $menuId,
-     * The array is aimed to build route with MenuTwig
-     * 
+     * The array is aimed to build route with MenuTwig.
+     *
      * @param string $menuId
      * @param array $parameters see https://redmine.champs-libres.coop/issues/179
+     *
      * @return array
      */
-    public function getRoutesFor($menuId, array $parameters = array())
+    public function getRoutesFor($menuId, array $parameters = [])
     {
-        $routes = array();
+        $routes = [];
         $routeCollection = $this->router->getRouteCollection();
 
         foreach ($routeCollection->all() as $routeKey => $route) {
             if ($route->hasOption('menus')) {
-                
                 if (array_key_exists($menuId, $route->getOption('menus'))) {
                     $route = $route->getOption('menus')[$menuId];
 
@@ -101,97 +117,69 @@ class MenuComposer
 
         return $routes;
     }
-    
-    public function getMenuFor($menuId, array $parameters = array())
+
+    /**
+     * Return true if the menu has at least one builder.
+     *
+     * This function is a helper to determine if the method `getMenuFor`
+     * should be used, or `getRouteFor`. The method `getMenuFor` should be used
+     * if the result is true (it **does** exists at least one menu builder.
+     *
+     * @param string $menuId
+     */
+    public function hasLocalMenuBuilder($menuId): bool
     {
-        $routes = $this->getRoutesFor($menuId, $parameters);
-        $menu = $this->menuFactory->createItem($menuId);
-        
-        // build menu from routes
-        foreach ($routes as $order => $route) {
-            $menu->addChild($this->translator->trans($route['label']), [
-                    'route' => $route['key'],
-                    'routeParameters' => $parameters['args'],
-                    'order' => $order
-                ])
-                ->setExtras([
-                    //'icon' => $route['icon'],
-                    // sf4 check: commented to avoid error: `An exception has been thrown during the rendering of a template ("Notice: Undefined index: icon").`
-                    'order' => $order
-                ])
-            ;
-        }
-        
-        if ($this->hasLocalMenuBuilder($menuId)) {
-            foreach ($this->localMenuBuilders[$menuId] as $builder) {
-                /* @var $builder LocalMenuBuilderInterface */
-                $builder->buildMenu($menuId, $menu, $parameters['args']);
+        return array_key_exists($menuId, $this->localMenuBuilders);
+    }
+
+    /**
+     * Set the route Collection
+     * This function is needed for testing purpose: routeCollection is not
+     * available as a service (RouterInterface is provided as a service and
+     * added to this class as paramater in __construct).
+     */
+    public function setRouteCollection(RouteCollection $routeCollection)
+    {
+        $this->routeCollection = $routeCollection;
+    }
+
+    private function reorderMenu(ItemInterface $menu)
+    {
+        $ordered = [];
+        $unordered = [];
+
+        foreach ($menu->getChildren() as $name => $item) {
+            $order = $item->getExtra('order');
+
+            if (null !== $order) {
+                $ordered[$this->resolveOrder($ordered, $order)] = $name;
+            } else {
+                $unordered = $name;
             }
         }
-        
-        $this->reorderMenu($menu);
-        
-        return $menu;
+
+        ksort($ordered);
+
+        $menus = array_merge(array_values($ordered), $unordered);
+        $menu->reorderChildren($menus);
     }
-    
+
     /**
      * recursive function to resolve the order of a array of routes.
-     * If the order chosen in routing.yml is already in used, find the 
+     * If the order chosen in routing.yml is already in used, find the
      * first next order available.
-     * 
+     *
      * @param array $routes the routes previously added
      * @param int $order
+     *
      * @return int
      */
     private function resolveOrder($routes, $order)
     {
         if (isset($routes[$order])) {
             return $this->resolveOrder($routes, $order + 1);
-        } else {
-            return $order;
         }
-    }
-    
-    private function reorderMenu(ItemInterface $menu) 
-    {
-        $ordered = [];
-        $unordered = [];
-        
-        foreach ($menu->getChildren() as $name => $item) {
-            $order = $item->getExtra('order');
-            
-            if ($order !== null) {
-               $ordered[$this->resolveOrder($ordered, $order)] = $name;
-            } else {
-                $unordered = $name;
-            }
-        }
-        
-        ksort($ordered);
-        
-        $menus = \array_merge(\array_values($ordered), $unordered);
-        $menu->reorderChildren($menus);
-    }
-    
-    
-    public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId) 
-    {
-        $this->localMenuBuilders[$menuId][] = $menuBuilder;
-    }
-    
-    /**
-     * Return true if the menu has at least one builder.
-     * 
-     * This function is a helper to determine if the method `getMenuFor`
-     * should be used, or `getRouteFor`. The method `getMenuFor` should be used
-     * if the result is true (it **does** exists at least one menu builder.
-     * 
-     * @param string $menuId
-     * @return bool
-     */
-    public function hasLocalMenuBuilder($menuId): bool
-    {
-        return \array_key_exists($menuId, $this->localMenuBuilders);
-    }
 
+        return $order;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index fe233e205..bf59bfcb8 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -1,27 +1,16 @@
 <?php
 
 /**
- * 
- * Copyright (C) 2014 Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing;
 
-use Chill\MainBundle\Routing\MenuComposer;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Twig\Environment;
@@ -29,90 +18,86 @@ use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 /**
- * Add the filter 'chill_menu'
- *
- * @author Julien Fastré <julien arobase fastre point info>
+ * Add the filter 'chill_menu'.
  */
 class MenuTwig extends AbstractExtension implements ContainerAwareInterface
 {
-    
     /**
-     *
-     * @var MenuComposer
-     */
-    private $menuComposer;
-    
-    /**
-     *
      * @var \Symfony\Component\DependencyInjection\ContainerInterface
      */
     private $container;
-    
+
     /**
-     * the default parameters for chillMenu
-     * 
-     * @var mixed[] 
+     * the default parameters for chillMenu.
+     *
+     * @var mixed[]
      */
-    private $defaultParams = array(
+    private $defaultParams = [
         'layout' => '@ChillMain/Menu/defaultMenu.html.twig',
-        'args' => array(),
-        'activeRouteKey' => null
-    );
-    
+        'args' => [],
+        'activeRouteKey' => null,
+    ];
+
+    /**
+     * @var MenuComposer
+     */
+    private $menuComposer;
+
     public function __construct(MenuComposer $menuComposer)
     {
         $this->menuComposer = $menuComposer;
     }
-    
-    public function getFunctions()
-    {
-        return [new TwigFunction('chill_menu',
-                array($this, 'chillMenu'), array(
-                    'is_safe' => array('html'),
-                    'needs_environment' => true
-                    ))
-            ];
-    }
-    
+
     /**
-     * Render a Menu corresponding to $menuId
-     * 
-     * Expected params : 
+     * Render a Menu corresponding to $menuId.
+     *
+     * Expected params :
      * - args: the arguments to build the path (i.e: if pattern is /something/{bar}, args must contain {'bar': 'foo'}
      * - layout: the layout. Absolute path needed (i.e.: ChillXyzBundle:section:foo.html.twig)
      * - activeRouteKey : the key active, will render the menu differently.
-     * 
+     *
      * @deprecated link: see https://redmine.champs-libres.coop/issues/179 for more informations
-     * 
+     *
      * @param string $menuId
      * @param mixed[] $params
      */
-    public function chillMenu(Environment $env, $menuId, array $params = array())
+    public function chillMenu(Environment $env, $menuId, array $params = [])
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
 
         $layout = $resolvedParams['layout'];
         unset($resolvedParams['layout']);
-        
+
         if ($this->menuComposer->hasLocalMenuBuilder($menuId) === false) {
             $resolvedParams['routes'] = $this->menuComposer->getRoutesFor($menuId, $resolvedParams);
-        
-            return $env->render($layout, $resolvedParams);
-        } else {
-            $resolvedParams['menus'] = $this->menuComposer->getMenuFor($menuId, $resolvedParams);
-            
+
             return $env->render($layout, $resolvedParams);
         }
+        $resolvedParams['menus'] = $this->menuComposer->getMenuFor($menuId, $resolvedParams);
+
+        return $env->render($layout, $resolvedParams);
     }
-    
+
+    public function getFunctions()
+    {
+        return [new TwigFunction(
+            'chill_menu',
+            [$this, 'chillMenu'],
+            [
+                'is_safe' => ['html'],
+                'needs_environment' => true,
+            ]
+        ),
+        ];
+    }
+
     public function getName()
     {
         return 'chill_menu';
     }
 
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null)
     {
         $this->container = $container;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
index 942819a39..adadc3422 100644
--- a/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
+++ b/src/Bundle/ChillMainBundle/Search/AbstractSearch.php
@@ -1,101 +1,91 @@
 <?php
 
-
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
-use Chill\MainBundle\Search\SearchInterface;
-use Chill\MainBundle\Search\ParsingException;
+use DateTime;
+use function array_key_exists;
+use function strpos;
 
 /**
  * This class implements abstract search with most common responses.
- * 
+ *
  * you should use this abstract class instead of SearchInterface : if the signature of
  * search interface change, the generic method will be implemented here.
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
  */
 abstract class AbstractSearch implements SearchInterface
 {
     /**
-     * parse string expected to be a date and transform to a DateTime object
-     * 
+     * parse string expected to be a date and transform to a DateTime object.
+     *
      * @param type $string
-     * @return \DateTime
+     *
      * @throws ParsingException if the  date is not parseable
+     *
+     * @return DateTime
      */
     public function parseDate($string)
     {
         try {
-            return new \DateTime($string);
+            return new DateTime($string);
         } catch (ParsingException $ex) {
             $exception = new ParsingException('The date is '
                       . 'not parsable', 0, $ex);
+
             throw $exception;
         }
-        
     }
-    
+
     /**
-     * recompose a pattern, retaining only supported terms
-     * 
+     * recompose a pattern, retaining only supported terms.
+     *
      * the outputted string should be used to show users their search
-     * 
-     * @param array $terms
-     * @param array $supportedTerms
+     *
      * @param string $domain if your domain is NULL, you should set NULL. You should set used domain instead
+     *
      * @return string
      */
-    protected function recomposePattern(array $terms, array $supportedTerms, $domain = NULL)
+    protected function recomposePattern(array $terms, array $supportedTerms, $domain = null)
     {
         $recomposed = '';
-        
-        if ($domain !== NULL)
-        {
-            $recomposed .= '@'.$domain.' ';
+
+        if (null !== $domain) {
+            $recomposed .= '@' . $domain . ' ';
         }
-        
+
         foreach ($supportedTerms as $term) {
-            if (array_key_exists($term, $terms) && $term !== '_default') {
-                $recomposed .= ' '.$term.':';
-                $containsSpace = \strpos($terms[$term], " ") !== false;
+            if (array_key_exists($term, $terms) && '_default' !== $term) {
+                $recomposed .= ' ' . $term . ':';
+                $containsSpace = strpos($terms[$term], ' ') !== false;
+
                 if ($containsSpace) {
-                    $recomposed .= "(";
+                    $recomposed .= '"';
                 }
-                $recomposed .= (mb_stristr(' ', $terms[$term]) === FALSE) ?  $terms[$term] : '('.$terms[$term].')';
+                $recomposed .= (mb_stristr(' ', $terms[$term]) === false) ? $terms[$term] : '(' . $terms[$term] . ')';
+
                 if ($containsSpace) {
-                    $recomposed .= ")";
+                    $recomposed .= '"';
                 }
             }
         }
-        
-        if ($terms['_default'] !== '') {
-            $recomposed .= ' '.$terms['_default'];
+
+        if ('' !== $terms['_default']) {
+            $recomposed .= ' ' . $terms['_default'];
         }
-        
+
         //strip first character if empty
-        if (mb_strcut($recomposed, 0, 1) === ' '){
+        if (mb_strcut($recomposed, 0, 1) === ' ') {
             $recomposed = mb_strcut($recomposed, 1);
         }
-        
+
         return $recomposed;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
index 6b8139419..5a68fab37 100644
--- a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
@@ -1,59 +1,67 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search\Entity;
 
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Search\SearchApiQuery;
+use function array_map;
+use function in_array;
 
 class SearchUserApiProvider implements SearchApiInterface
 {
     private UserRepository $userRepository;
 
-    /**
-     * @param UserRepository $userRepository
-     */
     public function __construct(UserRepository $userRepository)
     {
         $this->userRepository = $userRepository;
     }
 
-    public function provideQuery(string $pattern, array $parameters): SearchApiQuery
-    {
-        $query = new SearchApiQuery();
-        $query
-            ->setSelectKey("user")
-            ->setSelectJsonbMetadata("jsonb_build_object('id', u.id)")
-            ->setSelectPertinence("GREATEST(SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical),
-                SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical))", [ $pattern, $pattern ])
-            ->setFromClause("users AS u")
-            ->setWhereClauses("SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical) > 0.15
-                OR
-                SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical) > 0.15
-            ", [ $pattern, $pattern ]);
-
-        return $query;
-    }
-
-    public function supportsTypes(string $pattern, array $types, array $parameters): bool
-    {
-        return \in_array('user', $types);
-    }
-
-    public function prepare(array $metadatas): void
-    {
-        $ids = \array_map(fn($m) => $m['id'], $metadatas);
-
-        $this->userRepository->findBy([ 'id' => $ids ]);
-    }
-
-    public function supportsResult(string $key, array $metadatas): bool
-    {
-        return $key === 'user';
-    }
-
     public function getResult(string $key, array $metadata, float $pertinence)
     {
         return $this->userRepository->find($metadata['id']);
     }
+
+    public function prepare(array $metadatas): void
+    {
+        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+
+        $this->userRepository->findBy(['id' => $ids]);
+    }
+
+    public function provideQuery(string $pattern, array $parameters): SearchApiQuery
+    {
+        $query = new SearchApiQuery();
+        $query
+            ->setSelectKey('user')
+            ->setSelectJsonbMetadata("jsonb_build_object('id', u.id)")
+            ->setSelectPertinence('GREATEST(SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical),
+                SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical))', [$pattern, $pattern])
+            ->setFromClause('users AS u')
+            ->setWhereClauses('SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical) > 0.15
+                OR
+                SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical) > 0.15
+            ', [$pattern, $pattern]);
+
+        return $query;
+    }
+
+    public function supportsResult(string $key, array $metadatas): bool
+    {
+        return 'user' === $key;
+    }
+
+    public function supportsTypes(string $pattern, array $types, array $parameters): bool
+    {
+        return in_array('user', $types, true);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php b/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
index f258a51f8..dbe34c00b 100644
--- a/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/HasAdvancedSearchFormInterface.php
@@ -1,34 +1,23 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
 use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 interface HasAdvancedSearchFormInterface extends SearchInterface
 {
     public function buildForm(FormBuilderInterface $builder);
-    
+
     public function convertFormDataToQuery(array $data);
-    
-    public function convertTermsToFormData(array $terms) ;
-    
+
+    public function convertTermsToFormData(array $terms);
 }
diff --git a/src/Bundle/ChillMainBundle/Search/Model/Result.php b/src/Bundle/ChillMainBundle/Search/Model/Result.php
index a88c2f55f..96d021187 100644
--- a/src/Bundle/ChillMainBundle/Search/Model/Result.php
+++ b/src/Bundle/ChillMainBundle/Search/Model/Result.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search\Model;
 
 class Result
@@ -7,12 +16,11 @@ class Result
     private float $relevance;
 
     /**
-     * mixed an arbitrary result
+     * mixed an arbitrary result.
      */
     private $result;
 
     /**
-     * @param float $relevance
      * @param $result
      */
     public function __construct(float $relevance, $result)
@@ -30,7 +38,4 @@ class Result
     {
         return $this->result;
     }
-
-
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Search/ParsingException.php b/src/Bundle/ChillMainBundle/Search/ParsingException.php
index 36d02ab8a..1c53463a5 100644
--- a/src/Bundle/ChillMainBundle/Search/ParsingException.php
+++ b/src/Bundle/ChillMainBundle/Search/ParsingException.php
@@ -1,6 +1,18 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
-class ParsingException extends \Exception
+use Exception;
+
+class ParsingException extends Exception
 {
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php
index d59193114..b0740b383 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApi.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php
@@ -1,39 +1,42 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
-use Chill\MainBundle\Search\Entity\SearchUserApiProvider;
-use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\PersonBundle\Search\SearchPersonApiProvider;
-use Chill\ThirdPartyBundle\Search\ThirdPartyApiSearch;
+use Chill\MainBundle\Serializer\Model\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
-use Chill\MainBundle\Search\SearchProvider;
-use Symfony\Component\VarDumper\Resources\functions\dump;
+use function array_map;
+use function array_merge;
+use function count;
+use function implode;
+use function strtr;
 
-/**
- */
 class SearchApi
 {
     private EntityManagerInterface $em;
+
     private PaginatorFactory $paginator;
 
-    private array $providers = [];
+    private iterable $providers = [];
 
     public function __construct(
         EntityManagerInterface $em,
-        SearchPersonApiProvider $searchPerson,
-        ThirdPartyApiSearch $thirdPartyApiSearch,
-        SearchUserApiProvider $searchUser,
+        iterable $providers,
         PaginatorFactory $paginator
-    )
-    {
+    ) {
         $this->em = $em;
-        $this->providers[] = $searchPerson;
-        $this->providers[] = $thirdPartyApiSearch;
-        $this->providers[] = $searchUser;
+        $this->providers = $providers;
         $this->paginator = $paginator;
     }
 
@@ -59,105 +62,29 @@ class SearchApi
         return new Collection($results, $paginator);
     }
 
-    private function findQueries($pattern, array $types, array $parameters): array
-    {
-        return \array_map(
-            fn($p) => $p->provideQuery($pattern, $parameters),
-            $this->findProviders($pattern, $types, $parameters),
-        );
-    }
-
-    private function findProviders(string $pattern, array $types, array $parameters): array
-    {
-        return \array_filter(
-            $this->providers,
-            fn($p) => $p->supportsTypes($pattern, $types, $parameters)
-        );
-    }
-
-    private function countItems($providers, $types, $parameters): int
-    {
-        list($countQuery, $parameters) = $this->buildCountQuery($providers, $types, $parameters);
-        $rsmCount = new ResultSetMappingBuilder($this->em);
-        $rsmCount->addScalarResult('count', 'count');
-        $countNq = $this->em->createNativeQuery($countQuery, $rsmCount);
-        $countNq->setParameters($parameters);
-
-        return $countNq->getSingleScalarResult();
-    }
-
     private function buildCountQuery(array $queries, $types, $parameters)
     {
-        $query = "SELECT COUNT(sq.key) AS count FROM ({union_unordered}) AS sq";
+        $query = 'SELECT SUM(c) AS count FROM ({union_unordered}) AS sq';
         $unions = [];
         $parameters = [];
 
         foreach ($queries as $q) {
-            $unions[] = $q->buildQuery();
-            $parameters = \array_merge($parameters, $q->buildParameters());
+            $unions[] = $q->buildQuery(true);
+            $parameters = array_merge($parameters, $q->buildParameters(true));
         }
 
-        $unionUnordered = \implode(" UNION ", $unions);
+        $unionUnordered = implode(' UNION ', $unions);
 
         return [
-            \strtr($query, [ '{union_unordered}' => $unionUnordered ]),
-            $parameters
+            strtr($query, ['{union_unordered}' => $unionUnordered]),
+            $parameters,
         ];
     }
 
-    private function buildUnionQuery(array $queries, $types, $parameters)
+    private function buildResults(array $rawResults): array
     {
-        $query = "{unions} ORDER BY pertinence DESC";
-        $unions = [];
-        $parameters = [];
+        $items = [];
 
-        foreach ($queries as $q) {
-            $unions[] = $q->buildQuery();
-            $parameters = \array_merge($parameters, $q->buildParameters());
-        }
-
-        $union = \implode(" UNION ", $unions);
-
-        return [
-            \strtr($query, [ '{unions}' => $union]),
-            $parameters
-        ];
-    }
-
-    private function fetchRawResult($queries, $types, $parameters, $paginator): array
-    {
-        list($union, $parameters) = $this->buildUnionQuery($queries, $types, $parameters, $paginator);
-        $rsm = new ResultSetMappingBuilder($this->em);
-        $rsm->addScalarResult('key', 'key', Types::STRING)
-            ->addScalarResult('metadata', 'metadata', Types::JSON)
-            ->addScalarResult('pertinence', 'pertinence', Types::FLOAT)
-            ;
-
-        $nq = $this->em->createNativeQuery($union, $rsm);
-        $nq->setParameters($parameters);
-
-        return $nq->getResult();
-    }
-
-    private function prepareProviders($rawResults)
-    {
-        $metadatas = [];
-        foreach ($rawResults as $r) {
-            foreach ($this->providers as $k => $p) {
-                if ($p->supportsResult($r['key'], $r['metadata'])) {
-                    $metadatas[$k][] = $r['metadata'];
-                    break;
-                }
-            }
-        }
-
-        foreach ($metadatas as $k => $m) {
-            $this->providers[$k]->prepare($m);
-        }
-    }
-
-    private function buildResults($rawResults)
-    {
         foreach ($rawResults as $r) {
             foreach ($this->providers as $k => $p) {
                 if ($p->supportsResult($r['key'], $r['metadata'])) {
@@ -165,11 +92,98 @@ class SearchApi
                         ->setResult(
                             $p->getResult($r['key'], $r['metadata'], $r['pertinence'])
                         );
+
                     break;
                 }
             }
         }
 
-        return $items ?? [];
+        return $items;
+    }
+
+    private function buildUnionQuery(array $queries, $types, $parameters)
+    {
+        $query = '{unions} ORDER BY pertinence DESC';
+        $unions = [];
+        $parameters = [];
+
+        foreach ($queries as $q) {
+            $unions[] = $q->buildQuery();
+            $parameters = array_merge($parameters, $q->buildParameters());
+        }
+
+        $union = implode(' UNION ', $unions);
+
+        return [
+            strtr($query, ['{unions}' => $union]),
+            $parameters,
+        ];
+    }
+
+    private function countItems($providers, $types, $parameters): int
+    {
+        [$countQuery, $parameters] = $this->buildCountQuery($providers, $types, $parameters);
+        $rsmCount = new ResultSetMappingBuilder($this->em);
+        $rsmCount->addScalarResult('count', 'count');
+        $countNq = $this->em->createNativeQuery($countQuery, $rsmCount);
+        $countNq->setParameters($parameters);
+
+        return (int) $countNq->getSingleScalarResult();
+    }
+
+    private function fetchRawResult($queries, $types, $parameters, $paginator): array
+    {
+        [$union, $parameters] = $this->buildUnionQuery($queries, $types, $parameters);
+        $rsm = new ResultSetMappingBuilder($this->em);
+        $rsm->addScalarResult('key', 'key', Types::STRING)
+            ->addScalarResult('metadata', 'metadata', Types::JSON)
+            ->addScalarResult('pertinence', 'pertinence', Types::FLOAT);
+
+        $nq = $this->em->createNativeQuery($union, $rsm);
+        $nq->setParameters($parameters);
+
+        return $nq->getResult();
+    }
+
+    private function findProviders(string $pattern, array $types, array $parameters): array
+    {
+        $providers = [];
+
+        foreach ($this->providers as $provider) {
+            if ($provider->supportsTypes($pattern, $types, $parameters)) {
+                $providers[] = $provider;
+            }
+        }
+
+        return $providers;
+    }
+
+    private function findQueries($pattern, array $types, array $parameters): array
+    {
+        return array_map(
+            static fn ($p) => $p->provideQuery($pattern, $parameters),
+            $this->findProviders($pattern, $types, $parameters),
+        );
+    }
+
+    private function prepareProviders(array $rawResults)
+    {
+        $metadatas = [];
+        $providers = [];
+
+        foreach ($rawResults as $r) {
+            foreach ($this->providers as $k => $p) {
+                if ($p->supportsResult($r['key'], $r['metadata'])) {
+                    $metadatas[$k][] = $r['metadata'];
+                    $providers[$k] = $p;
+
+                    break;
+                }
+            }
+        }
+
+        foreach ($metadatas as $k => $m) {
+            $providers[$k]->prepare($m);
+        }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php b/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php
index 54269c946..111bd5e5e 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiInterface.php
@@ -1,18 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
-use Chill\MainBundle\Search\SearchApiQuery;
-
 interface SearchApiInterface
 {
-    public function provideQuery(string $pattern, array $parameters): SearchApiQuery;
-
-    public function supportsTypes(string $pattern, array $types, array $parameters): bool;
+    public function getResult(string $key, array $metadata, float $pertinence);
 
     public function prepare(array $metadatas): void;
 
+    public function provideQuery(string $pattern, array $parameters): SearchApiQuery;
+
     public function supportsResult(string $key, array $metadatas): bool;
 
-    public function getResult(string $key, array $metadata, float $pertinence);
+    public function supportsTypes(string $pattern, array $types, array $parameters): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
index 765650074..46dfc759b 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
@@ -1,18 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
+use RuntimeException;
 use Throwable;
+use function implode;
 
-class SearchApiNoQueryException extends \RuntimeException
+class SearchApiNoQueryException extends RuntimeException
 {
-    private string $pattern;
-    private array $types;
     private array $parameters;
 
-    public function __construct(string $pattern = "", array $types = [], array $parameters = [], $code = 0, Throwable $previous = null)
+    private string $pattern;
+
+    private array $types;
+
+    public function __construct(string $pattern = '', array $types = [], array $parameters = [], $code = 0, ?Throwable $previous = null)
     {
-        $typesStr = \implode(", ", $types);
+        $typesStr = implode(', ', $types);
         $message = "No query for this search: pattern : {$pattern}, types: {$typesStr}";
         $this->pattern = $pattern;
         $this->types = $types;
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
index 9188c0b5c..2fcea304d 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
@@ -1,40 +1,140 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
+use function array_push;
+use function count;
+use function implode;
+use function strtr;
+
 class SearchApiQuery
 {
-    private ?string $selectKey = null;
-    private array $selectKeyParams = [];
-    private ?string $jsonbMetadata = null;
-    private array $jsonbMetadataParams = [];
-    private ?string $pertinence = null;
-    private array $pertinenceParams = [];
     private ?string $fromClause = null;
+
     private array $fromClauseParams = [];
+
+    private ?string $jsonbMetadata = null;
+
+    private array $jsonbMetadataParams = [];
+
+    private ?string $pertinence = null;
+
+    private array $pertinenceParams = [];
+
+    private array $select = [];
+
+    private ?string $selectKey = null;
+
+    private array $selectKeyParams = [];
+
+    private array $selectParams = [];
+
     private array $whereClauses = [];
+
     private array $whereClausesParams = [];
 
-    public function setSelectKey(string $selectKey, array $params = []): self
+    public function addSelectClause(string $select, array $params = []): self
     {
-        $this->selectKey = $selectKey;
-        $this->selectKeyParams = $params;
+        $this->select[] = $select;
+        $this->selectParams = [...$this->selectParams, ...$params];
 
         return $this;
     }
 
-    public function setSelectJsonbMetadata(string $jsonbMetadata, array $params = []): self
+    /**
+     * Add a where clause.
+     *
+     * This will add to previous where clauses with and `AND` join
+     *
+     * @return $this
+     */
+    public function andWhereClause(string $whereClause, array $params = []): self
     {
-        $this->jsonbMetadata = $jsonbMetadata;
-        $this->jsonbMetadataParams = $params;
+        $this->whereClauses[] = $whereClause;
+        array_push($this->whereClausesParams, ...$params);
 
         return $this;
     }
 
-    public function setSelectPertinence(string $pertinence, array $params = []): self
+    public function buildParameters(bool $countOnly = false): array
     {
-        $this->pertinence = $pertinence;
-        $this->pertinenceParams = $params;
+        if (!$countOnly) {
+            return [
+                ...$this->buildSelectParams($countOnly),
+                ...$this->fromClauseParams,
+                ...$this->whereClausesParams,
+            ];
+        }
+
+        return [
+            ...$this->fromClauseParams,
+            ...$this->whereClausesParams,
+        ];
+    }
+
+    public function buildQuery(bool $countOnly = false): string
+    {
+        $isMultiple = count($this->whereClauses);
+        $where =
+            ($isMultiple ? '(' : '') .
+            implode(
+                ($isMultiple ? ')' : '') . ' AND ' . ($isMultiple ? '(' : ''),
+                $this->whereClauses
+            ) .
+            ($isMultiple ? ')' : '');
+
+        $select = $this->buildSelectClause($countOnly);
+
+        return strtr('SELECT
+                {select}
+            FROM {from}
+            WHERE {where}
+        ', [
+            '{select}' => $select,
+            '{from}' => $this->fromClause,
+            '{where}' => $where,
+        ]);
+    }
+
+    public function getFromClause(): string
+    {
+        return $this->fromClause;
+    }
+
+    public function getFromParams(): array
+    {
+        return $this->fromClauseParams;
+    }
+
+    public function getSelectClauses(): array
+    {
+        return $this->select;
+    }
+
+    public function getSelectParams(): array
+    {
+        return $this->selectParams;
+    }
+
+    public function resetSelectClause(): self
+    {
+        $this->select = [];
+        $this->selectParams = [];
+        $this->selectKey = null;
+        $this->selectKeyParams = [];
+        $this->jsonbMetadata = null;
+        $this->jsonbMetadataParams = [];
+        $this->pertinence = null;
+        $this->pertinenceParams = [];
 
         return $this;
     }
@@ -47,62 +147,84 @@ class SearchApiQuery
         return $this;
     }
 
+    public function setSelectJsonbMetadata(string $jsonbMetadata, array $params = []): self
+    {
+        $this->jsonbMetadata = $jsonbMetadata;
+        $this->jsonbMetadataParams = $params;
+
+        return $this;
+    }
+
+    public function setSelectKey(string $selectKey, array $params = []): self
+    {
+        $this->selectKey = $selectKey;
+        $this->selectKeyParams = $params;
+
+        return $this;
+    }
+
+    public function setSelectPertinence(string $pertinence, array $params = []): self
+    {
+        $this->pertinence = $pertinence;
+        $this->pertinenceParams = $params;
+
+        return $this;
+    }
+
     /**
      * Set the where clause and replace all existing ones.
-     *
      */
     public function setWhereClauses(string $whereClause, array $params = []): self
     {
         $this->whereClauses = [$whereClause];
-        $this->whereClausesParams = [$params];
+        $this->whereClausesParams = $params;
 
         return $this;
     }
 
-    /**
-     * Add a where clause.
-     *
-     * This will add to previous where clauses with and `AND` join
-     *
-     * @param string $whereClause
-     * @param array $params
-     * @return $this
-     */
-    public function andWhereClause(string $whereClause, array $params = []): self
+    private function buildSelectClause(bool $countOnly = false): string
     {
-        $this->whereClauses[] = $whereClause;
-        $this->whereClausesParams[] = $params;
+        if ($countOnly) {
+            return 'count(*) AS c';
+        }
 
-        return $this;
+        $selects = $this->getSelectClauses();
+
+        if (null !== $this->selectKey) {
+            $selects[] = strtr("'{key}' AS key", ['{key}' => $this->selectKey]);
+        }
+
+        if (null !== $this->jsonbMetadata) {
+            $selects[] = strtr('{metadata} AS metadata', ['{metadata}' => $this->jsonbMetadata]);
+        }
+
+        if (null !== $this->pertinence) {
+            $selects[] = strtr('{pertinence} AS pertinence', ['{pertinence}' => $this->pertinence]);
+        }
+
+        return implode(', ', $selects);
     }
 
-    public function buildQuery(): string
+    private function buildSelectParams(bool $count = false): array
     {
-        $where = \implode(' AND ', $this->whereClauses);
+        if ($count) {
+            return [];
+        }
 
-        return \strtr("SELECT
-            '{key}' AS key,
-            {metadata} AS metadata,
-            {pertinence} AS pertinence
-        FROM {from}
-        WHERE {where}
-        ", [
-            '{key}' => $this->selectKey,
-            '{metadata}' => $this->jsonbMetadata,
-            '{pertinence}' => $this->pertinence,
-            '{from}' => $this->fromClause,
-            '{where}' => $where,
-        ]);
-    }
+        $args = $this->getSelectParams();
 
-    public function buildParameters(): array
-    {
-        return \array_merge(
-            $this->selectKeyParams,
-            $this->jsonbMetadataParams,
-            $this->pertinenceParams,
-            $this->fromClauseParams,
-            \array_merge([], ...$this->whereClausesParams),
-        );
+        if (null !== $this->selectKey) {
+            $args = [...$args, ...$this->selectKeyParams];
+        }
+
+        if (null !== $this->jsonbMetadata) {
+            $args = [...$args, ...$this->jsonbMetadataParams];
+        }
+
+        if (null !== $this->pertinence) {
+            $args = [...$args, ...$this->pertinenceParams];
+        }
+
+        return $args;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
index bbc66877f..ac47de087 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
 use Symfony\Component\Serializer\Annotation as Serializer;
@@ -8,6 +17,8 @@ class SearchApiResult
 {
     private float $pertinence;
 
+    private float $relevance;
+
     private $result;
 
     public function __construct(float $relevance)
@@ -15,21 +26,6 @@ class SearchApiResult
         $this->relevance = $relevance;
     }
 
-    public function setResult($result): self
-    {
-        $this->result = $result;
-
-        return $this;
-    } 
-
-    /**
-     * @Serializer\Groups({"read"})
-     */
-    public function getResult()
-    {
-        return $this->result;
-    }
-
     /**
      * @Serializer\Groups({"read"})
      */
@@ -37,4 +33,19 @@ class SearchApiResult
     {
         return $this->relevance;
     }
+
+    /**
+     * @Serializer\Groups({"read"})
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    public function setResult($result): self
+    {
+        $this->result = $result;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchInterface.php b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
index 958ce9ddd..0c9369808 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchInterface.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchInterface.php
@@ -1,100 +1,89 @@
 <?php
 
-
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
 /**
  * This interface must be implemented on services which provide search results.
  *
  * @todo : write doc and add a link to documentation
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
  */
 interface SearchInterface
 {
-    const SEARCH_PREVIEW_OPTION = '_search_preview';
+    /**
+     * Supplementary parameters to the query string.
+     */
+    public const REQUEST_QUERY_KEY_ADD_PARAMETERS = 'add_q';
 
     /**
-     * Request parameters contained inside the `add_q` parameters
+     * Request parameters contained inside the `add_q` parameters.
      */
-    const REQUEST_QUERY_PARAMETERS = '_search_parameters';
+    public const REQUEST_QUERY_PARAMETERS = '_search_parameters';
+
+    public const SEARCH_PREVIEW_OPTION = '_search_preview';
 
     /**
-     * Supplementary parameters to the query string
+     * the order in which the results will appears in the global view.
+     *
+     * (this may be eventually defined in config.yml)
+     *
+     * @return int
      */
-    const REQUEST_QUERY_KEY_ADD_PARAMETERS = 'add_q';
+    public function getOrder();
 
-   /**
-    * return the result in a html string. The string will be inclued (as raw)
-    * into a global view.
-    *
-    * The global view may be :
-    * {% for result as resultsFromDifferentSearchInterface %}
-    *    {{ result|raw }}
-    * {% endfor %}
-    *
-    * **available options** :
-    * - SEARCH_PREVIEW_OPTION (boolean) : if renderResult should return a "preview" of
-    * the results. In this case, a subset of results should be returned, and,
-    * if the query return more results, a button "see all results" should be
-    * displayed at the end of the list.
-    *
-    * **Interaction between `start` and `limit` and pagination : you should
-    * take only the given parameters into account; the results from pagination
-    * should be ignored. (Most of the time, it should be the same).
-    *
-    * @param array  $terms   the string to search
-    * @param int    $start   the first result (for pagination)
-    * @param int    $limit   the number of result (for pagination)
-    * @param array  $option  the options, specific for each search
-    * @param string $format  The format for result
-    * @return string, an HTML string
-    */
-   public function renderResult(array $terms, $start=0, $limit=50, array $options = array(), $format = 'html');
+    /**
+     * we may desactive the search interface by default. in this case,
+     * the search will be launch and rendered only with "advanced search".
+     *
+     * this may be activated/desactived from bundle definition in config.yml
+     *
+     * @return bool
+     */
+    public function isActiveByDefault();
 
-   /**
-    * we may desactive the search interface by default. in this case,
-    * the search will be launch and rendered only with "advanced search"
-    *
-    * this may be activated/desactived from bundle definition in config.yml
-    *
-    * @return bool
-    */
-   public function isActiveByDefault();
-
-   /**
-    * the order in which the results will appears in the global view
-    *
-    * (this may be eventually defined in config.yml)
-    *
-    * @return int
-    */
-   public function getOrder();
-
-   /**
-    * indicate if the implementation supports the given domain
-    *
-    * @return boolean
-    */
-   public function supports($domain, $format);
+    /**
+     * return the result in a html string. The string will be inclued (as raw)
+     * into a global view.
+     *
+     * The global view may be :
+     * {% for result as resultsFromDifferentSearchInterface %}
+     *    {{ result|raw }}
+     * {% endfor %}
+     *
+     * **available options** :
+     * - SEARCH_PREVIEW_OPTION (boolean) : if renderResult should return a "preview" of
+     * the results. In this case, a subset of results should be returned, and,
+     * if the query return more results, a button "see all results" should be
+     * displayed at the end of the list.
+     *
+     * **Interaction between `start` and `limit` and pagination : you should
+     * take only the given parameters into account; the results from pagination
+     * should be ignored. (Most of the time, it should be the same).
+     *
+     * @param array  $terms   the string to search
+     * @param int    $start   the first result (for pagination)
+     * @param int    $limit   the number of result (for pagination)
+     * @param string $format  The format for result
+     *
+     * @return string, an HTML string
+     */
+    public function renderResult(array $terms, $start = 0, $limit = 50, array $options = [], $format = 'html');
 
+    /**
+     * indicate if the implementation supports the given domain.
+     *
+     * @param mixed $domain
+     * @param mixed $format
+     *
+     * @return bool
+     */
+    public function supports($domain, $format);
 }
diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
index ca5d169fa..61eb3fcd8 100644
--- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php
@@ -1,42 +1,83 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
-use Chill\MainBundle\Search\SearchInterface;
-use Chill\MainBundle\Search\HasAdvancedSearchFormInterface;
+use function array_key_exists;
+use function chr;
+use function count;
 
 /**
  * a service which gather all search services defined into the bundles
  * installed into the app.
  * the service is callable from the container with
- * $container->get('chill_main.search_provider')
- * 
- * the syntax for search string is : 
- * - domain, which begin with `@`. Example: `@person`. Restrict the search to some 
- * entities. It may exists multiple search provider for the same domain (example: 
+ * $container->get('chill_main.search_provider').
+ *
+ * the syntax for search string is :
+ * - domain, which begin with `@`. Example: `@person`. Restrict the search to some
+ * entities. It may exists multiple search provider for the same domain (example:
  * a search provider for people which performs regular search, and suggestion search
  * with phonetical algorithms
  * - terms, which are the terms of the search. There are terms with argument (example :
  * `birthdate:2016-04-01` and the default term, which is the search without argument
  * and without domain.
- *
  */
 class SearchProvider
 {
-
     /**
-     * 
-     * @var SearchInterface[]
-     */
-    private $searchServices = array();
-    
-    /**
-     *
      * @var HasAdvancedSearchForm[]
      */
-    private $hasAdvancedFormSearchServices = array();
-    
-    /*
+    private $hasAdvancedFormSearchServices = [];
+
+    /**
+     * store string which must be extracted to find default arguments.
+     *
+     * @var string[]
+     */
+    private $mustBeExtracted = [];
+
+    /**
+     * @var SearchInterface[]
+     */
+    private $searchServices = [];
+
+    public function addSearchService(SearchInterface $service, $name)
+    {
+        $this->searchServices[$name] = $service;
+
+        if ($service instanceof HasAdvancedSearchFormInterface) {
+            $this->hasAdvancedFormSearchServices[$name] = $service;
+        }
+    }
+
+    /**
+     * return search services with a specific name, defined in service
+     * definition.
+     *
+     * @param mixed $name
+     *
+     * @throws UnknowSearchNameException if not exists
+     *
+     * @return SearchInterface
+     */
+    public function getByName($name)
+    {
+        if (isset($this->searchServices[$name])) {
+            return $this->searchServices[$name];
+        }
+
+        throw new UnknowSearchNameException($name);
+    }
+
+    /**
      * return search services in an array, ordered by
      * the order key (defined in service definition)
      * the conflicts in keys (twice the same order) are resolved
@@ -46,43 +87,136 @@ class SearchProvider
      *
      * @return SearchInterface[], with an int as array key
      */
-
     public function getByOrder()
     {
         //sort the array
-        uasort($this->searchServices, function(SearchInterface $a, SearchInterface $b) {
-            if ($a->getOrder() == $b->getOrder()) {
+        uasort($this->searchServices, static function (SearchInterface $a, SearchInterface $b) {
+            if ($a->getOrder() === $b->getOrder()) {
                 return 0;
             }
+
             return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
         });
 
         return $this->searchServices;
     }
-    
+
+    /**
+     * return searchservice with an advanced form, defined in service
+     * definition.
+     *
+     * @param string $name
+     *
+     * @throws UnknowSearchNameException
+     *
+     * @return HasAdvancedSearchForm
+     */
+    public function getHasAdvancedFormByName($name)
+    {
+        if (array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
+            return $this->hasAdvancedFormSearchServices[$name];
+        }
+
+        throw new UnknowSearchNameException($name);
+    }
+
     public function getHasAdvancedFormSearchServices()
     {
         //sort the array
-        uasort($this->hasAdvancedFormSearchServices, function(SearchInterface $a, SearchInterface $b) {
-            if ($a->getOrder() == $b->getOrder()) {
+        uasort($this->hasAdvancedFormSearchServices, static function (SearchInterface $a, SearchInterface $b) {
+            if ($a->getOrder() === $b->getOrder()) {
                 return 0;
             }
+
             return ($a->getOrder() < $b->getOrder()) ? -1 : 1;
         });
 
         return $this->hasAdvancedFormSearchServices;
     }
 
+    public function getResultByName(
+        $pattern,
+        $name,
+        $start = 0,
+        $limit = 50,
+        array $options = [],
+        $format = 'html'
+    ) {
+        $terms = $this->parse($pattern);
+        $search = $this->getByName($name);
+
+        if (null !== $terms['_domain'] && !$search->supports($terms['_domain'], $format)) {
+            throw new ParsingException('The domain is not supported for the search name');
+        }
+
+        return $search->renderResult($terms, $start, $limit, $options, $format);
+    }
+
     /**
-     * parse the search string to extract domain and terms
-     * 
+     * search through services which supports domain and give
+     * results as an array of resultsfrom different SearchInterface.
+     *
      * @param string $pattern
+     * @param number $start
+     * @param number $limit
+     * @param string $format
+     *
+     * @throws UnknowSearchDomainException if the domain is unknow
+     *
+     * @return array of results from different SearchInterface
+     */
+    public function getSearchResults(
+        $pattern,
+        $start = 0,
+        $limit = 50,
+        array $options = [],
+        $format = 'html'
+    ) {
+        $terms = $this->parse($pattern);
+        $results = [];
+
+        //sort searchServices by order
+        $sortedSearchServices = [];
+
+        foreach ($this->searchServices as $service) {
+            $sortedSearchServices[$service->getOrder()] = $service;
+        }
+
+        if (null !== $terms['_domain']) {
+            foreach ($sortedSearchServices as $service) {
+                if ($service->supports($terms['_domain'], $format)) {
+                    $results[] = $service->renderResult($terms, $start, $limit, $options);
+                }
+            }
+
+            if (count($results) === 0) {
+                throw new UnknowSearchDomainException($terms['_domain']);
+            }
+        } else { // no domain provided, we use default search
+            foreach ($sortedSearchServices as $service) {
+                if ($service->isActiveByDefault()) {
+                    $results[] = $service->renderResult($terms, $start, $limit, $options);
+                }
+            }
+        }
+
+        //sort array
+        ksort($results);
+
+        return $results;
+    }
+
+    /**
+     * parse the search string to extract domain and terms.
+     *
+     * @param string $pattern
+     *
      * @return string[] an array where the keys are _domain, _default (residual terms) or term
      */
     public function parse($pattern)
     {
         //reset must be extracted
-        $this->mustBeExtracted = array();
+        $this->mustBeExtracted = [];
         //filter to lower and remove accentued
         $filteredPattern = mb_strtolower($this->remove_accents($pattern));
 
@@ -94,13 +228,27 @@ class SearchProvider
     }
 
     /**
-     * Extract the domain of the subject
-     * 
-     * The domain begins with `@`. Example: `@person`, `@report`, ....
-     * 
-     * @param type $subject
+     * extract default (residual) arguments.
+     *
+     * @param string $subject
+     *
      * @return string
+     */
+    private function extractDefault($subject)
+    {
+        return trim(str_replace($this->mustBeExtracted, '', $subject));
+    }
+
+    /**
+     * Extract the domain of the subject.
+     *
+     * The domain begins with `@`. Example: `@person`, `@report`, ....
+     *
+     * @param type $subject
+     *
      * @throws ParsingException
+     *
+     * @return string
      */
     private function extractDomain(&$subject)
     {
@@ -115,20 +263,21 @@ class SearchProvider
             $this->mustBeExtracted[] = $terms[0][0];
         }
 
-        return isset($terms[1][0]) ? $terms[1][0] : NULL;
+        return $terms[1][0] ?? null;
     }
 
     private function extractTerms(&$subject)
     {
-        $terms = array();
-        preg_match_all('/([a-z\-]+):([\w\-]+|\([^\(\r\n]+\))/', $subject, $matches);
+        $terms = [];
+        $matches = [];
+        preg_match_all('/([a-z\-]+):(([^"][\S\-]+)|"[^"]*")/', $subject, $matches);
 
         foreach ($matches[2] as $key => $match) {
             //remove from search pattern
             $this->mustBeExtracted[] = $matches[0][$key];
             //strip parenthesis
-            if (mb_substr($match, 0, 1) === '(' &&
-                  mb_substr($match, mb_strlen($match) - 1) === ')') {
+            if (mb_substr($match, 0, 1) === '"'
+                  && mb_substr($match, mb_strlen($match) - 1) === '"') {
                 $match = trim(mb_substr($match, 1, mb_strlen($match) - 2));
             }
             $terms[$matches[1][$key]] = $match;
@@ -137,128 +286,6 @@ class SearchProvider
         return $terms;
     }
 
-    /**
-     * store string which must be extracted to find default arguments
-     * 
-     * @var string[]
-     */
-    private $mustBeExtracted = array();
-
-    /**
-     * extract default (residual) arguments
-     * 
-     * @param string $subject
-     * @return string
-     */
-    private function extractDefault($subject)
-    {
-        return trim(str_replace($this->mustBeExtracted, '', $subject));
-    }
-
-    /**
-     * search through services which supports domain and give
-     * results as an array of resultsfrom different SearchInterface
-     * 
-     * @param string $pattern
-     * @param number $start
-     * @param number $limit
-     * @param array $options
-     * @param string $format
-     * @return array of results from different SearchInterface
-     * @throws UnknowSearchDomainException if the domain is unknow
-     */
-    public function getSearchResults($pattern, $start = 0, $limit = 50, 
-          array $options = array(), $format = 'html')
-    {
-        $terms = $this->parse($pattern);
-        $results = array();
-        
-        //sort searchServices by order
-        $sortedSearchServices = array();
-        foreach($this->searchServices as $service) {
-            $sortedSearchServices[$service->getOrder()] = $service;
-        }
-        
-        if ($terms['_domain'] !== NULL) {
-            foreach ($sortedSearchServices as $service) {
-                if ($service->supports($terms['_domain'], $format)) {
-                    $results[] = $service->renderResult($terms, $start, $limit, $options);
-                }
-            }
-            
-            if (count($results) === 0) {
-                throw new UnknowSearchDomainException($terms['_domain']);
-            }
-        } else { // no domain provided, we use default search
-            foreach($sortedSearchServices as $service) {
-                if ($service->isActiveByDefault()) {
-                    $results[] = $service->renderResult($terms, $start, $limit, $options);
-                }
-            }
-        }
-        
-        //sort array
-        ksort($results);
-
-        return $results;
-    }
-    
-    public function getResultByName($pattern, $name, $start = 0, $limit = 50,
-          array $options = array(), $format = 'html') 
-    {
-        $terms = $this->parse($pattern);
-        $search = $this->getByName($name);
-        
-        if ($terms['_domain'] !== NULL && !$search->supports($terms['_domain'], $format))
-        {
-            throw new ParsingException("The domain is not supported for the search name");
-        }
-        
-        return $search->renderResult($terms, $start, $limit, $options, $format);
-    }
-
-    /**
-     * return search services with a specific name, defined in service
-     * definition.
-     *
-     * @return SearchInterface
-     * @throws UnknowSearchNameException if not exists
-     */
-    public function getByName($name)
-    {
-        if (isset($this->searchServices[$name])) {
-            return $this->searchServices[$name];
-        } else {
-            throw new UnknowSearchNameException($name);
-        }
-    }
-    
-    /**
-     * return searchservice with an advanced form, defined in service 
-     * definition.
-     * 
-     * @param string $name
-     * @return HasAdvancedSearchForm
-     * @throws UnknowSearchNameException
-     */
-    public function getHasAdvancedFormByName($name) 
-    {
-        if (\array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
-            return $this->hasAdvancedFormSearchServices[$name];
-        } else {
-            throw new UnknowSearchNameException($name);
-        }
-    }
-
-    public function addSearchService(SearchInterface $service, $name)
-    {
-        $this->searchServices[$name] = $service;
-        
-        if ($service instanceof HasAdvancedSearchFormInterface) {
-            $this->hasAdvancedFormSearchServices[$name] = $service;
-        }
-    }
-
     /**
      * Converts all accent characters to ASCII characters.
      *
@@ -267,191 +294,194 @@ class SearchProvider
      * Imported from wordpress : https://core.trac.wordpress.org/browser/tags/4.1/src/wp-includes/formatting.php?order=name
      *
      * @param string $string Text that might have accent characters
+     *
      * @return string Filtered string with replaced "nice" characters.
+     *
      * @license GNU GPLv2 : https://core.trac.wordpress.org/browser/tags/4.1/src/license.txt
      */
     private function remove_accents($string)
     {
-        if (!preg_match('/[\x80-\xff]/', $string))
+        if (!preg_match('/[\x80-\xff]/', $string)) {
             return $string;
+        }
 
         //if ($this->seems_utf8($string)) { // remove from wordpress: we use only UTF-8
         if (true) {
-            $chars = array(
-               // Decompositions for Latin-1 Supplement
-               chr(194) . chr(170) => 'a', chr(194) . chr(186) => 'o',
-               chr(195) . chr(128) => 'A', chr(195) . chr(129) => 'A',
-               chr(195) . chr(130) => 'A', chr(195) . chr(131) => 'A',
-               chr(195) . chr(132) => 'A', chr(195) . chr(133) => 'A',
-               chr(195) . chr(134) => 'AE', chr(195) . chr(135) => 'C',
-               chr(195) . chr(136) => 'E', chr(195) . chr(137) => 'E',
-               chr(195) . chr(138) => 'E', chr(195) . chr(139) => 'E',
-               chr(195) . chr(140) => 'I', chr(195) . chr(141) => 'I',
-               chr(195) . chr(142) => 'I', chr(195) . chr(143) => 'I',
-               chr(195) . chr(144) => 'D', chr(195) . chr(145) => 'N',
-               chr(195) . chr(146) => 'O', chr(195) . chr(147) => 'O',
-               chr(195) . chr(148) => 'O', chr(195) . chr(149) => 'O',
-               chr(195) . chr(150) => 'O', chr(195) . chr(153) => 'U',
-               chr(195) . chr(154) => 'U', chr(195) . chr(155) => 'U',
-               chr(195) . chr(156) => 'U', chr(195) . chr(157) => 'Y',
-               chr(195) . chr(158) => 'TH', chr(195) . chr(159) => 's',
-               chr(195) . chr(160) => 'a', chr(195) . chr(161) => 'a',
-               chr(195) . chr(162) => 'a', chr(195) . chr(163) => 'a',
-               chr(195) . chr(164) => 'a', chr(195) . chr(165) => 'a',
-               chr(195) . chr(166) => 'ae', chr(195) . chr(167) => 'c',
-               chr(195) . chr(168) => 'e', chr(195) . chr(169) => 'e',
-               chr(195) . chr(170) => 'e', chr(195) . chr(171) => 'e',
-               chr(195) . chr(172) => 'i', chr(195) . chr(173) => 'i',
-               chr(195) . chr(174) => 'i', chr(195) . chr(175) => 'i',
-               chr(195) . chr(176) => 'd', chr(195) . chr(177) => 'n',
-               chr(195) . chr(178) => 'o', chr(195) . chr(179) => 'o',
-               chr(195) . chr(180) => 'o', chr(195) . chr(181) => 'o',
-               chr(195) . chr(182) => 'o', chr(195) . chr(184) => 'o',
-               chr(195) . chr(185) => 'u', chr(195) . chr(186) => 'u',
-               chr(195) . chr(187) => 'u', chr(195) . chr(188) => 'u',
-               chr(195) . chr(189) => 'y', chr(195) . chr(190) => 'th',
-               chr(195) . chr(191) => 'y', chr(195) . chr(152) => 'O',
-               // Decompositions for Latin Extended-A
-               chr(196) . chr(128) => 'A', chr(196) . chr(129) => 'a',
-               chr(196) . chr(130) => 'A', chr(196) . chr(131) => 'a',
-               chr(196) . chr(132) => 'A', chr(196) . chr(133) => 'a',
-               chr(196) . chr(134) => 'C', chr(196) . chr(135) => 'c',
-               chr(196) . chr(136) => 'C', chr(196) . chr(137) => 'c',
-               chr(196) . chr(138) => 'C', chr(196) . chr(139) => 'c',
-               chr(196) . chr(140) => 'C', chr(196) . chr(141) => 'c',
-               chr(196) . chr(142) => 'D', chr(196) . chr(143) => 'd',
-               chr(196) . chr(144) => 'D', chr(196) . chr(145) => 'd',
-               chr(196) . chr(146) => 'E', chr(196) . chr(147) => 'e',
-               chr(196) . chr(148) => 'E', chr(196) . chr(149) => 'e',
-               chr(196) . chr(150) => 'E', chr(196) . chr(151) => 'e',
-               chr(196) . chr(152) => 'E', chr(196) . chr(153) => 'e',
-               chr(196) . chr(154) => 'E', chr(196) . chr(155) => 'e',
-               chr(196) . chr(156) => 'G', chr(196) . chr(157) => 'g',
-               chr(196) . chr(158) => 'G', chr(196) . chr(159) => 'g',
-               chr(196) . chr(160) => 'G', chr(196) . chr(161) => 'g',
-               chr(196) . chr(162) => 'G', chr(196) . chr(163) => 'g',
-               chr(196) . chr(164) => 'H', chr(196) . chr(165) => 'h',
-               chr(196) . chr(166) => 'H', chr(196) . chr(167) => 'h',
-               chr(196) . chr(168) => 'I', chr(196) . chr(169) => 'i',
-               chr(196) . chr(170) => 'I', chr(196) . chr(171) => 'i',
-               chr(196) . chr(172) => 'I', chr(196) . chr(173) => 'i',
-               chr(196) . chr(174) => 'I', chr(196) . chr(175) => 'i',
-               chr(196) . chr(176) => 'I', chr(196) . chr(177) => 'i',
-               chr(196) . chr(178) => 'IJ', chr(196) . chr(179) => 'ij',
-               chr(196) . chr(180) => 'J', chr(196) . chr(181) => 'j',
-               chr(196) . chr(182) => 'K', chr(196) . chr(183) => 'k',
-               chr(196) . chr(184) => 'k', chr(196) . chr(185) => 'L',
-               chr(196) . chr(186) => 'l', chr(196) . chr(187) => 'L',
-               chr(196) . chr(188) => 'l', chr(196) . chr(189) => 'L',
-               chr(196) . chr(190) => 'l', chr(196) . chr(191) => 'L',
-               chr(197) . chr(128) => 'l', chr(197) . chr(129) => 'L',
-               chr(197) . chr(130) => 'l', chr(197) . chr(131) => 'N',
-               chr(197) . chr(132) => 'n', chr(197) . chr(133) => 'N',
-               chr(197) . chr(134) => 'n', chr(197) . chr(135) => 'N',
-               chr(197) . chr(136) => 'n', chr(197) . chr(137) => 'N',
-               chr(197) . chr(138) => 'n', chr(197) . chr(139) => 'N',
-               chr(197) . chr(140) => 'O', chr(197) . chr(141) => 'o',
-               chr(197) . chr(142) => 'O', chr(197) . chr(143) => 'o',
-               chr(197) . chr(144) => 'O', chr(197) . chr(145) => 'o',
-               chr(197) . chr(146) => 'OE', chr(197) . chr(147) => 'oe',
-               chr(197) . chr(148) => 'R', chr(197) . chr(149) => 'r',
-               chr(197) . chr(150) => 'R', chr(197) . chr(151) => 'r',
-               chr(197) . chr(152) => 'R', chr(197) . chr(153) => 'r',
-               chr(197) . chr(154) => 'S', chr(197) . chr(155) => 's',
-               chr(197) . chr(156) => 'S', chr(197) . chr(157) => 's',
-               chr(197) . chr(158) => 'S', chr(197) . chr(159) => 's',
-               chr(197) . chr(160) => 'S', chr(197) . chr(161) => 's',
-               chr(197) . chr(162) => 'T', chr(197) . chr(163) => 't',
-               chr(197) . chr(164) => 'T', chr(197) . chr(165) => 't',
-               chr(197) . chr(166) => 'T', chr(197) . chr(167) => 't',
-               chr(197) . chr(168) => 'U', chr(197) . chr(169) => 'u',
-               chr(197) . chr(170) => 'U', chr(197) . chr(171) => 'u',
-               chr(197) . chr(172) => 'U', chr(197) . chr(173) => 'u',
-               chr(197) . chr(174) => 'U', chr(197) . chr(175) => 'u',
-               chr(197) . chr(176) => 'U', chr(197) . chr(177) => 'u',
-               chr(197) . chr(178) => 'U', chr(197) . chr(179) => 'u',
-               chr(197) . chr(180) => 'W', chr(197) . chr(181) => 'w',
-               chr(197) . chr(182) => 'Y', chr(197) . chr(183) => 'y',
-               chr(197) . chr(184) => 'Y', chr(197) . chr(185) => 'Z',
-               chr(197) . chr(186) => 'z', chr(197) . chr(187) => 'Z',
-               chr(197) . chr(188) => 'z', chr(197) . chr(189) => 'Z',
-               chr(197) . chr(190) => 'z', chr(197) . chr(191) => 's',
-               // Decompositions for Latin Extended-B
-               chr(200) . chr(152) => 'S', chr(200) . chr(153) => 's',
-               chr(200) . chr(154) => 'T', chr(200) . chr(155) => 't',
-               // Euro Sign
-               chr(226) . chr(130) . chr(172) => 'E',
-               // GBP (Pound) Sign
-               chr(194) . chr(163) => '',
-               // Vowels with diacritic (Vietnamese)
-               // unmarked
-               chr(198) . chr(160) => 'O', chr(198) . chr(161) => 'o',
-               chr(198) . chr(175) => 'U', chr(198) . chr(176) => 'u',
-               // grave accent
-               chr(225) . chr(186) . chr(166) => 'A', chr(225) . chr(186) . chr(167) => 'a',
-               chr(225) . chr(186) . chr(176) => 'A', chr(225) . chr(186) . chr(177) => 'a',
-               chr(225) . chr(187) . chr(128) => 'E', chr(225) . chr(187) . chr(129) => 'e',
-               chr(225) . chr(187) . chr(146) => 'O', chr(225) . chr(187) . chr(147) => 'o',
-               chr(225) . chr(187) . chr(156) => 'O', chr(225) . chr(187) . chr(157) => 'o',
-               chr(225) . chr(187) . chr(170) => 'U', chr(225) . chr(187) . chr(171) => 'u',
-               chr(225) . chr(187) . chr(178) => 'Y', chr(225) . chr(187) . chr(179) => 'y',
-               // hook
-               chr(225) . chr(186) . chr(162) => 'A', chr(225) . chr(186) . chr(163) => 'a',
-               chr(225) . chr(186) . chr(168) => 'A', chr(225) . chr(186) . chr(169) => 'a',
-               chr(225) . chr(186) . chr(178) => 'A', chr(225) . chr(186) . chr(179) => 'a',
-               chr(225) . chr(186) . chr(186) => 'E', chr(225) . chr(186) . chr(187) => 'e',
-               chr(225) . chr(187) . chr(130) => 'E', chr(225) . chr(187) . chr(131) => 'e',
-               chr(225) . chr(187) . chr(136) => 'I', chr(225) . chr(187) . chr(137) => 'i',
-               chr(225) . chr(187) . chr(142) => 'O', chr(225) . chr(187) . chr(143) => 'o',
-               chr(225) . chr(187) . chr(148) => 'O', chr(225) . chr(187) . chr(149) => 'o',
-               chr(225) . chr(187) . chr(158) => 'O', chr(225) . chr(187) . chr(159) => 'o',
-               chr(225) . chr(187) . chr(166) => 'U', chr(225) . chr(187) . chr(167) => 'u',
-               chr(225) . chr(187) . chr(172) => 'U', chr(225) . chr(187) . chr(173) => 'u',
-               chr(225) . chr(187) . chr(182) => 'Y', chr(225) . chr(187) . chr(183) => 'y',
-               // tilde
-               chr(225) . chr(186) . chr(170) => 'A', chr(225) . chr(186) . chr(171) => 'a',
-               chr(225) . chr(186) . chr(180) => 'A', chr(225) . chr(186) . chr(181) => 'a',
-               chr(225) . chr(186) . chr(188) => 'E', chr(225) . chr(186) . chr(189) => 'e',
-               chr(225) . chr(187) . chr(132) => 'E', chr(225) . chr(187) . chr(133) => 'e',
-               chr(225) . chr(187) . chr(150) => 'O', chr(225) . chr(187) . chr(151) => 'o',
-               chr(225) . chr(187) . chr(160) => 'O', chr(225) . chr(187) . chr(161) => 'o',
-               chr(225) . chr(187) . chr(174) => 'U', chr(225) . chr(187) . chr(175) => 'u',
-               chr(225) . chr(187) . chr(184) => 'Y', chr(225) . chr(187) . chr(185) => 'y',
-               // acute accent
-               chr(225) . chr(186) . chr(164) => 'A', chr(225) . chr(186) . chr(165) => 'a',
-               chr(225) . chr(186) . chr(174) => 'A', chr(225) . chr(186) . chr(175) => 'a',
-               chr(225) . chr(186) . chr(190) => 'E', chr(225) . chr(186) . chr(191) => 'e',
-               chr(225) . chr(187) . chr(144) => 'O', chr(225) . chr(187) . chr(145) => 'o',
-               chr(225) . chr(187) . chr(154) => 'O', chr(225) . chr(187) . chr(155) => 'o',
-               chr(225) . chr(187) . chr(168) => 'U', chr(225) . chr(187) . chr(169) => 'u',
-               // dot below
-               chr(225) . chr(186) . chr(160) => 'A', chr(225) . chr(186) . chr(161) => 'a',
-               chr(225) . chr(186) . chr(172) => 'A', chr(225) . chr(186) . chr(173) => 'a',
-               chr(225) . chr(186) . chr(182) => 'A', chr(225) . chr(186) . chr(183) => 'a',
-               chr(225) . chr(186) . chr(184) => 'E', chr(225) . chr(186) . chr(185) => 'e',
-               chr(225) . chr(187) . chr(134) => 'E', chr(225) . chr(187) . chr(135) => 'e',
-               chr(225) . chr(187) . chr(138) => 'I', chr(225) . chr(187) . chr(139) => 'i',
-               chr(225) . chr(187) . chr(140) => 'O', chr(225) . chr(187) . chr(141) => 'o',
-               chr(225) . chr(187) . chr(152) => 'O', chr(225) . chr(187) . chr(153) => 'o',
-               chr(225) . chr(187) . chr(162) => 'O', chr(225) . chr(187) . chr(163) => 'o',
-               chr(225) . chr(187) . chr(164) => 'U', chr(225) . chr(187) . chr(165) => 'u',
-               chr(225) . chr(187) . chr(176) => 'U', chr(225) . chr(187) . chr(177) => 'u',
-               chr(225) . chr(187) . chr(180) => 'Y', chr(225) . chr(187) . chr(181) => 'y',
-               // Vowels with diacritic (Chinese, Hanyu Pinyin)
-               chr(201) . chr(145) => 'a',
-               // macron
-               chr(199) . chr(149) => 'U', chr(199) . chr(150) => 'u',
-               // acute accent
-               chr(199) . chr(151) => 'U', chr(199) . chr(152) => 'u',
-               // caron
-               chr(199) . chr(141) => 'A', chr(199) . chr(142) => 'a',
-               chr(199) . chr(143) => 'I', chr(199) . chr(144) => 'i',
-               chr(199) . chr(145) => 'O', chr(199) . chr(146) => 'o',
-               chr(199) . chr(147) => 'U', chr(199) . chr(148) => 'u',
-               chr(199) . chr(153) => 'U', chr(199) . chr(154) => 'u',
-               // grave accent
-               chr(199) . chr(155) => 'U', chr(199) . chr(156) => 'u',
-            );
+            $chars = [
+                // Decompositions for Latin-1 Supplement
+                chr(194) . chr(170) => 'a', chr(194) . chr(186) => 'o',
+                chr(195) . chr(128) => 'A', chr(195) . chr(129) => 'A',
+                chr(195) . chr(130) => 'A', chr(195) . chr(131) => 'A',
+                chr(195) . chr(132) => 'A', chr(195) . chr(133) => 'A',
+                chr(195) . chr(134) => 'AE', chr(195) . chr(135) => 'C',
+                chr(195) . chr(136) => 'E', chr(195) . chr(137) => 'E',
+                chr(195) . chr(138) => 'E', chr(195) . chr(139) => 'E',
+                chr(195) . chr(140) => 'I', chr(195) . chr(141) => 'I',
+                chr(195) . chr(142) => 'I', chr(195) . chr(143) => 'I',
+                chr(195) . chr(144) => 'D', chr(195) . chr(145) => 'N',
+                chr(195) . chr(146) => 'O', chr(195) . chr(147) => 'O',
+                chr(195) . chr(148) => 'O', chr(195) . chr(149) => 'O',
+                chr(195) . chr(150) => 'O', chr(195) . chr(153) => 'U',
+                chr(195) . chr(154) => 'U', chr(195) . chr(155) => 'U',
+                chr(195) . chr(156) => 'U', chr(195) . chr(157) => 'Y',
+                chr(195) . chr(158) => 'TH', chr(195) . chr(159) => 's',
+                chr(195) . chr(160) => 'a', chr(195) . chr(161) => 'a',
+                chr(195) . chr(162) => 'a', chr(195) . chr(163) => 'a',
+                chr(195) . chr(164) => 'a', chr(195) . chr(165) => 'a',
+                chr(195) . chr(166) => 'ae', chr(195) . chr(167) => 'c',
+                chr(195) . chr(168) => 'e', chr(195) . chr(169) => 'e',
+                chr(195) . chr(170) => 'e', chr(195) . chr(171) => 'e',
+                chr(195) . chr(172) => 'i', chr(195) . chr(173) => 'i',
+                chr(195) . chr(174) => 'i', chr(195) . chr(175) => 'i',
+                chr(195) . chr(176) => 'd', chr(195) . chr(177) => 'n',
+                chr(195) . chr(178) => 'o', chr(195) . chr(179) => 'o',
+                chr(195) . chr(180) => 'o', chr(195) . chr(181) => 'o',
+                chr(195) . chr(182) => 'o', chr(195) . chr(184) => 'o',
+                chr(195) . chr(185) => 'u', chr(195) . chr(186) => 'u',
+                chr(195) . chr(187) => 'u', chr(195) . chr(188) => 'u',
+                chr(195) . chr(189) => 'y', chr(195) . chr(190) => 'th',
+                chr(195) . chr(191) => 'y', chr(195) . chr(152) => 'O',
+                // Decompositions for Latin Extended-A
+                chr(196) . chr(128) => 'A', chr(196) . chr(129) => 'a',
+                chr(196) . chr(130) => 'A', chr(196) . chr(131) => 'a',
+                chr(196) . chr(132) => 'A', chr(196) . chr(133) => 'a',
+                chr(196) . chr(134) => 'C', chr(196) . chr(135) => 'c',
+                chr(196) . chr(136) => 'C', chr(196) . chr(137) => 'c',
+                chr(196) . chr(138) => 'C', chr(196) . chr(139) => 'c',
+                chr(196) . chr(140) => 'C', chr(196) . chr(141) => 'c',
+                chr(196) . chr(142) => 'D', chr(196) . chr(143) => 'd',
+                chr(196) . chr(144) => 'D', chr(196) . chr(145) => 'd',
+                chr(196) . chr(146) => 'E', chr(196) . chr(147) => 'e',
+                chr(196) . chr(148) => 'E', chr(196) . chr(149) => 'e',
+                chr(196) . chr(150) => 'E', chr(196) . chr(151) => 'e',
+                chr(196) . chr(152) => 'E', chr(196) . chr(153) => 'e',
+                chr(196) . chr(154) => 'E', chr(196) . chr(155) => 'e',
+                chr(196) . chr(156) => 'G', chr(196) . chr(157) => 'g',
+                chr(196) . chr(158) => 'G', chr(196) . chr(159) => 'g',
+                chr(196) . chr(160) => 'G', chr(196) . chr(161) => 'g',
+                chr(196) . chr(162) => 'G', chr(196) . chr(163) => 'g',
+                chr(196) . chr(164) => 'H', chr(196) . chr(165) => 'h',
+                chr(196) . chr(166) => 'H', chr(196) . chr(167) => 'h',
+                chr(196) . chr(168) => 'I', chr(196) . chr(169) => 'i',
+                chr(196) . chr(170) => 'I', chr(196) . chr(171) => 'i',
+                chr(196) . chr(172) => 'I', chr(196) . chr(173) => 'i',
+                chr(196) . chr(174) => 'I', chr(196) . chr(175) => 'i',
+                chr(196) . chr(176) => 'I', chr(196) . chr(177) => 'i',
+                chr(196) . chr(178) => 'IJ', chr(196) . chr(179) => 'ij',
+                chr(196) . chr(180) => 'J', chr(196) . chr(181) => 'j',
+                chr(196) . chr(182) => 'K', chr(196) . chr(183) => 'k',
+                chr(196) . chr(184) => 'k', chr(196) . chr(185) => 'L',
+                chr(196) . chr(186) => 'l', chr(196) . chr(187) => 'L',
+                chr(196) . chr(188) => 'l', chr(196) . chr(189) => 'L',
+                chr(196) . chr(190) => 'l', chr(196) . chr(191) => 'L',
+                chr(197) . chr(128) => 'l', chr(197) . chr(129) => 'L',
+                chr(197) . chr(130) => 'l', chr(197) . chr(131) => 'N',
+                chr(197) . chr(132) => 'n', chr(197) . chr(133) => 'N',
+                chr(197) . chr(134) => 'n', chr(197) . chr(135) => 'N',
+                chr(197) . chr(136) => 'n', chr(197) . chr(137) => 'N',
+                chr(197) . chr(138) => 'n', chr(197) . chr(139) => 'N',
+                chr(197) . chr(140) => 'O', chr(197) . chr(141) => 'o',
+                chr(197) . chr(142) => 'O', chr(197) . chr(143) => 'o',
+                chr(197) . chr(144) => 'O', chr(197) . chr(145) => 'o',
+                chr(197) . chr(146) => 'OE', chr(197) . chr(147) => 'oe',
+                chr(197) . chr(148) => 'R', chr(197) . chr(149) => 'r',
+                chr(197) . chr(150) => 'R', chr(197) . chr(151) => 'r',
+                chr(197) . chr(152) => 'R', chr(197) . chr(153) => 'r',
+                chr(197) . chr(154) => 'S', chr(197) . chr(155) => 's',
+                chr(197) . chr(156) => 'S', chr(197) . chr(157) => 's',
+                chr(197) . chr(158) => 'S', chr(197) . chr(159) => 's',
+                chr(197) . chr(160) => 'S', chr(197) . chr(161) => 's',
+                chr(197) . chr(162) => 'T', chr(197) . chr(163) => 't',
+                chr(197) . chr(164) => 'T', chr(197) . chr(165) => 't',
+                chr(197) . chr(166) => 'T', chr(197) . chr(167) => 't',
+                chr(197) . chr(168) => 'U', chr(197) . chr(169) => 'u',
+                chr(197) . chr(170) => 'U', chr(197) . chr(171) => 'u',
+                chr(197) . chr(172) => 'U', chr(197) . chr(173) => 'u',
+                chr(197) . chr(174) => 'U', chr(197) . chr(175) => 'u',
+                chr(197) . chr(176) => 'U', chr(197) . chr(177) => 'u',
+                chr(197) . chr(178) => 'U', chr(197) . chr(179) => 'u',
+                chr(197) . chr(180) => 'W', chr(197) . chr(181) => 'w',
+                chr(197) . chr(182) => 'Y', chr(197) . chr(183) => 'y',
+                chr(197) . chr(184) => 'Y', chr(197) . chr(185) => 'Z',
+                chr(197) . chr(186) => 'z', chr(197) . chr(187) => 'Z',
+                chr(197) . chr(188) => 'z', chr(197) . chr(189) => 'Z',
+                chr(197) . chr(190) => 'z', chr(197) . chr(191) => 's',
+                // Decompositions for Latin Extended-B
+                chr(200) . chr(152) => 'S', chr(200) . chr(153) => 's',
+                chr(200) . chr(154) => 'T', chr(200) . chr(155) => 't',
+                // Euro Sign
+                chr(226) . chr(130) . chr(172) => 'E',
+                // GBP (Pound) Sign
+                chr(194) . chr(163) => '',
+                // Vowels with diacritic (Vietnamese)
+                // unmarked
+                chr(198) . chr(160) => 'O', chr(198) . chr(161) => 'o',
+                chr(198) . chr(175) => 'U', chr(198) . chr(176) => 'u',
+                // grave accent
+                chr(225) . chr(186) . chr(166) => 'A', chr(225) . chr(186) . chr(167) => 'a',
+                chr(225) . chr(186) . chr(176) => 'A', chr(225) . chr(186) . chr(177) => 'a',
+                chr(225) . chr(187) . chr(128) => 'E', chr(225) . chr(187) . chr(129) => 'e',
+                chr(225) . chr(187) . chr(146) => 'O', chr(225) . chr(187) . chr(147) => 'o',
+                chr(225) . chr(187) . chr(156) => 'O', chr(225) . chr(187) . chr(157) => 'o',
+                chr(225) . chr(187) . chr(170) => 'U', chr(225) . chr(187) . chr(171) => 'u',
+                chr(225) . chr(187) . chr(178) => 'Y', chr(225) . chr(187) . chr(179) => 'y',
+                // hook
+                chr(225) . chr(186) . chr(162) => 'A', chr(225) . chr(186) . chr(163) => 'a',
+                chr(225) . chr(186) . chr(168) => 'A', chr(225) . chr(186) . chr(169) => 'a',
+                chr(225) . chr(186) . chr(178) => 'A', chr(225) . chr(186) . chr(179) => 'a',
+                chr(225) . chr(186) . chr(186) => 'E', chr(225) . chr(186) . chr(187) => 'e',
+                chr(225) . chr(187) . chr(130) => 'E', chr(225) . chr(187) . chr(131) => 'e',
+                chr(225) . chr(187) . chr(136) => 'I', chr(225) . chr(187) . chr(137) => 'i',
+                chr(225) . chr(187) . chr(142) => 'O', chr(225) . chr(187) . chr(143) => 'o',
+                chr(225) . chr(187) . chr(148) => 'O', chr(225) . chr(187) . chr(149) => 'o',
+                chr(225) . chr(187) . chr(158) => 'O', chr(225) . chr(187) . chr(159) => 'o',
+                chr(225) . chr(187) . chr(166) => 'U', chr(225) . chr(187) . chr(167) => 'u',
+                chr(225) . chr(187) . chr(172) => 'U', chr(225) . chr(187) . chr(173) => 'u',
+                chr(225) . chr(187) . chr(182) => 'Y', chr(225) . chr(187) . chr(183) => 'y',
+                // tilde
+                chr(225) . chr(186) . chr(170) => 'A', chr(225) . chr(186) . chr(171) => 'a',
+                chr(225) . chr(186) . chr(180) => 'A', chr(225) . chr(186) . chr(181) => 'a',
+                chr(225) . chr(186) . chr(188) => 'E', chr(225) . chr(186) . chr(189) => 'e',
+                chr(225) . chr(187) . chr(132) => 'E', chr(225) . chr(187) . chr(133) => 'e',
+                chr(225) . chr(187) . chr(150) => 'O', chr(225) . chr(187) . chr(151) => 'o',
+                chr(225) . chr(187) . chr(160) => 'O', chr(225) . chr(187) . chr(161) => 'o',
+                chr(225) . chr(187) . chr(174) => 'U', chr(225) . chr(187) . chr(175) => 'u',
+                chr(225) . chr(187) . chr(184) => 'Y', chr(225) . chr(187) . chr(185) => 'y',
+                // acute accent
+                chr(225) . chr(186) . chr(164) => 'A', chr(225) . chr(186) . chr(165) => 'a',
+                chr(225) . chr(186) . chr(174) => 'A', chr(225) . chr(186) . chr(175) => 'a',
+                chr(225) . chr(186) . chr(190) => 'E', chr(225) . chr(186) . chr(191) => 'e',
+                chr(225) . chr(187) . chr(144) => 'O', chr(225) . chr(187) . chr(145) => 'o',
+                chr(225) . chr(187) . chr(154) => 'O', chr(225) . chr(187) . chr(155) => 'o',
+                chr(225) . chr(187) . chr(168) => 'U', chr(225) . chr(187) . chr(169) => 'u',
+                // dot below
+                chr(225) . chr(186) . chr(160) => 'A', chr(225) . chr(186) . chr(161) => 'a',
+                chr(225) . chr(186) . chr(172) => 'A', chr(225) . chr(186) . chr(173) => 'a',
+                chr(225) . chr(186) . chr(182) => 'A', chr(225) . chr(186) . chr(183) => 'a',
+                chr(225) . chr(186) . chr(184) => 'E', chr(225) . chr(186) . chr(185) => 'e',
+                chr(225) . chr(187) . chr(134) => 'E', chr(225) . chr(187) . chr(135) => 'e',
+                chr(225) . chr(187) . chr(138) => 'I', chr(225) . chr(187) . chr(139) => 'i',
+                chr(225) . chr(187) . chr(140) => 'O', chr(225) . chr(187) . chr(141) => 'o',
+                chr(225) . chr(187) . chr(152) => 'O', chr(225) . chr(187) . chr(153) => 'o',
+                chr(225) . chr(187) . chr(162) => 'O', chr(225) . chr(187) . chr(163) => 'o',
+                chr(225) . chr(187) . chr(164) => 'U', chr(225) . chr(187) . chr(165) => 'u',
+                chr(225) . chr(187) . chr(176) => 'U', chr(225) . chr(187) . chr(177) => 'u',
+                chr(225) . chr(187) . chr(180) => 'Y', chr(225) . chr(187) . chr(181) => 'y',
+                // Vowels with diacritic (Chinese, Hanyu Pinyin)
+                chr(201) . chr(145) => 'a',
+                // macron
+                chr(199) . chr(149) => 'U', chr(199) . chr(150) => 'u',
+                // acute accent
+                chr(199) . chr(151) => 'U', chr(199) . chr(152) => 'u',
+                // caron
+                chr(199) . chr(141) => 'A', chr(199) . chr(142) => 'a',
+                chr(199) . chr(143) => 'I', chr(199) . chr(144) => 'i',
+                chr(199) . chr(145) => 'O', chr(199) . chr(146) => 'o',
+                chr(199) . chr(147) => 'U', chr(199) . chr(148) => 'u',
+                chr(199) . chr(153) => 'U', chr(199) . chr(154) => 'u',
+                // grave accent
+                chr(199) . chr(155) => 'U', chr(199) . chr(156) => 'u',
+            ];
 
             // Used for locale-specific rules
             /* remove from wordpress
@@ -477,7 +507,7 @@ class SearchProvider
             $string = strtr($string, $chars);
         } /* remove from wordpress: we use only utf 8
          * else {
-         
+
             // Assume ISO-8859-1 if not UTF-8
             $chars['in'] = chr(128) . chr(131) . chr(138) . chr(142) . chr(154) . chr(158)
                   . chr(159) . chr(162) . chr(165) . chr(181) . chr(192) . chr(193) . chr(194)
@@ -500,5 +530,4 @@ class SearchProvider
 
         return $string;
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
index 5c09ebe39..6868a53f6 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchDomainException.php
@@ -1,42 +1,32 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
+use Exception;
+
 /**
- * Throw by search provider when the search name is not found
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Throw by search provider when the search name is not found.
  */
-class UnknowSearchDomainException extends \Exception
+class UnknowSearchDomainException extends Exception
 {
-    
     private $domain;
-    
+
     public function __construct($domain)
     {
-        parent::__construct( "The domain $domain is not found");
+        parent::__construct("The domain {$domain} is not found");
         $this->domain = $domain;
     }
-    
-    public function getDomain() 
+
+    public function getDomain()
     {
         return $this->domain;
     }
diff --git a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
index 989fdbec5..36ee550e0 100644
--- a/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
+++ b/src/Bundle/ChillMainBundle/Search/UnknowSearchNameException.php
@@ -1,41 +1,31 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
+use Exception;
+
 /**
- * Throw by search provider when the search name is not found
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Throw by search provider when the search name is not found.
  */
-class UnknowSearchNameException extends \Exception
+class UnknowSearchNameException extends Exception
 {
-    
     private $name;
-    
+
     public function __construct($name)
     {
-        parent::__construct( "No module search supports with the name $name");
+        parent::__construct("No module search supports with the name {$name}");
         $this->name = $name;
     }
-    
+
     public function getName()
     {
         return $this->name;
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
new file mode 100644
index 000000000..058bfe070
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Search\Utils;
+
+use DateTimeImmutable;
+use function preg_match_all;
+use function strtr;
+use function trim;
+
+class ExtractDateFromPattern
+{
+    private const DATE_PATTERN = [
+        ['([12]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01]))', 'Y-m-d'], // 1981-05-12
+        ['((0[1-9]|[12]\\d|3[01])\\/(0[1-9]|1[0-2])\\/([12]\\d{3}))', 'd/m/Y'], // 15/12/1980
+        ['((0[1-9]|[12]\\d|3[01])-(0[1-9]|1[0-2])-([12]\\d{3}))', 'd-m-Y'], // 15/12/1980
+    ];
+
+    public function extractDates(string $subject): SearchExtractionResult
+    {
+        $dates = [];
+        $filteredSubject = $subject;
+
+        foreach (self::DATE_PATTERN as [$pattern, $format]) {
+            $matches = [];
+            preg_match_all($pattern, $filteredSubject, $matches);
+
+            foreach ($matches[0] as $match) {
+                $date = DateTimeImmutable::createFromFormat($format, $match);
+
+                if (false !== $date) {
+                    $dates[] = $date;
+                    // filter string: remove what is found
+                    $filteredSubject = trim(strtr($filteredSubject, [$match => '']));
+                }
+            }
+        }
+
+        return new SearchExtractionResult($filteredSubject, $dates);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
new file mode 100644
index 000000000..caad6d093
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Search\Utils;
+
+use LogicException;
+use function count;
+use function implode;
+use function preg_match;
+use function str_split;
+use function strtr;
+use function trim;
+
+class ExtractPhonenumberFromPattern
+{
+    private const PATTERN = '([\\+]{0,1}[0-9\\ ]{5,})';
+
+    public function extractPhonenumber(string $subject): SearchExtractionResult
+    {
+        $matches = [];
+        preg_match(self::PATTERN, $subject, $matches);
+
+        if (0 < count($matches)) {
+            $phonenumber = [];
+            $length = 0;
+
+            foreach (str_split(trim($matches[0])) as $key => $char) {
+                switch ($char) {
+                    case '0':
+                        $length++;
+
+                        if (0 === $key) {
+                            $phonenumber[] = '+32';
+                        } else {
+                            $phonenumber[] = $char;
+                        }
+
+                        break;
+
+                    case '1':
+                    case '2':
+                    case '3':
+                    case '4':
+                    case '5':
+                    case '6':
+                    case '7':
+                    case '8':
+                    case '9':
+                        $length++;
+                        $phonenumber[] = $char;
+
+                        break;
+
+                    case ' ':
+                        break;
+
+                    default:
+                        throw new LogicException('should not match not alnum character');
+                }
+            }
+
+            if (5 < $length) {
+                $filtered = trim(strtr($subject, [$matches[0] => '']));
+
+                return new SearchExtractionResult($filtered, [implode('', $phonenumber)]);
+            }
+        }
+
+        return new SearchExtractionResult($subject, []);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php b/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
new file mode 100644
index 000000000..23c1dae6b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Search\Utils;
+
+class SearchExtractionResult
+{
+    private string $filteredSubject;
+
+    private array $found;
+
+    public function __construct(string $filteredSubject, array $found)
+    {
+        $this->filteredSubject = $filteredSubject;
+        $this->found = $found;
+    }
+
+    public function getFilteredSubject(): string
+    {
+        return $this->filteredSubject;
+    }
+
+    public function getFound(): array
+    {
+        return $this->found;
+    }
+
+    public function hasResult(): bool
+    {
+        return [] !== $this->found;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
index 9131a6501..2cca61e9f 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
@@ -1,46 +1,42 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
-use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+use function get_class;
+use function in_array;
+use const E_USER_DEPRECATED;
 
 /**
  * Voter for Chill software.
  *
  * This abstract Voter provide generic methods to handle object specific to Chill
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
 {
     protected function supports($attribute, $subject)
     {
-        @trigger_error('This voter should implements the new `supports` '
+        @trigger_error(
+            'This voter should implements the new `supports` '
             . 'methods introduced by Symfony 3.0, and do not rely on '
             . 'getSupportedAttributes and getSupportedClasses methods.',
-            E_USER_DEPRECATED);
+            E_USER_DEPRECATED
+        );
 
-        return \in_array($attribute, $this->getSupportedAttributes($attribute))
-            && \in_array(\get_class($subject), $this->getSupportedClasses());
+        // @TODO: getSupportedAttributes() should be created in here and made abstract or in ChillVoterInterface.
+        // @TODO: getSupportedClasses() should be created in here and made abstract or in ChillVoterInterface.
+        return in_array($attribute, $this->getSupportedAttributes($attribute), true)
+            && in_array(get_class($subject), $this->getSupportedClasses(), true);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
@@ -49,7 +45,7 @@ abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
             . 'methods introduced by Symfony 3.0, and do not rely on '
             . 'isGranted method', E_USER_DEPRECATED);
 
+        // @TODO: isGranted() should be created in here and made abstract or in ChillVoterInterface.
         return $this->isGranted($attribute, $subject, $token->getUser());
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
index afff931ed..de7bff9ab 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
@@ -1,102 +1,227 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
-use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Security\RoleProvider;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\MainBundle\Entity\GroupCenter;
-use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserACLAwareRepositoryInterface;
+use Chill\MainBundle\Security\ParentRoleHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Traversable;
+use UnexpectedValueException;
+use function array_merge;
+use function get_class;
 
 /**
  * Helper for authorizations.
  *
  * Provides methods for user and entities information.
- *
  */
 class AuthorizationHelper implements AuthorizationHelperInterface
 {
-    protected RoleHierarchyInterface $roleHierarchy;
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
 
-    /**
-     * The role in a hierarchy, given by the parameter
-     * `security.role_hierarchy.roles` from the container.
-     *
-     * @var string[]
-     */
-    protected array $hierarchy;
+    private LoggerInterface $logger;
 
-    protected EntityManagerInterface $em;
+    private ParentRoleHelper $parentRoleHelper;
 
-    protected CenterResolverDispatcher $centerResolverDispatcher;
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
 
-    protected ScopeResolverDispatcher $scopeResolverDispatcher;
-
-    protected LoggerInterface $logger;
+    private UserACLAwareRepositoryInterface $userACLAwareRepository;
 
     public function __construct(
-        RoleHierarchyInterface $roleHierarchy,
-        ParameterBagInterface $parameterBag,
-        EntityManagerInterface $em,
-        CenterResolverDispatcher $centerResolverDispatcher,
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
         LoggerInterface $logger,
-        ScopeResolverDispatcher $scopeResolverDispatcher
+        ScopeResolverDispatcher $scopeResolverDispatcher,
+        UserACLAwareRepositoryInterface $userACLAwareRepository,
+        ParentRoleHelper $parentRoleHelper
     ) {
-        $this->roleHierarchy = $roleHierarchy;
-        $this->hierarchy     = $parameterBag->get('security.role_hierarchy.roles');
-        $this->em = $em;
         $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->logger = $logger;
         $this->scopeResolverDispatcher = $scopeResolverDispatcher;
+        $this->userACLAwareRepository = $userACLAwareRepository;
+        $this->parentRoleHelper = $parentRoleHelper;
     }
 
     /**
-     * Determines if a user is active on this center
+     * Filter an array of centers, return only center which are reachable.
      *
-     * If
-     *
-     * @param User $user
-     * @param Center|Center[] $center May be an array of center
-     * @return bool
+     * @param User $user The user
+     * @param array $centers a list of centers which are going to be filtered
+     * @param Center|string $role
      */
-    public function userCanReachCenter(User $user, $center)
+    public function filterReachableCenters(User $user, array $centers, $role): array
     {
-        if ($center instanceof \Traversable) {
+        $results = [];
+
+        if ($role instanceof Role) {
+            $role = $role->getRole();
+        }
+
+        foreach ($centers as $center) {
+            if ($this->userCanReachCenter($user, $center)) {
+                $results[] = $center;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @deprecated use UserACLAwareRepositoryInterface::findUsersByReachedACL instead
+     *
+     * @param array|Center|Center[] $center
+     * @param array|Scope|Scope[]|null $scope
+     *
+     * @return User[]
+     */
+    public function findUsersReaching(string $role, $center, $scope = null, bool $onlyEnabled = true): array
+    {
+        return $this->userACLAwareRepository
+            ->findUsersByReachedACL($role, $center, $scope, $onlyEnabled);
+    }
+
+    /**
+     * Return all the role which give access to the given role. Only the role
+     * which are registered into Chill are taken into account.
+     *
+     * @return string[] the role which give access to the given $role
+     */
+    public function getParentRoles(string $role): array
+    {
+        trigger_deprecation('Chill\MainBundle', '2.0', 'use ParentRoleHelper::getParentRoles instead');
+
+        return $this->parentRoleHelper->getParentRoles($role);
+    }
+
+    /**
+     * Get reachable Centers for the given user, role,
+     * and optionally Scope.
+     *
+     * @return array|Center[]
+     */
+    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array
+    {
+        if ($role instanceof Role) {
+            $role = $role->getRole();
+        }
+        $centers = [];
+
+        foreach ($user->getGroupCenters() as $groupCenter) {
+            $permissionGroup = $groupCenter->getPermissionsGroup();
+            //iterate on roleScopes
+            foreach ($permissionGroup->getRoleScopes() as $roleScope) {
+                //check that the role is in the reachable roles
+                if ($this->isRoleReached($role, $roleScope->getRole())) {
+                    if (null === $scope) {
+                        $centers[] = $groupCenter->getCenter();
+
+                        break;
+                    }
+
+                    if ($scope->getId() === $roleScope->getScope()->getId()) {
+                        $centers[] = $groupCenter->getCenter();
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $centers;
+    }
+
+    /**
+     * Return all reachable circle for a given user, center and role.
+     *
+     * @param Role|string $role
+     * @param Center|Center[] $center
+     *
+     * @return Scope[]
+     */
+    public function getReachableCircles(UserInterface $user, $role, $center)
+    {
+        $scopes = [];
+
+        if (is_iterable($center)) {
+            foreach ($center as $c) {
+                $scopes = array_merge($scopes, $this->getReachableCircles($user, $role, $c));
+            }
+
+            return $scopes;
+        }
+
+        if ($role instanceof Role) {
+            $role = $role->getRole();
+        }
+
+        foreach ($user->getGroupCenters() as $groupCenter) {
+            if ($center->getId() === $groupCenter->getCenter()->getId()) {
+                //iterate on permissionGroup
+                $permissionGroup = $groupCenter->getPermissionsGroup();
+                //iterate on roleScopes
+                foreach ($permissionGroup->getRoleScopes() as $roleScope) {
+                    //check that the role is in the reachable roles
+                    if ($this->isRoleReached($role, $roleScope->getRole())) {
+                        $scopes[] = $roleScope->getScope();
+                    }
+                }
+            }
+        }
+
+        return $scopes;
+    }
+
+    /**
+     * Return all reachable scope for a given user, center and role.
+     *
+     * @deprecated Use getReachableCircles
+     *
+     * @param Center|Center[] $center
+     *
+     * @return array|Scope[]
+     */
+    public function getReachableScopes(UserInterface $user, string $role, $center): array
+    {
+        if ($role instanceof Role) {
+            $role = $role->getRole();
+        }
+
+        return $this->getReachableCircles($user, $role, $center);
+    }
+
+    /**
+     * Determines if a user is active on this center.
+     *
+     * @param Center|Center[] $center May be an array of center
+     */
+    public function userCanReachCenter(User $user, $center): bool
+    {
+        if ($center instanceof Traversable) {
             foreach ($center as $c) {
                 if ($c->userCanReachCenter($user, $c)) {
                     return true;
                 }
             }
+
             return false;
-        } elseif ($center instanceof Center) {
+        }
+
+        if ($center instanceof Center) {
             foreach ($user->getGroupCenters() as $groupCenter) {
                 if ($center->getId() === $groupCenter->getCenter()->getId()) {
                     return true;
@@ -106,21 +231,25 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             return false;
         }
 
-        throw new \UnexpectedValueException(sprintf("The entity given is not an ".
-            "instance of %s, %s given", Center::class, get_class($center)));
+        throw new UnexpectedValueException(
+            sprintf(
+                'The entity given is not an instance of %s, %s given',
+                Center::class,
+                get_class($center)
+            )
+        );
     }
 
     /**
-     *
      * Determines if the user has access to the given entity.
      *
      * if the entity implements Chill\MainBundle\Entity\HasScopeInterface,
      * the scope is taken into account.
      *
-     * @param User $user
      * @param mixed $entity the entity may also implement HasScopeInterface
-     * @param string|Role $attribute
-     * @return boolean true if the user has access
+     * @param Role|string $attribute
+     *
+     * @return bool true if the user has access
      */
     public function userHasAccess(User $user, $entity, $attribute)
     {
@@ -134,51 +263,71 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             }
 
             return false;
-        } elseif ($center instanceof Center) {
-            return $this->userHasAccessForCenter($user, $center, $entity, $attribute);
-        } elseif (NULL === $center) {
-            return false;
-        } else {
-            throw new \UnexpectedValueException("could not resolver a center");
         }
+
+        if ($center instanceof Center) {
+            return $this->userHasAccessForCenter($user, $center, $entity, $attribute);
+        }
+
+        if (null === $center) {
+            return false;
+        }
+
+        throw new UnexpectedValueException('could not resolver a center');
+    }
+
+    /**
+     * Test if a parent role may give access to a given child role.
+     *
+     * @param string $childRole The role we want to test if he is reachable
+     * @param string $parentRole The role which should give access to $childRole
+     *
+     * @return bool true if the child role is granted by parent role
+     */
+    private function isRoleReached(string $childRole, string $parentRole)
+    {
+        return $this->parentRoleHelper->isRoleReached($childRole, $parentRole);
     }
 
     private function userHasAccessForCenter(User $user, Center $center, $entity, $attribute): bool
     {
         if (!$this->userCanReachCenter($user, $center)) {
-            $this->logger->debug("user cannot reach center of entity", [
+            $this->logger->debug('user cannot reach center of entity', [
                 'center_name' => $center->getName(),
-                'user' => $user->getUsername()
+                'user' => $user->getUsername(),
             ]);
+
             return false;
         }
 
-        foreach ($user->getGroupCenters() as $groupCenter){
+        foreach ($user->getGroupCenters() as $groupCenter) {
             //filter on center
             if ($groupCenter->getCenter() === $center) {
                 $permissionGroup = $groupCenter->getPermissionsGroup();
                 //iterate on roleScopes
-                foreach($permissionGroup->getRoleScopes() as $roleScope) {
+                foreach ($permissionGroup->getRoleScopes() as $roleScope) {
                     //check that the role allow to reach the required role
                     if ($this->isRoleReached($attribute, $roleScope->getRole())) {
                         //if yes, we have a right on something...
                         // perform check on scope if necessary
                         if ($this->scopeResolverDispatcher->isConcerned($entity)) {
-                           $scope = $this->scopeResolverDispatcher->resolveScope($entity);
+                            $scope = $this->scopeResolverDispatcher->resolveScope($entity);
 
-                           if (NULL === $scope) {
-                               return true;
-                           } elseif (is_iterable($scope)) {
-                               foreach ($scope as $s) {
-                                   if ($s === $roleScope->getScope()) {
-                                       return true;
-                                   }
-                               }
-                           } else {
-                               if ($scope === $roleScope->getScope()) {
-                                   return true;
-                               }
-                           }
+                            if (null === $scope) {
+                                return true;
+                            }
+
+                            if (is_iterable($scope)) {
+                                foreach ($scope as $s) {
+                                    if ($roleScope->getScope() === $s) {
+                                        return true;
+                                    }
+                                }
+                            } else {
+                                if ($roleScope->getScope() === $scope) {
+                                    return true;
+                                }
+                            }
                         } else {
                             return true;
                         }
@@ -187,204 +336,11 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             }
         }
 
-        $this->logger->debug("user can reach center entity, but not role", [
+        $this->logger->debug('user can reach center entity, but not role', [
             'username' => $user->getUsername(),
-            'center' => $center->getName()
+            'center' => $center->getName(),
         ]);
 
         return false;
     }
-
-    /**
-     * Get reachable Centers for the given user, role,
-     * and optionnaly Scope
-     *
-     * @param User $user
-     * @param string|Role $role
-     * @param null|Scope $scope
-     * @return Center[]|array
-     */
-    public function getReachableCenters(User $user, string $role, ?Scope $scope = null): array
-    {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-        $centers = array();
-
-        foreach ($user->getGroupCenters() as $groupCenter){
-            $permissionGroup = $groupCenter->getPermissionsGroup();
-            //iterate on roleScopes
-            foreach($permissionGroup->getRoleScopes() as $roleScope) {
-                //check that the role is in the reachable roles
-                if ($this->isRoleReached($role, $roleScope->getRole())) {
-                    if ($scope === null) {
-                        $centers[] = $groupCenter->getCenter();
-                        break 1;
-                    } else {
-                        if ($scope->getId() == $roleScope->getScope()->getId()){
-                            $centers[] = $groupCenter->getCenter();
-                            break 1;
-                        }
-                    }
-                }
-            }
-
-        }
-
-        return $centers;
-    }
-
-    /**
-     * Filter an array of centers, return only center which are reachable
-     *
-     * @param User $user The user
-     * @param array $centers a list of centers which are going to be filtered
-     * @param string|Center $role
-     */
-    public function filterReachableCenters(User $user, array $centers, $role): array
-    {
-        $results = [];
-
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
-        foreach ($centers as $center) {
-            if ($this->userCanReachCenter($user, $center, $role)) {
-                $results[] = $center;
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Return all reachable scope for a given user, center and role
-     *
-     * @deprecated Use getReachableCircles
-     *
-     * @param User $user
-     * @param string role
-     * @param Center|Center[] $center
-     * @return Scope[]|array
-     */
-    public function getReachableScopes(User $user, string $role, $center): array
-    {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
-        return $this->getReachableCircles($user, $role, $center);
-    }
-
-    /**
-     * Return all reachable circle for a given user, center and role
-     *
-     * @param User $user
-     * @param string|Role $role
-     * @param Center|Center[] $center
-     * @return Scope[]
-     */
-    public function getReachableCircles(User $user, $role, $center)
-    {
-        $scopes = [];
-
-        if (is_iterable($center)) {
-            foreach ($center as $c) {
-                $scopes = \array_merge($scopes, $this->getReachableCircles($user, $role, $c));
-            }
-
-            return $scopes;
-        }
-
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
-        foreach ($user->getGroupCenters() as $groupCenter){
-            if ($center->getId() === $groupCenter->getCenter()->getId()) {
-                //iterate on permissionGroup
-                $permissionGroup = $groupCenter->getPermissionsGroup();
-                //iterate on roleScopes
-                foreach($permissionGroup->getRoleScopes() as $roleScope) {
-                    //check that the role is in the reachable roles
-                    if ($this->isRoleReached($role, $roleScope->getRole())) {
-                        $scopes[] = $roleScope->getScope();
-                    }
-                }
-            }
-        }
-
-        return $scopes;
-    }
-
-    /**
-     *
-     * @return User[]
-     */
-    public function findUsersReaching(string $role, Center $center, Scope $circle = null): array
-    {
-        $parents = $this->getParentRoles($role);
-        $parents[] = $role;
-
-        $qb = $this->em->createQueryBuilder();
-        $qb
-            ->select('u')
-            ->from(User::class, 'u')
-            ->join('u.groupCenters', 'gc')
-            ->join('gc.permissionsGroup', 'pg')
-            ->join('pg.roleScopes', 'rs')
-            ->where('gc.center = :center')
-            ->andWhere($qb->expr()->in('rs.role', $parents))
-            ;
-
-        $qb->setParameter('center', $center);
-
-        if ($circle !== null) {
-            $qb->andWhere('rs.scope = :circle')
-                ->setParameter('circle', $circle)
-                ;
-        }
-
-        return $qb->getQuery()->getResult();
-    }
-
-    /**
-     * Test if a parent role may give access to a given child role
-     *
-     * @param Role $childRole The role we want to test if he is reachable
-     * @param Role $parentRole The role which should give access to $childRole
-     * @return boolean true if the child role is granted by parent role
-     */
-    protected function isRoleReached($childRole, $parentRole)
-    {
-        $reachableRoles = $this->roleHierarchy
-                ->getReachableRoleNames([$parentRole]);
-
-        return in_array($childRole, $reachableRoles);
-    }
-
-    /**
-     * Return all the role which give access to the given role. Only the role
-     * which are registered into Chill are taken into account.
-     *
-     * @param Role $role
-     * @return string[] the role which give access to the given $role
-     */
-    public function getParentRoles($role): array
-    {
-        $parentRoles = [];
-        // transform the roles from role hierarchy from string to Role
-        $roles = \array_keys($this->hierarchy);
-
-        foreach ($roles as $r) {
-            $childRoles = $this->roleHierarchy->getReachableRoleNames([$r]);
-
-            if (\in_array($role, $childRoles)) {
-                $parentRoles[] = $r;
-            }
-        }
-
-        return $parentRoles;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
index 31709bcd5..0e4d739f6 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php
@@ -1,32 +1,32 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 interface AuthorizationHelperInterface
 {
-
     /**
      * Get reachable Centers for the given user, role,
-     * and optionnaly Scope
+     * and optionnaly Scope.
      *
-     * @param User $user
-     * @param string|Role $role
-     * @param null|Scope $scope
      * @return Center[]
      */
-    public function getReachableCenters(User $user, string $role, ?Scope $scope = null): array;
+    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array;
 
     /**
-     * @param User $user
-     * @param string $role
-     * @param Center|Center[]|array $center
-     * @return array
+     * @param array|Center|Center[] $center
      */
-    public function getReachableScopes(User $user, string $role, $center): array;
-
+    public function getReachableScopes(UserInterface $user, string $role, $center): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
index 39af35706..ec1a0479d 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php
@@ -1,51 +1,34 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@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\MainBundle\Security\Authorization;
-
-use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Authorization;
+
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+
 class ChillExportVoter extends Voter
 {
-    const EXPORT = 'chill_export';
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-    
-    public function __construct(AuthorizationHelper $authorizationHelper)
+    public const EXPORT = 'chill_export';
+
+    protected AuthorizationHelperInterface $authorizationHelper;
+
+    public function __construct(AuthorizationHelperInterface $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
-    
+
     protected function supports($attribute, $subject): bool
     {
-        return $attribute === self::EXPORT;
+        return self::EXPORT === $attribute;
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
@@ -53,10 +36,7 @@ class ChillExportVoter extends Voter
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
-        $centers = $this->authorizationHelper
-            ->getReachableCenters($token->getUser(), new Role($attribute));
-        
-        return count($centers) > 0;
+
+        return [] !== $this->authorizationHelper->getReachableCenters($token->getUser(), $attribute);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
index 3e89d2595..013cac51d 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/ChillVoterInterface.php
@@ -1,30 +1,19 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 /**
  * Provides methods for compiling voter and build admin role fields.
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 interface ChillVoterInterface
 {
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
index ef1d319ac..95f070b3b 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
@@ -1,26 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use function in_array;
 
 final class DefaultVoterHelper implements VoterHelperInterface
 {
-    protected AuthorizationHelper $authorizationHelper;
+    private AuthorizationHelper $authorizationHelper;
 
-    protected CenterResolverDispatcher $centerResolverDispatcher;
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
 
-    protected array $configuration = [];
+    private array $configuration = [];
 
-    /**
-     * @param AuthorizationHelper $authorizationHelper
-     * @param CenterResolverDispatcher $centerResolverDispatcher
-     * @param array $configuration
-     */
     public function __construct(
         AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcher $centerResolverDispatcher,
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
         array $configuration
     ) {
         $this->authorizationHelper = $authorizationHelper;
@@ -30,13 +35,13 @@ final class DefaultVoterHelper implements VoterHelperInterface
 
     public function supports($attribute, $subject): bool
     {
-        foreach ($this->configuration as list($attributes, $subj)) {
-            if ($subj === null) {
-                if ($subject === null && \in_array($attribute, $attributes)) {
+        foreach ($this->configuration as [$attributes, $subj]) {
+            if (null === $subj) {
+                if (null === $subject && in_array($attribute, $attributes, true)) {
                     return true;
                 }
             } elseif ($subject instanceof $subj) {
-                return \in_array($attribute, $attributes);
+                return in_array($attribute, $attributes, true);
             }
         }
 
@@ -49,8 +54,8 @@ final class DefaultVoterHelper implements VoterHelperInterface
             return false;
         }
 
-        if (NULL === $subject) {
-            return 0 < count($this->authorizationHelper->getReachableCenters($token->getUser(), $attribute, null));
+        if (null === $subject) {
+            return [] !== $this->authorizationHelper->getReachableCenters($token->getUser(), $attribute, null);
         }
 
         return $this->authorizationHelper->userHasAccess(
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
index 9349eaed2..f95e93c2b 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
@@ -1,17 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 
 class DefaultVoterHelperFactory implements VoterHelperFactoryInterface
 {
     protected AuthorizationHelper $authorizationHelper;
-    protected CenterResolverDispatcher $centerResolverDispatcher;
+
+    protected CenterResolverDispatcherInterface $centerResolverDispatcher;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcher $centerResolverDispatcher
+        CenterResolverDispatcherInterface $centerResolverDispatcher
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->centerResolverDispatcher = $centerResolverDispatcher;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
index c8300e45a..64d40ad15 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
@@ -1,18 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 
 final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
 {
-    protected AuthorizationHelper $authorizationHelper;
-    protected CenterResolverDispatcher $centerResolverDispatcher;
-    protected array $configuration = [];
+    private AuthorizationHelper $authorizationHelper;
+
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+
+    private array $configuration = [];
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcher $centerResolverDispatcher
+        CenterResolverDispatcherInterface $centerResolverDispatcher
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->centerResolverDispatcher = $centerResolverDispatcher;
@@ -20,9 +31,9 @@ final class DefaultVoterHelperGenerator implements VoterGeneratorInterface
 
     public function addCheckFor(?string $subject, array $attributes): self
     {
-       $this->configuration[] = [$attributes, $subject];
+        $this->configuration[] = [$attributes, $subject];
 
-       return $this;
+        return $this;
     }
 
     public function build(): VoterHelperInterface
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
index 70e517536..ebf35ad7e 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterGeneratorInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 interface VoterGeneratorInterface
@@ -7,6 +16,7 @@ interface VoterGeneratorInterface
     /**
      * @param string $class The FQDN of a class
      * @param array $attributes an array of attributes
+     *
      * @return $this
      */
     public function addCheckFor(?string $class, array $attributes): self;
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
index 5b16a10ef..405faae60 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperFactoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 interface VoterHelperFactoryInterface
diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
index fc08bcb40..557a5e247 100644
--- a/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Authorization/VoterHelperInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -8,5 +17,5 @@ interface VoterHelperInterface
 {
     public function supports($attribute, $subject): bool;
 
-    public function voteOnAttribute($attribute, $subject, TokenInterface $token);
+    public function voteOnAttribute($attribute, $subject, TokenInterface $token): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
new file mode 100644
index 000000000..137c774b2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security;
+
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
+use function array_keys;
+use function in_array;
+
+/**
+ * Helper which traverse all role to find parents.
+ */
+class ParentRoleHelper
+{
+    /**
+     * The role in a hierarchy, given by the parameter
+     * `security.role_hierarchy.roles` from the container.
+     *
+     * @var string[]
+     */
+    protected array $hierarchy;
+
+    protected RoleHierarchyInterface $roleHierarchy;
+
+    public function __construct(
+        RoleHierarchyInterface $roleHierarchy,
+        ParameterBagInterface $parameterBag
+    ) {
+        $this->roleHierarchy = $roleHierarchy;
+        $this->hierarchy = $parameterBag->get('security.role_hierarchy.roles');
+    }
+
+    /**
+     * Return all the role which give access to the given role. Only the role
+     * which are registered into Chill are taken into account.
+     *
+     * The array contains always the current $role (which give access to himself)
+     *
+     * @return string[] the role which give access to the given $role
+     */
+    public function getParentRoles(string $role): array
+    {
+        $parentRoles = [$role];
+        // transform the roles from role hierarchy from string to Role
+        $roles = array_keys($this->hierarchy);
+
+        foreach ($roles as $r) {
+            $childRoles = $this->roleHierarchy->getReachableRoleNames([$r]);
+
+            if (in_array($role, $childRoles, true)) {
+                $parentRoles[] = $r;
+            }
+        }
+
+        return $parentRoles;
+    }
+
+    /**
+     * Test if a parent role may give access to a given child role.
+     *
+     * @param string $childRole The role we want to test if he is reachable
+     * @param string $parentRole The role which should give access to $childRole
+     *
+     * @return bool true if the child role is granted by parent role
+     */
+    public function isRoleReached($childRole, $parentRole): bool
+    {
+        $reachableRoles = $this->roleHierarchy
+            ->getReachableRoleNames([$parentRole]);
+
+        return in_array($childRole, $reachableRoles, true);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
index e9809d431..5e183e478 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
@@ -1,77 +1,75 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
 use Symfony\Component\EventDispatcher\Event;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PasswordRecoverEvent extends Event
 {
+    public const ASK_TOKEN_INVALID_FORM = 'chill_main.ask_token_invalid_form';
+
+    public const ASK_TOKEN_SUCCESS = 'chill_main.ask_token_success';
+
+    public const INVALID_TOKEN = 'chill_main.password_recover_invalid_token';
+
     /**
-     *
-     * @var User
-     */
-    protected $user;
-    
-    /**
-     *
-     * @var string
-     */
-    protected $token;
-    
-    /**
-     *
      * @var string
      */
     protected $ip;
-    
+
     /**
-     *
-     * @var boolean
+     * @var bool
      */
     protected $safelyGenerated;
-    
-    const ASK_TOKEN_INVALID_FORM = 'chill_main.ask_token_invalid_form';
-    const INVALID_TOKEN = 'chill_main.password_recover_invalid_token';
-    const ASK_TOKEN_SUCCESS = 'chill_main.ask_token_success';
-    
+
+    /**
+     * @var string
+     */
+    protected $token;
+
+    /**
+     * @var User
+     */
+    protected $user;
+
     /**
-     * 
      * @param type $token
      * @param User $user
      * @param type $ip
      * @param bool $safelyGenerated true if generated safely (from console command, etc.)
      */
-    public function __construct($token = null, User $user = null, $ip = null, bool $safelyGenerated = false)
+    public function __construct($token = null, ?User $user = null, $ip = null, bool $safelyGenerated = false)
     {
         $this->user = $user;
         $this->token = $token;
         $this->ip = $ip;
         $this->safelyGenerated = $safelyGenerated;
     }
-    
+
+    public function getIp()
+    {
+        return $this->ip;
+    }
+
+    /**
+     * @return string
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+
     /**
-     * 
      * @return User|null
      */
     public function getUser()
@@ -79,38 +77,16 @@ class PasswordRecoverEvent extends Event
         return $this->user;
     }
 
-    /**
-     * 
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-    
-    public function getIp()
-    {
-        return $this->ip;
-    }
-    
-    /**
-     * 
-     * @return boolean
-     */
     public function hasIp(): bool
     {
         return !empty($this->ip);
     }
-    
-    /**
-     * 
-     * @return boolean
-     */
+
     public function hasUser(): bool
     {
         return $this->user instanceof User;
     }
-    
+
     public function isSafelyGenerated(): bool
     {
         return $this->safelyGenerated;
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php
index 686a0dec5..3bd747428 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEventSubscriber.php
@@ -1,83 +1,69 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PasswordRecoverEventSubscriber implements EventSubscriberInterface
 {
     /**
-     *
      * @var PasswordRecoverLocker
      */
     protected $locker;
-    
+
     public function __construct(PasswordRecoverLocker $locker)
     {
         $this->locker = $locker;
     }
 
-    
     public static function getSubscribedEvents(): array
     {
         return [
             PasswordRecoverEvent::INVALID_TOKEN => [
-                [ 'onInvalidToken' ]
+                ['onInvalidToken'],
             ],
             PasswordRecoverEvent::ASK_TOKEN_INVALID_FORM => [
-                [ 'onAskTokenInvalidForm' ]
+                ['onAskTokenInvalidForm'],
             ],
             PasswordRecoverEvent::ASK_TOKEN_SUCCESS => [
-                [ 'onAskTokenSuccess']
-            ]
+                ['onAskTokenSuccess'],
+            ],
         ];
     }
-    
-    public function onInvalidToken(PasswordRecoverEvent $event)
-    {
-        // set global lock
-        $this->locker->createLock('invalid_token_global', null);
-        
-        // set ip lock
-        if ($event->hasIp()) {
-            $this->locker->createLock('invalid_token_by_ip', $event->getIp());
-        }
-    }
-    
+
     public function onAskTokenInvalidForm(PasswordRecoverEvent $event)
     {
         // set global lock
         $this->locker->createLock('ask_token_invalid_form_global', null);
-        
+
         // set ip lock
         if ($event->hasIp()) {
             $this->locker->createLock('ask_token_invalid_form_by_ip', $event->getIp());
         }
     }
-    
+
     public function onAskTokenSuccess(PasswordRecoverEvent $event)
     {
         $this->locker->createLock('ask_token_success_by_user', $event->getUser());
     }
+
+    public function onInvalidToken(PasswordRecoverEvent $event)
+    {
+        // set global lock
+        $this->locker->createLock('invalid_token_global', null);
+
+        // set ip lock
+        if ($event->hasIp()) {
+            $this->locker->createLock('invalid_token_by_ip', $event->getIp());
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
index 95c3890d0..223aa1494 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
@@ -1,170 +1,165 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Redis\ChillRedis;
+use LogicException;
 use Psr\Log\LoggerInterface;
+use UnexpectedValueException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PasswordRecoverLocker
 {
-    
+    public const ASK_TOKEN_INVALID_FORM_TTL = 3600;
+
     /**
-     * The maximum of invalid token globally (across all ip)
+     * TTL to keep invalid token recorded.
      */
-    const MAX_INVALID_TOKEN_GLOBAL = 50;
-    
+    public const INVALID_TOKEN_TTL = 3600;
+
+    public const MAX_ASK_TOKEN_BY_USER = 10;
+
+    public const MAX_ASK_TOKEN_INVALID_FORM_BY_IP = 10;
+
+    public const MAX_ASK_TOKEN_INVALID_FORM_GLOBAL = 50;
+
     /**
-     * The maximum of invalid token by ip
+     * The maximum of invalid token by ip.
      */
-    const MAX_INVALID_TOKEN_BY_IP = 10;
-    
+    public const MAX_INVALID_TOKEN_BY_IP = 10;
+
     /**
-     * TTL to keep invalid token recorded
+     * The maximum of invalid token globally (across all ip).
      */
-    const INVALID_TOKEN_TTL = 3600;
-    
-    const MAX_ASK_TOKEN_INVALID_FORM_GLOBAL = 50;
-    
-    const MAX_ASK_TOKEN_INVALID_FORM_BY_IP = 10;
-    
-    const MAX_ASK_TOKEN_BY_USER = 10;
-    
-    const ASK_TOKEN_INVALID_FORM_TTL = 3600;
-    
+    public const MAX_INVALID_TOKEN_GLOBAL = 50;
+
     /**
-     *
      * @var ChillRedis
      */
     protected $chillRedis;
-    
+
     /**
-     *
      * @var LoggerInterface
      */
     protected $logger;
-    
+
     public function __construct(ChillRedis $chillRedis, LoggerInterface $logger)
     {
         $this->chillRedis = $chillRedis;
         $this->logger = $logger;
     }
 
-    
     public function createLock($usage, $discriminator = null)
     {
         $max = $this->getMax($usage);
         $ttl = $this->getTtl($usage);
-        
-        for ($i = 0; $i < $max; $i++) {
+
+        for ($i = 0; $i < $max; ++$i) {
             $key = self::generateLockKey($usage, $i, $discriminator);
-            
+
             if (0 === $this->chillRedis->exists($key)) {
                 $this->chillRedis->set($key, 1);
                 $this->chillRedis->setTimeout($key, $ttl);
-                
+
                 break;
             }
         }
     }
-    
-    public function isLocked($usage, $discriminator = null) 
-    {
-        $max = $this->getMax($usage);
-        
-        for ($i = 0; $i < $max; $i++) {
-            $key = self::generateLockKey($usage, $i, $discriminator);
 
-            if ($this->chillRedis->exists($key) === 0) {
-                return false;
-            }
+    /**
+     * @param string $usage 'invalid_token_global' or ...
+     * @param mixed|null $discriminator
+     */
+    public static function generateLockKey($usage, int $number, $discriminator = null)
+    {
+        switch ($usage) {
+            case 'invalid_token_global':
+                return sprintf('invalid_token_global_%d', $number);
+
+            case 'invalid_token_by_ip':
+                return sprintf('invalid_token_ip_%s_%d', $discriminator, $number);
+
+            case 'ask_token_invalid_form_global':
+                return sprintf('ask_token_invalid_form_global_%d', $number);
+
+            case 'ask_token_invalid_form_by_ip':
+                return sprintf('ask_token_invalid_form_by_ip_%s_%d', $discriminator, $number);
+
+            case 'ask_token_success_by_user':
+                return sprintf('ask_token_success_by_user_%s_%d', $discriminator->getId(), $number);
+
+            default:
+                throw new LogicException('this usage is not implemented');
         }
-        
-        $this->logger->warning("locking reaching for password recovery", [
-            'usage' => $usage,
-            'discriminator' => $discriminator
-        ]);
-        
-        return true;
     }
-    
+
     public function getMax($usage)
     {
         switch ($usage) {
             case 'invalid_token_global':
                 return self::MAX_INVALID_TOKEN_GLOBAL;
+
             case 'invalid_token_by_ip':
                 return self::MAX_INVALID_TOKEN_BY_IP;
+
             case 'ask_token_invalid_form_global':
                 return self::MAX_ASK_TOKEN_INVALID_FORM_GLOBAL;
+
             case 'ask_token_invalid_form_by_ip':
                 return self::MAX_ASK_TOKEN_INVALID_FORM_BY_IP;
+
             case 'ask_token_success_by_user':
                 return self::MAX_ASK_TOKEN_BY_USER;
-                
+
             default:
-                throw new \UnexpectedValueException("this usage '$usage' is not yet implemented");
+                throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented");
         }
     }
-    
+
     public function getTtl($usage)
     {
         switch ($usage) {
             case 'invalid_token_global':
             case 'invalid_token_by_ip':
                 return self::INVALID_TOKEN_TTL;
-                
+
             case 'ask_token_invalid_form_global':
             case 'ask_token_invalid_form_by_ip':
                 return self::ASK_TOKEN_INVALID_FORM_TTL;
-                
+
             case 'ask_token_success_by_user':
                 return self::ASK_TOKEN_INVALID_FORM_TTL * 24;
-                
+
             default:
-                throw new \UnexpectedValueException("this usage '$usage' is not yet implemented");
+                throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented");
         }
     }
-    
-    /**
-     * 
-     * @param string $usage 'invalid_token_global' or ...
-     * @param int $number
-     */
-    public static function generateLockKey($usage, int $number, $discriminator = null)
+
+    public function isLocked($usage, $discriminator = null)
     {
-        switch($usage) {
-            case "invalid_token_global":
-                return sprintf('invalid_token_global_%d', $number);
-            case "invalid_token_by_ip":
-                return sprintf('invalid_token_ip_%s_%d', $discriminator, $number);
-            case "ask_token_invalid_form_global":
-                return sprintf('ask_token_invalid_form_global_%d', $number);
-            case "ask_token_invalid_form_by_ip":
-                return sprintf('ask_token_invalid_form_by_ip_%s_%d', $discriminator, $number);
-            case 'ask_token_success_by_user':
-                return sprintf('ask_token_success_by_user_%s_%d', $discriminator->getId(), $number);
-            default:
-                throw new \LogicException("this usage is not implemented");
+        $max = $this->getMax($usage);
+
+        for ($i = 0; $i < $max; ++$i) {
+            $key = self::generateLockKey($usage, $i, $discriminator);
+
+            if ($this->chillRedis->exists($key) === 0) {
+                return false;
+            }
         }
+
+        $this->logger->warning('locking reaching for password recovery', [
+            'usage' => $usage,
+            'discriminator' => $discriminator,
+        ]);
+
+        return true;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
index 324f76b02..40787fe74 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
@@ -1,67 +1,55 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Security\PasswordRecover;
-
-use Symfony\Component\Security\Core\Authorization\Voter\Voter;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\PasswordRecover;
+
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+use function in_array;
+
 class PasswordRecoverVoter extends Voter
 {
-    const TRY_TOKEN = 'CHILL_PASSWORD_TRY_TOKEN';
-    const ASK_TOKEN = 'CHILL_PASSWORD_ASK_TOKEN';
-    
-    protected $supported = [
-        self::TRY_TOKEN,
-        self::ASK_TOKEN
-    ];
-    
+    public const ASK_TOKEN = 'CHILL_PASSWORD_ASK_TOKEN';
+
+    public const TRY_TOKEN = 'CHILL_PASSWORD_TRY_TOKEN';
+
     /**
-     *
      * @var PasswordRecoverLocker
      */
     protected $locker;
-    
+
     /**
-     *
      * @var RequestStack
      */
     protected $requestStack;
-    
+
+    protected $supported = [
+        self::TRY_TOKEN,
+        self::ASK_TOKEN,
+    ];
+
     public function __construct(PasswordRecoverLocker $locker, RequestStack $requestStack)
     {
         $this->locker = $locker;
         $this->requestStack = $requestStack;
     }
 
-    
     protected function supports($attribute, $subject): bool
     {
-        if (!in_array($attribute, $this->supported)) {
+        if (!in_array($attribute, $this->supported, true)) {
             return false;
         }
-        
+
         return true;
     }
 
@@ -69,34 +57,38 @@ class PasswordRecoverVoter extends Voter
     {
         switch ($attribute) {
             case self::TRY_TOKEN:
-                if (TRUE === $this->locker->isLocked('invalid_token_global')) {
+                if (true === $this->locker->isLocked('invalid_token_global')) {
                     return false;
                 }
-                
+
                 $ip = $this->requestStack->getCurrentRequest()->getClientIp();
-                if (TRUE === $this->locker->isLocked('invalid_token_by_ip', $ip)) {
+
+                if (true === $this->locker->isLocked('invalid_token_by_ip', $ip)) {
                     return false;
                 }
-                
+
                 return true;
+
             case self::ASK_TOKEN:
-                if (TRUE === $this->locker->isLocked('ask_token_invalid_form_global')) {
+                if (true === $this->locker->isLocked('ask_token_invalid_form_global')) {
                     return false;
                 }
-                
+
                 $ip = $this->requestStack->getCurrentRequest()->getClientIp();
-                if (TRUE === $this->locker->isLocked('ask_token_invalid_form_by_ip', $ip)) {
+
+                if (true === $this->locker->isLocked('ask_token_invalid_form_by_ip', $ip)) {
                     return false;
                 }
-                
+
                 if ($subject instanceof User) {
-                    if (TRUE === $this->locker->isLocked('ask_token_success_by_user', $subject)) {
+                    if (true === $this->locker->isLocked('ask_token_success_by_user', $subject)) {
                         return false;
                     }
                 }
-                
+
                 return true;
-                
         }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
index 969f774a6..e6f3db0e7 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
@@ -1,59 +1,46 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Security\PasswordRecover;
-
-use Chill\MainBundle\Security\PasswordRecover\TokenManager;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Chill\MainBundle\Notification\Mailer;
-use Chill\MainBundle\Entity\User;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\PasswordRecover;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\Mailer;
+use DateTimeInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use function array_merge;
+
 class RecoverPasswordHelper
 {
+    public const RECOVER_PASSWORD_ROUTE = 'password_recover';
+
     /**
-     *
-     * @var TokenManager
-     */
-    protected $tokenManager;
-    
-    /**
-     *
-     * @var UrlGeneratorInterface
-     */
-    protected $urlGenerator;
-    
-    /**
-     *
      * @var Mailer
      */
     protected $mailer;
-    
+
     protected $routeParameters;
-    
-    const RECOVER_PASSWORD_ROUTE = 'password_recover';
-    
+
+    /**
+     * @var TokenManager
+     */
+    protected $tokenManager;
+
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
+
     public function __construct(
-        TokenManager $tokenManager, 
-        UrlGeneratorInterface $urlGenerator, 
+        TokenManager $tokenManager,
+        UrlGeneratorInterface $urlGenerator,
         Mailer $mailer,
         array $routeParameters
     ) {
@@ -64,64 +51,65 @@ class RecoverPasswordHelper
     }
 
     /**
-     * 
-     * @param User $user
-     * @param \DateTimeInterface $expiration
      * @param bool $absolute
      * @param array $parameters additional parameters to url
+     *
      * @return string
      */
-    public function generateUrl(User $user, \DateTimeInterface $expiration, $absolute = true, array $parameters = [])
+    public function generateUrl(User $user, DateTimeInterface $expiration, $absolute = true, array $parameters = [])
     {
-        
         $context = $this->urlGenerator->getContext();
         $previousHost = $context->getHost();
         $previousScheme = $context->getScheme();
-        
+
         $context->setHost($this->routeParameters['host']);
         $context->setScheme($this->routeParameters['scheme']);
-        
+
         $url = $this->urlGenerator->generate(
-            self::RECOVER_PASSWORD_ROUTE, 
-            \array_merge(
+            self::RECOVER_PASSWORD_ROUTE,
+            array_merge(
                 $this->tokenManager->generate($user, $expiration),
-                $parameters), 
+                $parameters
+            ),
             $absolute ? UrlGeneratorInterface::ABSOLUTE_URL : UrlGeneratorInterface::ABSOLUTE_PATH
-            );
-        
+        );
+
         // reset the host
         $context->setHost($previousHost);
         $context->setScheme($previousScheme);
-        
+
         return $url;
     }
-    
+
     public function sendRecoverEmail(
-        User $user, 
-        \DateTimeInterface $expiration, 
-        $template = '@ChillMain/Password/recover_email.txt.twig', 
-        array $templateParameters = [], 
+        User $user,
+        DateTimeInterface $expiration,
+        $template = '@ChillMain/Password/recover_email.txt.twig',
+        array $templateParameters = [],
         $force = false,
         array $additionalUrlParameters = [],
         $emailSubject = 'Recover your password'
     ) {
         $content = $this->mailer->renderContentToUser(
-            $user, 
-            $template, 
-            \array_merge([
+            $user,
+            $template,
+            array_merge(
+                [
                     'user' => $user,
-                    'url' => $this->generateUrl($user, $expiration, true, $additionalUrlParameters)
+                    'url' => $this->generateUrl($user, $expiration, true, $additionalUrlParameters),
                 ],
                 $templateParameters
-            ));
-        
+            )
+        );
+
         $this->mailer->sendNotification(
-            $user, 
-            [ $emailSubject ], 
+            $user,
+            [$emailSubject],
             [
                 'text/plain' => $content,
-            ], 
-            null, 
-            $force);
+            ],
+            null,
+            $force
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
index 3dc0c1060..3d9eb29d2 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
@@ -1,103 +1,101 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\PasswordRecover;
 
 use Chill\MainBundle\Entity\User;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Psr\Log\LoggerInterface;
+use UnexpectedValueException;
+use function bin2hex;
+use function hash;
+use function hex2bin;
+use function random_bytes;
+use function strlen;
+use function trim;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class TokenManager
 {
+    public const HASH = 'h';
+
+    public const TIMESTAMP = 'ts';
+
+    public const TOKEN = 't';
+
+    public const TOKEN_LENGTH = 24;
+
+    public const USERNAME_CANONICAL = 'u';
+
     /**
-     *
-     * @var string
-     */
-    protected $secret;
-    
-    /**
-     *
      * @var LoggerInterface
      */
     protected $logger;
-    
-    const TOKEN = 't';
-    const HASH = 'h';
-    const TIMESTAMP = 'ts';
-    const USERNAME_CANONICAL = 'u';
-    
-    const TOKEN_LENGTH = 24;
-    
+
+    /**
+     * @var string
+     */
+    protected $secret;
+
     public function __construct($secret, LoggerInterface $logger)
     {
         $this->secret = $secret;
         $this->logger = $logger;
     }
-    
-    public function generate(User $user, \DateTimeInterface $expiration)
+
+    public function generate(User $user, DateTimeInterface $expiration)
     {
-        $token = \random_bytes(self::TOKEN_LENGTH);
+        $token = random_bytes(self::TOKEN_LENGTH);
         $username = $user->getUsernameCanonical();
-        
+
         if (empty($username)) {
-            throw new \UnexpectedValueException("username should not be empty to generate a token");
+            throw new UnexpectedValueException('username should not be empty to generate a token');
         }
-        
-        $timestamp = $expiration->getTimestamp();
-        $hash = \hash('sha1', $token.$username.$timestamp.$this->secret);
-        
-        return [ 
-            self::HASH => $hash, 
-            self::TOKEN => \bin2hex($token),
-            self::TIMESTAMP => $timestamp, 
-            self::USERNAME_CANONICAL => $username
-            ];
+
+        $timestamp = (string) $expiration->getTimestamp();
+        $hash = hash('sha1', $token . $username . $timestamp . $this->secret);
+
+        return [
+            self::HASH => $hash,
+            self::TOKEN => bin2hex($token),
+            self::TIMESTAMP => $timestamp,
+            self::USERNAME_CANONICAL => $username,
+        ];
     }
-    
-    public function verify($hash, $token, User $user, $timestamp)
+
+    public function verify($hash, $token, User $user, string $timestamp)
     {
-        $token = \hex2bin(\trim($token));
-        
-        if (\strlen($token) !== self::TOKEN_LENGTH) {
+        $token = hex2bin(trim($token));
+
+        if (strlen($token) !== self::TOKEN_LENGTH) {
             return false;
         }
-        
+
         $username = $user->getUsernameCanonical();
-        $date = \DateTimeImmutable::createFromFormat('U', $timestamp);
-        
-        if ($date < new \DateTime('now')) {
-            
+        $date = DateTimeImmutable::createFromFormat('U', $timestamp);
+
+        if ($date < new DateTime('now')) {
             $this->logger->info('receiving a password recover token with expired '
                 . 'validity');
-            
+
             return false;
         }
-        
-        $expected = \hash('sha1', $token.$username.$timestamp.$this->secret);
-        
+
+        $expected = hash('sha1', $token . $username . $timestamp . $this->secret);
+
         if ($expected !== $hash) {
             return false;
         }
-        
+
         return true;
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php b/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php
index d5f49db5d..5a7d73eae 100644
--- a/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/ProvideRoleHierarchyInterface.php
@@ -1,42 +1,34 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security;
 
 /**
- * Give a hierarchy for the role. 
- * 
- * This hierarchy allow to sort roles, which is useful in UI
+ * Give a hierarchy for the role.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * This hierarchy allow to sort roles, which is useful in UI
  */
 interface ProvideRoleHierarchyInterface extends ProvideRoleInterface
 {
     /**
      * Return an array of roles, where keys are the hierarchy, and values
      * an array of roles.
-     * 
-     * Example: 
-     * 
+     *
+     * Example:
+     *
      * ```
      * [ 'Title' => [ 'CHILL_FOO_SEE', 'CHILL_FOO_UPDATE' ] ]
      * ```
-     * 
-     * @return array where keys are the hierarchy, and values an array of roles: `[ 'title' => [ 'CHILL_FOO_SEE', 'CHILL_FOO_UPDATE' ] ]`
+     *
+     * @return array<string, array<int, string>> Where keys are the hierarchy, and values an array of roles: `[ 'title' => [ 'CHILL_FOO_SEE', 'CHILL_FOO_UPDATE' ] ]`
      */
-    public function getRolesWithHierarchy();
+    public function getRolesWithHierarchy(): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php b/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php
index 08a48181a..b6680946c 100644
--- a/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/ProvideRoleInterface.php
@@ -1,53 +1,43 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security;
 
 /**
- * Declare role
- * 
+ * Declare role.
+ *
  * The role are added to the configuration at compile time.
- * 
- * The implemented object must be declared as a service and tagged as 
- * 
+ *
+ * The implemented object must be declared as a service and tagged as
+ *
  * <pre>
  * my_role_declaration:
  *    # ...
  *    tags:
  *       - { name: chill.role }
  * </pre>
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 interface ProvideRoleInterface
 {
     /**
-     * return an array of role provided by the object
-     * 
+     * Return an array of role provided by the object.
+     *
      * @return string[] array of roles (as string)
      */
-    public function getRoles();
-    
+    public function getRoles(): array;
+
     /**
-     * return roles which doesn't need 
-     * 
+     * Return roles which doesn't need.
+     *
      * @return string[] array of roles without scopes
      */
-    public function getRolesWithoutScope();
+    public function getRolesWithoutScope(): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
index 1e2f9c02b..e2fafbf7f 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
@@ -1,27 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
-class CenterResolverDispatcher
+final class CenterResolverDispatcher implements CenterResolverDispatcherInterface
 {
     /**
-     * @var iterabble|CenterResolverInterface[]
+     * @var CenterResolverInterface[]
      */
-    private iterable $resolvers = [];
+    private iterable $resolvers;
 
-    public function __construct(iterable $resolvers)
+    public function __construct(iterable $resolvers = [])
     {
         $this->resolvers = $resolvers;
     }
 
-    /**
-     * @param mixed $entity
-     * @param array|null $options
-     * @return null|Center|Center[]
-     */
     public function resolveCenter($entity, ?array $options = [])
     {
-        foreach($this->resolvers as $priority => $resolver) {
+        trigger_deprecation(
+            'ChillMainBundle',
+            'dev-master',
+            '
+            Use the service CenterResolverManager through the interface CenterResolverManagerInterface.
+            The new method "CenterResolverManagerInterface::resolveCenters(): array" is available and the typing
+            has been improved in order to avoid mixing types.
+            '
+        );
+
+        foreach ($this->resolvers as $resolver) {
             if ($resolver->supports($entity, $options)) {
                 return $resolver->resolveCenter($entity, $options);
             }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php
new file mode 100644
index 000000000..95bd03e20
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcherInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+
+/**
+ * @deprecated Use CenterResolverManager and its interface CenterResolverManagerInterface
+ */
+interface CenterResolverDispatcherInterface
+{
+    /**
+     * @param object $entity
+     *
+     * @return Center|Center[]|null
+     */
+    public function resolveCenter($entity, ?array $options = []);
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
index db49874b7..2c4e1f8f8 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php
@@ -1,19 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
 
 interface CenterResolverInterface
 {
-    public function supports($entity, ?array $options = []): bool;
+    public static function getDefaultPriority(): int;
 
     /**
-     * @param $entity
-     * @param array|null $options
-     * @return Center|array|Center[]
+     * @param object $entity
+     *
+     * @return Center|Center[]
      */
     public function resolveCenter($entity, ?array $options = []);
 
-    public static function getDefaultPriority(): int;
+    /**
+     * @param object $entity
+     */
+    public function supports($entity, ?array $options = []): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
new file mode 100644
index 000000000..2dfe1ecf2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+use UnexpectedValueException;
+use function get_class;
+use function is_array;
+
+final class CenterResolverManager implements CenterResolverManagerInterface
+{
+    /**
+     * @var CenterResolverInterface[]
+     */
+    private iterable $resolvers;
+
+    public function __construct(iterable $resolvers = [])
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    public function resolveCenters($entity, ?array $options = []): array
+    {
+        foreach ($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                $resolved = $resolver->resolveCenter($entity, $options);
+
+                if (null === $resolved) {
+                    return [];
+                }
+
+                if ($resolved instanceof Center) {
+                    return [$resolved];
+                }
+
+                if (is_array($resolved)) {
+                    return $resolved;
+                }
+
+                throw new UnexpectedValueException(sprintf(
+                    'the return type of a %s should be an instance of %s, an array or null. Resolver is %s',
+                    CenterResolverInterface::class,
+                    Center::class,
+                    get_class($resolver)
+                ));
+            }
+        }
+
+        return [];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php
new file mode 100644
index 000000000..34de9ecb6
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+
+interface CenterResolverManagerInterface
+{
+    /**
+     * @param object $entity
+     *
+     * @return Center[]
+     */
+    public function resolveCenters($entity, ?array $options = []): array;
+}
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
index e3e92164a..0da9e1151 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
@@ -1,21 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasCentersInterface;
+use UnexpectedValueException;
 
 class DefaultCenterResolver implements CenterResolverInterface
 {
-    public function supports($entity, ?array $options = []): bool
+    public static function getDefaultPriority(): int
     {
-        return $entity instanceof HasCenterInterface || $entity instanceof HasCentersInterface;
+        return -256;
     }
 
     /**
-     * @inheritDoc
-     *
      * @param HasCenterInterface $entity
      * @param array $options
      */
@@ -23,15 +30,17 @@ class DefaultCenterResolver implements CenterResolverInterface
     {
         if ($entity instanceof HasCenterInterface) {
             return $entity->getCenter();
-        } elseif ($entity instanceof HasCentersInterface) {
-            return $entity->getCenters();
-        } else {
-            throw new \UnexpectedValueException("should be an instanceof");
         }
+
+        if ($entity instanceof HasCentersInterface) {
+            return $entity->getCenters();
+        }
+
+        throw new UnexpectedValueException('should be an instanceof');
     }
 
-    public static function getDefaultPriority(): int
+    public function supports($entity, ?array $options = []): bool
     {
-        return -256;
+        return $entity instanceof HasCenterInterface || $entity instanceof HasCentersInterface;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
index caf052764..b2b5e97e5 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
@@ -1,33 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
+use UnexpectedValueException;
 
 class DefaultScopeResolver implements ScopeResolverInterface
 {
-
-    public function supports($entity, ?array $options = []): bool
+    public static function getDefaultPriority(): int
     {
-        return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
-    }
-
-    /**
-     * @inheritDoc
-     *
-     * @param HasScopeInterface|HasScopesInterface $entity
-     */
-    public function resolveScope($entity, ?array $options = [])
-    {
-        if ($entity instanceof HasScopeInterface) {
-            return $entity->getScope();
-        } elseif ($entity instanceof HasScopesInterface) {
-            return $entity->getScopes();
-        } else {
-            throw new \UnexpectedValueException("should be an instanceof %s or %s",
-                HasScopesInterface::class, HasScopeInterface::class);
-        }
+        return -256;
     }
 
     public function isConcerned($entity, ?array $options = []): bool
@@ -35,8 +27,28 @@ class DefaultScopeResolver implements ScopeResolverInterface
         return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
     }
 
-    public static function getDefaultPriority(): int
+    /**
+     * @param HasScopeInterface|HasScopesInterface $entity
+     */
+    public function resolveScope($entity, ?array $options = [])
     {
-        return -256;
+        if ($entity instanceof HasScopeInterface) {
+            return $entity->getScope();
+        }
+
+        if ($entity instanceof HasScopesInterface) {
+            return $entity->getScopes();
+        }
+
+        throw new UnexpectedValueException(
+            'should be an instanceof %s or %s',
+            HasScopesInterface::class,
+            HasScopeInterface::class
+        );
+    }
+
+    public function supports($entity, ?array $options = []): bool
+    {
+        return $entity instanceof HasScopeInterface || $entity instanceof HasScopesInterface;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
index 21ece21a3..66bfdb4ee 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
@@ -1,36 +1,66 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
 use Twig\TwigFilter;
 
 final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
 {
-    private CenterResolverDispatcher $centerResolverDispatcher;
+    private CenterResolverManagerInterface $centerResolverDispatcher;
 
-    /**
-     * @param CenterResolverDispatcher $centerResolverDispatcher
-     */
-    public function __construct(CenterResolverDispatcher $centerResolverDispatcher)
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    public function __construct(CenterResolverManagerInterface $centerResolverDispatcher, ScopeResolverDispatcher $scopeResolverDispatcher)
     {
         $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
     }
 
     public function getFilters()
     {
         return [
-            new TwigFilter('chill_resolve_center', [$this, 'resolveCenter'])
+            new TwigFilter('chill_resolve_center', [$this, 'resolveCenter']),
+            new TwigFilter('chill_resolve_scope', [$this, 'resolveScope']),
+            new TwigFilter('chill_is_scope_concerned', [$this, 'isScopeConcerned']),
         ];
     }
 
+    /**
+     * @param $entity
+     *
+     * @return bool
+     */
+    public function isScopeConcerned($entity, ?array $options = [])
+    {
+        return $this->scopeResolverDispatcher->isConcerned($entity, $options);
+    }
+
     /**
      * @param mixed $entity
-     * @param array|null $options
+     *
      * @return Center|Center[]|null
      */
     public function resolveCenter($entity, ?array $options = [])
     {
-        return $this->centerResolverDispatcher->resolveCenter($entity, $options);
+        return $this->centerResolverDispatcher->resolveCenters($entity, $options);
     }
 
+    /**
+     * @param $entity
+     *
+     * @return array|\Chill\MainBundle\Entity\Scope|\Chill\MainBundle\Entity\Scope[]
+     */
+    public function resolveScope($entity, ?array $options = [])
+    {
+        return $this->scopeResolverDispatcher->resolveScope();
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
index cc3f11560..0e4cfdc78 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
@@ -1,8 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Scope;
+use Doctrine\Common\Collections\Collection;
 
 final class ScopeResolverDispatcher
 {
@@ -16,21 +26,6 @@ final class ScopeResolverDispatcher
         $this->resolvers = $resolvers;
     }
 
-    /**
-     * @param $entity
-     * @return Scope|Scope[]|iterable
-     */
-    public function resolveScope($entity, ?array $options = [])
-    {
-        foreach ($this->resolvers as $resolver) {
-            if ($resolver->supports($entity, $options)) {
-                return $resolver->resolveScope($entity, $options);
-            }
-        }
-
-        return null;
-    }
-
     public function isConcerned($entity, ?array $options = []): bool
     {
         foreach ($this->resolvers as $resolver) {
@@ -41,4 +36,26 @@ final class ScopeResolverDispatcher
 
         return false;
     }
+
+    /**
+     * @param $entity
+     *
+     * @return iterable|Scope|Scope[]
+     */
+    public function resolveScope($entity, ?array $options = [])
+    {
+        foreach ($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                $scopes = $resolver->resolveScope($entity, $options);
+
+                if ($scopes instanceof Collection) {
+                    return $scopes->toArray();
+                }
+
+                return $scopes;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
index 04e949a59..2d5601ffa 100644
--- a/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
+++ b/src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
 use Chill\MainBundle\Entity\Scope;
@@ -9,27 +18,32 @@ use Chill\MainBundle\Entity\Scope;
  */
 interface ScopeResolverInterface
 {
-    /**
-     * Return true if this resolve is able to decide "something" on this entity.
-     */
-    public function supports($entity, ?array $options = []): bool;
-
-    /**
-     * Will return the scope for the entity
-     *
-     * @return Scope|array|Scope[]
-     */
-    public function resolveScope($entity, ?array $options = []);
-
-
-    /**
-     * Return true if the entity is concerned by scope, false otherwise.
-     */
-    public function isConcerned($entity, ?array $options = []): bool;
-
     /**
      * get the default priority for this resolver. Resolver with an higher priority will be
      * queried first.
      */
     public static function getDefaultPriority(): int;
+
+    /**
+     * Return true if the entity is concerned by scope, false otherwise.
+     *
+     * @param mixed $entity
+     */
+    public function isConcerned($entity, ?array $options = []): bool;
+
+    /**
+     * Will return the scope for the entity.
+     *
+     * @param mixed $entity
+     *
+     * @return array|Scope|Scope[]
+     */
+    public function resolveScope($entity, ?array $options = []);
+
+    /**
+     * Return true if this resolve is able to decide "something" on this entity.
+     *
+     * @param mixed $entity
+     */
+    public function supports($entity, ?array $options = []): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Security/RoleProvider.php b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
index f72435cb1..15b7f69ff 100644
--- a/src/Bundle/ChillMainBundle/Security/RoleProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/RoleProvider.php
@@ -1,136 +1,119 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
+use function array_fill_keys;
+use function array_key_exists;
+
 class RoleProvider
 {
     /**
-     *
      * @var ProvideRoleInterface[]
      */
-    private $providers = array();
-    
+    private $providers = [];
+
     /**
      * an array where keys are the role, and value is the title
      * for the given role.
-     * 
+     *
      * Null when not initialized.
      *
      * @var array|null
      */
-    private $rolesTitlesCache = null;
-    
+    private $rolesTitlesCache;
+
     /**
-     * Add a role provider
-     * 
+     * Add a role provider.
+     *
      * @internal This function is called by the dependency injector: it inject provider
+     *
      * @param \Chill\MainBundle\Security\ProvideRoleInterface $provider
      */
-    public function addProvider(ProvideRoleInterface $provider) 
+    public function addProvider(ProvideRoleInterface $provider)
     {
         $this->providers[] = $provider;
     }
-    
-    /**
-     * 
-     * @return string[] the roles as string
-     */
-    public function getRoles()
+
+    public function getRoles(): array
     {
-        $roles = array();
+        $roles = [];
+
         foreach ($this->providers as $provider) {
-            if ($provider->getRoles() !== NULL) {
+            if ($provider->getRoles() !== null) {
                 $roles = array_merge($roles, $provider->getRoles());
             }
         }
-        
+
         return $roles;
     }
-    
-    /**
-     * 
-     * @return string[] the roles as string
-     */
-    public function getRolesWithoutScopes()
+
+    public function getRolesWithoutScopes(): array
     {
-        $roles = array();
+        $roles = [];
+
         foreach ($this->providers as $provider) {
-            if ($provider->getRolesWithoutScope() !== NULL) {
+            if ($provider->getRolesWithoutScope() !== null) {
                 $roles = array_merge($roles, $provider->getRolesWithoutScope());
             }
         }
-        
+
         return $roles;
     }
-    
-    /**
-     * initialize the array for caching role and titles
-     * 
-     */
-    private function initializeRolesTitlesCache()
-    {
-        // break if already initialized
-        if ($this->rolesTitlesCache !== null) {
-            return;
-        }
-        
-        foreach ($this->providers as $provider) {
-            if ($provider instanceof ProvideRoleHierarchyInterface) {
-                foreach ($provider->getRolesWithHierarchy() as $title => $roles) {
-                    foreach($roles as $role) {
-                        $this->rolesTitlesCache[$role] = $title;
-                    }
-                }
-            } else {
-                if ($provider->getRoles() !== null) {
-                    $this->rolesTitlesCache = \array_merge(
-                        $this->rolesTitlesCache, 
-                        \array_fill_keys($provider->getRoles(), null)
-                        );
-                }
-            }
-        }
-    }
-    
+
     /**
      * Get the title for each role.
-     * 
+     *
      * @param string $role
+     *
      * @return string the title of the role
      */
     public function getRoleTitle($role)
     {
         $this->initializeRolesTitlesCache();
-        
-        if (! \array_key_exists($role, $this->rolesTitlesCache)) {
-            // this case might happens when the role is not described in 
+
+        if (!array_key_exists($role, $this->rolesTitlesCache)) {
+            // this case might happens when the role is not described in
             // `getRolesWithHierarchy`
             return null;
         }
-        
+
         return $this->rolesTitlesCache[$role];
     }
-    
+
+    /**
+     * initialize the array for caching role and titles.
+     */
+    private function initializeRolesTitlesCache()
+    {
+        // break if already initialized
+        if (null !== $this->rolesTitlesCache) {
+            return;
+        }
+
+        foreach ($this->providers as $provider) {
+            if ($provider instanceof ProvideRoleHierarchyInterface) {
+                foreach ($provider->getRolesWithHierarchy() as $title => $roles) {
+                    foreach ($roles as $role) {
+                        $this->rolesTitlesCache[$role] = $title;
+                    }
+                }
+            } else {
+                if ($provider->getRoles() !== null) {
+                    $this->rolesTitlesCache = array_merge(
+                        $this->rolesTitlesCache,
+                        array_fill_keys($provider->getRoles(), null)
+                    );
+                }
+            }
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
index b741fd2c2..b25c513fd 100644
--- a/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
+++ b/src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php
@@ -1,83 +1,73 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Security\UserProvider;
-
-use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
-use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\UserProvider;
+
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NoResultException;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+
 class UserProvider implements UserProviderInterface
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
+    protected EntityManagerInterface $em;
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
 
-    
     public function loadUserByUsername($username): UserInterface
     {
         try {
             $user = $this->em->createQuery(sprintf(
-                    "SELECT u FROM %s u "
-                    . "WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) "
-                    . "OR "
-                    . "u.emailCanonical = UNACCENT(LOWER(:pattern))", 
-                    User::class))
+                'SELECT u FROM %s u '
+                    . 'WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) '
+                    . 'OR '
+                    . 'u.emailCanonical = UNACCENT(LOWER(:pattern))',
+                User::class
+            ))
                 ->setParameter('pattern', $username)
                 ->getSingleResult();
-        } catch (\Doctrine\ORM\NoResultException $e) {
-            throw new UsernameNotFoundException(sprintf('Bad credentials.', $username));
+        } catch (NoResultException $e) {
+            throw new UsernameNotFoundException(
+                'Bad credentials.',
+                0,
+                $e
+            );
         }
-        
+
         return $user;
     }
 
     public function refreshUser(UserInterface $user): UserInterface
     {
         if (!$user instanceof User) {
-            throw new UnsupportedUserException("Unsupported user class: cannot reload this user");
+            throw new UnsupportedUserException('Unsupported user class: cannot reload this user');
         }
-        
+
         $reloadedUser = $this->em->getRepository(User::class)->find($user->getId());
-        
-        if (NULL === $reloadedUser) {
+
+        if (null === $reloadedUser) {
             throw new UsernameNotFoundException(sprintf('User with ID "%s" could not be reloaded.', $user->getId()));
         }
-        
+
         return $reloadedUser;
     }
 
     public function supportsClass($class): bool
     {
-        return $class === User::class;
+        return User::class === $class;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php b/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
index 9983d3595..758ca55b4 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Collection.php
@@ -1,28 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Model;
 
 use Chill\MainBundle\Pagination\PaginatorInterface;
 
 class Collection
 {
-    private PaginatorInterface $paginator;
-
     private $items;
 
+    private PaginatorInterface $paginator;
+
     public function __construct($items, PaginatorInterface $paginator)
     {
         $this->items = $items;
         $this->paginator = $paginator;
     }
 
-    public function getPaginator(): PaginatorInterface
-    {
-        return $this->paginator;
-    }
-
     public function getItems()
     {
         return $this->items;
     }
+
+    public function getPaginator(): PaginatorInterface
+    {
+        return $this->paginator;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
index ee628e014..fd250e967 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@@ -1,50 +1,135 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
+use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
 use Chill\MainBundle\Entity\Address;
+use DateTimeInterface;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
+class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
     use NormalizerAwareTrait;
 
-    public function normalize($address, string $format = null, array $context = [])
-    {
-        /** @var Address $address */
-        $data['address_id'] = $address->getId();
-        $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
-        $data['street'] = $address->getStreet();
-        $data['streetNumber'] = $address->getStreetNumber();
-        $data['postcode']['id'] = $address->getPostCode()->getId();
-        $data['postcode']['name'] = $address->getPostCode()->getName();
-        $data['postcode']['code'] = $address->getPostCode()->getCode();
-        $data['country']['id'] = $address->getPostCode()->getCountry()->getId();
-        $data['country']['name'] = $address->getPostCode()->getCountry()->getName();
-        $data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
-        $data['floor'] = $address->getFloor();
-        $data['corridor'] = $address->getCorridor();
-        $data['steps'] = $address->getSteps();
-        $data['flat'] = $address->getFlat();
-        $data['buildingName'] = $address->getBuildingName();
-        $data['distribution'] = $address->getDistribution();
-        $data['extra'] = $address->getExtra();
-        $data['validFrom'] = $address->getValidFrom();
-        $data['validTo'] = $address->getValidTo();
-        $data['addressReference'] = $this->normalizer->normalize($address->getAddressReference(), $format, [
-            AbstractNormalizer::GROUPS => ['read']
-        ]);
+    private const NULL_POSTCODE_COUNTRY = [
+        'id', 'name', 'code',
+    ];
 
-        return $data;
+    private const NULL_VALUE = [
+        'address_id',
+        'text',
+        'street',
+        'streetNumber',
+        'postcode',
+        'country',
+        'floor',
+        'corridor',
+        'steps',
+        'flat',
+        'buildingName',
+        'distribution',
+        'extra',
+        'validFrom' => DateTimeInterface::class,
+        'validTo' => DateTimeInterface::class,
+    ];
+
+    /**
+     * @param Address $address
+     */
+    public function normalize($address, ?string $format = null, array $context = [])
+    {
+        if ($address instanceof Address) {
+            $text = $address->isNoAddress() ? '' : $address->getStreet() . ', ' . $address->getStreetNumber();
+
+            if (null !== $address->getPostCode()->getCountry()->getCountryCode()) {
+                if ($address->getPostCode()->getCountry()->getCountryCode() === 'FR') {
+                    $text = $address->isNoAddress() ? '' : $address->getStreetNumber() . ', ' . $address->getStreet();
+                } else {
+                    $text = $address->isNoAddress() ? '' : $address->getStreetNumber() . ', ' . $address->getStreet();
+                }
+            }
+
+            $data = [
+                'address_id' => $address->getId(),
+                'text' => $text,
+                'street' => $address->getStreet(),
+                'streetNumber' => $address->getStreetNumber(),
+                'postcode' => [
+                    'id' => $address->getPostCode()->getId(),
+                    'name' => $address->getPostCode()->getName(),
+                    'code' => $address->getPostCode()->getCode(),
+                ],
+                'country' => [
+                    'id' => $address->getPostCode()->getCountry()->getId(),
+                    'name' => $address->getPostCode()->getCountry()->getName(),
+                    'code' => $address->getPostCode()->getCountry()->getCountryCode(),
+                ],
+                'floor' => $address->getFloor(),
+                'corridor' => $address->getCorridor(),
+                'steps' => $address->getSteps(),
+                'flat' => $address->getFlat(),
+                'buildingName' => $address->getBuildingName(),
+                'distribution' => $address->getDistribution(),
+                'extra' => $address->getExtra(),
+            ];
+
+            if ('json' === $format) {
+                $data['addressReference'] = $this->normalizer->normalize(
+                    $address->getAddressReference(),
+                    $format,
+                    [AbstractNormalizer::GROUPS => ['read']]
+                );
+                $data['validFrom'] = $address->getValidFrom();
+                $data['validTo'] = $address->getValidTo();
+            } elseif ('docgen' === $format) {
+                $dateContext = array_merge($context, ['docgen:expects' => DateTimeInterface::class]);
+                $data['validFrom'] = $this->normalizer->normalize($address->getValidFrom(), $format, $dateContext);
+                $data['validTo'] = $this->normalizer->normalize($address->getValidTo(), $format, $dateContext);
+            }
+
+            return $data;
+        }
+
+        if (null === $address) {
+            $helper = new NormalizeNullValueHelper($this->normalizer);
+
+            return array_merge(
+                $helper->normalize(self::NULL_VALUE, $format, $context),
+                [
+                    'postcode' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context),
+                    'country' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context),
+                ]
+            );
+        }
+
+        throw new UnexpectedValueException();
     }
 
-    public function supportsNormalization($data, string $format = null)
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        return $data instanceof Address;
+        if ('json' === $format) {
+            return $data instanceof Address;
+        }
+
+        if ('docgen' === $format) {
+            return
+                $data instanceof Address
+                || (null === $data && Address::class === ($context['docgen:expects'] ?? null));
+        }
+
+        return false;
     }
-
-
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
index f1681c60a..cbe712ee8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
@@ -1,69 +1,44 @@
 <?php
-/*
- * 
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Repository\CenterRepository;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use function array_key_exists;
 
-/**
- * 
- *
- */
-class CenterNormalizer implements NormalizerInterface, DenormalizerInterface
+class CenterNormalizer implements DenormalizerInterface, NormalizerInterface
 {
     private CenterRepository $repository;
 
-
     public function __construct(CenterRepository $repository)
     {
         $this->repository = $repository;
     }
 
-    public function normalize($center, string $format = null, array $context = array())
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
-        /** @var Center $center */
-        return [
-            'id' => $center->getId(),
-            'type' => 'center',
-            'name' => $center->getName()
-        ];
-    }
-
-    public function supportsNormalization($data, string $format = null): bool
-    {
-        return $data instanceof Center;
-    }
-
-    public function denormalize($data, string $type, string $format = null, array $context = [])
-    {
-        if (FALSE === \array_key_exists('type', $data)) {
+        if (false === array_key_exists('type', $data)) {
             throw new InvalidArgumentException('missing "type" key in data');
         }
+
         if ('center' !== $data['type']) {
             throw new InvalidArgumentException('type should be equal to "center"');
         }
-        if (FALSE === \array_key_exists('id', $data)) {
+
+        if (false === array_key_exists('id', $data)) {
             throw new InvalidArgumentException('missing "id" key in data');
         }
 
@@ -76,8 +51,23 @@ class CenterNormalizer implements NormalizerInterface, DenormalizerInterface
         return $center;
     }
 
-    public function supportsDenormalization($data, string $type, string $format = null)
+    public function normalize($center, ?string $format = null, array $context = [])
     {
-        return $type === Center::class;
+        /** @var Center $center */
+        return [
+            'id' => $center->getId(),
+            'type' => 'center',
+            'name' => $center->getName(),
+        ];
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return Center::class === $type;
+    }
+
+    public function supportsNormalization($data, ?string $format = null): bool
+    {
+        return $data instanceof Center && 'json' === $format;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
index d3f513c54..0c80e0439 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
@@ -1,40 +1,47 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Serializer\Model\Collection;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class CollectionNormalizer implements NormalizerInterface, NormalizerAwareInterface
+class CollectionNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
-    use NormalizerAwareTrait; 
+    use NormalizerAwareTrait;
 
-    public function supportsNormalization($data, string $format = null): bool
+    /**
+     * @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;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
index 8e333a2a4..3050ad268 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
@@ -1,60 +1,115 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use IntlDateFormatter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use function array_key_exists;
+use function is_array;
 
-class DateNormalizer implements NormalizerInterface, DenormalizerInterface
+class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
-    public function normalize($date, string $format = null, array $context = array())
+    private ParameterBagInterface $parameterBag;
+
+    private RequestStack $requestStack;
+
+    public function __construct(RequestStack $requestStack, ParameterBagInterface $parameterBag)
     {
-        /** @var \DateTimeInterface $date */
-        return [
-            'datetime' => $date->format(\DateTimeInterface::ISO8601)
-        ];
+        $this->requestStack = $requestStack;
+        $this->parameterBag = $parameterBag;
     }
 
-    public function supportsNormalization($data, string $format = null): bool
-    {
-        return $data instanceof \DateTimeInterface;
-    }
-
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         switch ($type) {
-            case \DateTime::class:
-                return \DateTime::createFromFormat(\DateTimeInterface::ISO8601, $data['datetime']);
-            case \DateTimeInterface::class:
-            case \DateTimeImmutable::class:
+            case DateTime::class:
+                return DateTime::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
+
+            case DateTimeInterface::class:
+            case DateTimeImmutable::class:
             default:
-                return \DateTimeImmutable::createFromFormat(\DateTimeInterface::ISO8601, $data['datetime']);
+                return DateTimeImmutable::createFromFormat(DateTimeInterface::ISO8601, $data['datetime']);
         }
     }
 
-    public function supportsDenormalization($data, string $type, string $format = null): bool
+    public function normalize($date, ?string $format = null, array $context = [])
     {
-        return $type === \DateTimeInterface::class ||
-            $type === \DateTime::class ||
-            $type === \DateTimeImmutable::class ||
-            (\is_array($data) && array_key_exists('datetime', $data));
+        /** @var DateTimeInterface $date */
+        switch ($format) {
+            case 'json':
+                return [
+                    'datetime' => $date->format(DateTimeInterface::ISO8601),
+                ];
+
+            case 'docgen':
+                if (null === $date) {
+                    return [
+                        'long' => '', 'short' => '',
+                    ];
+                }
+
+                $hasTime = $date->format('His') !== '000000';
+                $request = $this->requestStack->getCurrentRequest();
+                $locale = null !== $request ? $request->getLocale() : $this->parameterBag->get('kernel.default_locale');
+                $formatterLong = IntlDateFormatter::create(
+                    $locale,
+                    IntlDateFormatter::LONG,
+                    $hasTime ? IntlDateFormatter::SHORT : IntlDateFormatter::NONE
+                );
+                $formatterShort = IntlDateFormatter::create(
+                    $locale,
+                    IntlDateFormatter::SHORT,
+                    $hasTime ? IntlDateFormatter::SHORT : IntlDateFormatter::NONE
+                );
+
+                return [
+                    'short' => $formatterShort->format($date),
+                    'long' => $formatterLong->format($date),
+                ];
+        }
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
+    {
+        return DateTimeInterface::class === $type
+            || DateTime::class === $type
+            || DateTimeImmutable::class === $type
+            || (is_array($data) && array_key_exists('datetime', $data));
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    {
+        if ('json' === $format) {
+            return $data instanceof DateTimeInterface;
+        }
+
+        if ('docgen' === $format) {
+            return $data instanceof DateTimeInterface || (
+                null === $data
+                && array_key_exists('docgen:expects', $context)
+                && (
+                    DateTimeInterface::class === $context['docgen:expects']
+                    || DateTime::class === $context['docgen:expects']
+                    || DateTimeImmutable::class === $context['docgen:expects']
+                )
+            );
+        }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
index 25b2c5017..f31b5d60d 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
@@ -1,62 +1,67 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
+use LogicException;
+use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
-use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
-use Symfony\Component\Serializer\Exception\RuntimeException;
-
+use function count;
+use function implode;
 
 /**
- * Denormalize an object given a list of supported class
+ * Denormalize an object given a list of supported class.
  */
 class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterface, DenormalizerAwareInterface
 {
     use DenormalizerAwareTrait;
 
-    /**
-     * The type to set for enabling this type
-     */
-    public const TYPE = '@multi';
-
     /**
      * Should be present in context and contains an array of
-     * allowed types. 
+     * allowed types.
      */
     public const ALLOWED_TYPES = 'denormalize_multi.allowed_types';
 
     /**
-     * {@inheritDoc}
+     * The type to set for enabling this type.
      */
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public const TYPE = '@multi';
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         foreach ($context[self::ALLOWED_TYPES] as $localType) {
             if ($this->denormalizer->supportsDenormalization($data, $localType, $format)) {
                 try {
-                    return $this->denormalizer->denormalize($data, $localType, $format, $context);               } catch (RuntimeException $e) {
+                    return $this->denormalizer->denormalize($data, $localType, $format, $context);
+                } catch (RuntimeException $e) {
                     $lastException = $e;
                 }
             }
         }
 
-        throw new RuntimeException(sprintf("Could not find any denormalizer for those ".
-            "ALLOWED_TYPES: %s", \implode(", ", $context[self::ALLOWED_TYPES])));
+        throw new RuntimeException(sprintf('Could not find any denormalizer for those ' .
+            'ALLOWED_TYPES: %s', implode(', ', $context[self::ALLOWED_TYPES])));
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function supportsDenormalization($data, string $type, string $format = null, array $context = [])
+    public function supportsDenormalization($data, string $type, ?string $format = null, array $context = [])
     {
         if (self::TYPE !== $type) {
             return false;
         }
 
         if (0 === count($context[self::ALLOWED_TYPES] ?? [])) {
-            throw new \LogicException("The context should contains a list of 
-                allowed types");
+            throw new LogicException('The context should contains a list of
+                allowed types');
         }
 
         foreach ($context[self::ALLOWED_TYPES] as $localType) {
@@ -67,5 +72,4 @@ class DiscriminatedObjectDenormalizer implements ContextAwareDenormalizerInterfa
 
         return false;
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
index cb2635802..aa9d12e24 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
@@ -1,14 +1,24 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface as SerializerMetadata;
-
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use function array_key_exists;
+use function count;
+use function is_array;
 
 class DoctrineExistingEntityNormalizer implements DenormalizerInterface
 {
@@ -16,16 +26,15 @@ class DoctrineExistingEntityNormalizer implements DenormalizerInterface
 
     private ClassMetadataFactoryInterface $serializerMetadataFactory;
 
-
     public function __construct(EntityManagerInterface $em, ClassMetadataFactoryInterface $serializerMetadataFactory)
     {
         $this->em = $em;
         $this->serializerMetadataFactory = $serializerMetadataFactory;
     }
 
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
-        if (\array_key_exists(AbstractNormalizer::OBJECT_TO_POPULATE, $context)) {
+        if (array_key_exists(AbstractNormalizer::OBJECT_TO_POPULATE, $context)) {
             return $context[AbstractNormalizer::OBJECT_TO_POPULATE];
         }
 
@@ -33,23 +42,22 @@ class DoctrineExistingEntityNormalizer implements DenormalizerInterface
             ->find($data['id']);
     }
 
-    public function supportsDenormalization($data, string $type, string $format = null)
+    public function supportsDenormalization($data, string $type, ?string $format = null)
     {
-        if (FALSE === \is_array($data)) {
+        if (false === is_array($data)) {
             return false;
         }
 
-        if (FALSE === \array_key_exists('id', $data)) {
+        if (false === array_key_exists('id', $data)) {
             return false;
-        } 
+        }
 
-        if (FALSE === $this->em->getClassMetadata($type) instanceof ClassMetadata) {
-            return false; 
+        if (false === $this->em->getClassMetadata($type) instanceof ClassMetadata) {
+            return false;
         }
 
         // does have serializer metadata, and class discriminator ?
         if ($this->serializerMetadataFactory->hasMetadataFor($type)) {
-
             $classDiscriminator = $this->serializerMetadataFactory
                 ->getMetadataFor($type)->getClassDiscriminatorMapping();
 
@@ -58,14 +66,14 @@ class DoctrineExistingEntityNormalizer implements DenormalizerInterface
 
                 // check that only 2 keys
                 // that the second key is property
-                // and that the type match the class for given type property 
+                // and that the type match the class for given type property
                 return count($data) === 2
-                    && \array_key_exists($typeProperty, $data) 
-                    && $type === $classDiscriminator->getClassForType($data[$typeProperty]);
+                    && array_key_exists($typeProperty, $data)
+                    && $classDiscriminator->getClassForType($data[$typeProperty]) === $type;
             }
         }
 
         // we do not have any class discriminator. Check that the id is the only one key
         return count($data) === 1;
     }
-}    
+}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
index 210e85fb7..c8c532802 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
@@ -1,34 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Chill\MainBundle\Doctrine\Model\Point;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 
-use Chill\MainBundle\Doctrine\Model\Point;
-
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use function count;
+use function is_array;
 
 class PointNormalizer implements DenormalizerInterface
 {
-
-    public function supportsDenormalization($data, string $type, string $format = null) : bool
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
-        return $type === Point::class;
-    }
-
-    public function denormalize($data, string $type, string $format = null, array $context = [])
-    {
-
         if (!is_array($data)) {
             throw new InvalidArgumentException('point data is not an array. It should be an array of 2 coordinates.');
-        } else {
-            if (count($data) !== 2) {
-                throw new InvalidArgumentException('point data is not an array of 2 elements. It should be an array of 2 coordinates.');
-            } else {
-                return Point::fromLonLat($data[0], $data[1]);
-            }
         }
 
+        if (count($data) !== 2) {
+            throw new InvalidArgumentException('point data is not an array of 2 elements. It should be an array of 2 coordinates.');
+        }
+
+        return Point::fromLonLat($data[0], $data[1]);
     }
 
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
+    {
+        return Point::class === $type;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index af29ad4f4..d8c616d82 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -1,33 +1,38 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Templating\Entity\UserRender;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-class UserNormalizer implements NormalizerInterface, NormalizerAwareInterface
+class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
     use NormalizerAwareTrait;
+
+    public const NULL_USER = [
+        'type' => 'user',
+        'id' => '',
+        'username' => '',
+        'text' => '',
+        'label' => '',
+        'email' => '',
+    ];
+
     private UserRender $userRender;
 
     public function __construct(UserRender $userRender)
@@ -35,23 +40,53 @@ class UserNormalizer implements NormalizerInterface, NormalizerAwareInterface
         $this->userRender = $userRender;
     }
 
-    public function normalize($user, string $format = null, array $context = array())
+    public function normalize($user, ?string $format = null, array $context = [])
     {
         /** @var User $user */
+        $userJobContext = array_merge(
+            $context,
+            ['docgen:expects' => UserJob::class, 'groups' => 'docgen:read']
+        );
+        $scopeContext = array_merge(
+            $context,
+            ['docgen:expects' => Scope::class, 'groups' => 'docgen:read']
+        );
+        $centerContext = array_merge(
+            $context,
+            ['docgen:expects' => Center::class, 'groups' => 'docgen:read']
+        );
+
+        if (null === $user && 'docgen' === $format) {
+            return array_merge(self::NULL_USER, [
+                'user_job' => $this->normalizer->normalize(null, $format, $userJobContext),
+                'main_center' => $this->normalizer->normalize(null, $format, $centerContext),
+                'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext),
+            ]);
+        }
+
         return [
             'type' => 'user',
             'id' => $user->getId(),
             'username' => $user->getUsername(),
             'text' => $this->userRender->renderString($user, []),
             'label' => $user->getLabel(),
-            'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $context),
-            'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $context),
-            'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $context),
+            'email' => (string) $user->getEmail(),
+            'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $userJobContext),
+            'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $centerContext),
+            'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $scopeContext),
         ];
     }
 
-    public function supportsNormalization($data, string $format = null): bool
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
-        return $data instanceof User;
+        if ($data instanceof User && ('json' === $format || 'docgen' === $format)) {
+            return true;
+        }
+
+        if (null === $data && 'docgen' === $format && User::class === ($context['docgen:expects'] ?? null)) {
+            return true;
+        }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
index f587b41fe..6d3075d6f 100644
--- a/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
@@ -1,25 +1,14 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating;
 
 use Twig\Extension\AbstractExtension;
@@ -28,39 +17,42 @@ use Twig\TwigFilter;
 /**
  * Twig filter to transform a string in a safer way to be the content of a csv
  * cell.
- * 
+ *
  * This filter replace the char " by ""
  */
 class CSVCellTwig extends AbstractExtension
 {
-    /*
-     * Returns a list of filters to add to the existing list.
-     * 
-     * (non-PHPdoc)
-     * @see Twig_Extension::getFilters()
-     */
-    public function getFilters()
-    {
-        return array(
-            new TwigFilter(
-                'csv_cell',
-                array($this, 'csvCellFilter'),
-                array('is_safe' => array('html')))
-        );
-    }
-    
-    /*
-     * Replace into a string the char " by ""
-     * 
-     * @param String $content The input string.
-     * @return String The safe string.
+    /**
+     * Replace into a string the char " by "".
+     *
+     * @param string $content The input string.
+     *
+     * @return string The safe string.
      */
     public function csvCellFilter($content)
     {
         return str_replace('"', '""', $content);
     }
-    
-    /*
+
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * (non-PHPdoc)
+     *
+     * @see Twig_Extension::getFilters()
+     */
+    public function getFilters()
+    {
+        return [
+            new TwigFilter(
+                'csv_cell',
+                [$this, 'csvCellFilter'],
+                ['is_safe' => ['html']]
+            ),
+        ];
+    }
+
+    /**
      * Returns the name of the extension.
      *
      * @return The name of the extension.
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
index 29d189155..55212c64f 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillMarkdownRenderExtension.php
@@ -1,29 +1,23 @@
 <?php
-/*
- * Copyright (C) 2021 Champs Libres Cooperative <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\MainBundle\Templating;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-use Parsedown;
 
 /**
- * Render markdown
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating;
+
+use Parsedown;
+use Twig\Extension\AbstractExtension;
+
+use Twig\TwigFilter;
+
+/**
+ * Render markdown.
  */
 final class ChillMarkdownRenderExtension extends AbstractExtension
 {
@@ -42,8 +36,8 @@ final class ChillMarkdownRenderExtension extends AbstractExtension
     {
         return [
             new TwigFilter('chill_markdown_to_html', [$this, 'renderMarkdownToHtml'], [
-                'is_safe' => [ 'html' ]
-            ])
+                'is_safe' => ['html'],
+            ]),
         ];
     }
 
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
index b6b267386..4bc0cffd4 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
@@ -1,32 +1,22 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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\MainBundle\Templating;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-use Twig\Environment;
 
 /**
- * 
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating;
+
+use DateTimeInterface;
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use function array_merge;
+
 class ChillTwigHelper extends AbstractExtension
 {
     public function getFilters()
@@ -34,51 +24,53 @@ class ChillTwigHelper extends AbstractExtension
         return [
             new TwigFilter('chill_print_or_message', [$this, 'printOrMessage'], [
                 'needs_environment' => true,
-                'is_safe' => ['html', 'html_attrs']
+                'is_safe' => ['html', 'html_attrs'],
             ]),
         ];
     }
-    
+
     /**
-     * Print `value` inside a template, or, if $value is empty, 
+     * Print `value` inside a template, or, if $value is empty,
      * print $message.
-     * 
+     *
      * The template can be customized. The template is a full path to another
-     * template, or one of the key belows: 
-     * 
+     * template, or one of the key belows:
+     *
      * - 'default' ;
      * - 'blockquote' ;
-     * 
+     *
      * `DateTimeInterface are also rendered. The date and time format may be set
      * using those key in `$options´ parameter:
-     * 
+     *
      * - `date_format` (default to `'medium'`)
      * - `time_format` (default to `'none'`)
-     * 
-     * @param Environment $twig
+     *
      * @param string $value Default to 'No value'. Fallback to default if null
      * @param string $message
      * @param string $template
-     * @param array $options
+     *
      * @return string
      */
     public function printOrMessage(
         Environment $twig,
-        $value, 
-        $message = 'No value', 
+        $value,
+        $message = 'No value',
         $template = 'default',
         array $options = []
     ) {
-        if ($value instanceof \DateTimeInterface) {
-            $options = \array_merge([
+        if ($value instanceof DateTimeInterface) {
+            $options = array_merge([
                 'date_format' => 'medium',
-                'time_format' => 'none'
+                'time_format' => 'none',
             ], $options);
+
             switch ($template) {
                 case 'default':
                 case 'blockquote':
-                    $t = '@ChillMain/Extensions/PrintOrMessage/'.$template.'_date.html.twig';
+                    $t = '@ChillMain/Extensions/PrintOrMessage/' . $template . '_date.html.twig';
+
                     break;
+
                 default:
                     $t = $template;
             }
@@ -86,16 +78,18 @@ class ChillTwigHelper extends AbstractExtension
             switch ($template) {
                 case 'default':
                 case 'blockquote':
-                    $t = '@ChillMain/Extensions/PrintOrMessage/'.$template.'.html.twig';
+                    $t = '@ChillMain/Extensions/PrintOrMessage/' . $template . '.html.twig';
+
                     break;
+
                 default:
                     $t = $template;
             }
         }
-        
-        return $twig->render($t, \array_merge([
+
+        return $twig->render($t, array_merge([
             'value' => $value,
-            'message' => $message ?? 'No value'
+            'message' => $message ?? 'No value',
         ], $options));
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
index c3f0f0688..478920f05 100644
--- a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
@@ -1,152 +1,141 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating;
 
+use Symfony\Bridge\Twig\Extension\RoutingExtension;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Twig\Extension\AbstractExtension;
 use Twig\Node\Node;
-use Twig\TwigFunction;
 use Twig\TwigFilter;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bridge\Twig\Extension\RoutingExtension;
+use Twig\TwigFunction;
 
 /**
  * Provides function to build path with returnPath.
- * 
- * The logic of the function is based on the original routing extension.
  *
+ * The logic of the function is based on the original routing extension.
  */
 class ChillTwigRoutingHelper extends AbstractExtension
 {
     /**
-     *
-     * @var RequestStack
-     */
-    protected $requestStack;
-    
-    /**
-     *
      * @var RoutingExtension
      */
     protected $originalExtension;
-    
+
+    /**
+     * @var RequestStack
+     */
+    protected $requestStack;
+
     public function __construct(
-        RequestStack $requestStack, 
+        RequestStack $requestStack,
         RoutingExtension $originalExtension
     ) {
         $this->requestStack = $requestStack;
         $this->originalExtension = $originalExtension;
     }
 
-    
-    public function getFunctions()
-    {
-        return [
-            new TwigFunction('chill_return_path_or', [$this, 'getReturnPathOr'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']] ),
-            new TwigFunction('chill_path_add_return_path', [$this, 'getPathAddReturnPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']] ),
-            new TwigFunction('chill_path_forward_return_path', [$this, 'getPathForwardReturnPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']] ),
-            
-        ];
-    }
-    
     public function getFilters()
     {
         return [
             new TwigFilter('chill_return_path_label', [$this, 'getLabelReturnPath']),
         ];
     }
-    
-    public function isUrlGenerationSafe(Node $argsNode)
+
+    public function getFunctions()
     {
-        return $this->originalExtension->isUrlGenerationSafe($argsNode);
+        return [
+            new TwigFunction('chill_return_path_or', [$this, 'getReturnPathOr'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+            new TwigFunction('chill_path_add_return_path', [$this, 'getPathAddReturnPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+            new TwigFunction('chill_path_forward_return_path', [$this, 'getPathForwardReturnPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+        ];
     }
-    
+
     public function getLabelReturnPath($default)
     {
         $request = $this->requestStack->getCurrentRequest();
-        
+
         return $request->query->get('returnPathLabel', null) ?? $default;
     }
-    
+
     /**
-     * Return the return path if it exists, or generate the path if not.
-     * 
-     * @param string $name
-     * @param array $parameters
-     * @param bool $relative
-     * @return string
-     */
-    public function getReturnPathOr($name, $parameters = [], $relative = false)
-    {
-        $request = $this->requestStack->getCurrentRequest();
-        
-        if ($request->query->has('returnPath')) {
-            return $request->query->get('returnPath');
-        }
-        
-        return $this->originalExtension->getPath($name, $parameters, $relative);
-    }
-    
-    /**
-     * Build an url with a returnPath parameter to current page
-     * 
+     * Build an url with a returnPath parameter to current page.
+     *
      * @param string $name
      * @param array $parameters
      * @param bool $relative
+     * @param mixed|null $label
+     *
      * @return string
      */
     public function getPathAddReturnPath($name, $parameters = [], $relative = false, $label = null)
     {
         $request = $this->requestStack->getCurrentRequest();
-        
+
         $parameters['returnPath'] = $request->getRequestUri();
-        
+
         if ($label) {
             $parameters['returnPathLabel'] = $label;
         }
-        
+
         return $this->originalExtension->getPath($name, $parameters, $relative);
     }
-    
+
     /**
-     * Build an url with a returnPath parameter to current page
-     * 
+     * Build an url with a returnPath parameter to current page.
+     *
      * @param string $name
      * @param array $parameters
      * @param bool $relative
+     *
      * @return string
      */
     public function getPathForwardReturnPath($name, $parameters = [], $relative = false)
     {
         $request = $this->requestStack->getCurrentRequest();
-        
+
         if ($request->query->has('returnPath')) {
             $parameters['returnPath'] = $request->query->get('returnPath');
         }
-        
+
         return $this->originalExtension
             ->getPath(
-                $name, 
+                $name,
                 $parameters,
                 $relative
             );
     }
 
+    /**
+     * Return the return path if it exists, or generate the path if not.
+     *
+     * @param string $name
+     * @param array $parameters
+     * @param bool $relative
+     *
+     * @return string
+     */
+    public function getReturnPathOr($name, $parameters = [], $relative = false)
+    {
+        $request = $this->requestStack->getCurrentRequest();
+
+        if ($request->query->has('returnPath')) {
+            return $request->query->get('returnPath');
+        }
+
+        return $this->originalExtension->getPath($name, $parameters, $relative);
+    }
+
+    public function isUrlGenerationSafe(Node $argsNode)
+    {
+        return $this->originalExtension->isUrlGenerationSafe($argsNode);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
index c9b06a883..d82b2885a 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AbstractChillEntityRender.php
@@ -1,38 +1,25 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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\MainBundle\Templating\Entity;
 
 /**
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating\Entity;
+
 abstract class AbstractChillEntityRender implements ChillEntityRenderInterface
 {
-    protected function getDefaultOpeningBox($classSuffix): string
-    {
-        return '<section class="chill-entity entity-'.$classSuffix.'">';
-    }
-    
     protected function getDefaultClosingBox(): string
     {
         return '</section>';
     }
+
+    protected function getDefaultOpeningBox($classSuffix): string
+    {
+        return '<section class="chill-entity entity-' . $classSuffix . '">';
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
index 788fd43c1..264f11688 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -1,14 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
-use Symfony\Component\Templating\EngineInterface;
 use Chill\MainBundle\Entity\Address;
+use Symfony\Component\Templating\EngineInterface;
+use function array_merge;
+use function strtr;
 
 class AddressRender implements ChillEntityRenderInterface
 {
-    private EngineInterface $templating;
-
     public const DEFAULT_OPTIONS = [
         'with_valid_from' => false,
         'with_valid_to' => false,
@@ -16,57 +25,84 @@ class AddressRender implements ChillEntityRenderInterface
         'with_delimiter' => false,
         'has_no_address' => false,
         'multiline' => true,
-        'extended_infos' => false
+        'extended_infos' => false,
     ];
 
+    private EngineInterface $templating;
+
     public function __construct(EngineInterface $templating)
     {
         $this->templating = $templating;
     }
 
     /**
-     * {@inheritDoc}
+     * @param Address addr
+     * @param mixed $addr
      */
+    public function renderBox($addr, array $options): string
+    {
+        $options = array_merge(self::DEFAULT_OPTIONS, $options);
+
+        return $this->templating
+            ->render('@ChillMain/Entity/address.html.twig', [
+                'address' => $addr,
+                'streetLine' => $this->renderStreetLine($addr),
+                'render' => $options['render'] ?? 'bloc',
+                'options' => $options,
+            ]);
+    }
+
+    /**
+     * @param Address addr
+     * @param mixed $addr
+     */
+    public function renderString($addr, array $options): string
+    {
+        $lines = [];
+
+        $lines[0] = $this->renderStreetLine($addr);
+
+        if (!empty($addr->getPostcode())) {
+            $lines[1] = strtr('{postcode} {label}', [
+                '{postcode}' => $addr->getPostcode()->getCode(),
+                '{label}' => $addr->getPostcode()->getName(),
+            ]);
+        }
+
+        return implode(' - ', $lines);
+    }
+
     public function supports($entity, array $options): bool
     {
         return $entity instanceof Address;
     }
 
-    /**
-     * @param Address addr
-     */
-    public function renderString($addr, array $options): string
+    private function renderStreetLine($addr): string
     {
-        $lines = [];
         if (!empty($addr->getStreet())) {
-            $lines[0] = $addr->getStreet();
+            $street = $addr->getStreet();
+        } else {
+            $street = '';
         }
+
         if (!empty($addr->getStreetNumber())) {
-            $lines[0] .= ", ".$addr->getStreetNumber();
-        }
-        if (!empty($addr->getPostcode())) {
-            $lines[1] = \strtr("{postcode} {label}", [
-                '{postcode}' => $addr->getPostcode()->getCode(),
-                '{label}' => $addr->getPostcode()->getName()
-            ]);
+            $streetNumber = $addr->getStreetNumber();
+        } else {
+            $streetNumber = '';
         }
 
-        return implode(" - ", $lines);
-    }
+        $res = trim($street . ', ' . $streetNumber, ', ');
 
-    /**
-     * {@inheritDoc}
-     * @param Address addr
-     */
-    public function renderBox($addr, array $options): string
-    {
-        $options = \array_merge(self::DEFAULT_OPTIONS, $options);
+        if (null !== $addr->getPostCode()->getCountry()->getCountryCode()) {
+            if ($addr->getPostCode()->getCountry()->getCountryCode() === 'FR') {
+                $res = trim($streetNumber . ', ' . $street, ', ');
+            }
+        }
 
-        return $this->templating
-            ->render('@ChillMain/Entity/address.html.twig', [
-                'address' => $addr,
-                'render' => $options['render'] ?? 'bloc',
-                'options' => $options
-            ]);
+        if (',' === $res) {
+            $res = '';
+        }
+
+        return $res;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
index 8f8f58263..87a15955a 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRender.php
@@ -1,34 +1,25 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
 /**
- * Render an entity using `__toString()`
+ * Render an entity using `__toString()`.
  */
 class ChillEntityRender extends AbstractChillEntityRender
 {
     public function renderBox($entity, array $options): string
     {
-        return $this->getDefaultOpeningBox('default').$entity
-            .$this->getDefaultClosingBox();
+        return $this->getDefaultOpeningBox('default') . $entity
+            . $this->getDefaultClosingBox();
     }
 
     public function renderString($entity, array $options): string
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
index 32aa12d85..e1eae3884 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php
@@ -1,45 +1,34 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
 /**
- * Class ChillEntityRenderExtension
- *
- * @package Chill\MainBundle\Templating\Entity
+ * Class ChillEntityRenderExtension.
  */
 class ChillEntityRenderExtension extends AbstractExtension
 {
-    /**
-     * @var ChillEntityRenderInterface 
-     */
-    protected $renders = [];
-    
     /**
      * @var ChillEntityRender
      */
     protected $defaultRender;
-    
+
+    /**
+     * @var ChillEntityRenderInterface
+     */
+    protected $renders = [];
+
     /**
      * ChillEntityRenderExtension constructor.
      */
@@ -47,7 +36,12 @@ class ChillEntityRenderExtension extends AbstractExtension
     {
         $this->defaultRender = new ChillEntityRender();
     }
-    
+
+    public function addRender(ChillEntityRenderInterface $render)
+    {
+        $this->renders[] = $render;
+    }
+
     /**
      * @return array|TwigFilter[]
      */
@@ -55,54 +49,43 @@ class ChillEntityRenderExtension extends AbstractExtension
     {
         return [
             new TwigFilter('chill_entity_render_string', [$this, 'renderString'], [
-                'is_safe' => [ 'html' ]
+                'is_safe' => ['html'],
             ]),
             new TwigFilter('chill_entity_render_box', [$this, 'renderBox'], [
-                'is_safe' => [ 'html' ]
-            ])
+                'is_safe' => ['html'],
+            ]),
         ];
     }
-    
+
     /**
      * @param $entity
-     * @param array $options
-     * @return string
-     */
-    public function renderString($entity, array $options = []): string
-    {
-        if (NULL === $entity) {
-            return '';
-        }
-        return $this->getRender($entity, $options)
-            ->renderString($entity, $options);
-    }
-    
-    /**
-     * @param $entity
-     * @param array $options
-     * @return string
      */
     public function renderBox($entity, array $options = []): string
     {
-        if (NULL === $entity) {
+        if (null === $entity) {
             return '';
         }
+
         return $this->getRender($entity, $options)
             ->renderBox($entity, $options);
     }
-    
+
     /**
-     * @param ChillEntityRenderInterface $render
+     * @param $entity
      */
-    public function addRender(ChillEntityRenderInterface $render)
+    public function renderString($entity, array $options = []): string
     {
-        $this->renders[] = $render;
+        if (null === $entity) {
+            return '';
+        }
+
+        return $this->getRender($entity, $options)
+            ->renderString($entity, $options);
     }
-    
+
     /**
      * @param $entity
      * @param $options
-     * @return ChillEntityRenderInterface|null
      */
     protected function getRender($entity, $options): ?ChillEntityRenderInterface
     {
@@ -111,6 +94,7 @@ class ChillEntityRenderExtension extends AbstractExtension
                 return $render;
             }
         }
+
         return $this->defaultRender;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
index d43ac3e52..d55b8bfd7 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php
@@ -1,23 +1,14 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
 /**
@@ -27,40 +18,34 @@ namespace Chill\MainBundle\Templating\Entity;
 interface ChillEntityRenderInterface
 {
     /**
-     * Return true if the class support this object for the given options
-     * 
-     * @param type $entity
-     * @param array $options
-     * @return bool
-     */
-    public function supports($entity, array $options): bool;
-    
-    /**
-     * Return the entity as a string.
-     * 
-     * Example: returning the name of a person.
-     * 
-     * @param object $entity
-     * @param array $options
-     * @return string
-     */
-    public function renderString($entity, array $options): string;
-    
-    /**
-     * Return the entity in a box
-     * 
+     * Return the entity in a box.
+     *
      * Example: return a person inside a box:
-     * 
+     *
      * ```html
      * <span class="chill-entity">
      *  <span class="chill-entity__first-name">Roger</span>
      *  <span class="chill-entity__last-name">Dupont</span>
      * </span>
      * ```
-     * 
+     *
      * @param type $entity
-     * @param array $options
-     * @return string
      */
     public function renderBox($entity, array $options): string;
+
+    /**
+     * Return the entity as a string.
+     *
+     * Example: returning the name of a person.
+     *
+     * @param object $entity
+     */
+    public function renderString($entity, array $options): string;
+
+    /**
+     * Return true if the class support this object for the given options.
+     *
+     * @param type $entity
+     */
+    public function supports($entity, array $options): bool;
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
index 9ff0ca90c..a6285d26b 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
@@ -1,43 +1,33 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2020, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Symfony\Component\Templating\EngineInterface;
+use function array_merge;
 
 class CommentRender extends AbstractChillEntityRender
 {
     /**
-     * @var \Chill\MainBundle\Repository\UserRepository
-     */
-    private $userRepository;
-    
-    /**
-     * 
      * @var EngineInterface
      */
     private $engine;
 
+    /**
+     * @var \Chill\MainBundle\Repository\UserRepository
+     */
+    private $userRepository;
+
     public function __construct(
         UserRepository $userRepository,
         EngineInterface $engine
@@ -48,42 +38,36 @@ class CommentRender extends AbstractChillEntityRender
 
     /**
      * @param CommentEmbeddable $entity
-     * @param array $options
-     *
-     * @return string
      */
     public function renderBox($entity, array $options): string
     {
         // default options
-        $options = \array_merge([
-                'user' => [],
-                'disable_markdown' => false,
-                'limit_lines' => null,
-                'metadata' => true
-            ], $options);
-        
+        $options = array_merge([
+            'user' => [],
+            'disable_markdown' => false,
+            'limit_lines' => null,
+            'metadata' => true,
+        ], $options);
+
         if ($entity->getUserId()) {
             $user = $this->userRepository->find($entity->getUserId());
         }
-        
+
         return $this->engine
             ->render(
                 '@ChillMain/Entity/CommentEmbeddable.html.twig',
                 [
                     'opening_box' => $this->getDefaultOpeningBox('comment-embeddable'),
                     'closing_box' => $this->getDefaultClosingBox(),
-                    'user' => $user ?? NULL,
+                    'user' => $user ?? null,
                     'comment' => $entity,
-                    'options' => $options
+                    'options' => $options,
                 ]
             );
     }
 
     /**
      * @param CommentEmbeddable $entity
-     * @param array $options
-     *
-     * @return string
      */
     public function renderString($entity, array $options): string
     {
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/CompilerPass.php b/src/Bundle/ChillMainBundle/Templating/Entity/CompilerPass.php
index 7c25d2423..38f6284ca 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CompilerPass.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CompilerPass.php
@@ -1,39 +1,29 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Add service tagged with `chill.render_entity` to appropriate service
- *
+ * Add service tagged with `chill.render_entity` to appropriate service.
  */
 class CompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         $extension = $container->getDefinition(ChillEntityRenderExtension::class);
-        
+
         foreach ($container->findTaggedServiceIds('chill.render_entity') as $id => $tags) {
             $extension->addMethodCall('addRender', [new Reference($id)]);
         }
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
index 121b94ead..9247b8ffb 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -1,20 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Entity;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Component\Templating\EngineInterface;
+use function array_merge;
 
 class UserRender implements ChillEntityRenderInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
+    public const DEFAULT_OPTIONS = [
+        'main_scope' => true,
+        'user_job' => true,
+    ];
+
     private EngineInterface $engine;
 
-    const DEFAULT_OPTIONS = [
-        'main_scope' => true,
-        'user_job' => true
-    ];
+    private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
     {
@@ -22,45 +33,40 @@ class UserRender implements ChillEntityRenderInterface
         $this->engine = $engine;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function supports($entity, array $options): bool
+    public function renderBox($entity, array $options): string
     {
-        return $entity instanceof User;
+        $opts = array_merge(self::DEFAULT_OPTIONS, $options);
+
+        return $this->engine->render('@ChillMain/Entity/user.html.twig', [
+            'user' => $entity,
+            'opts' => $opts,
+        ]);
     }
 
     /**
-     * @inheritDoc
      * @param User $entity
      */
     public function renderString($entity, array $options): string
     {
-        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
+        $opts = array_merge(self::DEFAULT_OPTIONS, $options);
 
         $str = $entity->getLabel();
-        if (NULL !== $entity->getUserJob() && $opts['user_job']) {
-            $str .= ' ('.$this->translatableStringHelper
-                ->localize($entity->getUserJob()->getLabel()).')';
+
+        if (null !== $entity->getUserJob() && $opts['user_job']) {
+            $str .= ' (' . $this->translatableStringHelper
+                ->localize($entity->getUserJob()->getLabel()) . ')';
         }
-        if (NULL !== $entity->getMainScope() && $opts['main_scope']) {
-            $str .= ' ('.$this->translatableStringHelper
-                    ->localize($entity->getMainScope()->getName()).')';
+
+        if (null !== $entity->getMainScope() && $opts['main_scope']) {
+            $str .= ' (' . $this->translatableStringHelper
+                ->localize($entity->getMainScope()->getName()) . ')';
         }
 
         return $str;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function renderBox($entity, array $options): string
+    public function supports($entity, array $options): bool
     {
-        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
-
-        return $this->engine->render('@ChillMain/Entity/user.html.twig', [
-            'user' => $entity,
-            'opts' => $opts
-        ]);
+        return $entity instanceof User;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
index 6e554d1be..965c80fda 100644
--- a/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
+++ b/src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php
@@ -1,85 +1,75 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Events;
 
+use ArrayAccess;
+use RuntimeException;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * This event is transmitted on event chill_block.*
- * 
- * You may access to the context as an array : 
- * 
+ * This event is transmitted on event chill_block.*.
+ *
+ * You may access to the context as an array :
+ *
  * ```
  * $var = $event['context_key']
  * ```
- * 
- * The documentation for the bundle where the event is launched should give 
+ *
+ * The documentation for the bundle where the event is launched should give
  * you the context keys.
- * 
+ *
  * The keys are read-only: if you try to update the context using array access
  * (example, using `$event['context_key'] = $bar;`, an error will be thrown.
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class DelegatedBlockRenderingEvent extends Event implements \ArrayAccess
+class DelegatedBlockRenderingEvent extends Event implements ArrayAccess
 {
     /**
-     *
-     * @var mixed[]
-     */
-    protected $context;
-    
-    /**
-     * The returned content of the event
+     * The returned content of the event.
      *
      * @var string
      */
     protected $content = '';
-    
+
+    /**
+     * @var mixed[]
+     */
+    protected $context;
+
     public function __construct(array $context)
     {
         $this->context = $context;
     }
-    
+
     /**
      * add content to the event. This content will be printed in the
-     * layout which launched the event
-     * 
+     * layout which launched the event.
+     *
      * @param string $text
      */
     public function addContent($text)
     {
         $this->content .= $text;
     }
-    
+
     /**
-     * the content of the event
-     * 
+     * the content of the event.
+     *
      * @return string
      */
     public function getContent()
     {
         return $this->content;
     }
-    
+
     public function offsetExists($offset)
     {
         return isset($this->context[$offset]);
@@ -92,14 +82,13 @@ class DelegatedBlockRenderingEvent extends Event implements \ArrayAccess
 
     public function offsetSet($offset, $value)
     {
-        throw new \RuntimeException("The event context is read-only, you are not "
-                . "allowed to update it.");
+        throw new RuntimeException('The event context is read-only, you are not '
+                . 'allowed to update it.');
     }
 
     public function offsetUnset($offset)
     {
-        throw new \RuntimeException("The event context is read-only, you are not "
-                . "allowed to update it.");
+        throw new RuntimeException('The event context is read-only, you are not '
+                . 'allowed to update it.');
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index 0b9eb60bb..82b5f8295 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -1,18 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Listing;
 
 use Chill\MainBundle\Form\Type\Listing\FilterOrderType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
+use function array_merge;
+use function count;
 
 class FilterOrderHelper
 {
+    private array $checkboxes = [];
+
     private FormFactoryInterface $formFactory;
+
+    private ?string $formName = 'f';
+
+    private array $formOptions = [];
+
+    private string $formType = FilterOrderType::class;
+
     private RequestStack $requestStack;
+
     private ?array $searchBoxFields = null;
 
+    private ?array $submitted = null;
+
     public function __construct(
         FormFactoryInterface $formFactory,
         RequestStack $requestStack
@@ -21,6 +44,52 @@ class FilterOrderHelper
         $this->requestStack = $requestStack;
     }
 
+    public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = []): self
+    {
+        $missing = count($choices) - count($trans) - 1;
+        $this->checkboxes[$name] = [
+            'choices' => $choices, 'default' => $default,
+            'trans' => array_merge(
+                $trans,
+                0 < $missing ?
+                       array_fill(0, $missing, null) : []
+            ),
+        ];
+
+        return $this;
+    }
+
+    public function buildForm(): FormInterface
+    {
+        return $this->formFactory
+            ->createNamed($this->formName, $this->formType, $this->getDefaultData(), array_merge([
+                'helper' => $this,
+                'method' => 'GET',
+                'csrf_protection' => false,
+            ], $this->formOptions))
+            ->handleRequest($this->requestStack->getCurrentRequest());
+    }
+
+    public function getCheckboxData(string $name): array
+    {
+        return $this->getFormData()['checkboxes'][$name];
+    }
+
+    public function getCheckboxes(): array
+    {
+        return $this->checkboxes;
+    }
+
+    public function getQueryString(): ?string
+    {
+        return $this->getFormData()['q'];
+    }
+
+    public function hasSearchBox(): bool
+    {
+        return null !== $this->searchBoxFields;
+    }
+
     public function setSearchBox($searchBoxFields = null): self
     {
         $this->searchBoxFields = $searchBoxFields;
@@ -28,33 +97,28 @@ class FilterOrderHelper
         return $this;
     }
 
-    public function hasSearchBox(): bool
+    private function getDefaultData(): array
     {
-        return $this->searchBoxFields !== null;
+        $r = [];
+
+        if ($this->hasSearchBox()) {
+            $r['q'] = '';
+        }
+
+        foreach ($this->checkboxes as $name => $c) {
+            $r['checkboxes'][$name] = $c['default'];
+        }
+
+        return $r;
     }
 
     private function getFormData(): array
     {
-        return [
-            'q' => $this->getQueryString()
-        ];
-    }
+        if (null === $this->submitted) {
+            $this->submitted = $this->buildForm()
+                ->getData();
+        }
 
-    public function getQueryString(): ?string
-    {
-        $q = $this->requestStack->getCurrentRequest()
-            ->query->get('q', null);
-
-        return empty($q) ? NULL : $q;
-    }
-
-    public function buildForm($name = null, string $type = FilterOrderType::class, array $options = []): FormInterface
-    {
-        return $this->formFactory
-            ->createNamed($name, $type, $this->getFormData(), \array_merge([
-                'helper' => $this,
-                'method' => 'GET',
-                'csrf_protection' => false,
-            ], $options));
+        return $this->submitted;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
index ec0f6b60b..9e6cb813c 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Listing;
 
 use Symfony\Component\Form\FormFactoryInterface;
@@ -7,10 +16,14 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 class FilterOrderHelperBuilder
 {
-    private ?array $searchBoxFields = null;
+    private array $checkboxes = [];
+
     private FormFactoryInterface $formFactory;
+
     private RequestStack $requestStack;
 
+    private ?array $searchBoxFields = null;
+
     public function __construct(
         FormFactoryInterface $formFactory,
         RequestStack $requestStack
@@ -19,6 +32,13 @@ class FilterOrderHelperBuilder
         $this->requestStack = $requestStack;
     }
 
+    public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = []): self
+    {
+        $this->checkboxes[$name] = ['choices' => $choices, 'default' => $default, 'trans' => $trans];
+
+        return $this;
+    }
+
     public function addSearchBox(?array $fields = [], ?array $options = []): self
     {
         $this->searchBoxFields = $fields;
@@ -35,6 +55,14 @@ class FilterOrderHelperBuilder
 
         $helper->setSearchBox($this->searchBoxFields);
 
+        foreach ($this->checkboxes as $name => [
+            'choices' => $choices,
+            'default' => $default,
+            'trans' => $trans,
+        ]) {
+            $helper->addCheckbox($name, $choices, $default, $trans);
+        }
+
         return $helper;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
index 1b1c4c983..fd6b4622d 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
@@ -1,14 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Listing;
 
-use Symfony\Component\Form\FormFactoryBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 class FilterOrderHelperFactory implements FilterOrderHelperFactoryInterface
 {
     private FormFactoryInterface $formFactory;
+
     private RequestStack $requestStack;
 
     public function __construct(
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php
index a222adf7a..223e2d568 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Listing;
 
 interface FilterOrderHelperFactoryInterface
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php b/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
index 8fb168969..15e570009 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/Templating.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Listing;
 
 use Twig\Environment;
@@ -8,27 +17,25 @@ use Twig\TwigFilter;
 
 class Templating extends AbstractExtension
 {
-
-   public function getFilters()
-   {
-       return [
+    public function getFilters()
+    {
+        return [
             new TwigFilter('chill_render_filter_order_helper', [$this, 'renderFilterOrderHelper'], [
                 'needs_environment' => true, 'is_safe' => ['html'],
-            ])
-       ];
-   }
-
-   public function renderFilterOrderHelper(
-       Environment $environment,
-       FilterOrderHelper $helper,
-       ?string $template = '@ChillMain/FilterOrder/base.html.twig',
-       ?array $options = []
-   ) {
-       return $environment->render($template, [
-           'helper' => $helper,
-           'form' => $helper->buildForm()->createView(),
-           'options' => $options
-       ]);
-   }
+            ]),
+        ];
+    }
 
+    public function renderFilterOrderHelper(
+        Environment $environment,
+        FilterOrderHelper $helper,
+        ?string $template = '@ChillMain/FilterOrder/base.html.twig',
+        ?array $options = []
+    ) {
+        return $environment->render($template, [
+            'helper' => $helper,
+            'form' => $helper->buildForm()->createView(),
+            'options' => $options,
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
index 673b87dbe..88bb8f89d 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
@@ -1,92 +1,63 @@
 <?php
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating;
 
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
 
-/**
- * 
- * This helper helps to find the string in current locale from translatable_strings
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
- */
-class TranslatableStringHelper
+final class TranslatableStringHelper implements TranslatableStringHelperInterface
 {
-    /**
-     * 
-     * @var RequestStack
-     */
-    private $requestStack;
-    
-    private $fallbackLocales;
-    
-    public function __construct(RequestStack $requestStack, Translator $translator)
+    private string $defaultLocale;
+
+    private RequestStack $requestStack;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(RequestStack $requestStack, TranslatorInterface $translator, ParameterBagInterface $parameterBag)
     {
         $this->requestStack = $requestStack;
-        $this->fallbackLocales = $translator->getFallbackLocales();
+        $this->translator = $translator;
+        $this->defaultLocale = $parameterBag->get('kernel.default_locale');
     }
-    
-    /**
-     * return the string in current locale if it exists.
-     * 
-     * If it does not exists; return the name in the first language available.
-     * 
-     * Return a blank string if any strings are available.
-     * Return NULL if $translatableString is NULL
-     * 
-     * @param array $translatableStrings
-     * @return string
-     */
-    public function localize(array $translatableStrings)
-    {
-        if (NULL === $translatableStrings) {
-            return NULL;
-        }
-        
-        $language = $this->requestStack->getCurrentRequest()->getLocale();
-        
 
-        if (isset($translatableStrings[$language])) {
-            
-            return $translatableStrings[$language];
-        } else {
-            foreach ($this->fallbackLocales as $locale) {
-                if (array_key_exists($locale, $translatableStrings)) {
-                    
-                    return $translatableStrings[$locale];
-                }
-            }
-            
+    public function localize(array $translatableStrings): ?string
+    {
+        if ([] === $translatableStrings) {
+            return null;
         }
-        
+
+        $request = $this->requestStack->getCurrentRequest();
+
+        $language = null === $request ? $this->defaultLocale : $request->getLocale();
+
+        if (array_key_exists($language, $translatableStrings)) {
+            return $translatableStrings[$language];
+        }
+
+        foreach ($this->translator->getFallbackLocales() as $locale) {
+            if (array_key_exists($locale, $translatableStrings)) {
+                return $translatableStrings[$locale];
+            }
+        }
+
         // no fallback translation... trying the  first available
         $langs = array_keys($translatableStrings);
-        
-        if (count($langs) === 0) {
+
+        if ([] === $langs) {
             return '';
         }
-    
+
         return $translatableStrings[$langs[0]];
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php
new file mode 100644
index 000000000..0d7fe6d4c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating;
+
+interface TranslatableStringHelperInterface
+{
+    /**
+     * Return the string in current locale if it exists.
+     *
+     * If it does not exists; return the name in the first language available.
+     *
+     * Return a blank string if any strings are available.
+     */
+    public function localize(array $translatableStrings): ?string;
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
index e2d89e8d1..6f614f93d 100644
--- a/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
@@ -1,24 +1,14 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating;
 
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
@@ -28,42 +18,37 @@ use Twig\TwigFilter;
 class TranslatableStringTwig extends AbstractExtension
 {
     use ContainerAwareTrait;
-    
+
     /**
-     * @var TranslatableStringHelper $helper
+     * @var TranslatableStringHelper
      */
     private $helper;
-    
+
     /**
      * TranslatableStringTwig constructor.
-     *
-     * @param TranslatableStringHelper $translatableStringHelper
      */
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->helper = $translatableStringHelper;
     }
-    
-    /*
+
+    /**
      * Returns a list of filters to add to the existing list.
-     * 
+     *
      * (non-PHPdoc)
+     *
      * @see Twig_Extension::getFilters()
      */
     public function getFilters()
     {
-        return array(
+        return [
             new TwigFilter(
-                'localize_translatable_string', array($this, 'localize')));
+                'localize_translatable_string',
+                [$this, 'localize']
+            ), ];
     }
-    
-    public function localize(array $translatableStrings)
-    {
-        return $this->helper
-            ->localize($translatableStrings);
-    }
-    
-    /*
+
+    /**
      * Returns the name of the extension.
      *
      * @return The name of the extension.
@@ -73,4 +58,9 @@ class TranslatableStringTwig extends AbstractExtension
         return 'chill_main_localize';
     }
 
-}
\ No newline at end of file
+    public function localize(array $translatableStrings)
+    {
+        return $this->helper
+            ->localize($translatableStrings);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php b/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php
index 859cb673a..80dde8fa1 100644
--- a/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php
+++ b/src/Bundle/ChillMainBundle/Templating/UI/CountNotificationUser.php
@@ -1,51 +1,42 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Templating\UI;
-
-use Symfony\Component\Security\Core\User\UserInterface;
-use Chill\MainBundle\Entity\User;
 
 /**
- * Show a number of notification to user in the upper right corner
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating\UI;
+
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+/**
+ * Show a number of notification to user in the upper right corner.
  */
 class CountNotificationUser
 {
     /**
-     *
      * @var NotificationCounterInterface[]
      */
     protected $counters = [];
-    
+
     public function addNotificationCounter(NotificationCounterInterface $counter)
     {
         $this->counters[] = $counter;
     }
-    
+
     public function getSumNotification(UserInterface $u): int
     {
-        $sum = 0; 
-        
+        $sum = 0;
+
         foreach ($this->counters as $counter) {
             $sum += $counter->addNotification($u);
         }
-        
+
         return $sum;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php b/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php
index f0621b81a..528903cbf 100644
--- a/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/UI/NotificationCounterInterface.php
@@ -1,32 +1,22 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\UI;
 
 use Symfony\Component\Security\Core\User\UserInterface;
 
-/**
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 interface NotificationCounterInterface
 {
     /**
-     * Add a number of notification
+     * Add a number of notification.
      */
     public function addNotification(UserInterface $u): int;
 }
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php
index a768f0766..16f33057d 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Widget;
 
 use Twig\Environment;
@@ -7,4 +16,4 @@ use Twig\Environment;
 interface WidgetInterface
 {
     public function render(Environment $env, $place, array $context, array $config);
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
index 432d5a2ac..b8b751b81 100644
--- a/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+++ b/src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
@@ -1,163 +1,150 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Templating\Widget;
 
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Chill\MainBundle\Templating\Widget\WidgetInterface;
 use Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
+use function array_key_exists;
+use function ksort;
 
 /**
  * Add the function `chill_delegated_block`.
- * 
+ *
  * In a template, you can now allow rendering of a block from other bundle.
- *  
+ *
  *  The layout template must explicitly call the rendering of other block,
  *  with the twig function
- *  
+ *
  *  ```
  *  chill_delegated_block('block_name', { 'array' : 'with context' } )
  *  ```
- *  
+ *
  *  This will launch an event
  *  `Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent` with
  *  the event's name 'chill_block.block_name'.
- *  
+ *
  *  You may add content to the page using the function
  *  `DelegatedBlockRenderingEvent::addContent`.
- * 
- * See also the documentation of 
+ *
+ * See also the documentation of
  * `Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent`
  * for usage of this event class
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class WidgetRenderingTwig extends AbstractExtension
 {
-    
     /**
-     * Contains the widget. This is a double dimension array :
-     * 
-     * - first key is the place,
-     * - second key is the ordering ;
-     * - the value is an array where the widget is the first argument and the 
-     * second is the config
-     * 
-     * i.e :
-     * 
-     * $widget['place']['ordering'] = array($widget, $config);
-     * 
-     * 
-     * 
-     * @var array an array of widget by place and ordering
-     */
-    protected $widget = array();
-    
-    /**
-     *
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-    
+
+    /**
+     * Contains the widget. This is a double dimension array :.
+     *
+     * - first key is the place,
+     * - second key is the ordering ;
+     * - the value is an array where the widget is the first argument and the
+     * second is the config
+     *
+     * i.e :
+     *
+     * $widget['place']['ordering'] = array($widget, $config);
+     *
+     * @var array an array of widget by place and ordering
+     */
+    protected $widget = [];
+
     public function __construct(EventDispatcherInterface $eventDispatcher)
     {
         $this->eventDispatcher = $eventDispatcher;
     }
-    
-    
+
+    /**
+     * add a widget to this class, which become available for a future call.
+     *
+     * This function is used by DependencyInjection\CompilerPass\WidgetCompilerPass,
+     * which add the widget to this class when it is created by from DI, according
+     * to the given config under `chill_main`.
+     *
+     * @param string $place
+     * @param WidgetInterface $widget
+     * @param mixed $ordering
+     */
+    public function addWidget($place, $ordering, $widget, array $config = [])
+    {
+        $this->widget[$place][$ordering] = [$widget, $config];
+    }
+
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction(
+                'chill_delegated_block',
+                [$this, 'renderingWidget'],
+                [
+                    'is_safe' => ['html'],
+                    'needs_environment' => true,
+                    'deprecated' => true, 'alternative' => 'chill_widget',
+                ]
+            ),
+            new TwigFunction(
+                'chill_widget',
+                [$this, 'renderingWidget'],
+                ['is_safe' => ['html'], 'needs_environment' => true]
+            ),
+        ];
+    }
+
     public function getName()
     {
         return 'chill_main_widget';
     }
-    
-    public function getFunctions()
-    {
-        return array(
-            new TwigFunction('chill_delegated_block',
-                    array($this, 'renderingWidget'),
-                    array(
-                        'is_safe' => array('html'), 
-                        'needs_environment' => true,
-                        'deprecated' => true, 'alternative' => 'chill_widget'
-                        )),
-            new TwigFunction('chill_widget',
-                    array($this, 'renderingWidget'),
-                    array('is_safe' => array('html'), 'needs_environment' => true))
-        );
-    }
-    
-    public function renderingWidget(Environment $env, $block, array $context = array())
+
+    public function renderingWidget(Environment $env, $block, array $context = [])
     {
         // get the content of widgets
         $content = '';
+
         foreach ($this->getWidgetsArraysOrdered($block) as $a) {
-            /* @var $widget Widget\WidgetInterface */
+            /** @var Widget\WidgetInterface $widget */
             $widget = $a[0];
             $config = $a[1];
-            
+
             $content .= $widget->render($env, $block, $context, $config);
         }
-        
+
         // for old rendering events (deprecated)
         $event = new DelegatedBlockRenderingEvent($context);
-        
-        $this->eventDispatcher->dispatch('chill_block.'.$block, $event);
-        
-        return $content." ".$event->getContent();
+
+        $this->eventDispatcher->dispatch('chill_block.' . $block, $event);
+
+        return $content . ' ' . $event->getContent();
     }
-    
+
     /**
-     * add a widget to this class, which become available for a future call.
-     * 
-     * This function is used by DependencyInjection\CompilerPass\WidgetCompilerPass, 
-     * which add the widget to this class when it is created by from DI, according
-     * to the given config under `chill_main`.
-     * 
-     * @param string $place
-     * @param WidgetInterface $widget
-     * @param array $config
-     */
-    public function addWidget($place, $ordering, $widget, array $config = array())
-    {
-        $this->widget[$place][$ordering] = array($widget, $config);
-    }
-    
-    /**
-     * 
      * @param string $place
+     *
      * @return array
      */
     protected function getWidgetsArraysOrdered($place)
     {
         if (!array_key_exists($place, $this->widget)) {
-            $this->widget[$place] = array();
+            $this->widget[$place] = [];
         }
-        
-        \ksort($this->widget[$place]);
-        
+
+        ksort($this->widget[$place]);
+
         return $this->widget[$place];
     }
-    
-    
-
 }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
index d33a6f88d..f5b26b353 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -1,238 +1,260 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test\Export;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Traversable;
+use function call_user_func;
+use function count;
+use function is_array;
+use function is_callable;
+use function is_string;
 
 /**
  * Helper which creates a set of test for aggregators.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
  */
 abstract class AbstractAggregatorTest extends KernelTestCase
 {
     /**
-     * Create an aggregator instance which will be used in tests.
-     * 
-     * This method is always used after an eventuel `setUp` method.
-     * 
-     * @return \Chill\MainBundle\Export\AggregatorInterface
-     */
-    abstract public function getAggregator();
-    
-    /**
-     * Create possible combinaison of data (produced by the form).
-     * 
-     * This data will be used to generate data providers using this data.
-     * 
-     * This method is executed before the `setUp` method.
-     * 
-     * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
-     */
-    public abstract function getFormData();
-    
-    /**
-     * get an array of query builders that the aggregator will use.
-     * 
-     * Those query builders will be used to test aggregator behaviour on this
-     * query builder. 
-     * 
-     * This method is executed before the `setUp` method.
-     * 
-     * @return \Doctrine\DBAL\Query\QueryBuilder[]
-     */
-    public abstract function getQueryBuilders();
-    
-    /**
-     * prepare data for `testGetQueryKeys`
-     */
-    public function dataProviderGetQueryKeys()
-    {
-        foreach ($this->getFormData() as $data) {
-            yield array($data);
-        }
-    }
-    
-    /**
-     * prepare date for method `testGetResultsAndLabels`
-     */
-    public function dataProviderGetResultsAndLabels()
-    {
-        foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield array(clone $qb, $data);
-            }
-        }
-    }
-    
-    /**
-     * provide data for `testAlterQuery`
+     * provide data for `testAlterQuery`.
      */
     public function dataProviderAlterQuery()
     {
         foreach ($this->getQueryBuilders() as $qb) {
             foreach ($this->getFormData() as $data) {
-                yield array(clone $qb, $data);
+                yield [clone $qb, $data];
             }
         }
     }
-    
+
+    /**
+     * prepare data for `testGetQueryKeys`.
+     */
+    public function dataProviderGetQueryKeys()
+    {
+        foreach ($this->getFormData() as $data) {
+            yield [$data];
+        }
+    }
+
+    /**
+     * prepare date for method `testGetResultsAndLabels`.
+     */
+    public function dataProviderGetResultsAndLabels()
+    {
+        foreach ($this->getQueryBuilders() as $qb) {
+            foreach ($this->getFormData() as $data) {
+                yield [clone $qb, $data];
+            }
+        }
+    }
+
+    /**
+     * Create an aggregator instance which will be used in tests.
+     *
+     * This method is always used after an eventuel `setUp` method.
+     *
+     * @return \Chill\MainBundle\Export\AggregatorInterface
+     */
+    abstract public function getAggregator();
+
+    /**
+     * Create possible combinaison of data (produced by the form).
+     *
+     * This data will be used to generate data providers using this data.
+     *
+     * This method is executed before the `setUp` method.
+     *
+     * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
+     */
+    abstract public function getFormData();
+
+    /**
+     * get an array of query builders that the aggregator will use.
+     *
+     * Those query builders will be used to test aggregator behaviour on this
+     * query builder.
+     *
+     * This method is executed before the `setUp` method.
+     *
+     * @return \Doctrine\DBAL\Query\QueryBuilder[]
+     */
+    abstract public function getQueryBuilders();
+
+    /**
+     * test the alteration of query by the filter.
+     *
+     * @dataProvider dataProviderAlterQuery
+     *
+     * @param type $data
+     */
+    public function testAlterQuery(QueryBuilder $query, $data)
+    {
+        // retains informations about query
+        $nbOfFrom = $query->getDQLPart('from') !== null ?
+            count($query->getDQLPart('from')) : 0;
+        $nbOfWhere = $query->getDQLPart('where') !== null ?
+            $query->getDQLPart('where')->count() : 0;
+        $nbOfSelect = $query->getDQLPart('select') !== null ?
+            count($query->getDQLPart('select')) : 0;
+
+        $this->getAggregator()->alterQuery($query, $data);
+
+        $this->assertGreaterThanOrEqual(
+            $nbOfFrom,
+            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
+            "Test that there are equal or more 'from' clause after that the filter has
+                altered the query"
+        );
+        $this->assertGreaterThanOrEqual(
+            $nbOfWhere,
+            $query->getDQLPart('where') !== null ? $query->getDQLPart('where')->count() : 0,
+            "Test that there are equal or more 'where' clause after that the filter has"
+            . 'altered the query'
+        );
+        $this->assertGreaterThanOrEqual(
+            $nbOfSelect,
+            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
+            "Test that the filter has no altered the 'select' part of the query"
+        );
+    }
+
     /**
      * Test the `applyOn` method.
      */
     public function testApplyOn()
     {
         $filter = $this->getAggregator();
-        
-        $this->assertInternalType('string', $filter->applyOn(),
-            "test that the internal type of \"applyOn\" is a string");
-        $this->assertNotEmpty($filter->applyOn(),
-            "test that the \"applyOn\" method return a non-empty string");
+
+        $this->assertInternalType(
+            'string',
+            $filter->applyOn(),
+            'test that the internal type of "applyOn" is a string'
+        );
+        $this->assertNotEmpty(
+            $filter->applyOn(),
+            'test that the "applyOn" method return a non-empty string'
+        );
     }
-    
+
     /**
-     * test the `getTitle` method
-     */
-    public function testGetTitle()
-    {
-        $title = $this->getAggregator()->getTitle();
-        
-        $this->assertInternalType('string', $title);
-        $this->assertNotEmpty($title,
-            "test that the title is not empty");
-    }
-    
-    /**
-     * Test that the query keys are strings
-     * 
-     * @param array $data
+     * Test that the query keys are strings.
+     *
      * @dataProvider dataProviderGetQueryKeys
      */
     public function testGetQueryKeys(array $data)
     {
         $queryKeys = $this->getAggregator()->getQueryKeys($data);
-        
-        $this->assertInternalType('array', $queryKeys,
-            "test that the query keys returned are an array");
-        $this->assertContainsOnly("string", $queryKeys,
-            "test that the query keys returned by `getQueryKeys` are only strings");
-        $this->assertGreaterThanOrEqual(1, count($queryKeys),
-            "test that there are at least one query key returned");
+
+        $this->assertInternalType(
+            'array',
+            $queryKeys,
+            'test that the query keys returned are an array'
+        );
+        $this->assertContainsOnly(
+            'string',
+            $queryKeys,
+            'test that the query keys returned by `getQueryKeys` are only strings'
+        );
+        $this->assertGreaterThanOrEqual(
+            1,
+            count($queryKeys),
+            'test that there are at least one query key returned'
+        );
     }
-    
+
     /**
-     * 
-     * Test that 
-     * 
+     * Test that.
+     *
      * - the results have a correct form (are arrays or traversable)
      * - each key in a row are present in getQueryKeys ;
      * - each returned object of the `getLabels` method is callable
      * - each result can be converted to string using this callable
      * - each of this callable can provide a string for '_header'
-     * 
-     * @param QueryBuilder $qb
-     * @param array $data
-     * 
+     *
      * @dataProvider dataProviderGetResultsAndLabels
      */
     public function testGetResultsAndLabels(QueryBuilder $qb, array $data)
     {
         // it is more convenient to  group the `getResult` and `getLabels` test
         // due to the fact that testing both methods use the same tools.
-        
+
         // limit the result for the query for performance reason
         $qb->setMaxResults(1);
-        
+
         $queryKeys = $this->getAggregator()->getQueryKeys($data);
         $this->getAggregator()->alterQuery($qb, $data);
-        
+
         $results = $qb->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY);
-        
+
         if (count($results) === 0) {
-            $this->markTestIncomplete("The result is empty. We cannot process tests "
-                . "on results");
+            $this->markTestIncomplete('The result is empty. We cannot process tests '
+                . 'on results');
         }
-        
+
         // testing the result
         $result = $results[0];
-        
-        $this->assertTrue( $result instanceof \Traversable || is_array($result),
-            "test that each row in the result is traversable or an array");
-        
+
+        $this->assertTrue(
+            $result instanceof Traversable || is_array($result),
+            'test that each row in the result is traversable or an array'
+        );
+
         foreach ($queryKeys as $key) {
-            $this->assertContains($key, array_keys($result),
-                "test that each key is present in `getQueryKeys`");
-            
-            $closure = $this->getAggregator()->getLabels($key, array($result[$key]), $data);
-            
-            $this->assertTrue(is_callable($closure, false),
-                "test that the `getLabels` for key is a callable");
-            $this->assertTrue(is_string((string) call_user_func($closure, $result[$key])),
-                sprintf("test that the callable return by `getLabels` for key %s "
-                    . "is a string or an be converted to a string", $key));
-            
+            $this->assertContains(
+                $key,
+                array_keys($result),
+                'test that each key is present in `getQueryKeys`'
+            );
+
+            $closure = $this->getAggregator()->getLabels($key, [$result[$key]], $data);
+
+            $this->assertTrue(
+                is_callable($closure, false),
+                'test that the `getLabels` for key is a callable'
+            );
+            $this->assertTrue(
+                is_string((string) call_user_func($closure, $result[$key])),
+                sprintf('test that the callable return by `getLabels` for key %s '
+                    . 'is a string or an be converted to a string', $key)
+            );
+
             $this->assertTrue(
                 // conditions
                 is_string((string) call_user_func($closure, '_header'))
                 && !empty(call_user_func($closure, '_header'))
                 && call_user_func($closure, '_header') !== '_header',
                 // message
-                sprintf("Test that the callable return by `getLabels` for key %s "
-                . "can provide an header", $key)
-                );
+                sprintf('Test that the callable return by `getLabels` for key %s '
+                . 'can provide an header', $key)
+            );
         }
     }
-    
+
     /**
-     * test the alteration of query by the filter
-     * 
-     * @dataProvider dataProviderAlterQuery
-     * @param QueryBuilder $query
-     * @param type $data
+     * test the `getTitle` method.
      */
-    public function testAlterQuery(QueryBuilder $query, $data)
+    public function testGetTitle()
     {
-        // retains informations about query
-        $nbOfFrom   = $query->getDQLPart('from') !== null ? 
-            count($query->getDQLPart('from')) : 0;
-        $nbOfWhere  = $query->getDQLPart('where') !== null ? 
-            $query->getDQLPart('where')->count() : 0;
-        $nbOfSelect = $query->getDQLPart('select') !== null ?
-            count($query->getDQLPart('select')) : 0;
-        
-        $this->getAggregator()->alterQuery($query, $data);
-        
-        $this->assertGreaterThanOrEqual(
-            $nbOfFrom, 
-            $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
-            "Test that there are equal or more 'from' clause after that the filter has 
-                altered the query");
-        $this->assertGreaterThanOrEqual(
-            $nbOfWhere, 
-            $query->getDQLPart('where') !== null ? $query->getDQLPart('where')->count() : 0,
-            "Test that there are equal or more 'where' clause after that the filter has"
-            . "altered the query");
-        $this->assertGreaterThanOrEqual(
-            $nbOfSelect, 
-            $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
-            "Test that the filter has no altered the 'select' part of the query");
-        
+        $title = $this->getAggregator()->getTitle();
+
+        $this->assertInternalType('string', $title);
+        $this->assertNotEmpty(
+            $title,
+            'test that the title is not empty'
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
index fcf82fca9..99e9779f1 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php
@@ -1,28 +1,29 @@
 <?php
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test\Export;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\NativeQuery;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Test\PrepareClientTrait;
+use Doctrine\ORM\NativeQuery;
+use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Role\Role;
+use Traversable;
+use function call_user_func;
+use function count;
+use function is_array;
+use function is_callable;
+use function is_string;
 
 /**
  * This class provide a set of tests for exports.
@@ -30,41 +31,35 @@ use Symfony\Component\HttpFoundation\Request;
  * The tests provided by this class will check basic things, like
  * the type of value are conform to the expected, etc.
  *
- * @author julien.fastre@champs-libres.coop
+ * @internal
  */
 abstract class AbstractExportTest extends WebTestCase
 {
-
     use PrepareClientTrait;
 
+    public function dataProviderGetQueryKeys()
+    {
+        foreach ($this->getFormData() as $data) {
+            yield [$data];
+        }
+    }
 
     /**
-     * Create an instance of the report to test
-     *
-     * @return \Chill\MainBundle\Export\ExportInterface an instance of the export to test
+     * create data for `ìnitiateQuery` method.
      */
-    public abstract function getExport();
+    public function dataProviderInitiateQuery()
+    {
+        $acl = $this->getAcl();
+
+        foreach ($this->getModifiersCombination() as $modifiers) {
+            foreach ($this->getFormData() as $data) {
+                yield [$modifiers, $acl, $data];
+            }
+        }
+    }
 
     /**
-     * Create possible combinaison of data (produced by the form).
-     *
-     * This data will be used to generate data providers using this data.
-     *
-     * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
-     */
-    public abstract function getFormData();
-
-    /**
-     * get the possible modifiers which could apply in combination to this
-     * export.
-     * .
-     *
-     * @return array of string[] an array which contains an array of possible modifiers. Example : `array( array('modifier_1', 'modifier_2'), array('modifier_1'), ...)`
-     */
-    abstract public function getModifiersCombination();
-
-    /**
-     * Return an array usable as ACL
+     * Return an array usable as ACL.
      *
      * If this method is overridden, the returned result must be an array
      * with this form :
@@ -77,11 +72,10 @@ abstract class AbstractExportTest extends WebTestCase
      *     )
      * );
      * ```
-     *
      */
     public function getACL()
     {
-        if (static::$kernel === null) {
+        if (null === static::$kernel) {
             static::bootKernel();
         }
 
@@ -94,169 +88,103 @@ abstract class AbstractExportTest extends WebTestCase
             ->findAll();
 
         if (count($centers) === 0) {
-            throw new \RuntimeException("No center found. Did you forget to "
-                . "run `doctrine:fixtures:load` command before ?");
-        }
-        if (count($circles) === 0) {
-            throw new \RuntimeException("No circle found. Did you forget to "
-                . "run `doctrine:fixtures:load` command before ?");
+            throw new RuntimeException('No center found. Did you forget to '
+                . 'run `doctrine:fixtures:load` command before ?');
         }
 
-        return array([
+        if (count($circles) === 0) {
+            throw new RuntimeException('No circle found. Did you forget to '
+                . 'run `doctrine:fixtures:load` command before ?');
+        }
+
+        return [[
             'center' => $centers[0],
             'circles' => [
-                $circles
-            ]]);
-    }
-
-    /**
-     * Test that the getType method return a string
-     */
-    public function testGetType()
-    {
-        $export = $this->getExport();
-
-        $this->assertInternalType('string', $export->getType(),
-            "Assert that the `getType` method return a string");
-        $this->assertNotEmpty($export->getType(), "Assert that the `getType` method"
-            . " does not return an empty string.");
-    }
-
-    /**
-     * Test that the description is not empty
-     */
-    public function testGetDescription()
-    {
-        $export = $this->getExport();
-
-        $this->assertInternalType('string', $export->getDescription(),
-            "Assert that the `getDescription` method return a string");
-        $this->assertNotEmpty($export->getDescription(),
-            "Assert that the `getDescription` method does not return an empty "
-            . "string.");
-    }
-
-    /**
-     * create data for `ìnitiateQuery` method
-     */
-    public function dataProviderInitiateQuery()
-    {
-        $acl = $this->getAcl();
-
-        foreach($this->getModifiersCombination() as $modifiers) {
-
-            foreach($this->getFormData() as $data) {
-
-                yield array($modifiers, $acl, $data);
-            }
-        }
-    }
-
-    public function dataProviderGetQueryKeys()
-    {
-        foreach($this->getFormData() as $data) {
-            yield array($data);
-        }
+                $circles,
+            ], ]];
     }
 
     /**
+     * Create an instance of the report to test.
      *
-     * test that the query returned is a QueryBuilder or a NativeQuery.
-     *
-     * If the query is a QueryBuilder, test that select and from is not empty.
-     *
-     * If the query is a native sql, test the query is not empty (length is
-     * > 0).
-     *
-     * @dataProvider dataProviderInitiateQuery
+     * @return \Chill\MainBundle\Export\ExportInterface an instance of the export to test
      */
-    public function testInitiateQuery($modifiers, $acl, $data)
-    {
-        $query = $this->getExport()->initiateQuery($modifiers, $acl, $data);
-
-        $this->assertTrue($query instanceof QueryBuilder || $query instanceof NativeQuery,
-            sprintf("Assert that the returned query is an instance of %s or %s",
-                QueryBuilder::class, Query::class));
-
-        if ($query instanceof QueryBuilder) {
-
-            $this->assertGreaterThanOrEqual(1, count($query->getDQLPart('select')),
-                "assert there is at least one 'select' part");
-
-            $this->assertGreaterThanOrEqual(1, count($query->getDQLPart('from')),
-                "assert there is at least one 'from' part");
-
-        } elseif ($query instanceof NativeQuery) {
-            $this->assertNotEmpty($query->getSQL(),
-                "check that the SQL query is not empty");
-        }
-    }
+    abstract public function getExport();
 
     /**
-     * Test that supportsModifier return :
+     * Create possible combinaison of data (produced by the form).
      *
-     * - an array of string, if the query is a QueryBuilder ;
-     * - nothing, if the query is a native SQL
+     * This data will be used to generate data providers using this data.
      *
-     * @dataProvider dataProviderInitiateQuery
+     * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
      */
-    public function testSupportsModifier($modifiers, $acl, $data)
-    {
-        $export = $this->getExport();
-        $query = $export->initiateQuery($modifiers, $acl, $data);
-
-        if ($query instanceof QueryBuilder) {
-            $this->assertContainsOnly('string', $export->supportsModifiers(),
-                "Test that the `supportsModifiers` method returns only strings");
-        } elseif ($query instanceof NativeQuery) {
-            $this->assertTrue($export->supportsModifiers() === null ||
-                count($export->supportsModifiers()) === 0,
-                "Test that the `supportsModifier` methods returns null or an empty array");
-        }
-    }
+    abstract public function getFormData();
 
     /**
-     * Test required role is an instance of Role
+     * get the possible modifiers which could apply in combination to this
+     * export.
+     * .
+     *
+     * @return array of string[] an array which contains an array of possible modifiers. Example : `array( array('modifier_1', 'modifier_2'), array('modifier_1'), ...)`
      */
-    public function testRequiredRole()
-    {
-        $role = $this->getExport()->requiredRole();
-
-        $this->assertInstanceOf(Role::class, $role,
-            sprintf("test that the returned value of `requiredRole` is an instance "
-            . "of %s", Role::class));
-    }
+    abstract public function getModifiersCombination();
 
     /**
-     * Test the formatters type are string
+     * Test the formatters type are string.
      */
     public function testGetAllowedFormattersType()
     {
         $formattersTypes = $this->getExport()->getAllowedFormattersTypes();
 
-        $this->assertContainsOnly("string", $formattersTypes,
-            "Test that the method `getAllowedFormattersTypes` returns an array of string");
+        $this->assertContainsOnly(
+            'string',
+            $formattersTypes,
+            'Test that the method `getAllowedFormattersTypes` returns an array of string'
+        );
     }
 
     /**
-     * Test that the query keys are strings
+     * Test that the description is not empty.
+     */
+    public function testGetDescription()
+    {
+        $export = $this->getExport();
+
+        $this->assertInternalType(
+            'string',
+            $export->getDescription(),
+            'Assert that the `getDescription` method return a string'
+        );
+        $this->assertNotEmpty(
+            $export->getDescription(),
+            'Assert that the `getDescription` method does not return an empty '
+            . 'string.'
+        );
+    }
+
+    /**
+     * Test that the query keys are strings.
      *
-     * @param array $data
      * @dataProvider dataProviderGetQueryKeys
      */
     public function testGetQueryKeys(array $data)
     {
         $queryKeys = $this->getExport()->getQueryKeys($data);
 
-        $this->assertContainsOnly("string", $queryKeys,
-            "test that the query keys returned by `getQueryKeys` are only strings");
-        $this->assertGreaterThanOrEqual(1, count($queryKeys),
-            "test that there are at least one query key returned");
+        $this->assertContainsOnly(
+            'string',
+            $queryKeys,
+            'test that the query keys returned by `getQueryKeys` are only strings'
+        );
+        $this->assertGreaterThanOrEqual(
+            1,
+            count($queryKeys),
+            'test that there are at least one query key returned'
+        );
     }
 
     /**
-     *
-     * Test that
+     * Test that.
      *
      * - the results have a correct form (are arrays or traversable)
      * - each key in a row are present in getQueryKeys ;
@@ -266,7 +194,6 @@ abstract class AbstractExportTest extends WebTestCase
      *
      * @param string[] $modifiers
      * @param array $acl
-     * @param array $data
      *
      * @dataProvider dataProviderInitiateQuery
      */
@@ -276,7 +203,7 @@ abstract class AbstractExportTest extends WebTestCase
         // due to the fact that testing both methods use the same tools.
 
         $queryKeys = $this->getExport()->getQueryKeys($data);
-        $query     = $this->getExport()->initiateQuery($modifiers, $acl, $data);
+        $query = $this->getExport()->initiateQuery($modifiers, $acl, $data);
 
         // limit the result for the query for performance reason (only for QueryBuilder,
         // not possible in NativeQuery)
@@ -284,33 +211,45 @@ abstract class AbstractExportTest extends WebTestCase
             $query->setMaxResults(1);
         }
 
-        $results   = $this->getExport()->getResult($query, $data);
+        $results = $this->getExport()->getResult($query, $data);
 
-        $this->assertInternalType('array', $results,
-            "assert that the returned result is an array");
+        $this->assertInternalType(
+            'array',
+            $results,
+            'assert that the returned result is an array'
+        );
 
         if (count($results) === 0) {
-            $this->markTestIncomplete("The result is empty. We cannot process tests "
-                . "on results");
+            $this->markTestIncomplete('The result is empty. We cannot process tests '
+                . 'on results');
         }
 
         // testing the result
         $result = $results[0];
 
-        $this->assertTrue( $result instanceof \Traversable || is_array($result),
-            "test that each row in the result is traversable or an array");
+        $this->assertTrue(
+            $result instanceof Traversable || is_array($result),
+            'test that each row in the result is traversable or an array'
+        );
 
         foreach ($result as $key => $value) {
-            $this->assertContains($key, $queryKeys,
-                "test that each key is present in `getQueryKeys`");
+            $this->assertContains(
+                $key,
+                $queryKeys,
+                'test that each key is present in `getQueryKeys`'
+            );
 
-            $closure = $this->getExport()->getLabels($key, array($value), $data);
+            $closure = $this->getExport()->getLabels($key, [$value], $data);
 
-            $this->assertTrue(is_callable($closure, false),
-                "test that the `getLabels` for key is a callable");
-            $this->assertTrue(is_string((string) call_user_func($closure, $value)),
-                sprintf("test that the callable return by `getLabels` for key %s "
-                    . "is a string or an be converted to a string", $key));
+            $this->assertTrue(
+                is_callable($closure, false),
+                'test that the `getLabels` for key is a callable'
+            );
+            $this->assertTrue(
+                is_string((string) call_user_func($closure, $value)),
+                sprintf('test that the callable return by `getLabels` for key %s '
+                    . 'is a string or an be converted to a string', $key)
+            );
 
             $this->assertTrue(
                 // conditions
@@ -318,24 +257,85 @@ abstract class AbstractExportTest extends WebTestCase
                 && !empty(call_user_func($closure, '_header'))
                 && call_user_func($closure, '_header') !== '_header',
                 // message
-                sprintf("Test that the callable return by `getLabels` for key %s "
-                . "can provide an header", $key)
-                );
+                sprintf('Test that the callable return by `getLabels` for key %s '
+                . 'can provide an header', $key)
+            );
         }
-
     }
 
+    /**
+     * Test that the getType method return a string.
+     */
+    public function testGetType()
+    {
+        $export = $this->getExport();
+
+        $this->assertInternalType(
+            'string',
+            $export->getType(),
+            'Assert that the `getType` method return a string'
+        );
+        $this->assertNotEmpty($export->getType(), 'Assert that the `getType` method'
+            . ' does not return an empty string.');
+    }
+
+    /**
+     * test that the query returned is a QueryBuilder or a NativeQuery.
+     *
+     * If the query is a QueryBuilder, test that select and from is not empty.
+     *
+     * If the query is a native sql, test the query is not empty (length is
+     * > 0).
+     *
+     * @dataProvider dataProviderInitiateQuery
+     *
+     * @param mixed $modifiers
+     * @param mixed $acl
+     * @param mixed $data
+     */
+    public function testInitiateQuery($modifiers, $acl, $data)
+    {
+        $query = $this->getExport()->initiateQuery($modifiers, $acl, $data);
+
+        $this->assertTrue(
+            $query instanceof QueryBuilder || $query instanceof NativeQuery,
+            sprintf(
+                'Assert that the returned query is an instance of %s or %s',
+                QueryBuilder::class,
+                Query::class
+            )
+        );
+
+        if ($query instanceof QueryBuilder) {
+            $this->assertGreaterThanOrEqual(
+                1,
+                count($query->getDQLPart('select')),
+                "assert there is at least one 'select' part"
+            );
+
+            $this->assertGreaterThanOrEqual(
+                1,
+                count($query->getDQLPart('from')),
+                "assert there is at least one 'from' part"
+            );
+        } elseif ($query instanceof NativeQuery) {
+            $this->assertNotEmpty(
+                $query->getSQL(),
+                'check that the SQL query is not empty'
+            );
+        }
+    }
 
     /**
      * Test that the translated title of the export is present the list,
-     * and that the list of exports (under `/fr/exports/`) is still successfull
+     * and that the list of exports (under `/fr/exports/`) is still successfull.
      */
     public function testListExportPage()
     {
-        /* @var $client \Symfony\Component\BrowserKit\Client */
+        /** @var \Symfony\Component\BrowserKit\Client $client */
         $client = $this->getClient();
         $export = $this->getExport();
-        $prophet= new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $container = static::$kernel->getContainer();
 
         // store the locale in a request
@@ -343,16 +343,68 @@ abstract class AbstractExportTest extends WebTestCase
         $request->setLocale('fr');
         $container->get('request_stack')->push($request);
         // translate the title
-        $title  = $container->get('translator')->trans($export->getTitle());
+        $title = $container->get('translator')->trans($export->getTitle());
 
         // performs the request to /fr/exports
         $crawler = $client->request('GET', '/fr/exports/');
 
         // and finally make tests
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-            "test that the response of /fr/exports/ is successful");
-        $this->assertContains($title, $crawler->text(),
-            "test that the page /fr/exports/ contains the title of the "
-            . "exports ('$title')");
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'test that the response of /fr/exports/ is successful'
+        );
+        $this->assertContains(
+            $title,
+            $crawler->text(),
+            'test that the page /fr/exports/ contains the title of the '
+            . "exports ('{$title}')"
+        );
+    }
+
+    /**
+     * Test required role is an instance of Role.
+     */
+    public function testRequiredRole()
+    {
+        $role = $this->getExport()->requiredRole();
+
+        $this->assertInstanceOf(
+            Role::class,
+            $role,
+            sprintf('test that the returned value of `requiredRole` is an instance '
+            . 'of %s', Role::class)
+        );
+    }
+
+    /**
+     * Test that supportsModifier return :.
+     *
+     * - an array of string, if the query is a QueryBuilder ;
+     * - nothing, if the query is a native SQL
+     *
+     * @dataProvider dataProviderInitiateQuery
+     *
+     * @param mixed $modifiers
+     * @param mixed $acl
+     * @param mixed $data
+     */
+    public function testSupportsModifier($modifiers, $acl, $data)
+    {
+        $export = $this->getExport();
+        $query = $export->initiateQuery($modifiers, $acl, $data);
+
+        if ($query instanceof QueryBuilder) {
+            $this->assertContainsOnly(
+                'string',
+                $export->supportsModifiers(),
+                'Test that the `supportsModifiers` method returns only strings'
+            );
+        } elseif ($query instanceof NativeQuery) {
+            $this->assertTrue(
+                $export->supportsModifiers() === null
+                || count($export->supportsModifiers()) === 0,
+                'Test that the `supportsModifier` methods returns null or an empty array'
+            );
+        }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
index 7721b9212..78cf0083a 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -1,190 +1,199 @@
 <?php
-/*
- * Copyright (C) 2016 Champs Libres Cooperative <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\MainBundle\Test\Export;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
- *  Helper to test filters
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Test\Export;
+
+use Doctrine\ORM\QueryBuilder;
+use Exception;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use function count;
+use function get_class;
+use function is_array;
+use function is_string;
+
+/**
+ *  Helper to test filters.
+ *
+ * @internal
  */
 abstract class AbstractFilterTest extends KernelTestCase
 {
     /**
-     *
      * @var \Prophecy\Prophet
      */
     protected $prophet;
-    
-    /**
-     * Create a filter which will be used in tests.
-     * 
-     * This method is always used after an eventuel `setUp` method.
-     * 
-     * @return \Chill\MainBundle\Export\FilterInterface
-     */
-    abstract public function getFilter();
-    
-    /**
-     * Create possible combinaison of data (produced by the form).
-     * 
-     * This data will be used to generate data providers using this data.
-     * 
-     * As all data providers, this method is executed **before** calling
-     * the `setUp` method.
-     * 
-     * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
-     */
-    public abstract function getFormData();
-    
-    /**
-     * Return an array with different minimal query builders
-     * 
-     * As all data providers, this method is executed **before** calling
-     * the `setUp` method.
-     * 
-     * @return QueryBuilder[] an array of query builder
-     */
-    public abstract function getQueryBuilders();
-    
-    public function dataProviderAlterQuery()
-    {
-        foreach ($this->getQueryBuilders() as $qb) {
-            foreach ($this->getFormData() as $data) {
-                yield  array($qb, $data);
-            }
-        }
-    }
-    
-    public function dataProviderDescriptionAction()
-    {
-        foreach ($this->getFormData() as $data) {
-            yield array($data);
-        }
-    }
-    
+
     public function setUp()
     {
         $this->prepareProphet();
     }
-    
-    
-    public function testApplyOn()
+
+    public function dataProviderAlterQuery()
     {
-        $filter = $this->getFilter();
-        
-        $this->assertInternalType('string', $filter->applyOn());
+        foreach ($this->getQueryBuilders() as $qb) {
+            foreach ($this->getFormData() as $data) {
+                yield [$qb, $data];
+            }
+        }
     }
-    
+
+    public function dataProviderDescriptionAction()
+    {
+        foreach ($this->getFormData() as $data) {
+            yield [$data];
+        }
+    }
+
     /**
-     * test the alteration of query by the filter
-     * 
+     * Create a filter which will be used in tests.
+     *
+     * This method is always used after an eventuel `setUp` method.
+     *
+     * @return \Chill\MainBundle\Export\FilterInterface
+     */
+    abstract public function getFilter();
+
+    /**
+     * Create possible combinaison of data (produced by the form).
+     *
+     * This data will be used to generate data providers using this data.
+     *
+     * As all data providers, this method is executed **before** calling
+     * the `setUp` method.
+     *
+     * @return array an array of data. Example : `array( array(), array('fields' => array(1,2,3), ...)` where an empty array and `array(1,2,3)` are possible values
+     */
+    abstract public function getFormData();
+
+    /**
+     * Return an array with different minimal query builders.
+     *
+     * As all data providers, this method is executed **before** calling
+     * the `setUp` method.
+     *
+     * @return QueryBuilder[] an array of query builder
+     */
+    abstract public function getQueryBuilders();
+
+    /**
+     * test the alteration of query by the filter.
+     *
      * @dataProvider dataProviderAlterQuery
-     * @param QueryBuilder $query
+     *
      * @param type $data
      */
     public function testAlterQuery(QueryBuilder $query, $data)
     {
         // retains informations about query
-        $nbOfFrom   = $query->getDQLPart('from') !== null ? 
+        $nbOfFrom = $query->getDQLPart('from') !== null ?
             count($query->getDQLPart('from')) : 0;
-        $nbOfWhere  = $query->getDQLPart('where') !== null ? 
+        $nbOfWhere = $query->getDQLPart('where') !== null ?
             $query->getDQLPart('where')->count() : 0;
         $nbOfSelect = $query->getDQLPart('select') !== null ?
             count($query->getDQLPart('select')) : 0;
-        
+
         $this->getFilter()->alterQuery($query, $data);
-        
+
         $this->assertGreaterThanOrEqual(
-            $nbOfFrom, 
+            $nbOfFrom,
             $query->getDQLPart('from') !== null ? count($query->getDQLPart('from')) : 0,
-            "Test that there are equal or more 'from' clause after that the filter has 
+            "Test that there are equal or more 'from' clause after that the filter has
                 altered the query"
-            );
+        );
         $this->assertGreaterThanOrEqual(
-            $nbOfWhere, 
+            $nbOfWhere,
             $query->getDQLPart('where') !== null ? $query->getDQLPart('where')->count() : 0,
             "Test that there are equal or more 'where' clause after that the filter has"
-            . "altered the query"
-            );
+            . 'altered the query'
+        );
         $this->assertEquals(
-            $nbOfSelect, 
+            $nbOfSelect,
             $query->getDQLPart('select') !== null ? count($query->getDQLPart('select')) : 0,
             "Test that the filter has no altered the 'select' part of the query"
-            );
-        
+        );
     }
-    
-    public function testGetTitle()
+
+    public function testApplyOn()
     {
-        $title = $this->getFilter()->getTitle();
-        
-        $this->assertInternalType('string', $title);
-        $this->assertNotEmpty($title,
-            "test that the title is not empty");
+        $filter = $this->getFilter();
+
+        $this->assertInternalType('string', $filter->applyOn());
     }
-    
+
     /**
-     * 
      * @dataProvider dataProviderDescriptionAction
+     *
      * @param array $data
      */
     public function testDescriptionAction($data)
     {
         $description = $this->getFilter()->describeAction($data);
-        
+
         $this->assertTrue(
             is_string($description) || is_array($description),
-            "test that the description is a string or an array"
-            );
-        
+            'test that the description is a string or an array'
+        );
+
         if (is_string($description)) {
-            $this->assertNotEmpty($description,
-            "test that the description is not empty");
+            $this->assertNotEmpty(
+                $description,
+                'test that the description is not empty'
+            );
         } elseif (is_array($description)) {
-            $this->assertInternalType('string', $description[0],
-                    "test that the first element in the description array is a string");
-            
+            $this->assertInternalType(
+                'string',
+                $description[0],
+                'test that the first element in the description array is a string'
+            );
+
             // test that the message is translated
             try {
-                if (static::$kernel === null) {
+                if (null === static::$kernel) {
                     static::bootKernel();
                 }
-                
+
                 $catalogue = static::$kernel->getContainer()
                     ->get('translator')
                     ->getCatalogue();
-                
-            } catch (\Exception $ex) {
+            } catch (Exception $ex) {
                 $this->markTestIncomplete(
-                    sprintf("This test is incomplete due to %s thrown by 'translator' : %s, "
-                        . "complete stack : %s", get_class($ex), $ex->getMessage(),
-                        $ex->getTraceAsString()));
+                    sprintf(
+                        "This test is incomplete due to %s thrown by 'translator' : %s, "
+                        . 'complete stack : %s',
+                        get_class($ex),
+                        $ex->getMessage(),
+                        $ex->getTraceAsString()
+                    )
+                );
             }
-            $this->assertTrue($catalogue->has($description[0], 
-                isset($description[2]) ? $description[2] : 'messages'),
-                sprintf("Test that the message returned by getDescriptionAction is "
-                . "present in the catalogue of translations. HINT : check that \"%s\" "
-                . "is correctly translated", $description[0]));
+            $this->assertTrue(
+                $catalogue->has(
+                    $description[0],
+                    $description[2] ?? 'messages'
+                ),
+                sprintf('Test that the message returned by getDescriptionAction is '
+                . 'present in the catalogue of translations. HINT : check that "%s" '
+                . 'is correctly translated', $description[0])
+            );
         }
-        
+    }
+
+    public function testGetTitle()
+    {
+        $title = $this->getFilter()->getTitle();
+
+        $this->assertInternalType('string', $title);
+        $this->assertNotEmpty(
+            $title,
+            'test that the title is not empty'
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
index 39d530a29..9e4d6ea68 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareCenterTrait.php
@@ -1,59 +1,47 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test;
 
-
 /**
- * A trait to prepare center
- * 
+ * A trait to prepare center.
+ *
  * **Usage :** You must set up trait with `setUpTrait` before use
  * and use tearDownTrait after usage.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @codeCoverageIgnore
  */
 trait PrepareCenterTrait
 {
-    
     private $centerProphet;
-    
+
     /**
-     * prepare a mocked center, with and id and name given
-     * 
+     * prepare a mocked center, with and id and name given.
+     *
      * @param int $id
      * @param string $name
-     * @return \Chill\MainBundle\Entity\Center 
+     *
+     * @return \Chill\MainBundle\Entity\Center
      */
     protected function prepareCenter($id, $name)
     {
-        
-        if ($this->centerProphet === NULL) {
+        if (null === $this->centerProphet) {
             $this->centerProphet = new \Prophecy\Prophet();
         }
-        
+
         $center = $this->centerProphet->prophesize();
         $center->willExtend('\Chill\MainBundle\Entity\Center');
         $center->getId()->willReturn($id);
         $center->getName()->willReturn($name);
-        
+
         return $center->reveal();
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
index df150e556..3aa3ebd11 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareCircleTrait.php
@@ -1,57 +1,47 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test;
 
 /**
- * A trait to prepare center
- * 
+ * A trait to prepare center.
+ *
  * **Usage :** You must set up trait with `setUpTrait` before use
  * and use tearDownTrait after usage.
- * 
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @codeCoverageIgnore
  */
 trait PrepareCircleTrait
 {
     private $circleProphet;
-    
+
     /**
-     * prepare a mocked center, with and id and name given
-     * 
+     * prepare a mocked center, with and id and name given.
+     *
      * @param int $id
      * @param string $name
-     * @return \Chill\MainBundle\Entity\Center 
+     *
+     * @return \Chill\MainBundle\Entity\Center
      */
     protected function prepareCircle($id, $name)
     {
-        
-        if ($this->circleProphet === NULL) {
+        if (null === $this->circleProphet) {
             $this->circleProphet = new \Prophecy\Prophet();
         }
-        
+
         $scope = $this->circleProphet->prophesize();
         $scope->willExtend('\Chill\MainBundle\Entity\Scope');
         $scope->getId()->willReturn($id);
         $scope->getName()->willReturn($name);
-        
+
         return $scope->reveal();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
index 5df0b57dd..213eaed60 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php
@@ -1,27 +1,22 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test;
 
+use LogicException;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Prepare a client authenticated with a user
+ * Prepare a client authenticated with a user.
  */
 trait PrepareClientTrait
 {
@@ -30,21 +25,21 @@ trait PrepareClientTrait
      *
      * @param string $username the username (default 'center a_social')
      * @param string $password the password (default 'password')
-     * @return \Symfony\Component\BrowserKit\Client
-     * @throws \LogicException
+     *
+     * @throws LogicException
      */
     public function getClientAuthenticated(
         $username = 'center a_social',
         $password = 'password'
     ): KernelBrowser {
         if (!$this instanceof WebTestCase) {
-            throw new \LogicException(sprintf("The current class does not "
-                . "implements %s", WebTestCase::class));
+            throw new LogicException(sprintf('The current class does not '
+                . 'implements %s', WebTestCase::class));
         }
 
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => $password,
-        ));
+        return static::createClient([], [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => $password,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
index 01de3c0f6..286322f5e 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareScopeTrait.php
@@ -1,45 +1,38 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test;
 
 /**
- * A trait to prepare center
- * 
+ * A trait to prepare center.
+ *
  * **Usage :** You must set up trait with `setUpTrait` before use
  * and use tearDownTrait after usage.
- * 
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @codeCoverageIgnore
+ *
  * @deprecated use PrepareCircleTrait instead
  */
 trait PrepareScopeTrait
 {
     use PrepareCircleTrait;
-    
+
     /**
-     * prepare a mocked center, with and id and name given
-     * 
+     * prepare a mocked center, with and id and name given.
+     *
      * @param int $id
      * @param string $name
-     * @return \Chill\MainBundle\Entity\Center 
+     *
+     * @return \Chill\MainBundle\Entity\Center
+     *
      * @deprecated
      */
     protected function prepareScope($id, $name)
diff --git a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
index 5eccf2770..662438a98 100644
--- a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php
@@ -1,46 +1,36 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test;
 
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\GroupCenter;
-use Chill\MainBundle\Entity\RoleScope;
 use Chill\MainBundle\Entity\PermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\Entity\User;
+use LogicException;
 
 /**
- * A trait to prepare user with permission. May be used 
+ * A trait to prepare user with permission. May be used
  * within tests.
- * 
+ *
  * **Usage : ** You must set up trait with `setUpTrait` before use
  * and use tearDownTrait after usage.
- * 
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @codeCoverageIgnore
  */
 trait PrepareUserTrait
 {
-    
     /**
-     * prepare a user with correct permissions
-     * 
+     * prepare a user with correct permissions.
+     *
      * Example of permissions:
      * ```
      * array(
@@ -52,38 +42,36 @@ trait PrepareUserTrait
      *    )
      * )
      * ```
-     * Scope must be an int. Scope created have this int as id, and the 
+     * Scope must be an int. Scope created have this int as id, and the
      * int converted to string as name.
-     * 
-     * 
+     *
      * @param array $permissions an array of permissions, with key 'center' for the center and key 'attrs' for an array of  ['role' => (string), 'scope' => (int)]
+     *
+     * @throws LogicException if the trait is not set up
+     *
      * @return User
-     * @throws \LogicException if the trait is not set up
      */
     protected function prepareUser(array $permissions)
     {
         $user = new User();
-        
+
         foreach ($permissions as $permission) {
             $groupCenter = (new GroupCenter())
-                    ->setCenter($permission['center']);
+                ->setCenter($permission['center']);
             $permissionGroup = new PermissionsGroup();
-            
+
             foreach ($permission['permissionsGroup'] as $pg) {
-                
                 $roleScope = (new RoleScope())
-                        ->setRole($pg['role'])
-                        ->setScope($pg['scope']);
-                        ;
+                    ->setRole($pg['role'])
+                    ->setScope($pg['scope']);
+
                 $permissionGroup->addRoleScope($roleScope);
-                
             }
-            
+
             $groupCenter->setPermissionsGroup($permissionGroup);
             $user->addGroupCenter($groupCenter);
-            
-            }
-            
+        }
+
         return $user;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
index d471dd624..a25624719 100644
--- a/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
+++ b/src/Bundle/ChillMainBundle/Test/ProphecyTrait.php
@@ -1,53 +1,40 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test;
 
 /**
- * a trait to prepare prophecy
- * 
+ * a trait to prepare prophecy.
+ *
  * **Usage : ** You must set up trait with `setUpTrait` before use
  * and use tearDownTrait after usage.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @codeCoverageIgnore
  */
 trait ProphecyTrait
 {
-        
     /**
-     *
      * @var \Prophecy\Prophet()
      */
     private $prophet;
-    
+
     /**
-     * 
      * @return \Prophecy\Prophet
      */
     public function getProphet()
     {
-        if ($this->prophet === NULL) {
+        if (null === $this->prophet) {
             $this->prophet = new \Prophecy\Prophet();
         }
-        
+
         return $this->prophet;
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
new file mode 100644
index 000000000..de3b95a31
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Tests\Security\Authorization;
+
+use Chill\MainBundle\Security\ParentRoleHelper;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ParentRoleHelperTest extends KernelTestCase
+{
+    private ParentRoleHelper $parentRoleHelper;
+
+    public function setUp()
+    {
+        self::bootKernel();
+        $this->parentRoleHelper = self::$container->get(ParentRoleHelper::class);
+    }
+
+    public function testGetReachableRoles()
+    {
+        // this test will be valid until the role hierarchy for person is changed.
+        // this is not perfect but spare us a mock
+
+        $parentRoles = $this->parentRoleHelper->getParentRoles(PersonVoter::SEE);
+
+        $this->assertCount(3, $parentRoles);
+        $this->assertContains(PersonVoter::CREATE, $parentRoles);
+        $this->assertContains(PersonVoter::UPDATE, $parentRoles);
+        $this->assertContains(PersonVoter::SEE, $parentRoles);
+    }
+
+    public function testIsRoleReached()
+    {
+        $this->assertTrue($this->parentRoleHelper->isRoleReached(PersonVoter::SEE, PersonVoter::CREATE));
+        $this->assertFalse($this->parentRoleHelper->isRoleReached(PersonVoter::SEE, 'foo'));
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
index 2000a05bf..b36a655c5 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php
@@ -1,36 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Controller;
 
 use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Repository\AddressRepository;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 
-class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTestCase
 {
-    private KernelBrowser $client;
-
     use PrepareClientTrait;
 
+    private KernelBrowser $client;
+
     public function setUp()
     {
         self::bootKernel();
         $this->client = $this->getClientAuthenticated();
     }
 
-    /**
-     * @dataProvider generateAddressIds
-     * @param int $addressId
-     */
-    public function testDuplicate(int $addressId)
-    {
-        $this->client->request('POST', "/api/1.0/main/address/$addressId/duplicate.json");
-
-        $this->assertResponseIsSuccessful('test that duplicate is successful');
-    }
-
     public function generateAddressIds()
     {
         self::bootKernel();
@@ -43,7 +44,17 @@ class AddressControllerTest extends \Symfony\Bundle\FrameworkBundle\Test\WebTest
             ->getResult();
 
         foreach ($addresses as $a) {
-            yield [ $a->getId() ];
+            yield [$a->getId()];
         }
     }
+
+    /**
+     * @dataProvider generateAddressIds
+     */
+    public function testDuplicate(int $addressId)
+    {
+        $this->client->request('POST', "/api/1.0/main/address/{$addressId}/duplicate.json");
+
+        $this->assertResponseIsSuccessful('test that duplicate is successful');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
new file mode 100644
index 000000000..b62d56b0d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/AddressReferenceApiControllerTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Chill is a software for social workers.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Controller;
+
+use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AddressReferenceApiControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    public function provideData()
+    {
+        self::bootKernel();
+        /** @var EntityManagerInterface $em */
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $postalCode = $em->createQueryBuilder()
+            ->select('pc')
+            ->from(PostalCode::class, 'pc')
+            ->where('pc.origin = :origin')
+            ->setParameter('origin', 0)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getSingleResult();
+
+        yield [$postalCode->getId(), 'rue'];
+    }
+
+    /**
+     * @dataProvider provideData
+     */
+    public function testSearch(int $postCodeId, string $pattern)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            'GET',
+            "/api/1.0/main/address-reference/by-postal-code/{$postCodeId}/search.json",
+            ['q' => $pattern]
+        );
+
+        $this->assertResponseIsSuccessful();
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
index ede351e8b..981bb3094 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
@@ -1,52 +1,73 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class CenterControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CenterControllerTest extends WebTestCase
 {
     public function testCompleteScenario()
     {
         // Create a new client to browse the application
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'admin',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'admin',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
 
         // Create a new entry in the database
         $crawler = $client->request('GET', '/fr/admin/center/');
-        $this->assertEquals(200, $client->getResponse()->getStatusCode(), 
-              "Unexpected HTTP status code for GET /fr/admin/center/");
+        $this->assertEquals(
+            200,
+            $client->getResponse()->getStatusCode(),
+            'Unexpected HTTP status code for GET /fr/admin/center/'
+        );
         $crawler = $client->click($crawler->selectLink('Créer un nouveau centre')->link());
 
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Créer')->form(array(
-            'chill_mainbundle_center[name]'  => 'Test center',
-        ));
+        $form = $crawler->selectButton('Créer')->form([
+            'chill_mainbundle_center[name]' => 'Test center',
+        ]);
 
         $client->submit($form);
         $crawler = $client->followRedirect();
 
         // Check data in the show view
-        $this->assertGreaterThan(0, 
-              $crawler->filter('td:contains("Test center")')->count(), 
-              'Missing element td:contains("Test center")');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('td:contains("Test center")')->count(),
+            'Missing element td:contains("Test center")'
+        );
 
         // Edit the entity
         $crawler = $client->click($crawler->selectLink('Modifier')->link());
 
-        $form = $crawler->selectButton('Mettre à jour')->form(array(
-            'chill_mainbundle_center[name]'  => 'Foo',
-        ));
+        $form = $crawler->selectButton('Mettre à jour')->form([
+            'chill_mainbundle_center[name]' => 'Foo',
+        ]);
 
         $client->submit($form);
         $crawler = $client->followRedirect();
 
         // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(0, $crawler->filter('[value="Foo"]')->count(), 
-              'Missing element [value="Foo"]');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('[value="Foo"]')->count(),
+            'Missing element [value="Foo"]'
+        );
 
         $crawler = $client->request('GET', '/fr/admin/center/');
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
index d75f2cc71..33dbcc4ee 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ExportControllerTest.php
@@ -1,45 +1,39 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Test the export
+ * Test the export.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ExportControllerTest extends WebTestCase
+final class ExportControllerTest extends WebTestCase
 {
     public function testIndex()
     {
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
-        
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
+
         $client->request('GET', '/fr/exports/');
 
-        $this->assertTrue($client->getResponse()->isSuccessful(), 
-                "assert the list is shown");
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'assert the list is shown'
+        );
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
index a621b897e..bed40b372 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php
@@ -1,60 +1,70 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
-class LoginControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class LoginControllerTest extends WebTestCase
 {
     public function testLogin()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         //load login page and submit form
         $crawler = $client->request('GET', '/login');
         $this->assertTrue($client->getResponse()->isSuccessful());
-        
+
         $buttonCrawlerNode = $crawler->selectButton('login');
         $form = $buttonCrawlerNode->form();
-        
-        $client->submit($form, array(
-           '_username' => 'center a_social',
-           '_password' => 'password'
-        ));
-        
+
+        $client->submit($form, [
+            '_username' => 'center a_social',
+            '_password' => 'password',
+        ]);
+
         //the response is a redirection
         $this->assertTrue($client->getResponse()->isRedirect());
-        
+
         //the response is not a login page, but on a new page
         $this->assertNotRegExp('/\/login$/', $client->getResponse()
-              ->headers
-              ->get('location'));
-        
+            ->headers
+            ->get('location'));
+
         //on the home page, there must be a logout link
         $client->followRedirects(true);
         $crawler = $client->request('GET', '/');
- 
+
         $this->assertRegExp('/center a_social/', $client->getResponse()
-                                    ->getContent());
+            ->getContent());
         $logoutLinkFilter = $crawler->filter('a:contains("Se déconnecter")');
-        
+
         //check there is > 0 logout link
         $this->assertGreaterThan(0, $logoutLinkFilter->count(), 'check that a logout link is present');
-        
+
         //click on logout link
         $client->followRedirects(false);
         $client->click($crawler->selectLink('Se déconnecter')->link());
-        
+
         $this->assertTrue($client->getResponse()->isRedirect());
-        $client->followRedirect(); #redirect to login page
-        
+        $client->followRedirect(); //redirect to login page
+
         //check we are back on login page
         $this->assertRegExp('/\/login$/', $client->getResponse()
-              ->headers
-              ->get('location'));
-        
-        
+            ->headers
+            ->get('location'));
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
new file mode 100644
index 000000000..aec392045
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionApiControllerTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use DateTime;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PermissionApiControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    public function testDenormalizingObject()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            'POST',
+            '/api/1.0/main/permissions/info.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode([
+                'object' => [
+                    'datetime' => '1969-07-09T00:00:00+0100',
+                ],
+                'class' => DateTime::class,
+                'roles' => ['FOO_ROLE'],
+            ])
+        );
+
+        $this->assertResponseIsSuccessful();
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertFalse($data['roles']['FOO_ROLE']);
+    }
+
+    public function testNullObject()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            'POST',
+            '/api/1.0/main/permissions/info.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode([
+                'object' => null,
+                'class' => null,
+                'roles' => ['ROLE_USER', 'ROLE_ADMIN'],
+            ])
+        );
+
+        $this->assertResponseIsSuccessful();
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertTrue($data['roles']['ROLE_USER']);
+        $this->assertFalse($data['roles']['ROLE_ADMIN']);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
index 9657c4800..f27eaa7a7 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PermissionsGroupControllerTest.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class PermissionsGroupControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PermissionsGroupControllerTest extends WebTestCase
 {
     public function testEmpty()
     {
         $this->markTestSkipped();
     }
+
     /*
     public function testCompleteScenario()
     {
@@ -55,5 +69,5 @@ class PermissionsGroupControllerTest extends WebTestCase
         $this->assertNotRegExp('/Foo/', $client->getResponse()->getContent());
     }
 
-    */
+     */
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
new file mode 100644
index 000000000..5df1e1290
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/PostalCodeApiControllerTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Chill is a software for social workers.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function json_decode;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PostalCodeApiControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    public function testSearch()
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            'GET',
+            '/api/1.0/main/postal-code/search.json',
+            ['q' => 'fontenay le comte']
+        );
+
+        $this->assertResponseIsSuccessful();
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+
+        $this->assertEquals('Fontenay Le Comte', $data['results'][0]['name']);
+
+        // test response with invalid search pattern
+        $client->request(
+            'GET',
+            '/api/1.0/main/postal-code/search.json',
+            ['q' => '']
+        );
+        $this->assertResponseStatusCodeSame(400);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
index ad8318002..806153220 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -1,30 +1,46 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ScopeControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ScopeControllerTest extends WebTestCase
 {
     public function testCompleteScenario()
     {
         // Create a new client to browse the application
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'admin',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'admin',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
 
         // Create a new entry in the database
         $crawler = $client->request('GET', '/fr/admin/scope/');
-        $this->assertEquals(200, $client->getResponse()->getStatusCode(), 
-                "Unexpected HTTP status code for GET /fr/admin/scope/");
+        $this->assertEquals(
+            200,
+            $client->getResponse()->getStatusCode(),
+            'Unexpected HTTP status code for GET /fr/admin/scope/'
+        );
         $crawler = $client->click($crawler->selectLink('Créer un nouveau cercle')->link());
         // Fill in the form and submit it
-        $form = $crawler->selectButton('Créer')->form(array(
-            'chill_mainbundle_scope[name][fr]'  => 'Test en fr',
-            'chill_mainbundle_scope[name][en]'  => 'Test en en'
-        ));
+        $form = $crawler->selectButton('Créer')->form([
+            'chill_mainbundle_scope[name][fr]' => 'Test en fr',
+            'chill_mainbundle_scope[name][en]' => 'Test en en',
+        ]);
 
         $client->submit($form/*, array(
             'chill_mainbundle_scope' => array(
@@ -36,25 +52,26 @@ class ScopeControllerTest extends WebTestCase
             )
         )*/);
         $crawler = $client->followRedirect();
-        
+
         // Check data in the show view
-        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test en fr")')->count(),
-                'Missing element td:contains("Test en fr")');
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('td:contains("Test en fr")')->count(),
+            'Missing element td:contains("Test en fr")'
+        );
 
         // Edit the entity
         $crawler = $client->click($crawler->selectLink('Modifier')->link());
-        
-        $form = $crawler->selectButton('Mettre à jour')->form(array(
-            'chill_mainbundle_scope[name][fr]'  => 'Foo',
-            'chill_mainbundle_scope[name][en]'  => 'Foo en',
-        ));
+
+        $form = $crawler->selectButton('Mettre à jour')->form([
+            'chill_mainbundle_scope[name][fr]' => 'Foo',
+            'chill_mainbundle_scope[name][en]' => 'Foo en',
+        ]);
 
         $client->submit($form);
         $crawler = $client->followRedirect();
 
         // Check the element contains an attribute with value equals "Foo"
         $this->assertGreaterThan(0, $crawler->filter('[value="Foo"]')->count(), 'Missing element [value="Foo"]');
-
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
index 1c76d8975..a2cf41951 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchApiControllerTest.php
@@ -1,15 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Bundle\ChillMainBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
 
-class SearchApiControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SearchApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
+    public function generateSearchData()
+    {
+        yield ['per', ['person', 'thirdparty']];
+
+        yield ['per', ['thirdparty']];
+
+        yield ['per', ['person']];
+
+        yield ['fjklmeqjfkdqjklrmefdqjklm', ['person', 'thirdparty']];
+    }
+
     /**
      * @dataProvider generateSearchData
      */
@@ -20,17 +44,9 @@ class SearchApiControllerTest extends WebTestCase
         $client->request(
             Request::METHOD_GET,
             '/api/1.0/search.json',
-            [ 'q' => $pattern, 'type' => $types ]
+            ['q' => $pattern, 'type' => $types]
         );
 
         $this->assertResponseIsSuccessful();
     }
-
-    public function generateSearchData()
-    {
-        yield ['per', ['person', 'thirdparty'] ];
-        yield ['per', ['thirdparty'] ];
-        yield ['per', ['person'] ];
-        yield ['fjklmeqjfkdqjklrmefdqjklm', ['person', 'thirdparty'] ];
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
index a78ed1f28..4e101e370 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php
@@ -1,102 +1,100 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Chill\MainBundle\Search\SearchInterface;
-
-
 
 /**
- * Test the search controller
+ * Test the search controller.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class SearchControllerTest extends WebTestCase
+final class SearchControllerTest extends WebTestCase
 {
-   
+    public function testDomainUnknow()
+    {
+        $client = $this->getAuthenticatedClient();
+
+        $crawler = $client->request('GET', '/fr/search', ['q' => '@unknow domain']);
+
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The page is loaded without errors'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('*:contains("Le domaine de recherche "unknow" est inconnu.")')->count(),
+            'Message domain unknow is shown'
+        );
+    }
+
+    public function testParsingIncorrect()
+    {
+        $client = $this->getAuthenticatedClient();
+
+        $crawler = $client->request(
+            'GET',
+            '/fr/search',
+            ['q' => '@domaine @domain double domaine']
+        );
+
+        $this->assertGreaterThan(0, $crawler->filter('*:contains("Recherche invalide")')
+            ->count());
+    }
+
     /**
-     * Test the behaviour when no domain is provided in the search pattern : 
-     * the default search should be enabled
+     * Test the behaviour when no domain is provided in the search pattern :
+     * the default search should be enabled.
      */
     public function testSearchPath()
     {
         $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array('q' => 'default search'));
 
-        $this->assertTrue($client->getResponse()->isSuccessful(), 
-              "The page is loaded without errors");
-              
+        $crawler = $client->request('GET', '/fr/search', ['q' => 'default search']);
+
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The page is loaded without errors'
+        );
     }
-    
+
     public function testSearchPathEmpty()
     {
         $client = $this->getAuthenticatedClient();
-        
+
         $crawler = $client->request('GET', '/fr/search?q=');
 
         $this->assertGreaterThan(0, $crawler->filter('*:contains("Merci de fournir des termes de recherche.")')->count());
     }
-    
-    public function testDomainUnknow()
-    {
-        $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array('q' => '@unknow domain'));
 
-        $this->assertTrue($client->getResponse()->isSuccessful(), 
-              "The page is loaded without errors");
-        $this->assertGreaterThan(0, $crawler->filter('*:contains("Le domaine de recherche "unknow" est inconnu.")')->count(), 
-              "Message domain unknow is shown");
-        
-    }
-    
-    public function testParsingIncorrect()
-    {
-        $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', 
-              array('q' => '@domaine @domain double domaine'));
-        
-        $this->assertGreaterThan(0, $crawler->filter('*:contains("Recherche invalide")')
-              ->count());
-    }
-    
     public function testUnknowName()
     {
         $client = $this->getAuthenticatedClient();
-        
-        $client->request('GET', '/fr/search', 
-              array('q' => 'default search', 'name' => 'unknow'));
-        
+
+        $client->request(
+            'GET',
+            '/fr/search',
+            ['q' => 'default search', 'name' => 'unknow']
+        );
+
         $this->assertTrue($client->getResponse()->isNotFound());
     }
-    
+
     private function getAuthenticatedClient()
     {
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center b_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        return self::createClient([], [
+            'PHP_AUTH_USER' => 'center b_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
index 85d9895fc..813e9bc40 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserApiControllerTest.php
@@ -1,15 +1,44 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use function array_key_exists;
+use function json_decode;
 
-class UserApiControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class UserApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
+    /**
+     * @depends testIndex
+     *
+     * @param mixed $existingUser
+     */
+    public function testEntity($existingUser)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(Request::METHOD_GET, '/api/1.0/main/user/' . $existingUser['id'] . '.json');
+
+        $this->assertResponseIsSuccessful();
+    }
+
     public function testIndex()
     {
         $client = $this->getClientAuthenticated();
@@ -18,26 +47,14 @@ class UserApiControllerTest extends WebTestCase
 
         $this->assertResponseIsSuccessful();
 
-        $data = \json_decode($client->getResponse()->getContent(), true);
-        $this->assertTrue(\array_key_exists('count', $data));
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertTrue(array_key_exists('count', $data));
         $this->assertGreaterThan(0, $data['count']);
-        $this->assertTrue(\array_key_exists('results', $data));
+        $this->assertTrue(array_key_exists('results', $data));
 
         return $data['results'][0];
     }
 
-    /**
-     * @depends testIndex
-     */
-    public function testEntity($existingUser)
-    {
-        $client = $this->getClientAuthenticated();
-
-        $client->request(Request::METHOD_GET, '/api/1.0/main/user/'.$existingUser['id'].'.json');
-
-        $this->assertResponseIsSuccessful();
-    }
-
     public function testWhoami()
     {
         $client = $this->getClientAuthenticated();
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
index 0017fbb4e..00bec29f6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\User;
@@ -7,7 +16,11 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 
-class UserControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class UserControllerTest extends WebTestCase
 {
     private $client;
 
@@ -17,102 +30,11 @@ class UserControllerTest extends WebTestCase
     {
         self::bootKernel();
 
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'admin',
-           'PHP_AUTH_PW'   => 'password',
-           'HTTP_ACCEPT_LANGUAGE' => 'fr_FR'
-        ));
-    }
-
-    public function testList()
-    {
-        // get the list
-        $crawler = $this->client->request('GET', '/fr/admin/main/user');
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode(),
-                "Unexpected HTTP status code for GET /admin/main/user");
-    }
-
-    public function testNew()
-    {
-        $crawler = $this->client->request('GET', '/fr/admin/main/user/new');
-
-        $username = 'Test_user'.  uniqid();
-        $password = 'Password1234!';
-        // Fill in the form and submit it
-        $form = $crawler->selectButton('Créer')->form(array(
-            'chill_mainbundle_user[username]'  => $username,
-            'chill_mainbundle_user[plainPassword][first]' => $password,
-            'chill_mainbundle_user[plainPassword][second]' => $password,
-            'chill_mainbundle_user[email]'  => $username.'@gmail.com',
-            'chill_mainbundle_user[label]'  => $username,
-
-        ));
-
-        $this->client->submit($form);
-        $crawler = $this->client->followRedirect();
-
-        // Check data in the show view
-        $this->assertGreaterThan(0, $crawler->filter('td:contains("Test_user")')->count(),
-                'Missing element td:contains("Test user")');
-
-        //test the auth of the new client
-        $this->isPasswordValid($username, $password);
-    }
-
-    protected function isPasswordValid($username, $password)
-    {
-        /* @var $passwordEncoder \Symfony\Component\Security\Core\Encoder\UserPasswordEncoder */
-        $passwordEncoder = self::$container
-                ->get(UserPasswordEncoderInterface::class);
-
-        $user = self::$kernel->getContainer()
-                ->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:User')
-                ->findOneBy(array('username' => $username));
-
-        $this->assertTrue($passwordEncoder->isPasswordValid($user, $password));
-    }
-
-    /**
-     *
-     * @dataProvider dataGenerateUserId
-     */
-    public function testUpdate(int $userId, string $username)
-    {
-        $crawler = $this->client->request('GET', "/fr/admin/main/user/$userId/edit");
-
-        $username = 'Foo bar '.uniqid();
-        $form = $crawler->selectButton('Enregistrer & fermer')->form(array(
-            'chill_mainbundle_user[username]'  => $username,
-        ));
-
-        $this->client->submit($form);
-        $crawler = $this->client->followRedirect();
-        // Check the element contains an attribute with value equals "Foo"
-        $this->assertGreaterThan(0, $crawler->filter('[data-username="'.$username.'"]')->count(),
-                'Missing element [data-username="Foo bar"]');
-    }
-
-    /**
-     *
-     * @dataProvider dataGenerateUserId
-     */
-    public function testUpdatePassword(int $userId, $username)
-    {
-        $crawler = $this->client->request('GET', "/fr/admin/user/$userId/edit_password");
-        $newPassword = '1234Password!';
-
-        $form = $crawler->selectButton('Changer le mot de passe')->form(array(
-            'chill_mainbundle_user_password[new_password][first]' => $newPassword,
-            'chill_mainbundle_user_password[new_password][second]' => $newPassword,
-        ));
-
-        $this->client->submit($form);
-
-        $this->assertTrue($this->client->getResponse()->isRedirect(),
-                "the response is a redirection");
-
-        $this->isPasswordValid($username, $newPassword);
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'admin',
+            'PHP_AUTH_PW' => 'password',
+            'HTTP_ACCEPT_LANGUAGE' => 'fr_FR',
+        ]);
     }
 
     protected function tearDown()
@@ -120,7 +42,7 @@ class UserControllerTest extends WebTestCase
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
-        foreach ($this->toDelete as list($class, $id)) {
+        foreach ($this->toDelete as [$class, $id]) {
             $obj = $em->getRepository($class)->find($id);
             $em->remove($obj);
         }
@@ -134,15 +56,118 @@ class UserControllerTest extends WebTestCase
         $em = self::$container->get(EntityManagerInterface::class);
 
         $user = new User();
-        $user->setUsername('Test_user '.uniqid());
-        $user->setPassword(self::$container->get(UserPasswordEncoderInterface::class)->encodePassword($user,
-            'password'));
+        $user->setUsername('Test_user ' . uniqid());
+        $user->setPassword(self::$container->get(UserPasswordEncoderInterface::class)->encodePassword(
+            $user,
+            'password'
+        ));
 
         $em->persist($user);
         $em->flush();
 
         $this->toDelete[] = [User::class, $user->getId()];
 
-        yield [ $user->getId(), $user->getUsername() ];
+        yield [$user->getId(), $user->getUsername()];
+    }
+
+    public function testList()
+    {
+        // get the list
+        $crawler = $this->client->request('GET', '/fr/admin/main/user');
+        $this->assertEquals(
+            200,
+            $this->client->getResponse()->getStatusCode(),
+            'Unexpected HTTP status code for GET /admin/main/user'
+        );
+    }
+
+    public function testNew()
+    {
+        $crawler = $this->client->request('GET', '/fr/admin/main/user/new');
+
+        $username = 'Test_user' . uniqid();
+        $password = 'Password1234!';
+        // Fill in the form and submit it
+        $form = $crawler->selectButton('Créer')->form([
+            'chill_mainbundle_user[username]' => $username,
+            'chill_mainbundle_user[plainPassword][first]' => $password,
+            'chill_mainbundle_user[plainPassword][second]' => $password,
+            'chill_mainbundle_user[email]' => $username . '@gmail.com',
+            'chill_mainbundle_user[label]' => $username,
+        ]);
+
+        $this->client->submit($form);
+        $crawler = $this->client->followRedirect();
+
+        // Check data in the show view
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('td:contains("Test_user")')->count(),
+            'Missing element td:contains("Test user")'
+        );
+
+        //test the auth of the new client
+        $this->isPasswordValid($username, $password);
+    }
+
+    /**
+     * @dataProvider dataGenerateUserId
+     */
+    public function testUpdate(int $userId, string $username)
+    {
+        $crawler = $this->client->request('GET', "/fr/admin/main/user/{$userId}/edit");
+
+        $username = 'Foo bar ' . uniqid();
+        $form = $crawler->selectButton('Enregistrer & fermer')->form([
+            'chill_mainbundle_user[username]' => $username,
+        ]);
+
+        $this->client->submit($form);
+        $crawler = $this->client->followRedirect();
+        // Check the element contains an attribute with value equals "Foo"
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('[data-username="' . $username . '"]')->count(),
+            'Missing element [data-username="Foo bar"]'
+        );
+    }
+
+    /**
+     * @dataProvider dataGenerateUserId
+     *
+     * @param mixed $username
+     */
+    public function testUpdatePassword(int $userId, $username)
+    {
+        $crawler = $this->client->request('GET', "/fr/admin/user/{$userId}/edit_password");
+        $newPassword = '1234Password!';
+
+        $form = $crawler->selectButton('Changer le mot de passe')->form([
+            'chill_mainbundle_user_password[new_password][first]' => $newPassword,
+            'chill_mainbundle_user_password[new_password][second]' => $newPassword,
+        ]);
+
+        $this->client->submit($form);
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect(),
+            'the response is a redirection'
+        );
+
+        $this->isPasswordValid($username, $newPassword);
+    }
+
+    protected function isPasswordValid($username, $password)
+    {
+        /** @var \Symfony\Component\Security\Core\Encoder\UserPasswordEncoder $passwordEncoder */
+        $passwordEncoder = self::$container
+            ->get(UserPasswordEncoderInterface::class);
+
+        $user = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:User')
+            ->findOneBy(['username' => $username]);
+
+        $this->assertTrue($passwordEncoder->isPasswordValid($user, $password));
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
index 5632bf96a..bcb5b2d26 100644
--- a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php
@@ -1,49 +1,75 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Doctrine\Model;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Chill\MainBundle\Doctrine\Model\Point;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
- * Test the point model methods
+ * Test the point model methods.
  *
- * @author Julien Minet <julien.minet@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ExportControllerTest extends KernelTestCase
+final class PointTest extends KernelTestCase
 {
-
-    public function testToWKT()
+    public function testFromArrayGeoJson()
     {
+        $array = [
+            'type' => 'Point',
+            'coordinates' => [4.8634, 50.47382],
+        ];
         $lon = 4.8634;
         $lat = 50.47382;
         $point = $this->preparePoint($lon, $lat);
 
-        $this->assertEquals($point->toWKT(),'SRID=4326;POINT(4.8634 50.47382)');
+        $this->assertEquals($point, Point::fromArrayGeoJson($array));
     }
 
-    public function testToGeojson()
+    public function testFromGeoJson()
     {
+        $geojson = '{"type":"Point","coordinates":[4.8634,50.47382]}';
         $lon = 4.8634;
         $lat = 50.47382;
         $point = $this->preparePoint($lon, $lat);
 
-        $this->assertEquals($point->toGeoJson(),'{"type":"Point","coordinates":[4.8634,50.47382]}');
+        $this->assertEquals($point, Point::fromGeoJson($geojson));
     }
 
-    public function testToArrayGeoJson()
+    public function testFromLonLat()
     {
         $lon = 4.8634;
         $lat = 50.47382;
         $point = $this->preparePoint($lon, $lat);
 
-        $this->assertEquals(
-            $point->toArrayGeoJson(),
-            [
-                'type' => 'Point',
-                'coordinates' => [4.8634, 50.47382]
-            ]
-        );
+        $this->assertEquals($point, Point::fromLonLat($lon, $lat));
+    }
+
+    public function testGetLat()
+    {
+        $lon = 4.8634;
+        $lat = 50.47382;
+        $point = $this->preparePoint($lon, $lat);
+
+        $this->assertEquals($lat, $point->getLat());
+    }
+
+    public function testGetLon()
+    {
+        $lon = 4.8634;
+        $lat = 50.47382;
+        $point = $this->preparePoint($lon, $lat);
+
+        $this->assertEquals($lon, $point->getLon());
     }
 
     public function testJsonSerialize()
@@ -56,64 +82,46 @@ class ExportControllerTest extends KernelTestCase
             $point->jsonSerialize(),
             [
                 'type' => 'Point',
-                'coordinates' => [4.8634, 50.47382]
+                'coordinates' => [4.8634, 50.47382],
             ]
         );
     }
 
-    public function testFromGeoJson()
+    public function testToArrayGeoJson()
     {
-        $geojson = '{"type":"Point","coordinates":[4.8634,50.47382]}';
         $lon = 4.8634;
         $lat = 50.47382;
-        $point = $this->preparePoint($lon, $lat);;
+        $point = $this->preparePoint($lon, $lat);
 
-        $this->assertEquals($point, Point::fromGeoJson($geojson));
+        $this->assertEquals(
+            $point->toArrayGeoJson(),
+            [
+                'type' => 'Point',
+                'coordinates' => [4.8634, 50.47382],
+            ]
+        );
     }
 
-    public function testFromLonLat()
+    public function testToGeojson()
     {
         $lon = 4.8634;
         $lat = 50.47382;
-        $point = $this->preparePoint($lon, $lat);;
+        $point = $this->preparePoint($lon, $lat);
 
-        $this->assertEquals($point, Point::fromLonLat($lon, $lat));
+        $this->assertEquals($point->toGeoJson(), '{"type":"Point","coordinates":[4.8634,50.47382]}');
     }
 
-    public function testFromArrayGeoJson()
-    {
-        $array = [
-            'type' => 'Point',
-            'coordinates' => [4.8634, 50.47382]
-        ];
-        $lon = 4.8634;
-        $lat = 50.47382;
-        $point = $this->preparePoint($lon, $lat);;
-
-        $this->assertEquals($point, Point::fromArrayGeoJson($array));
-    }
-
-    public function testGetLat()
+    public function testToWKT()
     {
         $lon = 4.8634;
         $lat = 50.47382;
-        $point = $this->preparePoint($lon, $lat);;
+        $point = $this->preparePoint($lon, $lat);
 
-        $this->assertEquals($lat, $point->getLat());
-    }
-
-    public function testGetLon()
-    {
-        $lon = 4.8634;
-        $lat = 50.47382;
-        $point = $this->preparePoint($lon, $lat);;
-
-        $this->assertEquals($lon, $point->getLon());
+        $this->assertEquals($point->toWKT(), 'SRID=4326;POINT(4.8634 50.47382)');
     }
 
     private function preparePoint($lon, $lat)
     {
         return Point::fromLonLat($lon, $lat);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index d71997c9e..645dff22e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -1,243 +1,398 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Export;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\MainBundle\Export\ExportManager;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\FilterInterface;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Chill\MainBundle\Export\ExportInterface;
-use Prophecy\Argument;
-use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\ExportManager;
+use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\Export\ExportType;
+use Doctrine\ORM\QueryBuilder;
+use Prophecy\Argument;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Form\Type\Export\PickCenterType;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use function count;
 
 /**
- * Test the export manager
- * 
+ * Test the export manager.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ExportManagerTest extends KernelTestCase
+final class ExportManagerTest extends KernelTestCase
 {
-    
     use \Chill\MainBundle\Test\PrepareCenterTrait;
-    use \Chill\MainBundle\Test\PrepareUserTrait;
     use \Chill\MainBundle\Test\PrepareScopeTrait;
-    
-    
+    use \Chill\MainBundle\Test\PrepareUserTrait;
+
     /**
-     *
-     * @var Prophecy\Prophet 
+     * @var Prophecy\Prophet
      */
     private $prophet;
-    
-    
-    
-    
-    
+
     public function setUp()
     {
         self::bootKernel();
-        
-        $this->prophet = new \Prophecy\Prophet;
+
+        $this->prophet = new \Prophecy\Prophet();
     }
-    
+
     public function tearDown()
     {
         $this->prophet->checkPredictions();
     }
-    
-    /**
-     *  Create an ExportManager where every element may be replaced by a double. 
-     * 
-     * If null is provided for an element, this is replaced by the equivalent
-     * from the container; if the user provided is null, this is replaced by the
-     * user 'center a_social' from database.
-     * 
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Doctrine\ORM\EntityManagerInterface $em
-     * @param \Symfony\Component\Security\Core\Authorization\AuthorizationChecker $authorizationChecker
-     * @param \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper
-     * @param \Symfony\Component\Security\Core\User\UserInterface $user
-     * @return ExportManager
-     */
-    protected function createExportManager(
-            \Psr\Log\LoggerInterface $logger = null,
-            \Doctrine\ORM\EntityManagerInterface $em = null,
-            \Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface $authorizationChecker = null,
-            \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper = null,
-            \Symfony\Component\Security\Core\User\UserInterface $user = null
-            ) 
-    {
-        $localUser = $user === NULL ?  self::$container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:User')
-                ->findOneBy(array('username' => 'center a_social')) : 
-            $user;
-        $token = new \Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken($localUser, 'password', 'provider');
-        $tokenStorage = new \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage();
-        $tokenStorage->setToken($token);
-        
-        return new ExportManager(
-                $logger === NULL ? self::$container->get('logger') : $logger, 
-                $em === NULL ? self::$container->get('doctrine.orm.entity_manager') : $em, 
-                $authorizationChecker === NULL ? self::$container->get('security.authorization_checker') : $authorizationChecker,
-                $authorizationHelper === NULL ? self::$container->get('chill.main.security.authorization.helper') : $authorizationHelper,
-                $tokenStorage)
-            ;
-    }
-    
-    
-    public function testGetExportsWithoutGranting()
-    {
-        $exportManager = $this->createExportManager();
-        
-        //create an export and add it to ExportManager
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $exportManager->addExport($export->reveal(), 'dummy');
-        
-        $exports = iterator_to_array($exportManager->getExports(false));
 
-        $this->assertGreaterThan(0, count($exports));
-        $this->assertContains($export->reveal(), $exports);
-        $this->assertContains('dummy', array_keys($exports));
-    }
-    
-    public function testGetExistingExportsTypes()
+    public function testAggregatorsApplyingOn()
     {
-        $exportManager = $this->createExportManager();
-        
-        //create an export and add it to ExportManager
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $export->getType()->willReturn('my_type');
-        $exportManager->addExport($export->reveal(), 'dummy');
-        
-        $this->assertContains('my_type', $exportManager->getExistingExportsTypes());
-        
-    }
-    
-    public function testGetExport()
-    {
-        $exportManager = $this->createExportManager();
-        
-        //create an export and add it to ExportManager
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $exportManager->addExport($export->reveal(), 'dummy');
-        
-        $obtained = $exportManager->getExport('dummy');
+        $center = $this->prepareCenter(100, 'center');
+        $centers = [$center];
+        $user = $this->prepareUser([]);
 
-        $this->assertInstanceof(ExportInterface::class, $obtained);
-    }
-    
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testGetExportNonExistant()
-    {
-        $exportManager = $this->createExportManager();
-        
-        $exportManager->getExport('non existing');
-    }
-    
-    public function testGetFilter()
-    {
-        $exportManager = $this->createExportManager();
-        
-        //create a filter and add it to ExportManager
-        $filter = $this->prophet->prophesize();
-        $filter->willImplement('Chill\MainBundle\Export\FilterInterface');
-        $exportManager->addFilter($filter->reveal(), 'dummy');
-        
-        $obtained = $exportManager->getFilter('dummy');
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
+            ->willReturn(true);
 
-        $this->assertInstanceof('Chill\MainBundle\Export\FilterInterface', $obtained);
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user
+        );
+
+        $exportFooBar = $this->prophet->prophesize();
+        $exportFooBar->willImplement(ExportInterface::class);
+        $exportFooBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $exportFooBar->supportsModifiers()->willReturn(['foo', 'bar']);
+
+        $aggregatorBar = $this->prophet->prophesize();
+        $aggregatorBar->willImplement(AggregatorInterface::class);
+        $aggregatorBar->applyOn()->willReturn('bar');
+        $aggregatorBar->addRole()->willReturn(null);
+        $exportManager->addAggregator($aggregatorBar->reveal(), 'bar');
+
+        $exportBar = $this->prophet->prophesize();
+        $exportBar->willImplement(ExportInterface::class);
+        $exportBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $exportBar->supportsModifiers()->willReturn(['bar']);
+
+        $aggregatorFoo = $this->prophet->prophesize();
+        $aggregatorFoo->willImplement(AggregatorInterface::class);
+        $aggregatorFoo->applyOn()->willReturn('foo');
+        $aggregatorFoo->addRole()->willReturn(null);
+        $exportManager->addAggregator($aggregatorFoo->reveal(), 'foo');
+
+        $exportFoo = $this->prophet->prophesize();
+        $exportFoo->willImplement(ExportInterface::class);
+        $exportFoo->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $exportFoo->supportsModifiers()->willReturn(['foo']);
+
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFoo->reveal(), $centers));
+        $this->assertEquals(1, count($obtained));
+        $this->assertContains('foo', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportBar->reveal(), $centers));
+        $this->assertEquals(1, count($obtained));
+        $this->assertContains('bar', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar->reveal(), $centers));
+        $this->assertEquals(2, count($obtained));
+        $this->assertContains('bar', array_keys($obtained));
+        $this->assertContains('foo', array_keys($obtained));
+
+        // test with empty centers
+        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar->reveal(), []));
+        $this->assertEquals(0, count($obtained));
     }
-    
-    
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testGetFilterNonExistant()
+
+    public function testFiltersApplyingOn()
     {
-        $exportManager = $this->createExportManager();
-        
-        $exportManager->getFilter('non existing');
-    }
-    
-    public function testGetFilters()
-    {
-        $exportManager = $this->createExportManager();
-        
-        //create three filters and add them to ExportManager
-        $filterFoo = $this->prophet->prophesize();
-        $filterFoo->willImplement('Chill\MainBundle\Export\FilterInterface');
+        $center = $this->prepareCenter(100, 'center');
+        $centers = [$center];
+        $user = $this->prepareUser([]);
+
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
+            ->willReturn(true);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user
+        );
+
+        $exportFooBar = $this->prophet->prophesize();
+        $exportFooBar->willImplement(ExportInterface::class);
+        $exportFooBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $exportFooBar->supportsModifiers()->willReturn(['foo', 'bar']);
+
         $filterBar = $this->prophet->prophesize();
-        $filterBar->willImplement('Chill\MainBundle\Export\FilterInterface');
-        $filterFooBar = $this->prophet->prophesize();
-        $filterFooBar->willImplement('Chill\MainBundle\Export\FilterInterface');
-        $exportManager->addFilter($filterFoo->reveal(), 'foo');
+        $filterBar->willImplement(FilterInterface::class);
+        $filterBar->applyOn()->willReturn('bar');
+        $filterBar->addRole()->willReturn(null);
+        $filterBar->describeAction(Argument::cetera())->willReturn('string');
         $exportManager->addFilter($filterBar->reveal(), 'bar');
-        $exportManager->addFilter($filterFooBar->reveal(), 'foobar');
-        
-        $obtained = iterator_to_array($exportManager->getFilters(array('foo', 'bar')));
 
-        $this->assertContains($filterBar->reveal(), $obtained);
-        $this->assertContains($filterFoo->reveal(), $obtained);
-        $this->assertNotContains($filterFooBar->reveal(), $obtained);
+        $exportBar = $this->prophet->prophesize();
+        $exportBar->willImplement(ExportInterface::class);
+        $exportBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $exportBar->supportsModifiers()->willReturn(['bar']);
+
+        $filterFoo = $this->prophet->prophesize();
+        $filterFoo->willImplement(FilterInterface::class);
+        $filterFoo->applyOn()->willReturn('foo');
+        $filterFoo->addRole()->willReturn(null);
+        $filterFoo->describeAction(Argument::cetera())->willReturn('string');
+        $exportManager->addFilter($filterFoo->reveal(), 'foo');
+
+        $exportFoo = $this->prophet->prophesize();
+        $exportFoo->willImplement(ExportInterface::class);
+        $exportFoo->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $exportFoo->supportsModifiers()->willReturn(['foo']);
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFoo->reveal(), $centers));
+        $this->assertEquals(1, count($obtained));
+        $this->assertContains('foo', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportBar->reveal(), $centers));
+        $this->assertEquals(1, count($obtained));
+        $this->assertContains('bar', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar->reveal(), $centers));
+        $this->assertEquals(2, count($obtained));
+        $this->assertContains('bar', array_keys($obtained));
+        $this->assertContains('foo', array_keys($obtained));
+
+        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar->reveal(), []));
+        $this->assertEquals(0, count($obtained));
     }
-    
+
+    public function testFormattersByTypes()
+    {
+        $exportManager = $this->createExportManager();
+
+        //create a formatter
+        $formatterFoo = $this->prophet->prophesize();
+        $formatterFoo->willImplement('Chill\MainBundle\Export\FormatterInterface');
+        $formatterFoo->getType()->willReturn('foo');
+        $formatterBar = $this->prophet->prophesize();
+        $formatterBar->willImplement('Chill\MainBundle\Export\FormatterInterface');
+        $formatterBar->getType()->willReturn('bar');
+        $exportManager->addFormatter($formatterFoo->reveal(), 'foo');
+        $exportManager->addFormatter($formatterBar->reveal(), 'bar');
+
+        $obtained = $exportManager->getFormattersByTypes(['foo']);
+
+        $this->assertContains($formatterFoo->reveal(), $obtained);
+        $this->assertNotContains($formatterBar->reveal(), $obtained);
+    }
+
+    /**
+     * Test the generation of an export.
+     */
+    public function testGenerate()
+    {
+        $center = $this->prepareCenter(100, 'center');
+        $user = $this->prepareUser([]);
+
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
+            ->willReturn(true);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user
+        );
+
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $em = self::$container->get('doctrine.orm.entity_manager');
+        $export->initiateQuery(
+            Argument::is(['foo']),
+            Argument::Type('array'),
+            Argument::is(['a' => 'b'])
+        )
+            ->will(static function () use ($em) {
+                $qb = $em->createQueryBuilder();
+
+                return $qb->addSelect('COUNT(user.id) as export')
+                    ->from('ChillMainBundle:User', 'user');
+            });
+        //$export->initiateQuery()->shouldBeCalled();
+        $export->supportsModifiers()->willReturn(['foo']);
+        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+        $export->getResult(Argument::Type(QueryBuilder::class), Argument::Type('array'))->willReturn([
+            [
+                'aggregator' => 'cat a',
+                'export' => 0,
+            ],
+            [
+                'aggregator' => 'cat b',
+                'export' => 1,
+            ],
+        ]);
+        $export->getLabels(
+            Argument::is('export'),
+            Argument::is([0, 1]),
+            Argument::Type('array')
+        )
+            ->willReturn(static function ($value) {
+                switch ($value) {
+                        case 0:
+                        case 1:
+                            return $value;
+
+                        case '_header':
+                            return 'export';
+
+                        default: throw new RuntimeException(sprintf('The value %s is not valid', $value));
+                    }
+            });
+
+        $export->getQueryKeys(Argument::Type('array'))->willReturn(['export']);
+        $export->getTitle()->willReturn('dummy title');
+        $exportManager->addExport($export->reveal(), 'dummy');
+
+        $filter = $this->prophet->prophesize();
+        $filter->willImplement(FilterInterface::class);
+        //$filter->alterQuery()->shouldBeCalled();
+        $filter->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
+            ->willReturn(null);
+        $filter->addRole()->shouldBeCalled();
+        //$filter->addRole()->shouldBeCalled();
+        $filter->applyOn()->willReturn('foo');
+        $filter->describeAction(Argument::cetera())->willReturn('filtered string');
+        $exportManager->addFilter($filter->reveal(), 'filter_foo');
+
+        $aggregator = $this->prophet->prophesize();
+        $aggregator->willImplement(AggregatorInterface::class);
+        $aggregator->applyOn()->willReturn('foo');
+        $aggregator->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
+            ->willReturn(null);
+        //$aggregator->alterQuery()->shouldBeCalled();
+        $aggregator->getQueryKeys(Argument::Type('array'))->willReturn(['aggregator']);
+        $aggregator->getLabels(
+            Argument::is('aggregator'),
+            Argument::is(['cat a', 'cat b']),
+            Argument::is([])
+        )
+            ->willReturn(static function ($value) {
+                switch ($value) {
+                        case '_header': return 'foo_header';
+
+                        case 'cat a': return 'label cat a';
+
+                        case 'cat b': return 'label cat b';
+
+                        default:
+                            throw new RuntimeException(sprintf('This value (%s) is not valid', $value));
+                    }
+            });
+        $aggregator->addRole()->willReturn(null);
+        //$aggregator->addRole()->shouldBeCalled();
+        $exportManager->addAggregator($aggregator->reveal(), 'aggregator_foo');
+
+        //add formatter interface
+        $formatter = new \Chill\MainBundle\Export\Formatter\SpreadSheetFormatter(
+            self::$container->get('translator'),
+            $exportManager
+        );
+        $exportManager->addFormatter($formatter, 'spreadsheet');
+
+        //ob_start();
+        $response = $exportManager->generate(
+            'dummy',
+            [$center],
+            [
+                ExportType::FILTER_KEY => [
+                    'filter_foo' => [
+                        'enabled' => true,
+                        'form' => [],
+                    ],
+                ],
+                ExportType::AGGREGATOR_KEY => [
+                    'aggregator_foo' => [
+                        'enabled' => true,
+                        'form' => [],
+                    ],
+                ],
+                ExportType::PICK_FORMATTER_KEY => [
+                    'alias' => 'spreadsheet',
+                ],
+                ExportType::EXPORT_KEY => [
+                    'a' => 'b',
+                ],
+            ],
+            [
+                'format' => 'csv',
+                'aggregator_foo' => [
+                    'order' => 1,
+                ],
+            ]
+        );
+        //$content = ob_get_clean();
+        $this->assertInstanceOf(Response::class, $response);
+        $expected = <<<'EOT'
+            "dummy title",""
+            "",""
+            "filtered string",""
+            "foo_header","_header"
+            "label cat a",""
+            "label cat b","1"
+
+            EOT;
+
+        $this->assertEquals($expected, $response->getContent());
+    }
+
     public function testGetAggregator()
     {
         $exportManager = $this->createExportManager();
-        
+
         //create a filter and add it to ExportManager
         $agg = $this->prophet->prophesize();
         $agg->willImplement('Chill\MainBundle\Export\AggregatorInterface');
         $exportManager->addAggregator($agg->reveal(), 'dummy');
-        
+
         $obtained = $exportManager->getAggregator('dummy');
 
         $this->assertInstanceof('Chill\MainBundle\Export\AggregatorInterface', $obtained);
     }
-    
-    
+
     /**
      * @expectedException \RuntimeException
      */
     public function testGetAggregatorNonExistant()
     {
         $exportManager = $this->createExportManager();
-        
+
         $exportManager->getAggregator('non existing');
     }
-    
+
     public function testGetAggregators()
     {
         $exportManager = $this->createExportManager();
-        
+
         //create three filters and add them to ExportManager
         $aggFoo = $this->prophet->prophesize();
         $aggFoo->willImplement('Chill\MainBundle\Export\AggregatorInterface');
@@ -248,425 +403,289 @@ class ExportManagerTest extends KernelTestCase
         $exportManager->addAggregator($aggFoo->reveal(), 'foo');
         $exportManager->addAggregator($aggBar->reveal(), 'bar');
         $exportManager->addAggregator($aggFooBar->reveal(), 'foobar');
-        
-        $obtained = iterator_to_array($exportManager->getAggregators(array('foo', 'bar')));
+
+        $obtained = iterator_to_array($exportManager->getAggregators(['foo', 'bar']));
 
         $this->assertContains($aggBar->reveal(), $obtained);
         $this->assertContains($aggFoo->reveal(), $obtained);
         $this->assertNotContains($aggFooBar->reveal(), $obtained);
     }
-    
+
+    public function testGetExistingExportsTypes()
+    {
+        $exportManager = $this->createExportManager();
+
+        //create an export and add it to ExportManager
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $export->getType()->willReturn('my_type');
+        $exportManager->addExport($export->reveal(), 'dummy');
+
+        $this->assertContains('my_type', $exportManager->getExistingExportsTypes());
+    }
+
+    public function testGetExport()
+    {
+        $exportManager = $this->createExportManager();
+
+        //create an export and add it to ExportManager
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $exportManager->addExport($export->reveal(), 'dummy');
+
+        $obtained = $exportManager->getExport('dummy');
+
+        $this->assertInstanceof(ExportInterface::class, $obtained);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testGetExportNonExistant()
+    {
+        $exportManager = $this->createExportManager();
+
+        $exportManager->getExport('non existing');
+    }
+
+    public function testGetExportsWithoutGranting()
+    {
+        $exportManager = $this->createExportManager();
+
+        //create an export and add it to ExportManager
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $exportManager->addExport($export->reveal(), 'dummy');
+
+        $exports = iterator_to_array($exportManager->getExports(false));
+
+        $this->assertGreaterThan(0, count($exports));
+        $this->assertContains($export->reveal(), $exports);
+        $this->assertContains('dummy', array_keys($exports));
+    }
+
+    public function testGetFilter()
+    {
+        $exportManager = $this->createExportManager();
+
+        //create a filter and add it to ExportManager
+        $filter = $this->prophet->prophesize();
+        $filter->willImplement('Chill\MainBundle\Export\FilterInterface');
+        $exportManager->addFilter($filter->reveal(), 'dummy');
+
+        $obtained = $exportManager->getFilter('dummy');
+
+        $this->assertInstanceof('Chill\MainBundle\Export\FilterInterface', $obtained);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testGetFilterNonExistant()
+    {
+        $exportManager = $this->createExportManager();
+
+        $exportManager->getFilter('non existing');
+    }
+
+    public function testGetFilters()
+    {
+        $exportManager = $this->createExportManager();
+
+        //create three filters and add them to ExportManager
+        $filterFoo = $this->prophet->prophesize();
+        $filterFoo->willImplement('Chill\MainBundle\Export\FilterInterface');
+        $filterBar = $this->prophet->prophesize();
+        $filterBar->willImplement('Chill\MainBundle\Export\FilterInterface');
+        $filterFooBar = $this->prophet->prophesize();
+        $filterFooBar->willImplement('Chill\MainBundle\Export\FilterInterface');
+        $exportManager->addFilter($filterFoo->reveal(), 'foo');
+        $exportManager->addFilter($filterBar->reveal(), 'bar');
+        $exportManager->addFilter($filterFooBar->reveal(), 'foobar');
+
+        $obtained = iterator_to_array($exportManager->getFilters(['foo', 'bar']));
+
+        $this->assertContains($filterBar->reveal(), $obtained);
+        $this->assertContains($filterFoo->reveal(), $obtained);
+        $this->assertNotContains($filterFooBar->reveal(), $obtained);
+    }
+
     public function testGetFormatter()
     {
         $exportManager = $this->createExportManager();
-        
+
         //create a formatter
         $formatter = $this->prophet->prophesize();
         $formatter->willImplement('Chill\MainBundle\Export\FormatterInterface');
         $exportManager->addFormatter($formatter->reveal(), 'dummy');
-        
+
         $obtained = $exportManager->getFormatter('dummy');
-        
+
         $this->assertInstanceOf('Chill\MainBundle\Export\FormatterInterface', $obtained);
     }
-    
+
+    public function testIsGrantedForElementWithExportAndUserIsGranted()
+    {
+        $center = $this->prepareCenter(100, 'center A');
+        $user = $this->prepareUser([]);
+
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
+            ->willReturn(true);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user
+        );
+
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+
+        $result = $exportManager->isGrantedForElement($export->reveal(), null, [$center]);
+
+        $this->assertTrue($result);
+    }
+
+    public function testIsGrantedForElementWithExportAndUserIsGrantedNotForAllCenters()
+    {
+        $center = $this->prepareCenter(100, 'center A');
+        $centerB = $this->prepareCenter(102, 'center B');
+        $user = $this->prepareUser([]);
+
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
+            ->willReturn(true);
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
+            ->willReturn(false);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user
+        );
+
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+
+        $result = $exportManager->isGrantedForElement($export->reveal(), null, [$center, $centerB]);
+
+        $this->assertFalse($result);
+    }
+
+    public function testIsGrantedForElementWithExportEmptyCenters()
+    {
+        $user = $this->prepareUser([]);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            null,
+            null,
+            $user
+        );
+
+        $export = $this->prophet->prophesize();
+        $export->willImplement(\Chill\MainBundle\Export\ExportInterface::class);
+        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+
+        $result = $exportManager->isGrantedForElement($export->reveal(), null, []);
+
+        $this->assertFalse($result);
+    }
+
+    public function testIsGrantedForElementWithModifierFallbackToExport()
+    {
+        $center = $this->prepareCenter(100, 'center A');
+        $centerB = $this->prepareCenter(102, 'center B');
+        $user = $this->prepareUser([]);
+
+        $authorizationChecker = $this->prophet->prophesize();
+        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
+            ->willReturn(true);
+        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
+            ->willReturn(false);
+
+        $exportManager = $this->createExportManager(
+            null,
+            null,
+            $authorizationChecker->reveal(),
+            null,
+            $user
+        );
+
+        $modifier = $this->prophet->prophesize();
+        $modifier->willImplement(\Chill\MainBundle\Export\ModifierInterface::class);
+        $modifier->addRole()->willReturn(null);
+
+        $export = $this->prophet->prophesize();
+        $export->willImplement(ExportInterface::class);
+        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
+
+        $result = $exportManager->isGrantedForElement(
+            $modifier->reveal(),
+            $export->reveal(),
+            [$center, $centerB]
+        );
+
+        $this->assertFalse($result);
+    }
+
     /**
      * @expectedException \RuntimeException
      */
     public function testNonExistingFormatter()
     {
         $exportManager = $this->createExportManager();
-        
+
         $exportManager->getFormatter('non existing');
     }
-    
-    public function testFormattersByTypes()
-    {
-        $exportManager = $this->createExportManager();
-        
-        //create a formatter
-        $formatterFoo = $this->prophet->prophesize();
-        $formatterFoo->willImplement('Chill\MainBundle\Export\FormatterInterface');
-        $formatterFoo->getType()->willReturn('foo');
-        $formatterBar = $this->prophet->prophesize();
-        $formatterBar->willImplement('Chill\MainBundle\Export\FormatterInterface');
-        $formatterBar->getType()->willReturn('bar');
-        $exportManager->addFormatter($formatterFoo->reveal(), 'foo');
-        $exportManager->addFormatter($formatterBar->reveal(), 'bar');
-        
-        $obtained = $exportManager->getFormattersByTypes(array('foo'));
-        
-        $this->assertContains($formatterFoo->reveal(), $obtained);
-        $this->assertNotContains($formatterBar->reveal(), $obtained);
-    }
-    
-    public function testIsGrantedForElementWithExportAndUserIsGranted()
-    {
-        $center = $this->prepareCenter(100, 'center A');
-        $user = $this->prepareUser(array());
-        
-        $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
-                ->willReturn(True);
-        
-        $exportManager = $this->createExportManager(null, null, 
-                $authorizationChecker->reveal(), null, $user);
-        
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        
-        $result = $exportManager->isGrantedForElement($export->reveal(), null, array($center));
-        
-        $this->assertTrue($result);
-        
-    }
-    
-    public function testIsGrantedForElementWithExportAndUserIsGrantedNotForAllCenters()
-    {
-        $center = $this->prepareCenter(100, 'center A');
-        $centerB = $this->prepareCenter(102, 'center B');
-        $user = $this->prepareUser(array());
-        
-        $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
-                ->willReturn(true);
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
-                ->willReturn(false);
-        
-        $exportManager = $this->createExportManager(null, null, 
-                $authorizationChecker->reveal(), null, $user);
-        
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        
-        $result = $exportManager->isGrantedForElement($export->reveal(), null, array($center, $centerB));
-        
-        $this->assertFalse($result);
-        
-    }
-    
-    public function testIsGrantedForElementWithExportEmptyCenters()
-    {
-        $user = $this->prepareUser(array());
-        
-        $exportManager = $this->createExportManager(null, null, 
-                null, null, $user);
-        
-        $export = $this->prophet->prophesize();
-        $export->willImplement(\Chill\MainBundle\Export\ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        
-        $result = $exportManager->isGrantedForElement($export->reveal(), null, array());
-        
-        $this->assertFalse($result);
-        
-    }
-    
-    public function testIsGrantedForElementWithModifierFallbackToExport()
-    {
-        $center = $this->prepareCenter(100, 'center A');
-        $centerB = $this->prepareCenter(102, 'center B');
-        $user = $this->prepareUser(array());
-        
-        $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
-                ->willReturn(true);
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $centerB)
-                ->willReturn(false);
-        
-        $exportManager = $this->createExportManager(null, null, 
-                $authorizationChecker->reveal(), null, $user);
-        
-        $modifier = $this->prophet->prophesize();
-        $modifier->willImplement(\Chill\MainBundle\Export\ModifierInterface::class);
-        $modifier->addRole()->willReturn(NULL);
-        
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        
-        $result = $exportManager->isGrantedForElement($modifier->reveal(), 
-                $export->reveal(), array($center, $centerB));
-        
-        $this->assertFalse($result);
-        
-    }
-    
-    public function testAggregatorsApplyingOn()
-    {
-        $center = $this->prepareCenter(100, 'center');
-        $centers = array($center);
-        $user = $this->prepareUser(array());
-        
-        $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
-                ->willReturn(true);
-        
-        $exportManager = $this->createExportManager(null, null, 
-                $authorizationChecker->reveal(), null, $user);
-        
-        $exportFooBar = $this->prophet->prophesize();
-        $exportFooBar->willImplement(ExportInterface::class);
-        $exportFooBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportFooBar->supportsModifiers()->willReturn(array('foo', 'bar'));
-        
-        $aggregatorBar = $this->prophet->prophesize();
-        $aggregatorBar->willImplement(AggregatorInterface::class);
-        $aggregatorBar->applyOn()->willReturn('bar');
-        $aggregatorBar->addRole()->willReturn(null);
-        $exportManager->addAggregator($aggregatorBar->reveal(), 'bar');
-        
-        $exportBar = $this->prophet->prophesize();
-        $exportBar->willImplement(ExportInterface::class);
-        $exportBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportBar->supportsModifiers()->willReturn(array('bar'));
-        
-        $aggregatorFoo = $this->prophet->prophesize();
-        $aggregatorFoo->willImplement(AggregatorInterface::class);
-        $aggregatorFoo->applyOn()->willReturn('foo');
-        $aggregatorFoo->addRole()->willReturn(null);
-        $exportManager->addAggregator($aggregatorFoo->reveal(), 'foo');
-        
-        $exportFoo = $this->prophet->prophesize();
-        $exportFoo->willImplement(ExportInterface::class);
-        $exportFoo->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportFoo->supportsModifiers()->willReturn(array('foo'));
-        
 
-        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFoo->reveal(), $centers));
-        $this->assertEquals(1, count($obtained));
-        $this->assertContains('foo', array_keys($obtained));
-        
-        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportBar->reveal(), $centers));
-        $this->assertEquals(1, count($obtained));
-        $this->assertContains('bar', array_keys($obtained));
-        
-        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar->reveal(), $centers));
-        $this->assertEquals(2, count($obtained));
-        $this->assertContains('bar', array_keys($obtained));
-        $this->assertContains('foo', array_keys($obtained));
-        
-        // test with empty centers
-        $obtained = iterator_to_array($exportManager->getAggregatorsApplyingOn($exportFooBar->reveal(), array()));
-        $this->assertEquals(0, count($obtained));
-        
-    }
-    
-    public function testFiltersApplyingOn()
-    {
-        $center = $this->prepareCenter(100, 'center');
-        $centers = array($center);
-        $user = $this->prepareUser(array());
-        
-        $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
-                ->willReturn(true);
-        
-        $exportManager = $this->createExportManager(null, null, 
-                $authorizationChecker->reveal(), null, $user);
-        
-        $exportFooBar = $this->prophet->prophesize();
-        $exportFooBar->willImplement(ExportInterface::class);
-        $exportFooBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportFooBar->supportsModifiers()->willReturn(array('foo', 'bar'));
-        
-        $filterBar = $this->prophet->prophesize();
-        $filterBar->willImplement(FilterInterface::class);
-        $filterBar->applyOn()->willReturn('bar');
-        $filterBar->addRole()->willReturn(null);
-        $filterBar->describeAction(Argument::cetera())->willReturn('string');
-        $exportManager->addFilter($filterBar->reveal(), 'bar');
-        
-        $exportBar = $this->prophet->prophesize();
-        $exportBar->willImplement(ExportInterface::class);
-        $exportBar->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportBar->supportsModifiers()->willReturn(array('bar'));
-        
-        $filterFoo = $this->prophet->prophesize();
-        $filterFoo->willImplement(FilterInterface::class);
-        $filterFoo->applyOn()->willReturn('foo');
-        $filterFoo->addRole()->willReturn(null);
-        $filterFoo->describeAction(Argument::cetera())->willReturn('string');
-        $exportManager->addFilter($filterFoo->reveal(), 'foo');
-        
-        $exportFoo = $this->prophet->prophesize();
-        $exportFoo->willImplement(ExportInterface::class);
-        $exportFoo->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $exportFoo->supportsModifiers()->willReturn(array('foo'));
-        
-
-        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFoo->reveal(), $centers));
-        $this->assertEquals(1, count($obtained));
-        $this->assertContains('foo', array_keys($obtained));
-        
-        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportBar->reveal(), $centers));
-        $this->assertEquals(1, count($obtained));
-        $this->assertContains('bar', array_keys($obtained));
-        
-        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar->reveal(), $centers));
-        $this->assertEquals(2, count($obtained));
-        $this->assertContains('bar', array_keys($obtained));
-        $this->assertContains('foo', array_keys($obtained));
-        
-        $obtained = iterator_to_array($exportManager->getFiltersApplyingOn($exportFooBar->reveal(), array()));
-        $this->assertEquals(0, count($obtained));
-    }
-    
     /**
-     * Test the generation of an export
+     *  Create an ExportManager where every element may be replaced by a double.
+     *
+     * If null is provided for an element, this is replaced by the equivalent
+     * from the container; if the user provided is null, this is replaced by the
+     * user 'center a_social' from database.
+     *
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Doctrine\ORM\EntityManagerInterface $em
+     * @param \Symfony\Component\Security\Core\Authorization\AuthorizationChecker $authorizationChecker
+     * @param \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper
+     * @param \Symfony\Component\Security\Core\User\UserInterface $user
+     *
+     * @return ExportManager
      */
-    public function testGenerate()
-    {
-        $center = $this->prepareCenter(100, 'center');
-        $user = $this->prepareUser(array());
-        
-        $authorizationChecker = $this->prophet->prophesize();
-        $authorizationChecker->willImplement(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('CHILL_STAT_DUMMY', $center)
-                ->willReturn(true);
-        
-        $exportManager = $this->createExportManager(null, null, 
-                $authorizationChecker->reveal(), null, $user);
-        
-        $export = $this->prophet->prophesize();
-        $export->willImplement(ExportInterface::class);
-        $em = self::$container->get('doctrine.orm.entity_manager');
-        $export->initiateQuery(
-                    Argument::is(array('foo')), 
-                    Argument::Type('array'),
-                    Argument::is(array('a' => 'b'))
-                )
-                ->will(function () use ($em) {
-                    $qb = $em->createQueryBuilder();
-                    return $qb->addSelect('COUNT(user.id) as export')
-                            ->from('ChillMainBundle:User', 'user');
-                    
-                });
-        //$export->initiateQuery()->shouldBeCalled();
-        $export->supportsModifiers()->willReturn(array('foo'));
-        $export->requiredRole()->willReturn(new Role('CHILL_STAT_DUMMY'));
-        $export->getResult(Argument::Type(QueryBuilder::class), Argument::Type('array'))->willReturn(array(
-            array(
-                'aggregator' => 'cat a',
-                'export' => 0,
-            ),
-            array(
-                'aggregator' => 'cat b',
-                'export' => 1
-            )
-        ));
-        $export->getLabels(
-                    Argument::is('export'), 
-                    Argument::is(array(0, 1)), 
-                    Argument::Type('array')
-                )
-                ->willReturn(function($value) { 
-                    switch($value) {
-                        case 0: 
-                        case 1:
-                            return $value;
-                        case '_header':
-                            return 'export';
-                        default: throw new \RuntimeException(sprintf("The value %s is not valid", $value));
-                    }
-                });
-                
-        $export->getQueryKeys(Argument::Type('array'))->willReturn(array('export'));
-        $export->getTitle()->willReturn('dummy title');
-        $exportManager->addExport($export->reveal(), 'dummy');
-        
-        $filter = $this->prophet->prophesize();
-        $filter->willImplement(FilterInterface::class);
-        //$filter->alterQuery()->shouldBeCalled();
-        $filter->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
-                ->willReturn(null);
-        $filter->addRole()->shouldBeCalled();
-        //$filter->addRole()->shouldBeCalled();
-        $filter->applyOn()->willReturn('foo');
-        $filter->describeAction(Argument::cetera())->willReturn('filtered string');
-        $exportManager->addFilter($filter->reveal(), 'filter_foo');
-        
-        $aggregator = $this->prophet->prophesize();
-        $aggregator->willImplement(AggregatorInterface::class);
-        $aggregator->applyOn()->willReturn('foo');
-        $aggregator->alterQuery(Argument::Type(QueryBuilder::class), Argument::Type('array'))
-                ->willReturn(null);
-        //$aggregator->alterQuery()->shouldBeCalled();
-        $aggregator->getQueryKeys(Argument::Type('array'))->willReturn(array('aggregator'));
-        $aggregator->getLabels(
-                    Argument::is('aggregator'), 
-                    Argument::is(array('cat a', 'cat b')), 
-                    Argument::is(array())
-                )
-                ->willReturn(function($value) {
-                    switch ($value) {
-                        case '_header': return 'foo_header';
-                        case 'cat a'  : return 'label cat a';
-                        case 'cat b'  : return 'label cat b';
-                        default:
-                            throw new \RuntimeException(sprintf("This value (%s) is not valid", $value));
-                    }
-                });
-        $aggregator->addRole()->willReturn(null);
-        //$aggregator->addRole()->shouldBeCalled();
-        $exportManager->addAggregator($aggregator->reveal(), 'aggregator_foo');
-        
-        //add formatter interface
-        $formatter = new \Chill\MainBundle\Export\Formatter\SpreadSheetFormatter(
-                self::$container->get('translator'), $exportManager);
-        $exportManager->addFormatter($formatter, 'spreadsheet');
-        
-        //ob_start();
-        $response = $exportManager->generate(
-                'dummy', 
-                array($center), 
-                array(
-                    ExportType::FILTER_KEY => array(
-                        'filter_foo' => array(
-                            'enabled' => true,
-                            'form' => array()
-                        )
-                    ),
-                    ExportType::AGGREGATOR_KEY => array(
-                        'aggregator_foo' => array(
-                            'enabled' => true,
-                            'form' => array() 
-                        )
-                    ),
-                    ExportType::PICK_FORMATTER_KEY => array(
-                        'alias' => 'spreadsheet'
-                    ),
-                    ExportType::EXPORT_KEY => array(
-                        'a' => 'b'
-                    )
-                ), 
-                array(
-                    'format' => 'csv',
-                    'aggregator_foo' => array(
-                        'order' => 1
-                    )
-                )
-            );
-        //$content = ob_get_clean();
-        $this->assertInstanceOf(Response::class, $response);
-        $expected = <<<EOT
-"dummy title",""
-"",""
-"filtered string",""
-"foo_header","_header"
-"label cat a",""
-"label cat b","1"
+    protected function createExportManager(
+        ?\Psr\Log\LoggerInterface $logger = null,
+        ?\Doctrine\ORM\EntityManagerInterface $em = null,
+        ?AuthorizationCheckerInterface $authorizationChecker = null,
+        ?\Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper = null,
+        ?\Symfony\Component\Security\Core\User\UserInterface $user = null
+    ) {
+        $localUser = null === $user ? self::$container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:User')
+            ->findOneBy(['username' => 'center a_social']) :
+            $user;
+        $token = new \Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken($localUser, 'password', 'provider');
+        $tokenStorage = new \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage();
+        $tokenStorage->setToken($token);
 
-EOT;
-
-        $this->assertEquals($expected, $response->getContent());
+        return new ExportManager(
+            null === $logger ? self::$container->get('logger') : $logger,
+            null === $em ? self::$container->get('doctrine.orm.entity_manager') : $em,
+            null === $authorizationChecker ? self::$container->get('security.authorization_checker') : $authorizationChecker,
+            null === $authorizationHelper ? self::$container->get('chill.main.security.authorization.helper') : $authorizationHelper,
+            $tokenStorage
+        );
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
index a72360301..55f9b64c5 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php
@@ -1,83 +1,28 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type;
 
-use Symfony\Component\Form\Test\TypeTestCase;
-use Chill\MainBundle\Form\Type\CenterType;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\GroupCenter;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Chill\MainBundle\Entity\User;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class CenterTypeTest extends TypeTestCase
+final class PickCenterTypeTest extends TypeTestCase
 {
-    /**
-     * Test that a user which can reach only one center
-     * render as an hidden field
-     */
-    public function testUserCanReachSingleCenter()
-    {
-        $this->markTestSkipped();
-        //prepare user
-        $center = $this->prepareCenter(1, 'center');
-        $groupCenter = (new GroupCenter())
-                ->setCenter($center)
-                ;
-        $user = (new User())
-                ->addGroupCenter($groupCenter);
-
-        $type = $this->prepareType($user);
-
-        $this->assertEquals(HiddenType::class, $type->getParent());
-    }
-
-    /**
-     * Test that a user which can reach only one center
-     * render as an hidden field
-     */
-    public function testUserCanReachMultipleSameCenter()
-    {
-        $this->markTestSkipped();
-        //prepare user
-        $center = $this->prepareCenter(1, 'center');
-        $groupCenterA = (new GroupCenter())
-                ->setCenter($center)
-                ;
-        $groupCenterB = (new GroupCenter())
-                ->setCenter($center)
-                ;
-        $user = (new User())
-                ->addGroupCenter($groupCenterA)
-                ->addGroupCenter($groupCenterB);
-
-        $type = $this->prepareType($user);
-
-        $this->assertEquals(HiddenType::class, $type->getParent());
-    }
-
     /**
      * Test that a user which can reach multiple center
      * make CenterType render as "entity" type.
@@ -89,15 +34,12 @@ class CenterTypeTest extends TypeTestCase
         $centerA = $this->prepareCenter(1, 'centerA');
         $centerB = $this->prepareCenter(2, 'centerB');
         $groupCenterA = (new GroupCenter())
-                ->setCenter($centerA)
-                ;
+            ->setCenter($centerA);
         $groupCenterB = (new GroupCenter())
-              ->setCenter($centerB)
-              ;
+            ->setCenter($centerB);
         $user = (new User())
-                ->addGroupCenter($groupCenterA)
-                ->addGroupCenter($groupCenterB)
-              ;
+            ->addGroupCenter($groupCenterA)
+            ->addGroupCenter($groupCenterB);
 
         $type = $this->prepareType($user);
 
@@ -105,15 +47,57 @@ class CenterTypeTest extends TypeTestCase
     }
 
     /**
-     * prepare a mocked center, with and id and name given
+     * Test that a user which can reach only one center
+     * render as an hidden field.
+     */
+    public function testUserCanReachMultipleSameCenter()
+    {
+        $this->markTestSkipped();
+        //prepare user
+        $center = $this->prepareCenter(1, 'center');
+        $groupCenterA = (new GroupCenter())
+            ->setCenter($center);
+        $groupCenterB = (new GroupCenter())
+            ->setCenter($center);
+        $user = (new User())
+            ->addGroupCenter($groupCenterA)
+            ->addGroupCenter($groupCenterB);
+
+        $type = $this->prepareType($user);
+
+        $this->assertEquals(HiddenType::class, $type->getParent());
+    }
+
+    /**
+     * Test that a user which can reach only one center
+     * render as an hidden field.
+     */
+    public function testUserCanReachSingleCenter()
+    {
+        $this->markTestSkipped();
+        //prepare user
+        $center = $this->prepareCenter(1, 'center');
+        $groupCenter = (new GroupCenter())
+            ->setCenter($center);
+        $user = (new User())
+            ->addGroupCenter($groupCenter);
+
+        $type = $this->prepareType($user);
+
+        $this->assertEquals(HiddenType::class, $type->getParent());
+    }
+
+    /**
+     * prepare a mocked center, with and id and name given.
      *
      * @param int $id
      * @param string $name
+     *
      * @return \Chill\MainBundle\Entity\Center
      */
     private function prepareCenter($id, $name)
     {
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
 
         $prophecyCenter = $prophet->prophesize();
         $prophecyCenter->willExtend('\Chill\MainBundle\Entity\Center');
@@ -123,36 +107,35 @@ class CenterTypeTest extends TypeTestCase
         return $prophecyCenter->reveal();
     }
 
-
     /**
-     * prepare the type with mocked center transformer and token storage
+     * prepare the type with mocked center transformer and token storage.
      *
      * @param User $user the user for wich the form will be prepared
+     *
      * @return CenterType
      */
     private function prepareType(User $user)
     {
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
 
         //create a center transformer
         $centerTransformerProphecy = $prophet->prophesize();
         $centerTransformerProphecy
-              ->willExtend('Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer');
+            ->willExtend('Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer');
         $transformer = $centerTransformerProphecy->reveal();
 
         $tokenProphecy = $prophet->prophesize();
         $tokenProphecy
-                ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+            ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
         $tokenProphecy->getUser()->willReturn($user);
         $token = $tokenProphecy->reveal();
 
         $tokenStorageProphecy = $prophet->prophesize();
         $tokenStorageProphecy
-                ->willExtend('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage');
+            ->willExtend('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage');
         $tokenStorageProphecy->getToken()->willReturn($token);
         $tokenStorage = $tokenStorageProphecy->reveal();
 
         return new CenterType($tokenStorage, $transformer);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
index 3f0dd2367..c527a1f6a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php
@@ -1,148 +1,137 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Pagination;
 
+use Chill\MainBundle\Pagination\Page;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Chill\MainBundle\Pagination\Page;
 
 /**
- * Test the Page class
+ * Test the Page class.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PageTest extends KernelTestCase
+final class PageTest extends KernelTestCase
 {
     protected $paginator;
-    
+
     protected $prophet;
-    
-    public function setUp() {
-        $this->prophet = new \Prophecy\Prophet;
-        
-        
+
+    public function setUp()
+    {
+        $this->prophet = new \Prophecy\Prophet();
     }
-    
+
     /**
-     * 
-     * @param int $maxResult
-     * @param int $itemPerPage
-     * @param string $route
-     * @param array $routeParameters
-     * @return Page
-     */
-    protected function generatePage(
-          $number = 1, 
-          $itemPerPage = 10,
-          $route = 'route',
-          array $routeParameters = array(),
-          $totalItems = 100
-    ) {
-        $urlGenerator = $this->prophet->prophesize();
-        $urlGenerator->willImplement(UrlGeneratorInterface::class);
-        
-        return new Page(
-            $number, 
-            $itemPerPage, 
-            $urlGenerator->reveal(), 
-            $route, 
-            $routeParameters,
-            $totalItems
-        );
-    }
-    
-    public function testPageNumber() {
-        $page = $this->generatePage(1);
-        
-        $this->assertEquals(1, $page->getNumber());
-    }
-    
-    /**
-     * return a set of element to testGetFirstItemNumber
-     * 
-     * the set contains : 
+     * return a set of element to testGetFirstItemNumber.
+     *
+     * the set contains :
      * - the page number ;
      * - the number of item per page ;
      * - the expected first item number
-     * 
+     *
      * @return array
      */
-    public function generateGetFirstItemNumber() {
-        return array(
-           [1, 10, 0],
-           [2, 10, 10]
-        );
+    public function generateGetFirstItemNumber()
+    {
+        return [
+            [1, 10, 0],
+            [2, 10, 10],
+        ];
     }
-    
+
+    /**
+     * return a set of element to testGetLastItemNumber.
+     *
+     * the set contains :
+     * - the page number ;
+     * - the number of item per page ;
+     * - the expected last item number
+     *
+     * @return array
+     */
+    public function generateGetLastItemNumber()
+    {
+        return [
+            [1, 10, 9],
+            [2, 10, 19],
+        ];
+    }
+
     /**
-     * 
      * @param int $number
      * @param int $itemPerPage
      * @param int $expectedItemPerPage
      * @dataProvider generateGetFirstItemNumber
      */
     public function testGetFirstItemNumber(
-          $number, 
-          $itemPerPage, 
-          $expectedItemPerPage
+        $number,
+        $itemPerPage,
+        $expectedItemPerPage
     ) {
         $page = $this->generatePage($number, $itemPerPage);
-        
+
         $this->assertEquals($expectedItemPerPage, $page->getFirstItemNumber());
     }
-    
+
     /**
-     * return a set of element to testGetLastItemNumber
-     * 
-     * the set contains : 
-     * - the page number ;
-     * - the number of item per page ;
-     * - the expected last item number
-     * 
-     * @return array
-     */
-    public function generateGetLastItemNumber() {
-        return array(
-           [1, 10, 9],
-           [2, 10, 19]
-        );
-    }
-    
-    /**
-     * 
      * @param int $number
      * @param int $itemPerPage
      * @param int $expectedItemPerPage
      * @dataProvider generateGetLastItemNumber
      */
     public function testGetLastItemNumber(
-          $number, 
-          $itemPerPage, 
-          $expectedItemPerPage
+        $number,
+        $itemPerPage,
+        $expectedItemPerPage
     ) {
         $page = $this->generatePage($number, $itemPerPage);
-        
+
         $this->assertEquals($expectedItemPerPage, $page->getLastItemNumber());
     }
-    
-    
+
+    public function testPageNumber()
+    {
+        $page = $this->generatePage(1);
+
+        $this->assertEquals(1, $page->getNumber());
+    }
+
+    /**
+     * @param int $itemPerPage
+     * @param string $route
+     * @param mixed $number
+     * @param mixed $totalItems
+     *
+     * @return Page
+     */
+    protected function generatePage(
+        $number = 1,
+        $itemPerPage = 10,
+        $route = 'route',
+        array $routeParameters = [],
+        $totalItems = 100
+    ) {
+        $urlGenerator = $this->prophet->prophesize();
+        $urlGenerator->willImplement(UrlGeneratorInterface::class);
+
+        return new Page(
+            $number,
+            $itemPerPage,
+            $urlGenerator->reveal(),
+            $route,
+            $routeParameters,
+            $totalItems
+        );
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
index b1a234b94..2a92ef222 100644
--- a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php
@@ -1,133 +1,113 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Pagination;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Chill\MainBundle\Pagination\Paginator;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use function count;
 
 /**
- * Test the paginator class
+ * Test the paginator class.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PaginatorTest extends KernelTestCase
+final class PaginatorTest extends KernelTestCase
 {
     protected $paginator;
-    
+
     protected $prophet;
-    
-    public function setUp() 
+
+    public function setUp()
     {
-        $this->prophet = new \Prophecy\Prophet;
+        $this->prophet = new \Prophecy\Prophet();
     }
-    
-    /**
-     * 
-     * @param int $maxResult
-     * @param int $itemPerPage
-     * @param string $route
-     * @param array $routeParameters
-     * @return Paginator
-     */
-    protected function generatePaginator(
-          $totalItems,
-          $itemPerPage,
-          $currentPageNumber = 1,
-          $route = '',
-          array $routeParameters = array()
-    ) {
-        $urlGenerator = $this->prophet->prophesize();
-        $urlGenerator->willImplement(UrlGeneratorInterface::class);
-        
-        return new Paginator(
-              $totalItems, 
-              $itemPerPage,
-              $currentPageNumber,
-              $route,
-              $routeParameters,
-              $urlGenerator->reveal(),
-              'page',
-              'item_per_page'
-            );
-    }
-    
-    /**
-     * generate a set of pages with different maxItem, itemPerPage, and
-     * expected page number
-     * 
-     * @return array
-     */
-    public function generatePageNumber() 
-    {
-        return array(
-           [12, 10, 2],
-           [20, 10, 2],
-           [21, 10, 3],
-           [19, 10, 2],
-           [1, 10, 1],
-           [0, 10, 1],
-           [10, 10, 1]
-        );
-    }
-    
-    /**
-     * Test that the countPages method (and his alias `count`) return
-     * valid results.
-     * 
-     * @param int $totalItems
-     * @param int $itemPerPage
-     * @param int $expectedPageNumber
-     * @dataProvider generatePageNumber
-     */
-    public function testPageNumber($totalItems, $itemPerPage, $expectedPageNumber) 
-    {
-        $paginator = $this->generatePaginator($totalItems, $itemPerPage);
-        
-        $this->assertEquals($expectedPageNumber, $paginator->countPages());
-        $this->assertEquals($expectedPageNumber, count($paginator));
-    }
-    
+
     /**
      * generate an array with a set of page with :
      * - total items ;
      * - item per page ;
      * - current page number ;
-     * - expected hasNextPage result
-     * 
+     * - expected hasNextPage result.
+     *
      * @return array
      */
-    public function generateHasNextPage() 
+    public function generateHasNextPage()
     {
-        return array(
-          [10, 10, 1, false],
-          [20, 10, 1, true],
-          [12, 10, 1, true],
-          [12, 10, 2, false]
-        );
+        return [
+            [10, 10, 1, false],
+            [20, 10, 1, true],
+            [12, 10, 1, true],
+            [12, 10, 2, false],
+        ];
     }
-    
+
+    public function generateHasPage()
+    {
+        return [
+            [10, 10, -1, false],
+            [12, 10, 1,  true],
+            [12, 10, 2,  true],
+            [12, 10, 3,  false],
+        ];
+    }
+
+    /**
+     * generate an array with a set of page with :
+     * - total items ;
+     * - item per page ;
+     * - current page number ;
+     * - expected hasPreviousPage result.
+     *
+     * @return array
+     */
+    public function generateHasPreviousPage()
+    {
+        return [
+            [10, 10, 1, false],
+            [20, 10, 1, false],
+            [12, 10, 1, false],
+            [12, 10, 2, true],
+        ];
+    }
+
+    /**
+     * generate a set of pages with different maxItem, itemPerPage, and
+     * expected page number.
+     *
+     * @return array
+     */
+    public function generatePageNumber()
+    {
+        return [
+            [12, 10, 2],
+            [20, 10, 2],
+            [21, 10, 3],
+            [19, 10, 2],
+            [1, 10, 1],
+            [0, 10, 1],
+            [10, 10, 1],
+        ];
+    }
+
+    public function testGetPage()
+    {
+        $paginator = $this->generatePaginator(105, 10);
+
+        $this->assertEquals(5, $paginator->getPage(5)->getNumber());
+    }
+
     /**
-     * 
      * @param int $totalItems
      * @param int $itemPerPage
      * @param int $currentPage
@@ -135,103 +115,130 @@ class PaginatorTest extends KernelTestCase
      * @dataProvider generateHasNextPage
      */
     public function testHasNextPage(
-          $totalItems, 
-          $itemPerPage, 
-          $currentPage, 
-          $expectedHasNextPage
+        $totalItems,
+        $itemPerPage,
+        $currentPage,
+        $expectedHasNextPage
     ) {
         $paginator = $this->generatePaginator($totalItems, $itemPerPage, $currentPage);
-        
+
         $this->assertEquals($expectedHasNextPage, $paginator->hasNextPage());
     }
-    
+
     /**
-     * generate an array with a set of page with :
-     * - total items ;
-     * - item per page ;
-     * - current page number ;
-     * - expected hasPreviousPage result
-     * 
-     * @return array
-     */
-    public function generateHasPreviousPage() 
-    {
-        return array(
-          [10, 10, 1, false],
-          [20, 10, 1, false],
-          [12, 10, 1, false],
-          [12, 10, 2, true],
-        );
-    }
-    
-    /**
-     * 
-     * @param int $totalItems
-     * @param int $itemPerPage
-     * @param int $currentPage
-     * @param bool $expectedHasPreviousPage
-     * @dataProvider generateHasPreviousPage
-     */
-    public function testHasPreviousPage(
-          $totalItems, 
-          $itemPerPage, 
-          $currentPage, 
-          $expectedHasNextPage
-    ) {
-        $paginator = $this->generatePaginator($totalItems, $itemPerPage, $currentPage);
-        
-        $this->assertEquals($expectedHasNextPage, $paginator->hasPreviousPage());
-    }
-    
-    public function generateHasPage()
-    {
-        return array(
-           [10, 10, -1, false],
-           [12, 10, 1,  true],
-           [12, 10, 2,  true],
-           [12, 10, 3,  false]
-        );
-    }
-    
-    /**
-     * test the HasPage function
-     * 
-     * 
+     * test the HasPage function.
+     *
      * @param int $totalItems
      * @param int $itemPerpage
      * @param int $pageNumber
      * @param bool $expectedHasPage
      * @dataProvider generateHasPage
      */
-    public function testHasPage($totalItems, $itemPerpage, $pageNumber, 
-          $expectedHasPage)
-    {
+    public function testHasPage(
+        $totalItems,
+        $itemPerpage,
+        $pageNumber,
+        $expectedHasPage
+    ) {
         $paginator = $this->generatePaginator($totalItems, $itemPerpage);
-        
+
         $this->assertEquals($expectedHasPage, $paginator->hasPage($pageNumber));
     }
-    
-    public function testGetPage()
-    {
-        $paginator = $this->generatePaginator(105, 10);
-        
-        $this->assertEquals(5, $paginator->getPage(5)->getNumber());
+
+    /**
+     * @param int $totalItems
+     * @param int $itemPerPage
+     * @param int $currentPage
+     * @param mixed $expectedHasNextPage
+     * @dataProvider generateHasPreviousPage
+     */
+    public function testHasPreviousPage(
+        $totalItems,
+        $itemPerPage,
+        $currentPage,
+        $expectedHasNextPage
+    ) {
+        $paginator = $this->generatePaginator($totalItems, $itemPerPage, $currentPage);
+
+        $this->assertEquals($expectedHasNextPage, $paginator->hasPreviousPage());
     }
-    
+
+    /**
+     * Test that the countPages method (and his alias `count`) return
+     * valid results.
+     *
+     * @param int $totalItems
+     * @param int $itemPerPage
+     * @param int $expectedPageNumber
+     * @dataProvider generatePageNumber
+     */
+    public function testPageNumber($totalItems, $itemPerPage, $expectedPageNumber)
+    {
+        $paginator = $this->generatePaginator($totalItems, $itemPerPage);
+
+        $this->assertEquals($expectedPageNumber, $paginator->countPages());
+        $this->assertEquals($expectedPageNumber, count($paginator));
+    }
+
     public function testPagesGenerator()
     {
         $paginator = $this->generatePaginator(105, 10);
-        
+
         $generator = $paginator->getPagesGenerator();
-        
+
         $i = 1;
-        foreach($generator as $page) {
-            $this->assertEquals($i, $page->getNumber(),
-                  "assert that the current page number is $i");
-            $i++;
+
+        foreach ($generator as $page) {
+            $this->assertEquals(
+                $i,
+                $page->getNumber(),
+                "assert that the current page number is {$i}"
+            );
+            ++$i;
         }
-        
-        $this->assertEquals(11, $page->getNumber(), 
-              "assert that the last page number is 11");
+
+        $this->assertEquals(
+            11,
+            $page->getNumber(),
+            'assert that the last page number is 11'
+        );
+    }
+
+    public function testPagesWithoutResult()
+    {
+        $paginator = $this->generatePaginator(0, 10);
+
+        $this->assertEquals(0, $paginator->getCurrentPageFirstItemNumber());
+        $this->assertEquals(10, $paginator->getItemsPerPage());
+    }
+
+    /**
+     * @param int $itemPerPage
+     * @param string $route
+     * @param mixed $totalItems
+     * @param mixed $currentPageNumber
+     *
+     * @return Paginator
+     */
+    protected function generatePaginator(
+        $totalItems,
+        $itemPerPage,
+        $currentPageNumber = 1,
+        $route = '',
+        array $routeParameters = []
+    ) {
+        $urlGenerator = $this->prophet->prophesize();
+        $urlGenerator->willImplement(UrlGeneratorInterface::class);
+
+        return new Paginator(
+            $totalItems,
+            $itemPerPage,
+            $currentPageNumber,
+            $route,
+            $routeParameters,
+            $urlGenerator->reveal(),
+            'page',
+            'item_per_page'
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
index 359c47a7b..ff8ee423e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php
@@ -1,52 +1,41 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Routing\Loader;
 
-use Chill\MainBundle\Routing\Loader\ChillRoutesLoader;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-
 /**
- * Test the route loader
+ * Test the route loader.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class RouteLoaderTest extends KernelTestCase
+final class RouteLoaderTest extends KernelTestCase
 {
     private $router;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        $this->router = static::$kernel->getContainer()->get('router');
+        self::bootKernel();
+        $this->router = self::$kernel->getContainer()->get('router');
     }
-    
+
     /**
-     * Test that the route loader loads at least homepage
+     * Test that the route loader loads at least homepage.
      */
     public function testRouteFromMainBundleAreLoaded()
     {
         $homepage = $this->router->getRouteCollection()->get('chill_main_homepage');
-        
+
         $this->assertNotNull($homepage);
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
index c0f1827fb..c0c3b176a 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php
@@ -1,52 +1,43 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Search;
 
 /**
- * Description of AbstractSearch
+ * Description of AbstractSearch.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class AbstractSearchTest extends \PHPUnit\Framework\TestCase
+final class AbstractSearchTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Chill\MainBundle\Search\AbstractSearch
      */
     private $stub;
-    
+
     public function setUp()
     {
         $this->stub = $this->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
     }
-    
+
     public function testParseDateRegular()
     {
-        
         $date = $this->stub->parseDate('2014-05-01');
 
         $this->assertEquals('2014', $date->format('Y'));
         $this->assertEquals('05', $date->format('m'));
         $this->assertEquals('01', $date->format('d'));
     }
-    
+
     public function testRecompose()
     {
         $this->markTestSkipped();
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
index 2e63f24e0..339145d9f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php
@@ -1,27 +1,60 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Search;
 
 use Chill\MainBundle\Search\SearchApiQuery;
 use PHPUnit\Framework\TestCase;
+use function is_string;
 
-class SearchApiQueryTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SearchApiQueryTest extends TestCase
 {
+    public function testBuildParams()
+    {
+        $q = new SearchApiQuery();
+
+        $q
+            ->addSelectClause('bada', ['one', 'two'])
+            ->addSelectClause('boum', ['three', 'four'])
+            ->setWhereClauses('mywhere', ['six', 'seven']);
+
+        $params = $q->buildParameters();
+
+        $this->assertEquals(['six', 'seven'], $q->buildParameters(true));
+        $this->assertEquals(['one', 'two', 'three', 'four', 'six', 'seven'], $q->buildParameters());
+    }
+
     public function testMultipleWhereClauses()
     {
         $q = new SearchApiQuery();
         $q->setSelectJsonbMetadata('boum')
             ->setSelectKey('bim')
-            ->setSelectPertinence('1')
+            ->setSelectPertinence('?', ['gamma'])
             ->setFromClause('badaboum')
-            ->andWhereClause('foo', [ 'alpha' ])
-            ->andWhereClause('bar', [ 'beta' ])
-            ;
+            ->andWhereClause('foo', ['alpha'])
+            ->andWhereClause('bar', ['beta']);
 
         $query = $q->buildQuery();
 
-        $this->assertStringContainsString('foo AND bar', $query);
-        $this->assertEquals(['alpha', 'beta'], $q->buildParameters());
+        $this->assertStringContainsString('(foo) AND (bar)', $query);
+        $this->assertEquals(['gamma', 'alpha', 'beta'], $q->buildParameters());
+
+        $query = $q->buildQuery(true);
+
+        $this->assertStringContainsString('(foo) AND (bar)', $query);
+        $this->assertEquals(['gamma', 'alpha', 'beta'], $q->buildParameters());
     }
 
     public function testWithoutWhereClause()
@@ -30,11 +63,9 @@ class SearchApiQueryTest extends TestCase
         $q->setSelectJsonbMetadata('boum')
             ->setSelectKey('bim')
             ->setSelectPertinence('1')
-            ->setFromClause('badaboum')
-        ;
+            ->setFromClause('badaboum');
 
-        $this->assertTrue(\is_string($q->buildQuery()));
+        $this->assertTrue(is_string($q->buildQuery()));
         $this->assertEquals([], $q->buildParameters());
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
index 554b67b9a..3bbc2b94b 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php
@@ -1,197 +1,151 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Test\Search;
 
-use Chill\MainBundle\Search\SearchProvider;
 use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Search\SearchProvider;
 use PHPUnit\Framework\TestCase;
 
-
-class SearchProviderTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SearchProviderTest extends TestCase
 {
-    
     /**
-     *
-     * @var SearchProvider 
+     * @var SearchProvider
      */
     private $search;
-    
+
     public function setUp()
     {
         $this->search = new SearchProvider();
-        
+
         //add a default service
         $this->addSearchService(
-              $this->createDefaultSearchService('I am default', 10), 'default'
-              );
+            $this->createDefaultSearchService('I am default', 10),
+            'default'
+        );
         //add a domain service
         $this->addSearchService(
-              $this->createNonDefaultDomainSearchService('I am domain bar', 20, FALSE), 'bar'
-              );
+            $this->createNonDefaultDomainSearchService('I am domain bar', 20, false),
+            'bar'
+        );
     }
-    
+
+    public function testAccentued()
+    {
+        //$this->markTestSkipped('accentued characters must be implemented');
+
+        $terms = $this->p('manço bélier aztèque à saloù ê');
+
+        $this->assertEquals([
+            '_domain' => null,
+            '_default' => 'manco belier azteque a salou e',
+        ], $terms);
+    }
+
+    public function testAccentuedCapitals()
+    {
+        //$this->markTestSkipped('accentued characters must be implemented');
+
+        $terms = $this->p('MANÉÀ oÛ lÎ À');
+
+        $this->assertEquals([
+            '_domain' => null,
+            '_default' => 'manea ou li a',
+        ], $terms);
+    }
+
+    public function testArgumentNameWithTrait()
+    {
+        $terms = $this->p('date-from:2016-05-04');
+
+        $this->assertEquals([
+            '_domain' => null,
+            'date-from' => '2016-05-04',
+            '_default' => '',
+        ], $terms);
+    }
+
+    public function testCapitalLetters()
+    {
+        $terms = $this->p('Foo:Bar LOL marCi @PERSON');
+
+        $this->assertEquals([
+            '_domain' => 'person',
+            '_default' => 'lol marci',
+            'foo' => 'bar',
+        ], $terms);
+    }
+
+    public function testDoubleParenthesis()
+    {
+        $terms = $this->p('@papamobile name:"my beautiful name" residual surname:"i love techno"');
+
+        $this->assertEquals([
+            '_domain' => 'papamobile',
+            'name' => 'my beautiful name',
+            '_default' => 'residual',
+            'surname' => 'i love techno',
+        ], $terms);
+    }
+
     /**
      * @expectedException \Chill\MainBundle\Search\UnknowSearchNameException
      */
     public function testInvalidSearchName()
     {
-        $this->search->getByName("invalid name");
+        $this->search->getByName('invalid name');
     }
-    
-    public function testSimplePattern()
-    {
-        $terms = $this->p("@person birthdate:2014-01-02 name:(my name) is not my name");
-        
-        $this->assertEquals(array(
-           '_domain' => 'person',
-           'birthdate' => '2014-01-02',
-           '_default' => 'is not my name',
-           'name' => 'my name'
-        ), $terms);
-    }
-    
-    public function testWithoutDomain()
-    {
-        $terms = $this->p('foo:bar residual');
-        
-        $this->assertEquals(array(
-           '_domain' => null,
-           'foo' => 'bar',
-           '_default' => 'residual'
-        ), $terms);
-    }
-    
-    public function testWithoutDefault()
-    {
-        $terms = $this->p('@person foo:bar');
-        
-        $this->assertEquals(array(
-           '_domain' => 'person',
-           'foo' => 'bar',
-           '_default' => ''
-        ), $terms);
-    }
-    
-    public function testCapitalLetters()
-    {
-        $terms = $this->p('Foo:Bar LOL marCi @PERSON');
-        
-        $this->assertEquals(array(
-           '_domain' => 'person',
-           '_default' => 'lol marci',
-           'foo' => 'bar'
-        ), $terms);
-    }
-    
+
     /**
-     * @expectedException Chill\MainBundle\Search\ParsingException
+     * @expectedException \Chill\MainBundle\Search\ParsingException
      */
     public function testMultipleDomainError()
     {
-        $term = $this->p("@person @report");
+        $term = $this->p('@person @report');
     }
-    
-    public function testDoubleParenthesis()
-    {
-        $terms = $this->p("@papamobile name:(my beautiful name) residual "
-              . "surname:(i love techno)");
-        
-        $this->assertEquals(array(
-           '_domain' => 'papamobile',
-           'name' => 'my beautiful name',
-           '_default' => 'residual',
-           'surname' => 'i love techno'
-        ), $terms);
-    }
-    
-    public function testAccentued()
-    {
-        //$this->markTestSkipped('accentued characters must be implemented');
-        
-        $terms = $this->p('manço bélier aztèque à saloù ê');
-        
-        $this->assertEquals(array(
-           '_domain' => NULL,
-           '_default' => 'manco belier azteque a salou e'
-        ), $terms);
-    }
-    
-    public function testAccentuedCapitals()
-    {
-        //$this->markTestSkipped('accentued characters must be implemented');
-        
-        $terms = $this->p('MANÉÀ oÛ lÎ À');
-        
-        $this->assertEquals(array(
-           '_domain' => null,
-           '_default' => 'manea ou li a'
-        ), $terms);
-    }
-    
-    public function testTrimInParenthesis()
-    {
-        $terms = $this->p('foo:(bar     )');
-        
-        $this->assertEquals(array(
-           '_domain' => null,
-           'foo' => 'bar',
-           '_default' => ''
-        ), $terms);
-    }
-    
-    public function testTrimInDefault()
-    {
-        $terms = $this->p('  foo bar     ');
-        
-        $this->assertEquals(array(
-           '_domain' => null,
-           '_default' => 'foo bar'
-        ), $terms);
-    }
-    
-    public function testArgumentNameWithTrait()
-    {
-        $terms = $this->p('date-from:2016-05-04');
-        
-        $this->assertEquals(array(
-            '_domain' => null,
-            'date-from' => '2016-05-04',
-            '_default' => ''
-        ), $terms);
-    }
-    
+
     /**
-     * Test the behaviour when no domain is provided in the search pattern : 
-     * the default search should be enabled
+     * Test the behaviour when no domain is provided in the search pattern :
+     * the default search should be enabled.
      */
     public function testSearchResultDefault()
     {
         $response = $this->search->getSearchResults('default search');
 
         //$this->markTestSkipped();
-        
-        $this->assertEquals(array(
-           "I am default"
-        ), $response);      
+
+        $this->assertEquals([
+            'I am default',
+        ], $response);
     }
-    
+
+    public function testSearchResultDomainSearch()
+    {
+        //add a search service which will be supported
+        $this->addSearchService(
+            $this->createNonDefaultDomainSearchService('I am domain foo', 100, true),
+            'foo'
+        );
+
+        $response = $this->search->getSearchResults('@foo default search');
+
+        $this->assertEquals([
+            'I am domain foo',
+        ], $response);
+    }
+
     /**
      * @expectedException \Chill\MainBundle\Search\UnknowSearchDomainException
      */
@@ -200,116 +154,154 @@ class SearchProviderTest extends TestCase
         $response = $this->search->getSearchResults('@unknow domain');
 
         //$this->markTestSkipped();
-        
     }
-    
-    public function testSearchResultDomainSearch()
-    {
-        //add a search service which will be supported
-        $this->addSearchService(
-              $this->createNonDefaultDomainSearchService("I am domain foo", 100, TRUE), 'foo'
-              );
-        
-        $response = $this->search->getSearchResults('@foo default search');
-        
-        $this->assertEquals(array(
-           "I am domain foo"
-        ), $response);
-        
-    }
-    
+
     public function testSearchWithinSpecificSearchName()
     {
         //add a search service which will be supported
         $this->addSearchService(
-              $this->createNonDefaultDomainSearchService("I am domain foo", 100, TRUE), 'foo'
-              );
-        
+            $this->createNonDefaultDomainSearchService('I am domain foo', 100, true),
+            'foo'
+        );
+
         $response = $this->search->getResultByName('@foo search', 'foo');
-        
+
         $this->assertEquals('I am domain foo', $response);
-        
     }
-    
+
     /**
      * @expectedException \Chill\MainBundle\Search\ParsingException
      */
     public function testSearchWithinSpecificSearchNameInConflictWithSupport()
     {
         $response = $this->search->getResultByName('@foo default search', 'bar');
-        
     }
-    
+
+    public function testSimplePattern()
+    {
+        $terms = $this->p('@person birthdate:2014-01-02 name:"my name" is not my name');
+
+        $this->assertEquals([
+            '_domain' => 'person',
+            'birthdate' => '2014-01-02',
+            '_default' => 'is not my name',
+            'name' => 'my name',
+        ], $terms);
+    }
+
+    public function testTrimInDefault()
+    {
+        $terms = $this->p('  foo bar     ');
+
+        $this->assertEquals([
+            '_domain' => null,
+            '_default' => 'foo bar',
+        ], $terms);
+    }
+
+    public function testTrimInParenthesis()
+    {
+        $terms = $this->p('foo:"bar     "');
+
+        $this->assertEquals([
+            '_domain' => null,
+            'foo' => 'bar',
+            '_default' => '',
+        ], $terms);
+    }
+
+    public function testWithoutDefault()
+    {
+        $terms = $this->p('@person foo:bar');
+
+        $this->assertEquals([
+            '_domain' => 'person',
+            'foo' => 'bar',
+            '_default' => '',
+        ], $terms);
+    }
+
+    public function testWithoutDomain()
+    {
+        $terms = $this->p('foo:bar residual');
+
+        $this->assertEquals([
+            '_domain' => null,
+            'foo' => 'bar',
+            '_default' => 'residual',
+        ], $terms);
+    }
+
     /**
-     * shortcut for executing parse method
-     * 
+     * Add a search service to the chill.main.search_provider.
+     *
+     * Useful for mocking the SearchInterface
+     *
+     * @param string $name
+     */
+    private function addSearchService(SearchInterface $search, $name)
+    {
+        $this->search
+            ->addSearchService($search, $name);
+    }
+
+    private function createDefaultSearchService($result, $order)
+    {
+        $mock = $this
+            ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
+
+        //set the mock as default
+        $mock->expects($this->any())
+            ->method('isActiveByDefault')
+            ->will($this->returnValue(true));
+
+        $mock->expects($this->any())
+            ->method('getOrder')
+            ->will($this->returnValue($order));
+
+        //set the return value
+        $mock->expects($this->any())
+            ->method('renderResult')
+            ->will($this->returnValue($result));
+
+        return $mock;
+    }
+
+    private function createNonDefaultDomainSearchService($result, $order, $domain)
+    {
+        $mock = $this
+            ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
+
+        //set the mock as default
+        $mock->expects($this->any())
+            ->method('isActiveByDefault')
+            ->will($this->returnValue(false));
+
+        $mock->expects($this->any())
+            ->method('getOrder')
+            ->will($this->returnValue($order));
+
+        $mock->expects($this->any())
+            ->method('supports')
+            ->will($this->returnValue($domain));
+
+        //set the return value
+        $mock->expects($this->any())
+            ->method('renderResult')
+            ->will($this->returnValue($result));
+
+        return $mock;
+    }
+
+    /**
+     * shortcut for executing parse method.
+     *
      * @param unknown $pattern
+     *
      * @return string[]
      */
     private function p($pattern)
     {
         return $this->search->parse($pattern);
     }
-    
-    /**
-     * Add a search service to the chill.main.search_provider
-     * 
-     * Useful for mocking the SearchInterface
-     * 
-     * @param SearchInterface $search
-     * @param string $name
-     */
-    private function addSearchService(SearchInterface $search,  $name)
-    {
-        $this->search
-              ->addSearchService($search, $name);
-    }
-    
-    private function createDefaultSearchService($result, $order)
-    {
-        $mock = $this
-              ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
-        
-        //set the mock as default
-        $mock->expects($this->any())
-              ->method('isActiveByDefault')
-              ->will($this->returnValue(TRUE));
-        
-        $mock->expects($this->any())
-              ->method('getOrder')
-              ->will($this->returnValue($order));
-        
-        //set the return value
-        $mock->expects($this->any())
-              ->method('renderResult')
-              ->will($this->returnValue($result));
-        
-        return $mock;
-    }
-    
-    private function createNonDefaultDomainSearchService($result, $order, $domain)
-    {
-        $mock = $this
-              ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
-        
-        //set the mock as default
-        $mock->expects($this->any())
-              ->method('isActiveByDefault')
-              ->will($this->returnValue(FALSE));
-        
-        $mock->expects($this->any())
-              ->method('getOrder')
-              ->will($this->returnValue($order));
-        
-        $mock->expects($this->any())
-              ->method('supports')
-              ->will($this->returnValue($domain));
-        
-        //set the return value
-        $mock->expects($this->any())
-              ->method('renderResult')
-              ->will($this->returnValue($result));
-        
-        return $mock;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
new file mode 100644
index 000000000..310fac60e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Search\Utils;
+
+use Chill\MainBundle\Search\Utils\ExtractDateFromPattern;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use function array_map;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ExtractDateFromPatternTest extends TestCase
+{
+    public function provideSubjects()
+    {
+        yield ['15/06/1981', '', 1, '1981-06-15'];
+
+        yield ['15/06/1981 30/12/1987', '', 2, '1981-06-15', '1987-12-30'];
+
+        yield ['diallo 15/06/1981', 'diallo', 1, '1981-06-15'];
+
+        yield ['diallo  31/03/1981', 'diallo', 1, '1981-03-31'];
+
+        yield ['diallo 15-06-1981', 'diallo', 1, '1981-06-15'];
+
+        yield ['diallo 1981-12-08', 'diallo', 1, '1981-12-08'];
+
+        yield ['diallo', 'diallo', 0];
+    }
+
+    /**
+     * @dataProvider provideSubjects
+     */
+    public function testExtractDate(string $subject, string $filtered, int $count, ...$datesSearched)
+    {
+        $extractor = new ExtractDateFromPattern();
+        $result = $extractor->extractDates($subject);
+
+        $this->assertCount($count, $result->getFound());
+        $this->assertEquals($filtered, $result->getFilteredSubject());
+        $this->assertContainsOnlyInstancesOf(DateTimeImmutable::class, $result->getFound());
+
+        $dates = array_map(
+            static function (DateTimeImmutable $d) {
+                return $d->format('Y-m-d');
+            },
+            $result->getFound()
+        );
+
+        foreach ($datesSearched as $date) {
+            $this->assertContains($date, $dates);
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
new file mode 100644
index 000000000..f792c0a04
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Search\Utils;
+
+use Chill\MainBundle\Search\Utils\ExtractPhonenumberFromPattern;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ExtractPhonenumberFromPatternTest extends KernelTestCase
+{
+    public function provideData()
+    {
+        yield ['Diallo', 0, [], 'Diallo', 'no phonenumber'];
+
+        yield ['Diallo 15/06/2021', 0, [], 'Diallo 15/06/2021', 'no phonenumber and a date'];
+
+        yield ['Diallo 0486 123 456', 1, ['+32486123456'], 'Diallo', 'a phonenumber and a name'];
+
+        yield ['Diallo 123 456', 1, ['123456'], 'Diallo', 'a number and a name, without leadiing 0'];
+
+        yield ['123 456', 1, ['123456'], '', 'only phonenumber'];
+
+        yield ['0123 456', 1, ['+32123456'], '', 'only phonenumber with a leading 0'];
+    }
+
+    /**
+     * @dataProvider provideData
+     *
+     * @param mixed $subject
+     * @param mixed $expectedCount
+     * @param mixed $expected
+     * @param mixed $filteredSubject
+     * @param mixed $msg
+     */
+    public function testExtract($subject, $expectedCount, $expected, $filteredSubject, $msg)
+    {
+        $extractor = new ExtractPhonenumberFromPattern();
+        $result = $extractor->extractPhonenumber($subject);
+
+        $this->assertCount($expectedCount, $result->getFound());
+        $this->assertEquals($filteredSubject, $result->getFilteredSubject());
+        $this->assertEquals($expected, $result->getFound());
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
index 764d6c429..4618ba3b1 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php
@@ -1,386 +1,46 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Security\Authorization;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\MainBundle\Test\PrepareUserTrait;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\PrepareCenterTrait;
 use Chill\MainBundle\Test\PrepareScopeTrait;
+use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\MainBundle\Test\ProphecyTrait;
-use Chill\MainBundle\Entity\User;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\Center;
+use function array_map;
+use function in_array;
 
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class AuthorizationHelperTest extends KernelTestCase
+final class AuthorizationHelperTest extends KernelTestCase
 {
-
-    use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait, ProphecyTrait;
+    use PrepareCenterTrait;
+    use PrepareScopeTrait;
+    use PrepareUserTrait;
+    use ProphecyTrait;
 
     public function setUp()
     {
-        static::bootKernel();
-    }
-
-    /**
-     *
-     * @return \Chill\MainBundle\Security\Authorization\AuthorizationHelper
-     */
-    private function getAuthorizationHelper()
-    {
-        return static::$container
-                ->get('chill.main.security.authorization.helper')
-                ;
-    }
-
-    /**
-     * Test function userCanReach of helper.
-     *
-     * A user can reach center => the function should return true.
-     */
-    public function testUserCanReachCenter_UserShouldReach()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'ANY_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-
-        $this->assertTrue($helper->userCanReachCenter($user, $center));
-    }
-
-    /**
-     * Test function userCanReach of helper
-     *
-     * A user can not reachcenter =>W the function should return false
-     */
-    public function testUserCanReachCenter_UserShouldNotReach()
-    {
-        $centerA = $this->prepareCenter(1, 'center');
-        $centerB = $this->prepareCenter(2, 'centerB');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'ANY_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-
-        $this->assertFalse($helper->userCanReachCenter($user, $centerB));
-
-    }
-
-    public function testUserHasAccess_shouldHaveAccess_EntityWithoutScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->getCenter()->willReturn($center);
-
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(),
-              'CHILL_ROLE'));
-    }
-
-    public function testUserHasAccess_ShouldHaveAccessWithInheritance_EntityWithoutScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_MASTER_ROLE']
-                )
-            )
-        ));
-
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->getCenter()->willReturn($center);
-
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(),
-              'CHILL_INHERITED_ROLE_1'));
-    }
-
-
-    public function testuserHasAccess_UserHasNoRole_EntityWithoutScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'ANY_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->getCenter()->willReturn($center);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    /**
-     * test that a user has no access on a entity, but is granted on the same role
-     * on another center
-     */
-    public function testUserHasAccess_userHasNoRole_UserHasRoleOnAnotherCenter_EntityWithoutScope()
-    {
-        $centerA = $this->prepareCenter(1, 'center');
-        $centerB = $this->prepareCenter(2, 'centerB');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'ANY_ROLE']
-                ),
-            array(
-                'centerB' => $centerB, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'ANY_ROLE'],
-                    ['scope' => $scope, 'role' => 'CHILL_ROLE']
-                )
-            )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->getCenter()->willReturn($centerA);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testtestUserHasAccess_UserShouldHaveAccess_EntityWithScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
-        $entity->getCenter()->willReturn($center);
-        $entity->getScope()->willReturn($scope);
-
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testUserHasAccess_UserHasNoRole_EntityWithScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
-        $entity->getCenter()->willReturn($center);
-        $entity->getScope()->willReturn($scope);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'ANOTHER_ROLE'));
-    }
-
-    public function testUserHasAccess_UserHasNoCenter_EntityWithScope()
-    {
-        $centerA = $this->prepareCenter(1, 'center'); //the user will have this center
-        $centerB = $this->prepareCenter(2, 'centerB'); //the entity will have another center
-        $scope = $this->prepareScope(1, 'default');
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
-        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
-        $entity->getCenter()->willReturn($centerB);
-        $entity->getScope()->willReturn($scope);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testUserHasAccess_UserHasNoScope_EntityWithScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $scopeA = $this->prepareScope(1, 'default'); //the entity will have this scope
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
-                )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement(HasCenterInterface::class);
-        $entity->willImplement(HasScopeInterface::class);
-        $entity->getCenter()->willReturn($center);
-        $entity->getScope()->willReturn($scopeA);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testUserHasAccess_MultiCenter_EntityWithoutScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $centerB = $this->prepareCenter(1, 'centerB');
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
-            )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement(HasCentersInterface::class);
-        $entity->getCenters()->willReturn([$center, $centerB]);
-
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testUserHasNoAccess_MultiCenter_EntityWithoutScope()
-    {
-        $center = $this->prepareCenter(1, 'center');
-        $centerB = $this->prepareCenter(1, 'centerB');
-        $centerC = $this->prepareCenter(1, 'centerC');
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                ['scope' => $scopeB, 'role' => 'CHILL_ROLE']
-            )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement(HasCentersInterface::class);
-        $entity->getCenters()->willReturn([$centerB, $centerC]);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testUserHasNoAccess_EntityMultiScope()
-    {
-        $centerA = $this->prepareCenter(1, 'center');
-        $centerB = $this->prepareCenter(1, 'centerB');
-        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $scopeC = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 'permissionsGroup' => array(
-                ['scope' => $scopeA, 'role' => 'CHILL_ROLE']
-            )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement(HasCentersInterface::class);
-        $entity->willImplement(HasScopesInterface::class);
-        $entity->getCenters()->willReturn([$centerA, $centerB]);
-        $entity->getScopes()->willReturn([$scopeB, $scopeC]);
-
-        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-    public function testUserHasAccess_EntityMultiScope()
-    {
-        $centerA = $this->prepareCenter(1, 'center');
-        $centerB = $this->prepareCenter(1, 'centerB');
-        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
-        $user = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 'permissionsGroup' => array(
-                ['scope' => $scopeA, 'role' => 'CHILL_ROLE']
-            )
-            )
-        ));
-        $helper = $this->getAuthorizationHelper();
-        $entity = $this->getProphet()->prophesize();
-        $entity->willImplement(HasCentersInterface::class);
-        $entity->willImplement(HasScopesInterface::class);
-        $entity->getCenters()->willReturn([$centerA, $centerB]);
-        $entity->getScopes()->willReturn([$scopeA, $scopeB]);
-
-        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
-    }
-
-
-
-    /**
-     *
-     * @dataProvider dataProvider_getReachableCenters
-     * @param Center $shouldHaveCenter
-     * @param User $user
-     * @param Role $role
-     * @param Scope $scope
-     */
-    public function testGetReachableCenters($test, $result, $msg)
-    {
-        $this->assertEquals($test, $result, $msg);
+        self::bootKernel();
     }
 
     public function dataProvider_getReachableCenters()
@@ -392,93 +52,92 @@ class AuthorizationHelperTest extends KernelTestCase
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
 
-        $userA = $this->prepareUser(array(
-            array(
+        $userA = $this->prepareUser([
+            [
                 'center' => $centerA,
-                'permissionsGroup' => array(
+                'permissionsGroup' => [
                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_1'],
-                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2']
-                )
-            ),
-            array(
-               'center' => $centerB,
-               'permissionsGroup' => array(
-                     ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2'],
-                     ['scope' => $scopeC, 'role' => 'CHILL_ROLE_2']
-               )
-            )
-
-        ));
+                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2'],
+                ],
+            ],
+            [
+                'center' => $centerB,
+                'permissionsGroup' => [
+                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2'],
+                    ['scope' => $scopeC, 'role' => 'CHILL_ROLE_2'],
+                ],
+            ],
+        ]);
 
         $ah = $this->getAuthorizationHelper();
 
-        return array(
-           // without scopes
-            array(
+        return [
+            // without scopes
+            [
                 true,
-                in_array($centerA, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_1'), null)),
-                'center A should be available for userA, with role 1 '
-           ),
-            array(
+                in_array($centerA, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_1',
+                    null
+                ), true),
+                'center A should be available for userA, with role 1 ',
+            ],
+            [
                 true,
-                in_array($centerA, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_2'), null)),
-                'center A should be available for userA, with role 2 '
-           ),
-           array(
+                in_array($centerA, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_2',
+                    null
+                ), true),
+                'center A should be available for userA, with role 2 ',
+            ],
+            [
                 true,
-                in_array($centerB, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_2'), null)),
-                'center A should be available for userA, with role 2 '
-           ),
-           array(
+                in_array($centerB, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_2',
+                    null
+                ), true),
+                'center A should be available for userA, with role 2 ',
+            ],
+            [
                 false,
-                in_array($centerB, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_1'), null)),
-                'center B should NOT be available for userA, with role 1 '
-            ),
-           // with scope
-           array(
+                in_array($centerB, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_1',
+                    null
+                ), true),
+                'center B should NOT be available for userA, with role 1 ',
+            ],
+            // with scope
+            [
                 true,
-                in_array($centerA, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_1'), $scopeB)),
-                'center A should be available for userA, with role 1, scopeC '
-           ),
-           array(
+                in_array($centerA, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_1',
+                    $scopeB
+                ), true),
+                'center A should be available for userA, with role 1, scopeC ',
+            ],
+            [
                 false,
-                in_array($centerA, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_2'), $scopeC)),
-                'center A should NOT be available for userA, with role 2, scopeA '
-           ),
-           array(
+                in_array($centerA, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_2',
+                    $scopeC
+                ), true),
+                'center A should NOT be available for userA, with role 2, scopeA ',
+            ],
+            [
                 true,
-                in_array($centerB, $ah->getReachableCenters($userA,
-                    new Role('CHILL_ROLE_2'), $scopeA)),
-                'center B should be available for userA, with role 2, scopeA '
-           ),
-        );
-
-    }
-
-    /**
-     *
-     * @dataProvider dataProvider_getReachableScopes
-     * @param boolean $expectedResult
-     * @param Scope $testedScope
-     * @param User $user
-     * @param Role $role
-     * @param Center $center
-     * @param string $message
-     */
-    public function testGetReachableScopes($expectedResult, Scope $testedScope,
-            User $user, Role $role, Center $center, $message)
-    {
-        $reachableScopes = $this->getAuthorizationHelper()
-                ->getReachableScopes($user, $role, $center);
-
-        $this->assertEquals($expectedResult, in_array($testedScope, $reachableScopes),
-                $message);
+                in_array($centerB, $ah->getReachableCenters(
+                    $userA,
+                    'CHILL_ROLE_2',
+                    $scopeA
+                ), true),
+                'center B should be available for userA, with role 2, scopeA ',
+            ],
+        ];
     }
 
     public function dataProvider_getReachableScopes()
@@ -489,52 +148,69 @@ class AuthorizationHelperTest extends KernelTestCase
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
 
-        $userA = $this->prepareUser(array(
-            array(
+        $userA = $this->prepareUser([
+            [
                 'center' => $centerA,
-                'permissionsGroup' => array(
+                'permissionsGroup' => [
                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_1'],
-                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2']
-                )
-            ),
-            array(
-               'center' => $centerB,
-               'permissionsGroup' => array(
-                     ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2'],
-                     ['scope' => $scopeC, 'role' => 'CHILL_ROLE_2'],
-                     ['scope' => $scopeB, 'role' => 'CHILL_ROLE_2']
-               )
-            )
+                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2'],
+                ],
+            ],
+            [
+                'center' => $centerB,
+                'permissionsGroup' => [
+                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE_2'],
+                    ['scope' => $scopeC, 'role' => 'CHILL_ROLE_2'],
+                    ['scope' => $scopeB, 'role' => 'CHILL_ROLE_2'],
+                ],
+            ],
+        ]);
 
-        ));
-
-        return array(
-            array(
+        return [
+            [
                 true,
                 $scopeA,
                 $userA,
-                new Role('CHILL_ROLE_2'),
+                'CHILL_ROLE_2',
                 $centerA,
-                "Assert that a scope is found within accessible scopes"
-            ),
-            array(
+                'Assert that a scope is found within accessible scopes',
+            ],
+            [
                 false,
                 $scopeB,
                 $userA,
-                new Role('CHILL_ROLE_2'),
+                'CHILL_ROLE_2',
                 $centerA,
-                "Assert that a scope not reachable is NOT found within accessible scopes"
-            ),
-            array(
+                'Assert that a scope not reachable is NOT found within accessible scopes',
+            ],
+            [
                 false,
                 $scopeB,
                 $userA,
-                new Role('CHILL_ROLE_1'),
+                'CHILL_ROLE_1',
                 $centerB,
-                "Assert that a scope not reachable is not found within accessible scopes."
-                . " Trying on filter centering"
-            )
-        );
+                'Assert that a scope not reachable is not found within accessible scopes.'
+                . ' Trying on filter centering',
+            ],
+        ];
+    }
+
+    public function testFindUsersReaching()
+    {
+        $centerA = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository(Center::class)
+            ->findOneByName('Center A');
+
+        $users = $this->getAuthorizationHelper()
+            ->findUsersReaching(
+                'CHILL_PERSON_SEE',
+                $centerA
+            );
+
+        $usernames = array_map(static function (User $u) { return $u->getUsername(); }, $users);
+
+        $this->assertContains('center a_social', $usernames);
     }
 
     public function testGetParentRoles()
@@ -542,24 +218,368 @@ class AuthorizationHelperTest extends KernelTestCase
         $parentRoles = $this->getAuthorizationHelper()
             ->getParentRoles('CHILL_INHERITED_ROLE_1');
 
-        $this->assertContains('CHILL_MASTER_ROLE', $parentRoles,
-            "Assert that `CHILL_MASTER_ROLE` is a parent of `CHILL_INHERITED_ROLE_1`");
+        $this->assertContains(
+            'CHILL_MASTER_ROLE',
+            $parentRoles,
+            'Assert that `CHILL_MASTER_ROLE` is a parent of `CHILL_INHERITED_ROLE_1`'
+        );
     }
 
-    public function testFindUsersReaching()
+    /**
+     * @dataProvider dataProvider_getReachableCenters
+     *
+     * @param mixed $test
+     * @param mixed $result
+     * @param mixed $msg
+     */
+    public function testGetReachableCenters($test, $result, $msg)
     {
-        $centerA = static::$kernel->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository(Center::class)
-            ->findOneByName('Center A');
-
-        $users = $this->getAuthorizationHelper()
-            ->findUsersReaching(new Role('CHILL_PERSON_SEE'),
-                $centerA);
-
-        $usernames = \array_map(function(User $u) { return $u->getUsername(); }, $users);
-
-        $this->assertContains('center a_social', $usernames);
+        $this->assertEquals($test, $result, $msg);
     }
 
+    /**
+     * @dataProvider dataProvider_getReachableScopes
+     *
+     * @param bool $expectedResult
+     * @param string $message
+     */
+    public function testGetReachableScopes(
+        $expectedResult,
+        Scope $testedScope,
+        User $user,
+        string $role,
+        Center $center,
+        $message
+    ) {
+        $reachableScopes = $this->getAuthorizationHelper()
+            ->getReachableScopes($user, $role, $center);
+
+        $this->assertEquals(
+            $expectedResult,
+            in_array($testedScope, $reachableScopes, true),
+            $message
+        );
+    }
+
+    public function testtestUserHasAccessUserShouldHaveAccessEntityWithScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity->getCenter()->willReturn($center);
+        $entity->getScope()->willReturn($scope);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    /**
+     * Test function userCanReach of helper.
+     *
+     * A user can not reachcenter =>W the function should return false
+     */
+    public function testUserCanReachCenterUserShouldNotReach()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(2, 'centerB');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'ANY_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+
+        $this->assertFalse($helper->userCanReachCenter($user, $centerB));
+    }
+
+    /**
+     * Test function userCanReach of helper.
+     *
+     * A user can reach center => the function should return true.
+     */
+    public function testUserCanReachCenterUserShouldReach()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'ANY_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+
+        $this->assertTrue($helper->userCanReachCenter($user, $center));
+    }
+
+    public function testUserHasAccessEntityMultiScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->willImplement(HasScopesInterface::class);
+        $entity->getCenters()->willReturn([$centerA, $centerB]);
+        $entity->getScopes()->willReturn([$scopeA, $scopeB]);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasAccessMultiCenterEntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scopeB, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->getCenters()->willReturn([$center, $centerB]);
+
+        $this->assertTrue($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasAccessShouldHaveAccessEntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->getCenter()->willReturn($center);
+
+        $this->assertTrue($helper->userHasAccess(
+            $user,
+            $entity->reveal(),
+            'CHILL_ROLE'
+        ));
+    }
+
+    public function testUserHasAccessShouldHaveAccessWithInheritanceEntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_MASTER_ROLE'],
+                ],
+            ],
+        ]);
+
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->getCenter()->willReturn($center);
+
+        $this->assertTrue($helper->userHasAccess(
+            $user,
+            $entity->reveal(),
+            'CHILL_INHERITED_ROLE_1'
+        ));
+    }
+
+    public function testUserHasAccessUserHasNoCenterEntityWithScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center'); //the user will have this center
+        $centerB = $this->prepareCenter(2, 'centerB'); //the entity will have another center
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity->getCenter()->willReturn($centerB);
+        $entity->getScope()->willReturn($scope);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testuserHasAccessUserHasNoRoleEntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'ANY_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->getCenter()->willReturn($center);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasAccessUserHasNoRoleEntityWithScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->willImplement('\Chill\MainBundle\Entity\HasScopeInterface');
+        $entity->getCenter()->willReturn($center);
+        $entity->getScope()->willReturn($scope);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'ANOTHER_ROLE'));
+    }
+
+    /**
+     * test that a user has no access on a entity, but is granted on the same role
+     * on another center.
+     */
+    public function testUserHasAccessUserHasNoRoleUserHasRoleOnAnotherCenterEntityWithoutScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(2, 'centerB');
+        $scope = $this->prepareScope(1, 'default');
+        $user = $this->prepareUser([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'ANY_ROLE'],
+                ],
+                [
+                    'centerB' => $centerB, 'permissionsGroup' => [
+                        ['scope' => $scope, 'role' => 'ANY_ROLE'],
+                        ['scope' => $scope, 'role' => 'CHILL_ROLE'],
+                    ],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement('\Chill\MainBundle\Entity\HasCenterInterface');
+        $entity->getCenter()->willReturn($centerA);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasAccessUserHasNoScopeEntityWithScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $scopeA = $this->prepareScope(1, 'default'); //the entity will have this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scopeB, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCenterInterface::class);
+        $entity->willImplement(HasScopeInterface::class);
+        $entity->getCenter()->willReturn($center);
+        $entity->getScope()->willReturn($scopeA);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasNoAccessEntityMultiScope()
+    {
+        $centerA = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $scopeA = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $scopeC = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => $scopeA, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->willImplement(HasScopesInterface::class);
+        $entity->getCenters()->willReturn([$centerA, $centerB]);
+        $entity->getScopes()->willReturn([$scopeB, $scopeC]);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    public function testUserHasNoAccessMultiCenterEntityWithoutScope()
+    {
+        $center = $this->prepareCenter(1, 'center');
+        $centerB = $this->prepareCenter(1, 'centerB');
+        $centerC = $this->prepareCenter(1, 'centerC');
+        $scopeB = $this->prepareScope(2, 'other'); //the user will be granted this scope
+        $user = $this->prepareUser([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scopeB, 'role' => 'CHILL_ROLE'],
+                ],
+            ],
+        ]);
+        $helper = $this->getAuthorizationHelper();
+        $entity = $this->getProphet()->prophesize();
+        $entity->willImplement(HasCentersInterface::class);
+        $entity->getCenters()->willReturn([$centerB, $centerC]);
+
+        $this->assertFalse($helper->userHasAccess($user, $entity->reveal(), 'CHILL_ROLE'));
+    }
+
+    /**
+     * @return \Chill\MainBundle\Security\Authorization\AuthorizationHelper
+     */
+    private function getAuthorizationHelper()
+    {
+        return self::$container
+            ->get('chill.main.security.authorization.helper');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
index abb36459b..4bb6c6743 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php
@@ -1,58 +1,52 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\MainBundle\Tests\PasswordRecover;
-
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\MainBundle\Security\PasswordRecover\TokenManager;
-use Chill\MainBundle\Entity\User;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-class TokenManagerTest extends KernelTestCase
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Tests\PasswordRecover;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\PasswordRecover\TokenManager;
+use DateInterval;
+use DateTimeImmutable;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class TokenManagerTest extends KernelTestCase
 {
     protected $tokenManager;
-    
-    public static function setUpBefore()
-    {
-        
-    }
-    
+
     public function setUp()
     {
         self::bootKernel();
-        
+
         $logger = self::$container
             ->get('logger');
-        
+
         $this->tokenManager = new TokenManager('secret', $logger);
     }
 
-    public function testGenerate() 
+    public static function setUpBefore()
+    {
+    }
+
+    public function testGenerate()
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = new \DateTimeImmutable('tomorrow');
-        
+        $expiration = new DateTimeImmutable('tomorrow');
+
         $tokens = $tokenManager->generate($user, $expiration);
-        
+
         $this->assertInternalType('array', $tokens);
         $this->assertArrayHasKey('h', $tokens);
         $this->assertArrayHasKey('t', $tokens);
@@ -60,57 +54,57 @@ class TokenManagerTest extends KernelTestCase
         $this->assertNotEmpty($tokens['t']);
         $this->assertEquals($user->getUsernameCanonical(), $tokens['u']);
     }
-    
+
     /**
      * @expectedException \UnexpectedValueException
      */
-    public function testGenerateEmptyUsernameCanonical() 
+    public function testGenerateEmptyUsernameCanonical()
     {
         $tokenManager = $this->tokenManager;
         // set a username, but not a username canonical
         $user = (new User())->setUsername('test');
-        $expiration = new \DateTimeImmutable('tomorrow');
-        
+        $expiration = new DateTimeImmutable('tomorrow');
+
         $tokenManager->generate($user, $expiration);
     }
-    
+
     public function testVerify()
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = new \DateTimeImmutable('tomorrow');
-        
+        $expiration = new DateTimeImmutable('tomorrow');
+
         $tokens = $tokenManager->generate($user, $expiration);
-        
+
         $hash = $tokens[TokenManager::HASH];
         $token = $tokens[TokenManager::TOKEN];
         $timestamp = $tokens[TokenManager::TIMESTAMP];
-        
+
         $verification = $tokenManager->verify($hash, $token, $user, $timestamp);
-        
+
         $this->assertTrue($verification);
-        
+
         // test with altering token
-        $this->assertFalse($tokenManager->verify($hash.'5', $token, $user, $timestamp));
-        $this->assertFalse($tokenManager->verify($hash, $token.'25', $user, $timestamp));
+        $this->assertFalse($tokenManager->verify($hash . '5', $token, $user, $timestamp));
+        $this->assertFalse($tokenManager->verify($hash, $token . '25', $user, $timestamp));
         $this->assertFalse($tokenManager->verify($hash, $token, $user->setUsernameCanonical('test2'), $timestamp));
-        $this->assertFalse($tokenManager->verify($hash, $token, $user, $timestamp+1));
+        $this->assertFalse($tokenManager->verify($hash, $token, $user, (string) ($timestamp + 1)));
     }
-    
+
     public function testVerifyExpiredFails()
     {
         $tokenManager = $this->tokenManager;
         $user = (new User())->setUsernameCanonical('test');
-        $expiration = (new \DateTimeImmutable('now'))->sub(new \DateInterval('PT1S'));
-        
+        $expiration = (new DateTimeImmutable('now'))->sub(new DateInterval('PT1S'));
+
         $tokens = $tokenManager->generate($user, $expiration);
-        
+
         $hash = $tokens[TokenManager::HASH];
         $token = $tokens[TokenManager::TOKEN];
         $timestamp = $tokens[TokenManager::TIMESTAMP];
-        
+
         $verification = $tokenManager->verify($hash, $token, $user, $timestamp);
-        
+
         $this->assertFalse($verification);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
index 851183e3d..80b01a170 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php
@@ -1,14 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Security\Resolver;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-class CenterResolverDispatcherTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CenterResolverDispatcherTest extends KernelTestCase
 {
-    private CenterResolverDispatcher $dispatcher;
+    private CenterResolverDispatcherInterface $dispatcher;
 
     protected function setUp()
     {
@@ -18,10 +32,10 @@ class CenterResolverDispatcherTest extends KernelTestCase
 
     public function testResolveCenter()
     {
-       $center = new Center();
+        $center = new Center();
 
-       $resolved = $this->dispatcher->resolveCenter($center);
+        $resolved = $this->dispatcher->resolveCenter($center);
 
-       $this->assertSame($center, $resolved);
+        $this->assertSame($center, $resolved);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
index de6d19b5a..32c07b04e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
@@ -8,7 +17,11 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Resolver\DefaultScopeResolver;
 use PHPUnit\Framework\TestCase;
 
-class DefaultScopeResolverTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DefaultScopeResolverTest extends TestCase
 {
     private DefaultScopeResolver $scopeResolver;
 
@@ -21,8 +34,8 @@ class DefaultScopeResolverTest extends TestCase
     {
         $scope = new Scope();
         $entity = new class($scope) implements HasScopeInterface {
-
-            public function __construct(Scope $scope) {
+            public function __construct(Scope $scope)
+            {
                 $this->scope = $scope;
             }
 
@@ -30,7 +43,6 @@ class DefaultScopeResolverTest extends TestCase
             {
                 return $this->scope;
             }
-
         };
 
         $this->assertTrue($this->scopeResolver->supports($entity));
@@ -41,8 +53,8 @@ class DefaultScopeResolverTest extends TestCase
     public function testHasScopesInterface()
     {
         $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
-
-            public function __construct(Scope $scopeA, Scope $scopeB) {
+            public function __construct(Scope $scopeA, Scope $scopeB)
+            {
                 $this->scopes = [$scopeA, $scopeB];
             }
 
@@ -58,5 +70,4 @@ class DefaultScopeResolverTest extends TestCase
         $this->assertSame($scopeA, $this->scopeResolver->resolveScope($entity)[0]);
         $this->assertSame($scopeB, $this->scopeResolver->resolveScope($entity)[1]);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
index 2a36fd365..320d2e326 100644
--- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Security\Resolver;
 
 use Chill\MainBundle\Entity\HasScopeInterface;
@@ -9,7 +18,11 @@ use Chill\MainBundle\Security\Resolver\DefaultScopeResolver;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 use PHPUnit\Framework\TestCase;
 
-class DefaultScopeResolverDispatcherTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ScopeResolverDispatcherTest extends TestCase
 {
     private ScopeResolverDispatcher $scopeResolverDispatcher;
 
@@ -22,8 +35,8 @@ class DefaultScopeResolverDispatcherTest extends TestCase
     {
         $scope = new Scope();
         $entity = new class($scope) implements HasScopeInterface {
-
-            public function __construct(Scope $scope) {
+            public function __construct(Scope $scope)
+            {
                 $this->scope = $scope;
             }
 
@@ -31,7 +44,6 @@ class DefaultScopeResolverDispatcherTest extends TestCase
             {
                 return $this->scope;
             }
-
         };
 
         $this->assertTrue($this->scopeResolverDispatcher->isConcerned($entity));
@@ -41,8 +53,8 @@ class DefaultScopeResolverDispatcherTest extends TestCase
     public function testHasScopesInterface()
     {
         $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface {
-
-            public function __construct(Scope $scopeA, Scope $scopeB) {
+            public function __construct(Scope $scopeA, Scope $scopeB)
+            {
                 $this->scopes = [$scopeA, $scopeB];
             }
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
new file mode 100644
index 000000000..fc9612299
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Serializer\Normalizer;
+
+use Chill\MainBundle\Serializer\Normalizer\DateNormalizer;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Prophecy\Prophet;
+use stdClass;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DateNormalizerTest extends KernelTestCase
+{
+    private Prophet $prophet;
+
+    public function setUp()
+    {
+        $this->prophet = new Prophet();
+    }
+
+    public function generateDataNormalize()
+    {
+        $datetime = DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 15:05:01+02:00');
+        $date = DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 00:00:00+02:00');
+
+        yield [
+            ['datetime' => '2021-06-05T15:05:01+0200'],
+            $datetime, 'json', null, 'simple normalization to json',
+        ];
+
+        yield [
+            ['long' => '5 juin 2021', 'short' => '05/06/2021'],
+            $date, 'docgen', 'fr', 'normalization to docgen for a date, with current request',
+        ];
+
+        yield [
+            ['long' => '5 juin 2021', 'short' => '05/06/2021'],
+            $date, 'docgen', null, 'normalization to docgen for a date, without current request',
+        ];
+
+        yield [
+            ['long' => '5 juin 2021 à 15:05', 'short' => '05/06/2021 15:05'],
+            $datetime, 'docgen', null, 'normalization to docgen for a datetime, without current request',
+        ];
+
+        yield [
+            ['long' => '', 'short' => ''],
+            null, 'docgen', null, 'normalization to docgen for a null datetime',
+        ];
+    }
+
+    /**
+     * @dataProvider generateDataNormalize
+     *
+     * @param mixed $expected
+     * @param mixed $date
+     * @param mixed $format
+     * @param mixed $locale
+     * @param mixed $msg
+     */
+    public function testNormalize($expected, $date, $format, $locale, $msg)
+    {
+        $this->assertEquals($expected, $this->buildDateNormalizer($locale)->normalize($date, $format, []), $msg);
+    }
+
+    public function testSupports()
+    {
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTime(), 'json'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTimeImmutable(), 'json'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTime(), 'docgen'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new DateTimeImmutable(), 'docgen'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => DateTimeImmutable::class]));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => DateTimeInterface::class]));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => DateTime::class]));
+        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new stdClass(), 'docgen'));
+        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new DateTime(), 'xml'));
+    }
+
+    private function buildDateNormalizer(?string $locale = null): DateNormalizer
+    {
+        $requestStack = $this->prophet->prophesize(RequestStack::class);
+        $parameterBag = new ParameterBag();
+        $parameterBag->set('kernel.default_locale', 'fr');
+
+        if (null === $locale) {
+            $requestStack->getCurrentRequest()->willReturn(null);
+        } else {
+            $request = $this->prophet->prophesize(Request::class);
+            $request->getLocale()->willReturn($locale);
+            $requestStack->getCurrentRequest()->willReturn($request->reveal());
+        }
+
+        return new DateNormalizer($requestStack->reveal(), $parameterBag);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
index c4f4bc13d..b45b2c21d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php
@@ -1,38 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Serializer\Normalizer;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
-use Chill\MainBundle\Entity\User;
 
-
-class DoctrineExistingEntityNormalizerTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DoctrineExistingEntityNormalizerTest extends KernelTestCase
 {
     protected DoctrineExistingEntityNormalizer $normalizer;
 
     protected function setUp()
     {
         self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class); 
+        $em = self::$container->get(EntityManagerInterface::class);
         $serializerFactory = self::$container->get(ClassMetadataFactoryInterface::class);
 
         $this->normalizer = new DoctrineExistingEntityNormalizer($em, $serializerFactory);
     }
 
-    /**
-     * @dataProvider dataProviderUserId
-     */
-    public function testGetMappedClass($userId)
-    {
-        $data = [ 'type' => 'user', 'id' => $userId]; 
-        $supports = $this->normalizer->supportsDenormalization($data, User::class);
-
-        $this->assertTrue($supports);
-    }
-
     public function dataProviderUserId()
     {
         self::bootKernel();
@@ -43,9 +44,21 @@ class DoctrineExistingEntityNormalizerTest extends KernelTestCase
             ->select('u.id')
             ->setMaxResults(1)
             ->getQuery()
-            ->getResult()
-            ;
+            ->getResult();
 
-        yield [ $userIds[0]['id'] ];
+        yield [$userIds[0]['id']];
+    }
+
+    /**
+     * @dataProvider dataProviderUserId
+     *
+     * @param mixed $userId
+     */
+    public function testGetMappedClass($userId)
+    {
+        $data = ['type' => 'user', 'id' => $userId];
+        $supports = $this->normalizer->supportsDenormalization($data, User::class);
+
+        $this->assertTrue($supports);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
index 98bf23386..bb98b074d 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
@@ -1,46 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Services;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
- * This class provide functional test for MenuComposer
+ * This class provide functional test for MenuComposer.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class MenuComposerTest extends KernelTestCase
+final class MenuComposerTest extends KernelTestCase
 {
-    
     /**
-     *
      * @var \Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader;
      */
     private $loader;
-    
+
     /**
-     *
      * @var \Chill\MainBundle\DependencyInjection\Services\MenuComposer;
      */
     private $menuComposer;
-    
+
     public function setUp()
     {
-        self::bootKernel(array('environment' => 'test'));
-        $this->menuComposer = static::$container
-                ->get('chill.main.menu_composer');
+        self::bootKernel(['environment' => 'test']);
+        $this->menuComposer = self::$container
+            ->get('chill.main.menu_composer');
     }
-    
+
     /**
      * @covers \Chill\MainBundle\Routing\MenuComposer
      */
     public function testMenuComposer()
     {
         $collection = new RouteCollection();
-        
+
         $routes = $this->menuComposer->getRoutesFor('dummy0');
-        
+
         $this->assertInternalType('array', $routes);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
index d95969b9d..89edc17d6 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/ChillMarkdownRenderExtensionTest.php
@@ -1,76 +1,71 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, 
- * <http://www.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\MainBundle\Tests\Templating;
-
-use PHPUnit\Framework\TestCase;
-use Chill\MainBundle\Templating\ChillMarkdownRenderExtension;
 
 /**
- * Test the service ChillMarkdownRenderExtension
- * 
- * @internal we do not want to test the markdown transformation. We just want to
- * test that the markdown is correctly transformed into html, and that the html 
- * is safe.
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-class ChillMarkdownRenderExtensionTest extends TestCase
-{
-    
-    private const SIMPLE_MARKDOWN = <<<MD
-# test
 
-Text.
-MD;
-    
-    private const SIMPLE_HTML = <<<HTML
-<h1>test</h1>
-<p>Text.</p>
-HTML;
-    
-    private const UNAUTHORIZED_MARKDOWN = <<<MD
-<script>alert("ok");</script>
-MD;
-    
-    private const UNAUTHORIZED_HTML = <<<HTML
-<p>&lt;script&gt;alert(&quot;ok&quot;);&lt;/script&gt;</p>
-HTML;
-    
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Tests\Templating;
+
+use Chill\MainBundle\Templating\ChillMarkdownRenderExtension;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test the service ChillMarkdownRenderExtension.
+ *
+ * @internal we do not want to test the markdown transformation. We just want to
+ * test that the markdown is correctly transformed into html, and that the html
+ * is safe.
+ * @coversNothing
+ */
+final class ChillMarkdownRenderExtensionTest extends TestCase
+{
+    private const SIMPLE_HTML = <<<'HTML'
+        <h1>test</h1>
+        <p>Text.</p>
+        HTML;
+
+    private const SIMPLE_MARKDOWN = <<<'MD'
+        # test
+
+        Text.
+        MD;
+
+    private const UNAUTHORIZED_HTML = <<<'HTML'
+        <p>&lt;script&gt;alert(&quot;ok&quot;);&lt;/script&gt;</p>
+        HTML;
+
+    private const UNAUTHORIZED_MARKDOWN = <<<'MD'
+        <script>alert("ok");</script>
+        MD;
+
     /**
-     * Test that the markdown input is transformed into html
+     * Test that the markdown input is transformed into html.
      */
     public function testRendering()
     {
         $extension = new ChillMarkdownRenderExtension();
-        
-        $this->assertEquals(self::SIMPLE_HTML, 
-            $extension->renderMarkdownToHtml(self::SIMPLE_MARKDOWN));
+
+        $this->assertEquals(
+            self::SIMPLE_HTML,
+            $extension->renderMarkdownToHtml(self::SIMPLE_MARKDOWN)
+        );
     }
-    
+
     /**
-     * Test that the output of the markdown content is sanitized
+     * Test that the output of the markdown content is sanitized.
      */
     public function testSecurity()
     {
         $extension = new ChillMarkdownRenderExtension();
-        
-        $this->assertEquals(self::UNAUTHORIZED_HTML, 
-            $extension->renderMarkdownToHtml(self::UNAUTHORIZED_MARKDOWN));
+
+        $this->assertEquals(
+            self::UNAUTHORIZED_HTML,
+            $extension->renderMarkdownToHtml(self::UNAUTHORIZED_MARKDOWN)
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
index 79551d23c..c866224e3 100644
--- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
@@ -1,22 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Templating\Entity;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Templating\Entity\AddressRender;
-use Chill\MainBundle\Entity\Address;
+use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Templating\EngineInterface;
 
-class AddressRenderTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AddressRenderTest extends KernelTestCase
 {
-
     protected function setUp()
     {
         self::bootKernel();
     }
 
+    public function addressDataProvider(): Iterator
+    {
+        $addr = new Address();
+        $country = (new Country())
+            ->setName(['fr' => 'Pays'])
+            ->setCountryCode('BE');
+        $postCode = new PostalCode();
+        $postCode->setName('Locality')
+            ->setCode('012345')
+            ->setCountry($country);
+
+        $addr->setStreet('Rue ABC')
+            ->setStreetNumber('5')
+            ->setPostcode($postCode);
+
+        yield [$addr, 'Rue ABC, 5 - 012345 Locality'];
+    }
+
     /**
      * @dataProvider addressDataProvider
      */
@@ -26,30 +57,8 @@ class AddressRenderTest extends KernelTestCase
         $renderer = new AddressRender($engine);
 
         $this->assertEquals($expectedString, $renderer->renderString($addr, []));
+
         return;
         $this->assertIsString($renderer->renderBox($addr, []));
-    } 
-
-
-    public function addressDataProvider(): \Iterator
-    {
-        $addr = new Address();
-        $country = (new Country())
-            ->setName([ "fr" => "Pays" ])
-            ->setCountryCode("BE")
-            ;
-        $postCode = new PostalCode();
-        $postCode->setName("Locality")
-            ->setCode("012345")
-            ->setCountry($country)
-            ;
-
-        $addr->setStreet("Rue ABC")
-            ->setStreetNumber("5")
-            ->setPostcode($postCode)
-            ;
-
-        yield[ $addr, "Rue ABC, 5 - 012345 Locality"];
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/TestHelper.php b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
index a969eeeb3..205474685 100644
--- a/src/Bundle/ChillMainBundle/Tests/TestHelper.php
+++ b/src/Bundle/ChillMainBundle/Tests/TestHelper.php
@@ -1,47 +1,38 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests;
 
 use Symfony\Component\BrowserKit\Client;
 
 /**
- * Provide useful methods for tests
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Provide useful methods for tests.
  */
 class TestHelper
 {
     /**
-     * create a client authenticated with an user
-     * 
-     * @param WebTestCase $testCase
+     * create a client authenticated with an user.
+     *
+     * @param mixed $username
+     * @param mixed $password
+     *
      * @return \Symfony\Component\BrowserKit\Client authenticated client
      */
-    public static function getAuthenticatedClientOptions($username = 'center a_social',
-            $password = 'password')
-    {
-       return array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => $password,
-        );
+    public static function getAuthenticatedClientOptions(
+        $username = 'center a_social',
+        $password = 'password'
+    ) {
+        return [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => $password,
+        ];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
index 955ec4382..6fd0facd4 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/CountriesInfoTest.php
@@ -1,48 +1,60 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Util;
 
-use PHPUnit\Framework\TestCase;
 use Chill\MainBundle\Util\CountriesInfo;
+use PHPUnit\Framework\TestCase;
 
 /**
- * tests for CountriesInfos
+ * tests for CountriesInfos.
  *
- * @author julien.fastre@champs-libre.coop
+ * @internal
+ * @coversNothing
  */
-class CountriesInfoTest extends TestCase {
-    
-    public function testGetCountryData() 
+final class CountriesInfoTest extends TestCase
+{
+    public function getGetContinentsCodes()
     {
-        $raw = CountriesInfo::getCountriesData();
-        
-        $this->assertStringStartsWith("AS AF AFG 004 Afghanistan, Islamic Republic of",
-                $raw);
+        $continents = CountriesInfo::getContinentsCodes();
+
+        $this->assertContains('EU', $continents);
     }
-    
-    public function testGetArrayCountriesData() 
+
+    public function testGetArrayCountriesData()
     {
         $data = CountriesInfo::getArrayCountriesData();
-        
+
         $this->assertNotNull($data);
-        $this->assertContains(array(
-            "AS", "AF", "AFG", "004", "Afghanistan, Islamic Republic of"
-        ), $data);
+        $this->assertContains([
+            'AS', 'AF', 'AFG', '004', 'Afghanistan, Islamic Republic of',
+        ], $data);
     }
-    
+
     public function testGetCountryCodeByContinents()
     {
         $countries = CountriesInfo::getCountriesCodeByContinent('EU');
-        
+
         $this->assertContains('BE', $countries);
         $this->assertContains('FR', $countries);
         $this->assertContains('GB', $countries);
     }
-    
-    public function getGetContinentsCodes()
+
+    public function testGetCountryData()
     {
-        $continents = CountriesInfo::getContinentsCodes();
-        
-        $this->assertContains('EU', $continents);
+        $raw = CountriesInfo::getCountriesData();
+
+        $this->assertStringStartsWith(
+            'AS AF AFG 004 Afghanistan, Islamic Republic of',
+            $raw
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
index c06b4a4f4..694677a8f 100644
--- a/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php
@@ -1,35 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Tests\Util;
 
 use Chill\MainBundle\Util\DateRangeCovering;
+use DateTime;
+use DateTimeZone;
 use PHPUnit\Framework\TestCase;
+use function usort;
 
-class DateRangeCoveringTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DateRangeCoveringTest extends TestCase
 {
-
     public function testCoveringWithMinCover1()
     {
-        $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels')); 
+        $cover = new DateRangeCovering(1, new DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-12-01'), 1)
-            ->add(new \DateTime('2010-06-01'), new \DateTime('2011-06-01'), 2)
-            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-06-01'), 3)
-            ->compute()
-            ;
+            ->add(new DateTime('2010-01-01'), new DateTime('2010-12-01'), 1)
+            ->add(new DateTime('2010-06-01'), new DateTime('2011-06-01'), 2)
+            ->add(new DateTime('2019-06-01'), new DateTime('2019-06-01'), 3)
+            ->compute();
 
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(1, $cover->getIntersections());
         $this->assertEquals(
-            new \DateTime('2010-06-01'),
+            new DateTime('2010-06-01'),
             $cover->getIntersections()[0][0],
-            "assert date start are the intersection"
+            'assert date start are the intersection'
         );
         $this->assertEquals(
-            new \DateTime('2010-12-01'),
+            new DateTime('2010-12-01'),
             $cover->getIntersections()[0][1],
-            "assert date end are the intersection"
+            'assert date end are the intersection'
         );
         $this->assertIsArray($cover->getIntersections()[0][2]);
         $this->assertContains(1, $cover->getIntersections()[0][2]);
@@ -37,16 +51,26 @@ class DateRangeCoveringTest extends TestCase
         $this->assertNotContains(3, $cover->getIntersections()[0][2]);
     }
 
+    public function testCoveringWithMinCover1NoCoveringWithNullDates()
+    {
+        $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')); 
+        $cover = new DateRangeCovering(1, new DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-12-01'), 1)
-            ->add(new \DateTime('2010-06-01'), new \DateTime('2011-06-01'), 2)
-            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-12-01'), 3)
-            ->add(new \DateTime('2019-06-01'), new \DateTime('2020-06-01'), 4)
-            ->compute()
-            ;
+            ->add(new DateTime('2010-01-01'), new DateTime('2010-12-01'), 1)
+            ->add(new DateTime('2010-06-01'), new DateTime('2011-06-01'), 2)
+            ->add(new DateTime('2019-01-01'), new DateTime('2019-12-01'), 3)
+            ->add(new DateTime('2019-06-01'), new DateTime('2020-06-01'), 4)
+            ->compute();
 
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
@@ -55,7 +79,7 @@ class DateRangeCoveringTest extends TestCase
         $intersections = $cover->getIntersections();
 
         // sort the intersections to compare them in expected order
-        \usort($intersections, function($a, $b) {
+        usort($intersections, static function ($a, $b) {
             if ($a[0] === $b[0]) {
                 return $a[1] <=> $b[1];
             }
@@ -65,14 +89,14 @@ class DateRangeCoveringTest extends TestCase
 
         // first intersection
         $this->assertEquals(
-            new \DateTime('2010-06-01'),
+            new DateTime('2010-06-01'),
             $intersections[0][0],
-            "assert date start are the intersection"
+            'assert date start are the intersection'
         );
         $this->assertEquals(
-            new \DateTime('2010-12-01'),
+            new DateTime('2010-12-01'),
             $intersections[0][1],
-            "assert date end are the intersection"
+            'assert date end are the intersection'
         );
         $this->assertIsArray($intersections[0][2]);
         $this->assertContains(1, $intersections[0][2]);
@@ -82,14 +106,14 @@ class DateRangeCoveringTest extends TestCase
 
         // second intersection
         $this->assertEquals(
-            new \DateTime('2019-06-01'),
+            new DateTime('2019-06-01'),
             $intersections[1][0],
-            "assert date start are the intersection"
+            'assert date start are the intersection'
         );
         $this->assertEquals(
-            new \DateTime('2019-12-01'),
+            new DateTime('2019-12-01'),
             $intersections[1][1],
-            "assert date end are the intersection"
+            'assert date end are the intersection'
         );
         $this->assertIsArray($intersections[1][2]);
         $this->assertContains(3, $intersections[1][2]);
@@ -100,28 +124,27 @@ class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover2()
     {
-        $cover = new DateRangeCovering(2, new \DateTimeZone('Europe/Brussels')); 
+        $cover = new DateRangeCovering(2, new DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), 1)
-            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), 2)
-            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), 3)
-            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), 4)
-            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), 5)
-            ->compute()
-            ;
+            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), 1)
+            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), 2)
+            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), 3)
+            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), 4)
+            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), 5)
+            ->compute();
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(1, $cover->getIntersections());
 
         $this->assertEquals(
-            new \DateTime('2010-06-01'),
+            new DateTime('2010-06-01'),
             $cover->getIntersections()[0][0],
-            "assert date start are the intersection"
+            'assert date start are the intersection'
         );
         $this->assertEquals(
-            new \DateTime('2010-09-01'),
+            new DateTime('2010-09-01'),
             $cover->getIntersections()[0][1],
-            "assert date end are the intersection"
+            'assert date end are the intersection'
         );
         $this->assertIsArray($cover->getIntersections()[0][2]);
         $this->assertContains(1, $cover->getIntersections()[0][2]);
@@ -133,30 +156,29 @@ class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover2AndThreePeriodsCovering()
     {
-        $cover = new DateRangeCovering(2, new \DateTimeZone('Europe/Brussels')); 
+        $cover = new DateRangeCovering(2, new DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), 1)
-            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), 2)
-            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), 3)
-            ->add(new \DateTime('2009-01-01'), new \DateTime('2010-09-15'), 4)
-            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), 5)
-            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), 6)
-            ->compute()
-            ;
+            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), 1)
+            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), 2)
+            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), 3)
+            ->add(new DateTime('2009-01-01'), new DateTime('2010-09-15'), 4)
+            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), 5)
+            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), 6)
+            ->compute();
 
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(1, $cover->getIntersections());
 
         $this->assertEquals(
-            new \DateTime('2010-04-01'),
+            new DateTime('2010-04-01'),
             $cover->getIntersections()[0][0],
-            "assert date start are the intersection"
+            'assert date start are the intersection'
         );
         $this->assertEquals(
-            new \DateTime('2010-09-15'),
+            new DateTime('2010-09-15'),
             $cover->getIntersections()[0][1],
-            "assert date end are the intersection"
+            'assert date end are the intersection'
         );
         $this->assertIsArray($cover->getIntersections()[0][2]);
         $this->assertContains(1, $cover->getIntersections()[0][2]);
@@ -169,46 +191,43 @@ class DateRangeCoveringTest extends TestCase
 
     public function testCoveringWithMinCover2AndThreePeriodsCoveringWithNullMetadata()
     {
-        $cover = new DateRangeCovering(2, new \DateTimeZone('Europe/Brussels')); 
+        $cover = new DateRangeCovering(2, new DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), null)
-            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), null)
-            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), null)
-            ->add(new \DateTime('2009-01-01'), new \DateTime('2010-09-15'), null)
-            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), null)
-            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), null)
-            ->compute()
-            ;
+            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), null)
+            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), null)
+            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), null)
+            ->add(new DateTime('2009-01-01'), new DateTime('2010-09-15'), null)
+            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), null)
+            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), null)
+            ->compute();
 
         $this->assertTrue($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(1, $cover->getIntersections());
 
         $this->assertEquals(
-            new \DateTime('2010-04-01'),
+            new DateTime('2010-04-01'),
             $cover->getIntersections()[0][0],
-            "assert date start are the intersection"
+            'assert date start are the intersection'
         );
         $this->assertEquals(
-            new \DateTime('2010-09-15'),
+            new DateTime('2010-09-15'),
             $cover->getIntersections()[0][1],
-            "assert date end are the intersection"
+            'assert date end are the intersection'
         );
         $this->assertIsArray($cover->getIntersections()[0][2]);
     }
 
-
     public function testCoveringWithMinCover3Absent()
     {
-        $cover = new DateRangeCovering(3, new \DateTimeZone('Europe/Brussels')); 
+        $cover = new DateRangeCovering(3, new DateTimeZone('Europe/Brussels'));
         $cover
-            ->add(new \DateTime('2010-01-01'), new \DateTime('2010-10-01'), 1)
-            ->add(new \DateTime('2010-06-01'), new \DateTime('2010-09-01'), 2)
-            ->add(new \DateTime('2010-04-01'), new \DateTime('2010-12-01'), 3)
-            ->add(new \DateTime('2019-01-01'), new \DateTime('2019-10-01'), 4)
-            ->add(new \DateTime('2019-06-01'), new \DateTime('2019-09-01'), 5)
-            ->compute()
-            ;
+            ->add(new DateTime('2010-01-01'), new DateTime('2010-10-01'), 1)
+            ->add(new DateTime('2010-06-01'), new DateTime('2010-09-01'), 2)
+            ->add(new DateTime('2010-04-01'), new DateTime('2010-12-01'), 3)
+            ->add(new DateTime('2019-01-01'), new DateTime('2019-10-01'), 4)
+            ->add(new DateTime('2019-06-01'), new DateTime('2019-09-01'), 5)
+            ->compute();
         $this->assertFalse($cover->hasIntersections());
         $this->assertIsArray($cover->getIntersections());
         $this->assertCount(0, $cover->getIntersections());
diff --git a/src/Bundle/ChillMainBundle/Tests/bootstrap.php b/src/Bundle/ChillMainBundle/Tests/bootstrap.php
index 9211155e5..d4e1e46fa 100644
--- a/src/Bundle/ChillMainBundle/Tests/bootstrap.php
+++ b/src/Bundle/ChillMainBundle/Tests/bootstrap.php
@@ -1,8 +1,16 @@
 <?php
 
-if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
     throw new \LogicException('Could not find autoload.php in vendor/. Did you run "composer install --dev"?');
 }
 
 require $autoloadFile;
-
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
index de2ae9975..c36751960 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
@@ -1,121 +1,63 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Timeline;
 
-use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\DBAL\Types\Type;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\NativeQuery;
+use Doctrine\ORM\Query\ResultSetMapping;
+use LogicException;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use function array_key_exists;
+use function is_string;
 
 /**
- * Build timeline
+ * Build timeline.
  */
 class TimelineBuilder implements ContainerAwareInterface
 {
-    
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-    
+
     /**
-     *
      * @var \Doctrine\ORM\EntityManagerInterface
      */
     private $em;
-    
+
     /**
-     * Record provider
-     * 
+     * Record provider.
+     *
      * This array has the structure `[ 'service id' => $service ]`
      *
      * @var TimelineProviderInterface[]
      */
     private $providers = [];
-    
+
     /**
-     * Record provider and their context
-     * 
+     * Record provider and their context.
+     *
      * This array has the structure `[ 'context' => [ 'service id' ] ]`
      *
      * @var array
      */
     private $providersByContext = [];
-    
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
-    
-    /**
-     * return an HTML string with timeline
-     *
-     * This function must be called from controller
-     *
-     * @example https://redmine.champs-libres.coop/projects/chillperson/repository/revisions/bd2e1b1808f73e39532e9538413025df5487cad0/entry/Controller/TimelinePersonController.php#L47 the implementation in person bundle
-     *
-     * @param string $context
-     * @param array $args arguments defined by the bundle which create the context
-     * @param int $firstItem first item number
-     * @param int $number number of items by page
-     * @return string an HTML representation, must be included using `|raw` filter
-     */
-    public function getTimelineHTML($context, array $args, $firstItem = 0, $number = 20)
-    {
-        list($union, $parameters) = $this->buildUnionQuery($context, $args);
-        
-        //add ORDER BY clause and LIMIT
-        $query = $union . sprintf(' ORDER BY date DESC LIMIT %d OFFSET %d',
-            $number, $firstItem);
-        
-        // run query and handle results
-        $fetched = $this->runUnionQuery($query, $parameters);
-        $entitiesByKey = $this->getEntities($fetched, $context);
-        
-        return $this->render($fetched, $entitiesByKey, $context, $args);
-    }
-    
-    /**
-     * Return the number of items for the given context and args
-     *
-     * @param unknown $context
-     * @param array $args
-     * @return mixed|\Doctrine\DBAL\Driver\Statement|NULL
-     */
-    public function countItems($context, array $args)
-    {
-        $rsm = (new ResultSetMapping())
-            ->addScalarResult('total', 'total', Type::INTEGER);
 
-        list($select, $parameters) = $this->buildUnionQuery($context, $args);
-
-        // embed the union query inside a count query
-        $countQuery = sprintf('SELECT COUNT(sq.id) AS total FROM (%s) as sq', $select);
-
-        $nq = $this->em->createNativeQuery($countQuery, $rsm);
-        $nq->setParameters($parameters);
-        
-        return $nq->getSingleScalarResult();
-    }
-    
     /**
-     * add a provider id
+     * add a provider id.
      *
      * @internal This function is called by the TimelineCompilerClass
      *
@@ -127,36 +69,142 @@ class TimelineBuilder implements ContainerAwareInterface
         $this->providersByContext[$context][] = $id;
         $this->providers[$id] = $provider;
     }
-    
+
     /**
-     * Get providers by context
+     * Return the number of items for the given context and args.
+     *
+     * @param unknown $context
+     *
+     * @return \Doctrine\DBAL\Driver\Statement|mixed|null
+     */
+    public function countItems($context, array $args)
+    {
+        $rsm = (new ResultSetMapping())
+            ->addScalarResult('total', 'total', Types::INTEGER);
+
+        [$select, $parameters] = $this->buildUnionQuery($context, $args);
+
+        // embed the union query inside a count query
+        $countQuery = sprintf('SELECT COUNT(sq.id) AS total FROM (%s) as sq', $select);
+
+        $nq = $this->em->createNativeQuery($countQuery, $rsm);
+        $nq->setParameters($parameters);
+
+        return $nq->getSingleScalarResult();
+    }
+
+    /**
+     * Get providers by context.
      *
      * @param string $context
+     *
      * @return TimelineProviderInterface[]
      */
     public function getProvidersByContext($context)
     {
         //throw an exception if no provider have been defined for this context
         if (!array_key_exists($context, $this->providersByContext)) {
-            throw new \LogicException(sprintf('No builders have been defined for "%s"'
+            throw new LogicException(sprintf('No builders have been defined for "%s"'
                     . ' context', $context));
         }
-    
+
         $providers = [];
-        
-        foreach($this->providersByContext[$context] as $providerId) {
+
+        foreach ($this->providersByContext[$context] as $providerId) {
             $providers[] = $this->providers[$providerId];
         }
-        
+
         return $providers;
     }
-    
+
     /**
-     * build the UNION query with all providers
+     * return an HTML string with timeline.
+     *
+     * This function must be called from controller
+     *
+     * @example https://redmine.champs-libres.coop/projects/chillperson/repository/revisions/bd2e1b1808f73e39532e9538413025df5487cad0/entry/Controller/TimelinePersonController.php#L47 the implementation in person bundle
+     *
+     * @param string $context
+     * @param array $args arguments defined by the bundle which create the context
+     * @param int $firstItem first item number
+     * @param int $number number of items by page
+     *
+     * @return string an HTML representation, must be included using `|raw` filter
+     */
+    public function getTimelineHTML($context, array $args, $firstItem = 0, $number = 20)
+    {
+        [$union, $parameters] = $this->buildUnionQuery($context, $args);
+
+        //add ORDER BY clause and LIMIT
+        $query = $union . sprintf(
+            ' ORDER BY date DESC LIMIT %d OFFSET %d',
+            $number,
+            $firstItem
+        );
+
+        // run query and handle results
+        $fetched = $this->runUnionQuery($query, $parameters);
+        $entitiesByKey = $this->getEntities($fetched, $context);
+
+        return $this->render($fetched, $entitiesByKey, $context, $args);
+    }
+
+    /**
+     * Hack to replace the arbitrary "AS" statement in DQL
+     * into proper SQL query
+     * TODO remove
+     * private function replaceASInDQL(string $dql): string
+     * {
+     * $pattern = '/^(SELECT\s+[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s{0,},\s{0,}[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s{0,},\s{0,}[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s+FROM.*)/';
+     * $replacements = '${1} AS id ${3} AS type ${5} AS date ${7}';.
+     *
+     * $s = \preg_replace($pattern, $replacements, $dql, 1);
+     *
+     * if (NULL === $s) {
+     * throw new \RuntimeException('Could not replace the "AS" statement produced by '.
+     * 'DQL with normal SQL AS: '.$dql);
+     * }
+     *
+     * return $s;
+     * }
+     *
+     * @param mixed $data
+     */
+
+    /**
+     * return the SQL SELECT query as a string,.
+     *
+     * @return array: first parameter is the sql string, second an array with parameters
+     */
+    private function buildSelectQuery($data): array
+    {
+        return [$data->buildSql(), $data->getParameters()];
+        // dead code
+        $parameters = [];
+
+        $sql = sprintf(
+            'SELECT %s AS id, '
+                . '%s AS "date", '
+                . "'%s' AS type "
+                . 'FROM %s '
+                . 'WHERE %s',
+            $data['id'],
+            $data['date'],
+            $data['type'],
+            $data['FROM'],
+            is_string($data['WHERE']) ? $data['WHERE'] : $data['WHERE'][0]
+        );
+
+        return [$sql, $data['WHERE'][1]];
+    }
+
+    /**
+     * build the UNION query with all providers.
      *
      * @uses self::buildSelectQuery to build individual SELECT queries
      *
-     * @throws \LogicException if no builder have been defined for this context
+     * @throws LogicException if no builder have been defined for this context
+     *
      * @return array, where first element is the query, the second one an array with the parameters
      */
     private function buildUnionQuery(string $context, array $args): array
@@ -165,146 +213,48 @@ class TimelineBuilder implements ContainerAwareInterface
         $union = '';
         $parameters = [];
 
-        foreach($this->getProvidersByContext($context) as $provider) {
+        foreach ($this->getProvidersByContext($context) as $provider) {
             $data = $provider->fetchQuery($context, $args);
-            list($select, $selectParameters) = $this->buildSelectQuery($data);
-            $append = empty($union) ?  $select : ' UNION '.$select;
+            [$select, $selectParameters] = $this->buildSelectQuery($data);
+            $append = empty($union) ? $select : ' UNION ' . $select;
             $union .= $append;
             $parameters = array_merge($parameters, $selectParameters);
         }
-        
+
         return [$union, $parameters];
     }
 
     /**
-     * Hack to replace the arbitrary "AS" statement in DQL
-     * into proper SQL query
-     * TODO remove
-    private function replaceASInDQL(string $dql): string
-    {
-        $pattern = '/^(SELECT\s+[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s{0,},\s{0,}[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s{0,},\s{0,}[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s+FROM.*)/';
-        $replacements = '${1} AS id ${3} AS type ${5} AS date ${7}';
-
-        $s = \preg_replace($pattern, $replacements, $dql, 1);
-
-        if (NULL === $s) {
-            throw new \RuntimeException('Could not replace the "AS" statement produced by '.
-                'DQL with normal SQL AS: '.$dql);
-        }
-
-        return $s;
-    }
-     */
-    
-    /**
-     * return the SQL SELECT query as a string,
-     *
-     * @return array: first parameter is the sql string, second an array with parameters
-     */
-    private function buildSelectQuery($data): array
-    {
-        return [$data->buildSql(), $data->getParameters()];
-
-        // dead code
-        $parameters = [];
-
-        $sql = sprintf(
-                'SELECT %s AS id, '
-                . '%s AS "date", '
-                . "'%s' AS type "
-                . 'FROM %s '
-                . 'WHERE %s',
-                $data['id'],
-                $data['date'],
-                $data['type'],
-                $data['FROM'],
-                is_string($data['WHERE']) ? $data['WHERE'] : $data['WHERE'][0]
-            );
-
-        return [$sql, $data['WHERE'][1]];
- 
-    }
-    
-    /**
-     * run the UNION query and return result as an array
-     *
-     * @return array an array with the results
-     */
-    private function runUnionQuery(string $query, array $parameters): array
-    {
-        $resultSetMapping = (new ResultSetMapping())
-                ->addScalarResult('id', 'id')
-                ->addScalarResult('type', 'type')
-                ->addScalarResult('date', 'date');
-        
-        return $this->em->createNativeQuery($query, $resultSetMapping)
-            ->setParameters($parameters)
-            ->getArrayResult();
-    }
-    
-    /**
-     *
-     * @param array $queriedIds
      * @param string $context
+     *
      * @return array with the form array($type => [$entity, $entity, $entity])
      */
     private function getEntities(array $queriedIds, $context)
     {
         //gather entities by type to pass all id with same type to the TimelineProvider.
-        $idsByType = array();
-        
-        foreach($queriedIds as $result) {
+        $idsByType = [];
+
+        foreach ($queriedIds as $result) {
             $idsByType[$result['type']][] = $result['id'];
         }
-        
+
         //fetch entities from providers
-        $entitiesByType = array();
+        $entitiesByType = [];
+
         foreach ($idsByType as $type => $ids) {
             //iterate providers for current context
-            foreach($this->getProvidersByContext($context) as $provider) {
+            foreach ($this->getProvidersByContext($context) as $provider) {
                 if ($provider->supportsType($type)) {
                     $entitiesByType[$type] = $provider->getEntities($ids);
+
                     break; //we assume that providers have unique keys => we break the loop
                 }
             }
         }
-        
+
         return $entitiesByType;
     }
-    
-    /**
-     * render the timeline as HTML
-     *
-     * @param array $fetched
-     * @param array $entitiesByType
-     * @param string $context
-     * @param mixed[] $args
-     * @return string the HTML representation of the timeline
-     */
-    private function render(array $fetched, array $entitiesByType, $context, array $args)
-    {
-        //add results to a pretty array
-        $timelineEntries = array();
-        foreach ($fetched as $result) {
-            $data = $this->getTemplateData(
-                    $result['type'],
-                    $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;
-        }
-        
-        return $this->container->get('templating')
-                ->render('@ChillMain/Timeline/chain_timelines.html.twig', array(
-                    'results' => $timelineEntries
-                ));
-        
-    }
-    
+
     /**
      * get the template data from the provider for the given entity, by type.
      *
@@ -312,14 +262,66 @@ class TimelineBuilder implements ContainerAwareInterface
      * @param mixed $entity
      * @param string $context
      * @param mixed[] $args
+     *
      * @return array the template data fetched from the provider
      */
     private function getTemplateData($type, $entity, $context, array $args)
     {
-        foreach($this->getProvidersByContext($context) as $provider) {
+        foreach ($this->getProvidersByContext($context) as $provider) {
             if ($provider->supportsType($type)) {
                 return $provider->getEntityTemplate($entity, $context, $args);
             }
         }
     }
+
+    /**
+     * render the timeline as HTML.
+     *
+     * @param string $context
+     * @param mixed[] $args
+     *
+     * @return string the HTML representation of the timeline
+     */
+    private function render(array $fetched, array $entitiesByType, $context, array $args)
+    {
+        //add results to a pretty array
+        $timelineEntries = [];
+
+        foreach ($fetched as $result) {
+            $data = $this->getTemplateData(
+                $result['type'],
+                $entitiesByType[$result['type']][$result['id']], //the entity
+                    $context,
+                $args
+            );
+
+            $timelineEntries[] = [
+                'date' => new DateTime($result['date']),
+                'template' => $data['template'],
+                'template_data' => $data['template_data'],
+            ];
+        }
+
+        return $this->container->get('templating')
+            ->render('@ChillMain/Timeline/chain_timelines.html.twig', [
+                'results' => $timelineEntries,
+            ]);
+    }
+
+    /**
+     * run the UNION query and return result as an array.
+     *
+     * @return array an array with the results
+     */
+    private function runUnionQuery(string $query, array $parameters): array
+    {
+        $resultSetMapping = (new ResultSetMapping())
+            ->addScalarResult('id', 'id')
+            ->addScalarResult('type', 'type')
+            ->addScalarResult('date', 'date');
+
+        return $this->em->createNativeQuery($query, $resultSetMapping)
+            ->setParameters($parameters)
+            ->getArrayResult();
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
index abe695e75..98c812ef2 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
@@ -1,29 +1,23 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Timeline;
 
+use LogicException;
+
 /**
- * Interface for service providing info to timeline
- * 
+ * Interface for service providing info to timeline.
+ *
  * Services implementing those interface must be tagged like this :
- * 
+ *
  * ```
  * services:
  *    my_timeline:
@@ -34,97 +28,96 @@ namespace Chill\MainBundle\Timeline;
  *          # a second 'center' context :
  *          - { name: timeline, context: center }
  * ```
- * 
+ *
  * The bundle which will call the timeline will document available context and
  * the arguments provided by the context.
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 interface TimelineProviderInterface
 {
-    
     /**
-     * provide data to build a SQL SELECT query to fetch entities
-     * 
+     * provide data to build a SQL SELECT query to fetch entities.
+     *
      * The TimeLineBuilder will create a full SELECT query and append
      * the query into an UNION of SELECT queries. This permit to fetch
      * all entities from different table in a single query.
-     * 
+     *
      * The associative array MUST have the following key :
      * - `id` : the name of the id column
      * - `type`: a string to indicate the type
      * - `date`: the name of the datetime column, used to order entities by date
      * - `FROM` (in capital) : the FROM clause. May contains JOIN instructions
-     * 
+     *
      * Those key are optional:
-     * - `WHERE` (in capital) : the WHERE clause. 
-     * 
+     * - `WHERE` (in capital) : the WHERE clause.
+     *
      * Where relevant, the data must be quoted to avoid SQL injection.
-     * 
+     *
      * `$context` and `$args` are defined by the bundle which will call the timeline
-     * rendering. 
-     * 
+     * rendering.
+     *
      * @param string $context
      * @param mixed[] $args the argument to the context.
+     *
      * @return string[]
      * @throw  \LogicException if the context is not supported
      */
     public function fetchQuery($context, array $args);
-    
-    /**
-     * Indicate if the result type may be handled by the service
-     * 
-     * @param string $type the key present in the SELECT query
-     * @return boolean
-     */
-    public function supportsType($type);
 
     /**
      * fetch entities from db into an associative array. The keys **MUST BE**
-     * the id
-     * 
-     * All ids returned by all SELECT queries 
+     * the id.
+     *
+     * All ids returned by all SELECT queries
      * (@see TimeLineProviderInterface::fetchQuery) and with the type
      * supported by the provider (@see TimelineProviderInterface::supportsType)
      * will be passed as argument.
-     * 
+     *
      * @param array $ids an array of id
+     *
      * @return mixed[] an associative array of entities, with id as key
      */
     public function getEntities(array $ids);
-    
+
     /**
      * return an associative array with argument to render the entity
-     * in an html template, which will be included in the timeline page
-     * 
+     * in an html template, which will be included in the timeline page.
+     *
      * The result must have the following key :
-     * 
+     *
      * - `template` : the template FQDN
      * - `template_data`: the data required by the template
-     * 
-     * 
+     *
+     *
      * Example:
-     * 
+     *
      * ```
-     * array( 
+     * array(
      *    'template'      => 'ChillMyBundle:timeline:template.html.twig',
      *    'template_data' => array(
-     *             'accompanyingPeriod' => $entity, 
-     *              'person' => $args['person'] 
+     *             'accompanyingPeriod' => $entity,
+     *              'person' => $args['person']
      *         )
      *    );
      * ```
-     * 
+     *
      * `$context` and `$args` are defined by the bundle which will call the timeline
-     * rendering. 
-     * 
+     * rendering.
+     *
      * @param type $entity
      * @param type $context
-     * @param array $args
+     *
+     * @throws LogicException if the context is not supported
+     *
      * @return mixed[]
-     * @throws \LogicException if the context is not supported
      */
     public function getEntityTemplate($entity, $context, array $args);
- 
+
+    /**
+     * Indicate if the result type may be handled by the service.
+     *
+     * @param string $type the key present in the SELECT query
+     *
+     * @return bool
+     */
+    public function supportsType($type);
 }
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
index e7e456a80..23e60ef97 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php
@@ -1,30 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Timeline;
 
+use function strtr;
 
 class TimelineSingleQuery
 {
-    private ?string $id;
-
     private ?string $date;
 
-    private ?string $key;
-
-    private ?string $from;
-
-    private ?string $where;
-
-    private array $parameters = [];
-
     private bool $distinct = false;
 
+    private ?string $from;
+
+    private ?string $id;
+
+    private ?string $key;
+
+    private array $parameters = [];
+
+    private ?string $where;
+
     public function __construct(
-        string $id = null,
-        string $date = null,
-        string $key = null,
-        string $from = null,
-        string $where = null,
+        ?string $id = null,
+        ?string $date = null,
+        ?string $key = null,
+        ?string $from = null,
+        ?string $where = null,
         array $parameters = []
     ) {
         $this->id = $id;
@@ -35,6 +45,27 @@ class TimelineSingleQuery
         $this->parameters = $parameters;
     }
 
+    public function buildSql(): string
+    {
+        $parameters = [];
+
+        return strtr(
+            'SELECT {distinct} {id} AS id, '
+                . '{date} AS "date", '
+                . "'{key}' AS type "
+                . 'FROM {from} '
+                . 'WHERE {where}',
+            [
+                '{distinct}' => $this->distinct ? 'DISTINCT' : '',
+                '{id}' => $this->getId(),
+                '{date}' => $this->getDate(),
+                '{key}' => $this->getKey(),
+                '{from}' => $this->getFrom(),
+                '{where}' => $this->getWhere(),
+            ]
+        );
+    }
+
     public static function fromArray(array $a)
     {
         return new TimelineSingleQuery(
@@ -43,78 +74,49 @@ class TimelineSingleQuery
             $a['type'] ?? $a['key'] ?? null,
             $a['FROM'] ?? $a['from'] ?? null,
             $a['WHERE'] ?? $a['where'] ?? null,
-            $a['parameters'] ?? null);
-    }
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-    
-    public function setId(string $id): self
-    {
-        $this->id = $id;
-    
-        return $this;
+            $a['parameters'] ?? null
+        );
     }
 
     public function getDate(): string
     {
         return $this->date;
     }
-    
-    public function setDate(string $date): self
+
+    public function getFrom(): string
     {
-        $this->date = $date;
-    
-        return $this;
+        return $this->from;
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
     }
 
     public function getKey(): string
     {
         return $this->key;
     }
-    
-    public function setKey(string $key): self
-    {
-        $this->key = $key;
-    
-        return $this;
-    }
 
-    public function getFrom(): string
+    public function getParameters(): array
     {
-        return $this->from;
-    }
-    
-    public function setFrom(string $from): self
-    {
-        $this->from = $from;
-    
-        return $this;
+        return $this->parameters;
     }
 
     public function getWhere(): string
     {
         return $this->where;
     }
-    
-    public function setWhere(string $where): self
+
+    public function isDistinct(): bool
     {
-        $this->where = $where;
-    
-        return $this;
+        return $this->distinct;
     }
 
-    public function getParameters(): array
+    public function setDate(string $date): self
     {
-        return $this->parameters;
-    }
-    
-    public function setParameters(array $parameters): self
-    {
-        $this->parameters = $parameters;
-    
+        $this->date = $date;
+
         return $this;
     }
 
@@ -125,31 +127,38 @@ class TimelineSingleQuery
         return $this;
     }
 
-    public function isDistinct(): bool
+    public function setFrom(string $from): self
     {
-        return $this->distinct;
+        $this->from = $from;
+
+        return $this;
     }
 
-    public function buildSql(): string
+    public function setId(string $id): self
     {
-        $parameters = [];
+        $this->id = $id;
 
-        $sql = \strtr(
-                'SELECT {distinct} {id} AS id, '
-                . '{date} AS "date", '
-                . "'{key}' AS type "
-                . 'FROM {from} '
-                . 'WHERE {where}',
-                [
-                    '{distinct}' => $this->distinct ? 'DISTINCT' : '',
-                    '{id}' => $this->getId(),
-                    '{date}' => $this->getDate(),
-                    '{key}' => $this->getKey(),
-                    '{from}' => $this->getFrom(),
-                    '{where}' => $this->getWhere(),
-                ]
-            );
+        return $this;
+    }
 
-        return $sql;
+    public function setKey(string $key): self
+    {
+        $this->key = $key;
+
+        return $this;
+    }
+
+    public function setParameters(array $parameters): self
+    {
+        $this->parameters = $parameters;
+
+        return $this;
+    }
+
+    public function setWhere(string $where): self
+    {
+        $this->where = $where;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
index a6dfbee49..05089a04f 100644
--- a/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
+++ b/src/Bundle/ChillMainBundle/Util/CountriesInfo.php
@@ -1,361 +1,370 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Util;
 
+use UnexpectedValueException;
+use function array_key_exists;
+
 /**
  * Get information about countries.
- * 
- * This class is used to get the continent of countries.
  *
- * @author julien.fastre@champs-libre.coop
+ * This class is used to get the continent of countries.
  */
-class CountriesInfo {
-    
+class CountriesInfo
+{
+    private static $cacheCountriesCodeByContinent;
+
     private static $preparedData;
-    
+
     /**
-     * get the information about country in arrays where :
-     * 
+     * get the information about country in arrays where :.
+     *
      * - key 0 = continent
      * - key 1 = country code, in 2 letters
-     * - key 2 = country code, in 3 letters 
+     * - key 2 = country code, in 3 letters
      * - key 3 = country number
      * - key 4 = country name, in english
-     * 
+     *
      * @return array an array of countries array
      */
     public static function getArrayCountriesData()
     {
-        if (self::$preparedData === null) {
+        if (null === self::$preparedData) {
             $raw = self::getCountriesData();
-            
+
             // parse data line by line
             $separator = "\r\n";
             $line = strtok($raw, $separator);
-            
-            while ($line !== false) {
-                self::$preparedData[] = explode(" ", $line, 5);
-                
+
+            while (false !== $line) {
+                self::$preparedData[] = explode(' ', $line, 5);
+
                 $line = strtok($separator);
             }
-            
-            return self::$preparedData;
-        } else {
+
             return self::$preparedData;
         }
+
+        return self::$preparedData;
     }
-    
-    private static $cacheCountriesCodeByContinent;
-    
-    private static function prepareCacheCountriesByContinent()
-    {
-        if (self::$cacheCountriesCodeByContinent === null) {
-            $data = self::getArrayCountriesData();
-            
-            array_walk($data, function($item, $key) {
-                self::$cacheCountriesCodeByContinent[$item[0]][] = $item[1];
-            });
-        }
-    }
-    
-    public static function getCountriesCodeByContinent($continent)
-    {
-        self::prepareCacheCountriesByContinent();
-        
-        if (array_key_exists($continent, self::$cacheCountriesCodeByContinent)) {
-            return self::$cacheCountriesCodeByContinent[$continent];
-        } else {
-            throw new \UnexpectedValueException(sprintf("The continent with prefix "
-                    . "%s is unknown.", $continent));
-        }
-        
-    }
-    
+
     public static function getContinentsCodes()
     {
         self::prepareCacheCountriesByContinent();
-        
+
         return array_keys(self::$cacheCountriesCodeByContinent);
     }
-    
+
+    public static function getCountriesCodeByContinent($continent)
+    {
+        self::prepareCacheCountriesByContinent();
+
+        if (array_key_exists($continent, self::$cacheCountriesCodeByContinent)) {
+            return self::$cacheCountriesCodeByContinent[$continent];
+        }
+
+        throw new UnexpectedValueException(sprintf('The continent with prefix '
+                    . '%s is unknown.', $continent));
+    }
+
     public static function getCountriesData()
     {
         // this list is extracted by https://en.wikipedia.org/wiki/List_of_sovereign_states_and_dependent_territories_by_continent_%28data_file%29
-        // 
+        //
         // The columns are :
         // - continent code ;
         // - country code (two letters) ;
         // - country code (three letters) ;
         // - country number
         // - english name
-        // 
-        // source : 
-        // Wikipedia contributors, "List of sovereign states and dependent territories by continent (data file)," 
-        // Wikipedia, The Free Encyclopedia, https://en.wikipedia.org/w/index.php?title=List_of_sovereign_states_and_dependent_territories_by_continent_(data_file)&oldid=688980440 
-        // (accessed January 2, 2016). 
-        return <<<EOT
-AS AF AFG 004 Afghanistan, Islamic Republic of
-EU AL ALB 008 Albania, Republic of
-AN AQ ATA 010 Antarctica (the territory South of 60 deg S)
-AF DZ DZA 012 Algeria, People's Democratic Republic of
-OC AS ASM 016 American Samoa
-EU AD AND 020 Andorra, Principality of
-AF AO AGO 024 Angola, Republic of
-NA AG ATG 028 Antigua and Barbuda
-EU AZ AZE 031 Azerbaijan, Republic of
-AS AZ AZE 031 Azerbaijan, Republic of
-SA AR ARG 032 Argentina, Argentine Republic
-OC AU AUS 036 Australia, Commonwealth of
-EU AT AUT 040 Austria, Republic of
-NA BS BHS 044 Bahamas, Commonwealth of the
-AS BH BHR 048 Bahrain, Kingdom of
-AS BD BGD 050 Bangladesh, People's Republic of
-EU AM ARM 051 Armenia, Republic of
-AS AM ARM 051 Armenia, Republic of
-NA BB BRB 052 Barbados
-EU BE BEL 056 Belgium, Kingdom of
-NA BM BMU 060 Bermuda
-AS BT BTN 064 Bhutan, Kingdom of
-SA BO BOL 068 Bolivia, Republic of
-EU BA BIH 070 Bosnia and Herzegovina
-AF BW BWA 072 Botswana, Republic of
-AN BV BVT 074 Bouvet Island (Bouvetoya)
-SA BR BRA 076 Brazil, Federative Republic of
-NA BZ BLZ 084 Belize
-AS IO IOT 086 British Indian Ocean Territory (Chagos Archipelago)
-OC SB SLB 090 Solomon Islands
-NA VG VGB 092 British Virgin Islands
-AS BN BRN 096 Brunei Darussalam
-EU BG BGR 100 Bulgaria, Republic of
-AS MM MMR 104 Myanmar, Union of
-AF BI BDI 108 Burundi, Republic of
-EU BY BLR 112 Belarus, Republic of
-AS KH KHM 116 Cambodia, Kingdom of
-AF CM CMR 120 Cameroon, Republic of
-NA CA CAN 124 Canada
-AF CV CPV 132 Cape Verde, Republic of
-NA KY CYM 136 Cayman Islands
-AF CF CAF 140 Central African Republic
-AS LK LKA 144 Sri Lanka, Democratic Socialist Republic of
-AF TD TCD 148 Chad, Republic of
-SA CL CHL 152 Chile, Republic of
-AS CN CHN 156 China, People's Republic of
-AS TW TWN 158 Taiwan
-AS CX CXR 162 Christmas Island
-AS CC CCK 166 Cocos (Keeling) Islands
-SA CO COL 170 Colombia, Republic of
-AF KM COM 174 Comoros, Union of the
-AF YT MYT 175 Mayotte
-AF CG COG 178 Congo, Republic of the
-AF CD COD 180 Congo, Democratic Republic of the
-OC CK COK 184 Cook Islands
-NA CR CRI 188 Costa Rica, Republic of
-EU HR HRV 191 Croatia, Republic of
-NA CU CUB 192 Cuba, Republic of
-EU CY CYP 196 Cyprus, Republic of
-AS CY CYP 196 Cyprus, Republic of
-EU CZ CZE 203 Czech Republic
-AF BJ BEN 204 Benin, Republic of
-EU DK DNK 208 Denmark, Kingdom of
-NA DM DMA 212 Dominica, Commonwealth of
-NA DO DOM 214 Dominican Republic
-SA EC ECU 218 Ecuador, Republic of
-NA SV SLV 222 El Salvador, Republic of
-AF GQ GNQ 226 Equatorial Guinea, Republic of
-AF ET ETH 231 Ethiopia, Federal Democratic Republic of
-AF ER ERI 232 Eritrea, State of
-EU EE EST 233 Estonia, Republic of
-EU FO FRO 234 Faroe Islands
-SA FK FLK 238 Falkland Islands (Malvinas)
-AN GS SGS 239 South Georgia and the South Sandwich Islands
-OC FJ FJI 242 Fiji, Republic of the Fiji Islands
-EU FI FIN 246 Finland, Republic of
-EU AX ALA 248 Åland Islands
-EU FR FRA 250 France, French Republic
-SA GF GUF 254 French Guiana
-OC PF PYF 258 French Polynesia
-AN TF ATF 260 French Southern Territories
-AF DJ DJI 262 Djibouti, Republic of
-AF GA GAB 266 Gabon, Gabonese Republic
-EU GE GEO 268 Georgia
-AS GE GEO 268 Georgia
-AF GM GMB 270 Gambia, Republic of the
-AS PS PSE 275 Palestinian Territory, Occupied
-EU DE DEU 276 Germany, Federal Republic of
-AF GH GHA 288 Ghana, Republic of
-EU GI GIB 292 Gibraltar
-OC KI KIR 296 Kiribati, Republic of
-EU GR GRC 300 Greece, Hellenic Republic
-NA GL GRL 304 Greenland
-NA GD GRD 308 Grenada
-NA GP GLP 312 Guadeloupe
-OC GU GUM 316 Guam
-NA GT GTM 320 Guatemala, Republic of
-AF GN GIN 324 Guinea, Republic of
-SA GY GUY 328 Guyana, Co-operative Republic of
-NA HT HTI 332 Haiti, Republic of
-AN HM HMD 334 Heard Island and McDonald Islands
-EU VA VAT 336 Holy See (Vatican City State)
-NA HN HND 340 Honduras, Republic of
-AS HK HKG 344 Hong Kong, Special Administrative Region of China
-EU HU HUN 348 Hungary, Republic of
-EU IS ISL 352 Iceland, Republic of
-AS IN IND 356 India, Republic of
-AS ID IDN 360 Indonesia, Republic of
-AS IR IRN 364 Iran, Islamic Republic of
-AS IQ IRQ 368 Iraq, Republic of
-EU IE IRL 372 Ireland
-AS IL ISR 376 Israel, State of
-EU IT ITA 380 Italy, Italian Republic
-AF CI CIV 384 Cote d'Ivoire, Republic of
-NA JM JAM 388 Jamaica
-AS JP JPN 392 Japan
-EU KZ KAZ 398 Kazakhstan, Republic of
-AS KZ KAZ 398 Kazakhstan, Republic of
-AS JO JOR 400 Jordan, Hashemite Kingdom of
-AF KE KEN 404 Kenya, Republic of
-AS KP PRK 408 Korea, Democratic People's Republic of
-AS KR KOR 410 Korea, Republic of
-AS KW KWT 414 Kuwait, State of
-AS KG KGZ 417 Kyrgyz Republic
-AS LA LAO 418 Lao People's Democratic Republic
-AS LB LBN 422 Lebanon, Lebanese Republic
-AF LS LSO 426 Lesotho, Kingdom of
-EU LV LVA 428 Latvia, Republic of
-AF LR LBR 430 Liberia, Republic of
-AF LY LBY 434 Libyan Arab Jamahiriya
-EU LI LIE 438 Liechtenstein, Principality of
-EU LT LTU 440 Lithuania, Republic of
-EU LU LUX 442 Luxembourg, Grand Duchy of
-AS MO MAC 446 Macao, Special Administrative Region of China
-AF MG MDG 450 Madagascar, Republic of
-AF MW MWI 454 Malawi, Republic of
-AS MY MYS 458 Malaysia
-AS MV MDV 462 Maldives, Republic of
-AF ML MLI 466 Mali, Republic of
-EU MT MLT 470 Malta, Republic of
-NA MQ MTQ 474 Martinique
-AF MR MRT 478 Mauritania, Islamic Republic of
-AF MU MUS 480 Mauritius, Republic of
-NA MX MEX 484 Mexico, United Mexican States
-EU MC MCO 492 Monaco, Principality of
-AS MN MNG 496 Mongolia
-EU MD MDA 498 Moldova, Republic of
-EU ME MNE 499 Montenegro, Republic of
-NA MS MSR 500 Montserrat
-AF MA MAR 504 Morocco, Kingdom of
-AF MZ MOZ 508 Mozambique, Republic of
-AS OM OMN 512 Oman, Sultanate of
-AF NA NAM 516 Namibia, Republic of
-OC NR NRU 520 Nauru, Republic of
-AS NP NPL 524 Nepal, State of
-EU NL NLD 528 Netherlands, Kingdom of the
-NA AN ANT 530 Netherlands Antilles
-NA CW CUW 531 Curaçao
-NA AW ABW 533 Aruba
-NA SX SXM 534 Sint Maarten (Netherlands)
-NA BQ BES 535 Bonaire, Sint Eustatius and Saba
-OC NC NCL 540 New Caledonia
-OC VU VUT 548 Vanuatu, Republic of
-OC NZ NZL 554 New Zealand
-NA NI NIC 558 Nicaragua, Republic of
-AF NE NER 562 Niger, Republic of
-AF NG NGA 566 Nigeria, Federal Republic of
-OC NU NIU 570 Niue
-OC NF NFK 574 Norfolk Island
-EU NO NOR 578 Norway, Kingdom of
-OC MP MNP 580 Northern Mariana Islands, Commonwealth of the
-OC UM UMI 581 United States Minor Outlying Islands
-NA UM UMI 581 United States Minor Outlying Islands
-OC FM FSM 583 Micronesia, Federated States of
-OC MH MHL 584 Marshall Islands, Republic of the
-OC PW PLW 585 Palau, Republic of
-AS PK PAK 586 Pakistan, Islamic Republic of
-NA PA PAN 591 Panama, Republic of
-OC PG PNG 598 Papua New Guinea, Independent State of
-SA PY PRY 600 Paraguay, Republic of
-SA PE PER 604 Peru, Republic of
-AS PH PHL 608 Philippines, Republic of the
-OC PN PCN 612 Pitcairn Islands
-EU PL POL 616 Poland, Republic of
-EU PT PRT 620 Portugal, Portuguese Republic
-AF GW GNB 624 Guinea-Bissau, Republic of
-AS TL TLS 626 Timor-Leste, Democratic Republic of
-NA PR PRI 630 Puerto Rico, Commonwealth of
-AS QA QAT 634 Qatar, State of
-AF RE REU 638 Reunion
-EU RO ROU 642 Romania
-EU RU RUS 643 Russian Federation
-AS RU RUS 643 Russian Federation
-AF RW RWA 646 Rwanda, Republic of
-NA BL BLM 652 Saint Barthelemy
-AF SH SHN 654 Saint Helena
-NA KN KNA 659 Saint Kitts and Nevis, Federation of
-NA AI AIA 660 Anguilla
-NA LC LCA 662 Saint Lucia
-NA MF MAF 663 Saint Martin
-NA PM SPM 666 Saint Pierre and Miquelon
-NA VC VCT 670 Saint Vincent and the Grenadines
-EU SM SMR 674 San Marino, Republic of
-AF ST STP 678 Sao Tome and Principe, Democratic Republic of
-AS SA SAU 682 Saudi Arabia, Kingdom of
-AF SN SEN 686 Senegal, Republic of
-EU RS SRB 688 Serbia, Republic of
-AF SC SYC 690 Seychelles, Republic of
-AF SL SLE 694 Sierra Leone, Republic of
-AS SG SGP 702 Singapore, Republic of
-EU SK SVK 703 Slovakia (Slovak Republic)
-AS VN VNM 704 Vietnam, Socialist Republic of
-EU SI SVN 705 Slovenia, Republic of
-AF SO SOM 706 Somalia, Somali Republic
-AF ZA ZAF 710 South Africa, Republic of
-AF ZW ZWE 716 Zimbabwe, Republic of
-EU ES ESP 724 Spain, Kingdom of
-AF SS SSD 728 South Sudan
-AF EH ESH 732 Western Sahara
-AF SD SDN 736 Sudan, Republic of
-SA SR SUR 740 Suriname, Republic of
-EU SJ SJM 744 Svalbard & Jan Mayen Islands
-AF SZ SWZ 748 Swaziland, Kingdom of
-EU SE SWE 752 Sweden, Kingdom of
-EU CH CHE 756 Switzerland, Swiss Confederation
-AS SY SYR 760 Syrian Arab Republic
-AS TJ TJK 762 Tajikistan, Republic of
-AS TH THA 764 Thailand, Kingdom of
-AF TG TGO 768 Togo, Togolese Republic
-OC TK TKL 772 Tokelau
-OC TO TON 776 Tonga, Kingdom of
-NA TT TTO 780 Trinidad and Tobago, Republic of
-AS AE ARE 784 United Arab Emirates
-AF TN TUN 788 Tunisia, Tunisian Republic
-EU TR TUR 792 Turkey, Republic of
-AS TR TUR 792 Turkey, Republic of
-AS TM TKM 795 Turkmenistan
-NA TC TCA 796 Turks and Caicos Islands
-OC TV TUV 798 Tuvalu
-AF UG UGA 800 Uganda, Republic of
-EU UA UKR 804 Ukraine
-EU MK MKD 807 Macedonia, The Republic of
-AF EG EGY 818 Egypt, Arab Republic of
-EU GB GBR 826 United Kingdom of Great Britain & Northern Ireland
-EU GG GGY 831 Guernsey, Bailiwick of
-EU JE JEY 832 Jersey, Bailiwick of
-EU IM IMN 833 Isle of Man
-AF TZ TZA 834 Tanzania, United Republic of
-NA US USA 840 United States of America
-NA VI VIR 850 United States Virgin Islands
-AF BF BFA 854 Burkina Faso
-SA UY URY 858 Uruguay, Eastern Republic of
-AS UZ UZB 860 Uzbekistan, Republic of
-SA VE VEN 862 Venezuela, Bolivarian Republic of
-OC WF WLF 876 Wallis and Futuna
-OC WS WSM 882 Samoa, Independent State of
-AS YE YEM 887 Yemen
-AF ZM ZMB 894 Zambia, Republic of
-OC XX null null Disputed Territory
-AS XE null null Iraq-Saudi Arabia Neutral Zone
-AS XD null null United Nations Neutral Zone
-AS XS null null Spratly Islands
-EOT;
+        //
+        // source :
+        // Wikipedia contributors, "List of sovereign states and dependent territories by continent (data file),"
+        // Wikipedia, The Free Encyclopedia, https://en.wikipedia.org/w/index.php?title=List_of_sovereign_states_and_dependent_territories_by_continent_(data_file)&oldid=688980440
+        // (accessed January 2, 2016).
+        return <<<'EOT'
+            AS AF AFG 004 Afghanistan, Islamic Republic of
+            EU AL ALB 008 Albania, Republic of
+            AN AQ ATA 010 Antarctica (the territory South of 60 deg S)
+            AF DZ DZA 012 Algeria, People's Democratic Republic of
+            OC AS ASM 016 American Samoa
+            EU AD AND 020 Andorra, Principality of
+            AF AO AGO 024 Angola, Republic of
+            NA AG ATG 028 Antigua and Barbuda
+            EU AZ AZE 031 Azerbaijan, Republic of
+            AS AZ AZE 031 Azerbaijan, Republic of
+            SA AR ARG 032 Argentina, Argentine Republic
+            OC AU AUS 036 Australia, Commonwealth of
+            EU AT AUT 040 Austria, Republic of
+            NA BS BHS 044 Bahamas, Commonwealth of the
+            AS BH BHR 048 Bahrain, Kingdom of
+            AS BD BGD 050 Bangladesh, People's Republic of
+            EU AM ARM 051 Armenia, Republic of
+            AS AM ARM 051 Armenia, Republic of
+            NA BB BRB 052 Barbados
+            EU BE BEL 056 Belgium, Kingdom of
+            NA BM BMU 060 Bermuda
+            AS BT BTN 064 Bhutan, Kingdom of
+            SA BO BOL 068 Bolivia, Republic of
+            EU BA BIH 070 Bosnia and Herzegovina
+            AF BW BWA 072 Botswana, Republic of
+            AN BV BVT 074 Bouvet Island (Bouvetoya)
+            SA BR BRA 076 Brazil, Federative Republic of
+            NA BZ BLZ 084 Belize
+            AS IO IOT 086 British Indian Ocean Territory (Chagos Archipelago)
+            OC SB SLB 090 Solomon Islands
+            NA VG VGB 092 British Virgin Islands
+            AS BN BRN 096 Brunei Darussalam
+            EU BG BGR 100 Bulgaria, Republic of
+            AS MM MMR 104 Myanmar, Union of
+            AF BI BDI 108 Burundi, Republic of
+            EU BY BLR 112 Belarus, Republic of
+            AS KH KHM 116 Cambodia, Kingdom of
+            AF CM CMR 120 Cameroon, Republic of
+            NA CA CAN 124 Canada
+            AF CV CPV 132 Cape Verde, Republic of
+            NA KY CYM 136 Cayman Islands
+            AF CF CAF 140 Central African Republic
+            AS LK LKA 144 Sri Lanka, Democratic Socialist Republic of
+            AF TD TCD 148 Chad, Republic of
+            SA CL CHL 152 Chile, Republic of
+            AS CN CHN 156 China, People's Republic of
+            AS TW TWN 158 Taiwan
+            AS CX CXR 162 Christmas Island
+            AS CC CCK 166 Cocos (Keeling) Islands
+            SA CO COL 170 Colombia, Republic of
+            AF KM COM 174 Comoros, Union of the
+            AF YT MYT 175 Mayotte
+            AF CG COG 178 Congo, Republic of the
+            AF CD COD 180 Congo, Democratic Republic of the
+            OC CK COK 184 Cook Islands
+            NA CR CRI 188 Costa Rica, Republic of
+            EU HR HRV 191 Croatia, Republic of
+            NA CU CUB 192 Cuba, Republic of
+            EU CY CYP 196 Cyprus, Republic of
+            AS CY CYP 196 Cyprus, Republic of
+            EU CZ CZE 203 Czech Republic
+            AF BJ BEN 204 Benin, Republic of
+            EU DK DNK 208 Denmark, Kingdom of
+            NA DM DMA 212 Dominica, Commonwealth of
+            NA DO DOM 214 Dominican Republic
+            SA EC ECU 218 Ecuador, Republic of
+            NA SV SLV 222 El Salvador, Republic of
+            AF GQ GNQ 226 Equatorial Guinea, Republic of
+            AF ET ETH 231 Ethiopia, Federal Democratic Republic of
+            AF ER ERI 232 Eritrea, State of
+            EU EE EST 233 Estonia, Republic of
+            EU FO FRO 234 Faroe Islands
+            SA FK FLK 238 Falkland Islands (Malvinas)
+            AN GS SGS 239 South Georgia and the South Sandwich Islands
+            OC FJ FJI 242 Fiji, Republic of the Fiji Islands
+            EU FI FIN 246 Finland, Republic of
+            EU AX ALA 248 Åland Islands
+            EU FR FRA 250 France, French Republic
+            SA GF GUF 254 French Guiana
+            OC PF PYF 258 French Polynesia
+            AN TF ATF 260 French Southern Territories
+            AF DJ DJI 262 Djibouti, Republic of
+            AF GA GAB 266 Gabon, Gabonese Republic
+            EU GE GEO 268 Georgia
+            AS GE GEO 268 Georgia
+            AF GM GMB 270 Gambia, Republic of the
+            AS PS PSE 275 Palestinian Territory, Occupied
+            EU DE DEU 276 Germany, Federal Republic of
+            AF GH GHA 288 Ghana, Republic of
+            EU GI GIB 292 Gibraltar
+            OC KI KIR 296 Kiribati, Republic of
+            EU GR GRC 300 Greece, Hellenic Republic
+            NA GL GRL 304 Greenland
+            NA GD GRD 308 Grenada
+            NA GP GLP 312 Guadeloupe
+            OC GU GUM 316 Guam
+            NA GT GTM 320 Guatemala, Republic of
+            AF GN GIN 324 Guinea, Republic of
+            SA GY GUY 328 Guyana, Co-operative Republic of
+            NA HT HTI 332 Haiti, Republic of
+            AN HM HMD 334 Heard Island and McDonald Islands
+            EU VA VAT 336 Holy See (Vatican City State)
+            NA HN HND 340 Honduras, Republic of
+            AS HK HKG 344 Hong Kong, Special Administrative Region of China
+            EU HU HUN 348 Hungary, Republic of
+            EU IS ISL 352 Iceland, Republic of
+            AS IN IND 356 India, Republic of
+            AS ID IDN 360 Indonesia, Republic of
+            AS IR IRN 364 Iran, Islamic Republic of
+            AS IQ IRQ 368 Iraq, Republic of
+            EU IE IRL 372 Ireland
+            AS IL ISR 376 Israel, State of
+            EU IT ITA 380 Italy, Italian Republic
+            AF CI CIV 384 Cote d'Ivoire, Republic of
+            NA JM JAM 388 Jamaica
+            AS JP JPN 392 Japan
+            EU KZ KAZ 398 Kazakhstan, Republic of
+            AS KZ KAZ 398 Kazakhstan, Republic of
+            AS JO JOR 400 Jordan, Hashemite Kingdom of
+            AF KE KEN 404 Kenya, Republic of
+            AS KP PRK 408 Korea, Democratic People's Republic of
+            AS KR KOR 410 Korea, Republic of
+            AS KW KWT 414 Kuwait, State of
+            AS KG KGZ 417 Kyrgyz Republic
+            AS LA LAO 418 Lao People's Democratic Republic
+            AS LB LBN 422 Lebanon, Lebanese Republic
+            AF LS LSO 426 Lesotho, Kingdom of
+            EU LV LVA 428 Latvia, Republic of
+            AF LR LBR 430 Liberia, Republic of
+            AF LY LBY 434 Libyan Arab Jamahiriya
+            EU LI LIE 438 Liechtenstein, Principality of
+            EU LT LTU 440 Lithuania, Republic of
+            EU LU LUX 442 Luxembourg, Grand Duchy of
+            AS MO MAC 446 Macao, Special Administrative Region of China
+            AF MG MDG 450 Madagascar, Republic of
+            AF MW MWI 454 Malawi, Republic of
+            AS MY MYS 458 Malaysia
+            AS MV MDV 462 Maldives, Republic of
+            AF ML MLI 466 Mali, Republic of
+            EU MT MLT 470 Malta, Republic of
+            NA MQ MTQ 474 Martinique
+            AF MR MRT 478 Mauritania, Islamic Republic of
+            AF MU MUS 480 Mauritius, Republic of
+            NA MX MEX 484 Mexico, United Mexican States
+            EU MC MCO 492 Monaco, Principality of
+            AS MN MNG 496 Mongolia
+            EU MD MDA 498 Moldova, Republic of
+            EU ME MNE 499 Montenegro, Republic of
+            NA MS MSR 500 Montserrat
+            AF MA MAR 504 Morocco, Kingdom of
+            AF MZ MOZ 508 Mozambique, Republic of
+            AS OM OMN 512 Oman, Sultanate of
+            AF NA NAM 516 Namibia, Republic of
+            OC NR NRU 520 Nauru, Republic of
+            AS NP NPL 524 Nepal, State of
+            EU NL NLD 528 Netherlands, Kingdom of the
+            NA AN ANT 530 Netherlands Antilles
+            NA CW CUW 531 Curaçao
+            NA AW ABW 533 Aruba
+            NA SX SXM 534 Sint Maarten (Netherlands)
+            NA BQ BES 535 Bonaire, Sint Eustatius and Saba
+            OC NC NCL 540 New Caledonia
+            OC VU VUT 548 Vanuatu, Republic of
+            OC NZ NZL 554 New Zealand
+            NA NI NIC 558 Nicaragua, Republic of
+            AF NE NER 562 Niger, Republic of
+            AF NG NGA 566 Nigeria, Federal Republic of
+            OC NU NIU 570 Niue
+            OC NF NFK 574 Norfolk Island
+            EU NO NOR 578 Norway, Kingdom of
+            OC MP MNP 580 Northern Mariana Islands, Commonwealth of the
+            OC UM UMI 581 United States Minor Outlying Islands
+            NA UM UMI 581 United States Minor Outlying Islands
+            OC FM FSM 583 Micronesia, Federated States of
+            OC MH MHL 584 Marshall Islands, Republic of the
+            OC PW PLW 585 Palau, Republic of
+            AS PK PAK 586 Pakistan, Islamic Republic of
+            NA PA PAN 591 Panama, Republic of
+            OC PG PNG 598 Papua New Guinea, Independent State of
+            SA PY PRY 600 Paraguay, Republic of
+            SA PE PER 604 Peru, Republic of
+            AS PH PHL 608 Philippines, Republic of the
+            OC PN PCN 612 Pitcairn Islands
+            EU PL POL 616 Poland, Republic of
+            EU PT PRT 620 Portugal, Portuguese Republic
+            AF GW GNB 624 Guinea-Bissau, Republic of
+            AS TL TLS 626 Timor-Leste, Democratic Republic of
+            NA PR PRI 630 Puerto Rico, Commonwealth of
+            AS QA QAT 634 Qatar, State of
+            AF RE REU 638 Reunion
+            EU RO ROU 642 Romania
+            EU RU RUS 643 Russian Federation
+            AS RU RUS 643 Russian Federation
+            AF RW RWA 646 Rwanda, Republic of
+            NA BL BLM 652 Saint Barthelemy
+            AF SH SHN 654 Saint Helena
+            NA KN KNA 659 Saint Kitts and Nevis, Federation of
+            NA AI AIA 660 Anguilla
+            NA LC LCA 662 Saint Lucia
+            NA MF MAF 663 Saint Martin
+            NA PM SPM 666 Saint Pierre and Miquelon
+            NA VC VCT 670 Saint Vincent and the Grenadines
+            EU SM SMR 674 San Marino, Republic of
+            AF ST STP 678 Sao Tome and Principe, Democratic Republic of
+            AS SA SAU 682 Saudi Arabia, Kingdom of
+            AF SN SEN 686 Senegal, Republic of
+            EU RS SRB 688 Serbia, Republic of
+            AF SC SYC 690 Seychelles, Republic of
+            AF SL SLE 694 Sierra Leone, Republic of
+            AS SG SGP 702 Singapore, Republic of
+            EU SK SVK 703 Slovakia (Slovak Republic)
+            AS VN VNM 704 Vietnam, Socialist Republic of
+            EU SI SVN 705 Slovenia, Republic of
+            AF SO SOM 706 Somalia, Somali Republic
+            AF ZA ZAF 710 South Africa, Republic of
+            AF ZW ZWE 716 Zimbabwe, Republic of
+            EU ES ESP 724 Spain, Kingdom of
+            AF SS SSD 728 South Sudan
+            AF EH ESH 732 Western Sahara
+            AF SD SDN 736 Sudan, Republic of
+            SA SR SUR 740 Suriname, Republic of
+            EU SJ SJM 744 Svalbard & Jan Mayen Islands
+            AF SZ SWZ 748 Swaziland, Kingdom of
+            EU SE SWE 752 Sweden, Kingdom of
+            EU CH CHE 756 Switzerland, Swiss Confederation
+            AS SY SYR 760 Syrian Arab Republic
+            AS TJ TJK 762 Tajikistan, Republic of
+            AS TH THA 764 Thailand, Kingdom of
+            AF TG TGO 768 Togo, Togolese Republic
+            OC TK TKL 772 Tokelau
+            OC TO TON 776 Tonga, Kingdom of
+            NA TT TTO 780 Trinidad and Tobago, Republic of
+            AS AE ARE 784 United Arab Emirates
+            AF TN TUN 788 Tunisia, Tunisian Republic
+            EU TR TUR 792 Turkey, Republic of
+            AS TR TUR 792 Turkey, Republic of
+            AS TM TKM 795 Turkmenistan
+            NA TC TCA 796 Turks and Caicos Islands
+            OC TV TUV 798 Tuvalu
+            AF UG UGA 800 Uganda, Republic of
+            EU UA UKR 804 Ukraine
+            EU MK MKD 807 Macedonia, The Republic of
+            AF EG EGY 818 Egypt, Arab Republic of
+            EU GB GBR 826 United Kingdom of Great Britain & Northern Ireland
+            EU GG GGY 831 Guernsey, Bailiwick of
+            EU JE JEY 832 Jersey, Bailiwick of
+            EU IM IMN 833 Isle of Man
+            AF TZ TZA 834 Tanzania, United Republic of
+            NA US USA 840 United States of America
+            NA VI VIR 850 United States Virgin Islands
+            AF BF BFA 854 Burkina Faso
+            SA UY URY 858 Uruguay, Eastern Republic of
+            AS UZ UZB 860 Uzbekistan, Republic of
+            SA VE VEN 862 Venezuela, Bolivarian Republic of
+            OC WF WLF 876 Wallis and Futuna
+            OC WS WSM 882 Samoa, Independent State of
+            AS YE YEM 887 Yemen
+            AF ZM ZMB 894 Zambia, Republic of
+            OC XX null null Disputed Territory
+            AS XE null null Iraq-Saudi Arabia Neutral Zone
+            AS XD null null United Nations Neutral Zone
+            AS XS null null Spratly Islands
+            EOT;
+    }
+
+    private static function prepareCacheCountriesByContinent()
+    {
+        if (null === self::$cacheCountriesCodeByContinent) {
+            $data = self::getArrayCountriesData();
+
+            array_walk($data, static function ($item, $key) {
+                self::$cacheCountriesCodeByContinent[$item[0]][] = $item[1];
+            });
+        }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
index 2b168f18b..07f8b14ff 100644
--- a/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
+++ b/src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
@@ -1,19 +1,43 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Util;
 
+use DateTimeImmutable;
+use DateTimeInterface;
+use DateTimeZone;
+use LogicException;
+use function array_diff;
+use function array_flip;
+use function array_intersect_key;
+use function array_key_exists;
+use function array_merge;
+use function array_unique;
+use function array_values;
+use function count;
+use function ksort;
+use const PHP_INT_MAX;
+
 /**
- * Utilities to compare date periods
+ * Utilities to compare date periods.
  *
- * This class allow to compare periods when there are period covering. The 
+ * This class allow to compare periods when there are period covering. The
  * argument `minCovers` allow to find also when there are more than 2 period
- * which intersects. 
+ * which intersects.
  *
- * Example: a team may have maximum 2 leaders on a same period: you will 
+ * Example: a team may have maximum 2 leaders on a same period: you will
  * find here all periods where there are more than 2 leaders.
  *
  * Usage:
- * 
+ *
  * ```php
  * $cover = new DateRangeCovering(2); // 2 means we will have periods
  *    // when there are 2+ periods intersecting
@@ -37,33 +61,33 @@ class DateRangeCovering
 
     private array $intervals = [];
 
-    private int $minCover;
-
-    private int $uniqueKeyCounter = 0;
-
     private array $metadatas = [];
 
+    private int $minCover;
+
     private array $sequence = [];
 
-    private \DateTimeZone $tz;
+    private DateTimeZone $tz;
+
+    private int $uniqueKeyCounter = 0;
 
     /**
      * @param int $minCover the minimum of covering required
      */
-    public function __construct(int $minCover, \DateTimeZone $tz)
+    public function __construct(int $minCover, DateTimeZone $tz)
     {
-        if ($minCover < 0) {
-            throw new \LogicException("argument minCover cannot be lower than 0");
+        if (0 > $minCover) {
+            throw new LogicException('argument minCover cannot be lower than 0');
         }
 
         $this->minCover = $minCover;
         $this->tz = $tz;
     }
 
-    public function add(\DateTimeInterface $start, \DateTimeInterface $end = null, $metadata = null): self
+    public function add(DateTimeInterface $start, ?DateTimeInterface $end = null, $metadata = null): self
     {
         if ($this->computed) {
-            throw new \LogicException("You cannot add intervals to a computed instance");
+            throw new LogicException('You cannot add intervals to a computed instance');
         }
 
         $k = $this->uniqueKeyCounter++;
@@ -72,29 +96,17 @@ class DateRangeCovering
 
         $this->addToSequence($start->getTimestamp(), $k, null);
         $this->addToSequence(
-            NULL === $end ? PHP_INT_MAX : $end->getTimestamp(), null, $k
-        ); 
+            null === $end ? PHP_INT_MAX : $end->getTimestamp(),
+            null,
+            $k
+        );
 
         return $this;
     }
 
-    private function addToSequence($timestamp, int $start = null, int $end = null)
-    {
-        if (!\array_key_exists($timestamp, $this->sequence)) {
-            $this->sequence[$timestamp] = [ 's' => [], 'e' => [] ];
-        }
-
-        if (NULL !== $start) {
-            $this->sequence[$timestamp]['s'][] = $start;
-        }
-        if (NULL !== $end) {
-            $this->sequence[$timestamp]['e'][] = $end;
-        }
-    }
-
     public function compute(): self
     {
-        \ksort($this->sequence);
+        ksort($this->sequence);
 
         $currentPeriod = [];
         $currents = [];
@@ -102,8 +114,8 @@ class DateRangeCovering
         $overs = [];
 
         foreach ($this->sequence as $ts => $moves) {
-            $currents = \array_merge($currents, $moves['s']);
-            $currents = \array_diff($currents, $moves['e']);
+            $currents = array_merge($currents, $moves['s']);
+            $currents = array_diff($currents, $moves['e']);
 
             if (count($currents) > $this->minCover && !$isOpen) {
                 $currentPeriod[0] = $ts;
@@ -115,23 +127,23 @@ class DateRangeCovering
                 $currentPeriod = [];
                 $isOpen = false;
             } elseif ($isOpen) {
-                $currentPeriod[2] = \array_merge($currentPeriod[2], $currents);
+                $currentPeriod[2] = array_merge($currentPeriod[2], $currents);
             }
         }
 
         // process metadata
-        foreach ($overs as list($start, $end, $metadata)) {
+        foreach ($overs as [$start, $end, $metadata]) {
             $this->intersections[] = [
-                (new \DateTimeImmutable('@'.$start))
+                (new DateTimeImmutable('@' . $start))
                     ->setTimezone($this->tz),
-                $end === PHP_INT_MAX ? null : (new \DateTimeImmutable('@'.$end))
+                PHP_INT_MAX === $end ? null : (new DateTimeImmutable('@' . $end))
                     ->setTimezone($this->tz),
-                \array_values(
-                    \array_intersect_key(
+                array_values(
+                    array_intersect_key(
                         $this->metadatas,
-                        \array_flip(\array_unique($metadata))
+                        array_flip(array_unique($metadata))
                     )
-                )
+                ),
             ];
         }
 
@@ -140,85 +152,38 @@ 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));
-        }
-
-        return count($this->intersections) > 0;
-    }
-
     public function getIntersections(): array
     {
         if (!$this->computed) {
-            throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+            throw new LogicException(sprintf('You cannot call the method %s before ' .
+                "'process'", __METHOD__));
         }
 
         return $this->intersections;
     }
 
+    public function hasIntersections(): bool
+    {
+        if (!$this->computed) {
+            throw new LogicException(sprintf('You cannot call the method %s before ' .
+                "'process'", __METHOD__));
+        }
+
+        return count($this->intersections) > 0;
+    }
+
+    private function addToSequence($timestamp, ?int $start = null, ?int $end = null)
+    {
+        if (!array_key_exists($timestamp, $this->sequence)) {
+            $this->sequence[$timestamp] = ['s' => [], 'e' => []];
+        }
+
+        if (null !== $start) {
+            $this->sequence[$timestamp]['s'][] = $start;
+        }
+
+        if (null !== $end) {
+            $this->sequence[$timestamp]['e'][] = $end;
+        }
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
index cf4479456..27fbe2f50 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
@@ -1,43 +1,36 @@
 <?php
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
 /**
- * 
  * @Annotation
  */
 class PhonenumberConstraint extends Constraint
 {
-    public $notMobileMessage = "This is not a mobile phonenumber";
-    
-    public $notLandlineMessage = "This is not a landline phonenumber";
-    
-    public $notValidMessage = "This is not a valid phonenumber";
-    
+    public $notLandlineMessage = 'This is not a landline phonenumber';
+
+    public $notMobileMessage = 'This is not a mobile phonenumber';
+
+    public $notValidMessage = 'This is not a valid phonenumber';
+
     /**
-     * The type of phone: landline (not able to receive sms) or mobile (can receive sms)
+     * The type of phone: landline (not able to receive sms) or mobile (can receive sms).
      *
      * @var string 'landline', 'mobile' or 'any'
      */
-    public $type = null;
-    
+    public $type;
+
     public function validatedBy()
     {
         return \Chill\MainBundle\Validation\Validator\ValidPhonenumber::class;
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
index 9f9b6381b..fe61d4655 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/RoleScopeScopePresenceConstraint.php
@@ -1,46 +1,35 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
 /**
- * Check that a role scope has a scope if required
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Check that a role scope has a scope if required.
  */
 class RoleScopeScopePresenceConstraint extends Constraint
 {
-    
-    public $messagePresenceRequired = "The role \"%role%\" require to be associated with "
-            . "a scope.";
-    public $messageNullRequired = "The role \"%role%\" should not be associated with a scope.";
-    
-    public function validatedBy()
-    {
-        return 'role_scope_scope_presence';
-    }
-    
+    public $messageNullRequired = 'The role "%role%" should not be associated with a scope.';
+
+    public $messagePresenceRequired = 'The role "%role%" require to be associated with '
+            . 'a scope.';
+
     public function getTargets()
     {
         return self::CLASS_CONSTRAINT;
     }
-    
+
+    public function validatedBy()
+    {
+        return 'role_scope_scope_presence';
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php
index 1cd481dd7..4b2a5d5b4 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/UserUniqueEmailAndUsernameConstraint.php
@@ -1,42 +1,32 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@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\MainBundle\Validation\Constraint;
-
-use Symfony\Component\Validator\Constraint;
-use Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Validation\Constraint;
+
+use Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername;
+use Symfony\Component\Validator\Constraint;
+
 class UserUniqueEmailAndUsernameConstraint extends Constraint
 {
-    public $messageDuplicateUsername = "A user with the same or a close username already exists";
-    public $messageDuplicateEmail = "A user with the same or a close email already exists";
-    
+    public $messageDuplicateEmail = 'A user with the same or a close email already exists';
+
+    public $messageDuplicateUsername = 'A user with the same or a close username already exists';
+
+    public function getTargets()
+    {
+        return [self::CLASS_CONSTRAINT];
+    }
+
     public function validatedBy()
     {
         return UserUniqueEmailAndUsername::class;
     }
-    
-    public function getTargets()
-    {
-        return [ self::CLASS_CONSTRAINT ];
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
index e6681738a..20abb8907 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
@@ -1,60 +1,48 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validation\Validator;
 
-use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Entity\RoleScope;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
+use Chill\MainBundle\Security\RoleProvider;
 use Chill\MainBundle\Validation\Constraint\RoleScopeScopePresenceConstraint;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use function in_array;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class RoleScopeScopePresence extends ConstraintValidator
 {
     /**
-     *
-     * @var RoleProvider
-     */
-    private $roleProvider;
-    
-    /**
-     *
      * @var LoggerInterface
      */
     private $logger;
-    
+
+    /**
+     * @var RoleProvider
+     */
+    private $roleProvider;
+
     /**
-     *
      * @var TranslatorInterface
      */
     private $translator;
-    
-    public function __construct(RoleProvider $roleProvider, LoggerInterface $logger,
-            TranslatorInterface $translator)
-    {
+
+    public function __construct(
+        RoleProvider $roleProvider,
+        LoggerInterface $logger,
+        TranslatorInterface $translator
+    ) {
         $this->roleProvider = $roleProvider;
         $this->logger = $logger;
         $this->translator = $translator;
@@ -62,41 +50,37 @@ class RoleScopeScopePresence extends ConstraintValidator
 
     public function validate($value, Constraint $constraint)
     {
-        if (! $value instanceof RoleScope) {
-            throw new \RuntimeException('The validated object is not an instance of roleScope');
+        if (!$value instanceof RoleScope) {
+            throw new RuntimeException('The validated object is not an instance of roleScope');
         }
-        
-        if (! $constraint instanceof RoleScopeScopePresenceConstraint) {
-            throw new \RuntimeException('This validator should be used with RoleScopScopePresenceConstraint');
+
+        if (!$constraint instanceof RoleScopeScopePresenceConstraint) {
+            throw new RuntimeException('This validator should be used with RoleScopScopePresenceConstraint');
         }
-        
+
         $this->logger->debug('begin validation of a role scope instance');
-        
+
         //if the role scope should have a scope
         if (
-                !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes())
-                &&
-                $value->getScope() === NULL
+                !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+                && $value->getScope() === null
                 ) {
             $this->context->buildViolation($constraint->messagePresenceRequired)
-                    ->setParameter('%role%', $this->translator->trans($value->getRole()))
-                    ->addViolation();
+                ->setParameter('%role%', $this->translator->trans($value->getRole()))
+                ->addViolation();
             $this->logger->debug('the role scope should have a scope, but scope is null. Violation build.');
         } elseif // if the scope should be null
             (
-                in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes())
-                &&
-                ! is_null($value->getScope())
-            )
-        {
+                in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true)
+                && null !== $value->getScope()
+            ) {
             $this->context->buildViolation($constraint->messageNullRequired)
-                    ->setParameter('%role%', $this->translator->trans($value->getRole()))
-                    ->addViolation();
+                ->setParameter('%role%', $this->translator->trans($value->getRole()))
+                ->addViolation();
             $this->logger->debug('the role scole should not have a scope, but scope is not null. Violation build.');
         } // everything is fine !
         else {
             $this->logger->debug('role scope is valid. Validation finished.');
         }
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
index 0dafa0b98..4ece73852 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
@@ -1,117 +1,107 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@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\MainBundle\Validation\Validator;
-
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Constraint;
-use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Validation\Validator;
+
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use UnexpectedValueException;
+
 class UserUniqueEmailAndUsername extends ConstraintValidator
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
 
-    
     public function validate($value, Constraint $constraint)
     {
         if (!$value instanceof User) {
-            throw new \UnexpectedValueException("This validation should happens "
-                . "only on class ".User::class);
+            throw new UnexpectedValueException('This validation should happens '
+                . 'only on class ' . User::class);
         }
-        
+
         if ($value->getId() !== null) {
             $countUsersByUsername = $this->em->createQuery(
                 sprintf(
-                    "SELECT COUNT(u) FROM %s u "
-                    . "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) "
-                    . "AND u != :user",
-                    User::class)
+                    'SELECT COUNT(u) FROM %s u '
+                    . 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) '
+                    . 'AND u != :user',
+                    User::class
                 )
+            )
                 ->setParameter('username', $value->getUsername())
                 ->setParameter('user', $value)
                 ->getSingleScalarResult();
         } else {
             $countUsersByUsername = $this->em->createQuery(
                 sprintf(
-                    "SELECT COUNT(u) FROM %s u "
-                    . "WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ",
-                    User::class)
+                    'SELECT COUNT(u) FROM %s u '
+                    . 'WHERE u.usernameCanonical = LOWER(UNACCENT(:username)) ',
+                    User::class
                 )
+            )
                 ->setParameter('username', $value->getUsername())
                 ->getSingleScalarResult();
         }
-        
-        if ($countUsersByUsername > 0) {
+
+        if (0 < $countUsersByUsername) {
             $this->context
                 ->buildViolation($constraint->messageDuplicateUsername)
                 ->setParameters([
-                    '%username%' => $value->getUsername()
+                    '%username%' => $value->getUsername(),
                 ])
                 ->atPath('username')
-                ->addViolation()
-                ;
+                ->addViolation();
         }
-        
+
         if ($value->getId() !== null) {
             $countUsersByEmail = $this->em->createQuery(
                 sprintf(
-                    "SELECT COUNT(u) FROM %s u "
-                    . "WHERE u.emailCanonical = LOWER(UNACCENT(:email)) "
-                    . "AND u != :user",
-                    User::class)
+                    'SELECT COUNT(u) FROM %s u '
+                    . 'WHERE u.emailCanonical = LOWER(UNACCENT(:email)) '
+                    . 'AND u != :user',
+                    User::class
                 )
+            )
                 ->setParameter('email', $value->getEmail())
                 ->setParameter('user', $value)
                 ->getSingleScalarResult();
         } else {
             $countUsersByEmail = $this->em->createQuery(
                 sprintf(
-                    "SELECT COUNT(u) FROM %s u "
-                    . "WHERE u.emailCanonical = LOWER(UNACCENT(:email))",
-                    User::class)
+                    'SELECT COUNT(u) FROM %s u '
+                    . 'WHERE u.emailCanonical = LOWER(UNACCENT(:email))',
+                    User::class
                 )
+            )
                 ->setParameter('email', $value->getEmail())
                 ->getSingleScalarResult();
         }
-        
-        if ($countUsersByEmail > 0) {
+
+        if (0 < $countUsersByEmail) {
             $this->context
                 ->buildViolation($constraint->messageDuplicateEmail)
                 ->setParameters([
-                    '%email%' => $value->getEmail()
+                    '%email%' => $value->getEmail(),
                 ])
                 ->atPath('email')
-                ->addViolation()
-                ;
+                ->addViolation();
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
index 127bfad33..5f2a5bf14 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
@@ -1,41 +1,31 @@
 <?php
-/*
- * Copyright (C) 2018 Champs-Libres <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\MainBundle\Validation\Validator;
-
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Constraint;
-use Chill\MainBundle\Phonenumber\PhonenumberHelper;
-use Psr\Log\LoggerInterface;
 
 /**
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Validation\Validator;
+
+use Chill\MainBundle\Phonenumber\PhonenumberHelper;
+use LogicException;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
 class ValidPhonenumber extends ConstraintValidator
 {
+    protected $logger;
+
     /**
-     *
      * @var PhonenumberHelper
      */
     protected $phonenumberHelper;
-    
-    protected $logger;
-    
+
     public function __construct(
         LoggerInterface $logger,
         PhonenumberHelper $phonenumberHelper
@@ -43,45 +33,49 @@ class ValidPhonenumber extends ConstraintValidator
         $this->phonenumberHelper = $phonenumberHelper;
         $this->logger = $logger;
     }
-    
+
     /**
-     * 
      * @param string $value
      * @param \Chill\MainBundle\Validation\Constraint\PhonenumberConstraint $constraint
      */
     public function validate($value, Constraint $constraint)
     {
-        if (FALSE === $this->phonenumberHelper->isPhonenumberValidationConfigured()) {
+        if (false === $this->phonenumberHelper->isPhonenumberValidationConfigured()) {
             $this->logger->debug('[phonenumber] skipping validation due to not configured helper');
-            
+
             return;
         }
-        
+
         if (empty($value)) {
             return;
         }
-        
-        switch($constraint->type) {
+
+        switch ($constraint->type) {
             case 'landline':
                 $isValid = $this->phonenumberHelper->isValidPhonenumberLandOrVoip($value);
                 $message = $constraint->notLandlineMessage;
+
                 break;
+
             case 'mobile':
                 $isValid = $this->phonenumberHelper->isValidPhonenumberMobile($value);
                 $message = $constraint->notMobileMessage;
+
                 break;
+
             case 'any':
                 $isValid = $this->phonenumberHelper->isValidPhonenumberAny($value);
                 $message = $constraint->notValidMessage;
+
                 break;
-            
+
             default:
-                throw new \LogicException(sprintf("This type '%s' is not implemented. "
+                throw new LogicException(sprintf("This type '%s' is not implemented. "
                     . "Possible values are 'mobile', 'landline' or 'any'", $constraint->type));
         }
-        
-        if (FALSE === $isValid) {
-            $this->context->addViolation($message, [ '%phonenumber%' => $value ]);
+
+        if (false === $isValid) {
+            $this->context->addViolation($message, ['%phonenumber%' => $value]);
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php
index 238aa1a7f..8b405db6a 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistency.php
@@ -1,52 +1,43 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validator\Constraints\Entity;
 
 use Symfony\Component\Validator\Constraint;
 
 /**
- * 
- *
  * @Annotation
  */
 class UserCircleConsistency extends Constraint
 {
-    public $message = "{{ username }} is not allowed to see entities published in this circle";
-    
-    public $role;
-    
     public $getUserFunction = 'getUser';
-    
+
+    public $message = '{{ username }} is not allowed to see entities published in this circle';
+
     public $path = 'circle';
-    
+
+    public $role;
+
     public function getDefaultOption()
     {
         return 'role';
     }
-    
+
     public function getRequiredOptions()
     {
-        return [ 'role' ];
+        return ['role'];
     }
-    
+
     public function getTargets()
     {
         return self::CLASS_CONSTRAINT;
     }
-    
 }
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
index c8ec72b50..5cc283d95 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
@@ -1,66 +1,52 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validator\Constraints\Entity;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use function call_user_func;
 
-/**
- * 
- *
- */
 class UserCircleConsistencyValidator extends ConstraintValidator
 {
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $autorizationHelper;
-    
-    function __construct(AuthorizationHelper $autorizationHelper)
+
+    public function __construct(AuthorizationHelper $autorizationHelper)
     {
         $this->autorizationHelper = $autorizationHelper;
     }
 
-    
     /**
-     * 
      * @param object $value
      * @param UserCircleConsistency $constraint
      */
     public function validate($value, Constraint $constraint)
     {
-        /* @var $user \Chill\MainBundle\Entity\User */
-        $user = \call_user_func([$value, $constraint->getUserFunction ]);
-        
-        if ($user === null) {
+        /** @var \Chill\MainBundle\Entity\User $user */
+        $user = call_user_func([$value, $constraint->getUserFunction]);
+
+        if (null === $user) {
             return;
         }
-        
-        if (FALSE === $this->autorizationHelper->userHasAccess($user, $value, $constraint->role)) {
+
+        if (false === $this->autorizationHelper->userHasAccess($user, $value, $constraint->role)) {
             $this->context
                 ->buildViolation($constraint->message)
                 ->setParameter('{{ username }}', $user->getUsername())
                 ->atPath($constraint->path)
-                ->addViolation()
-                ;
+                ->addViolation();
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php
index d00962e39..88378e9ce 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraint.php
@@ -1,47 +1,39 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validator\Constraints\Export;
 
 use Symfony\Component\Validator\Constraint;
 
 /**
- * Constraint which will check the ExportElement. 
+ * Constraint which will check the ExportElement.
  *
  * @see ExportElementConstraintValidator
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ExportElementConstraint extends Constraint
 {
     public $element;
 
+    public function getRequiredOptions()
+    {
+        return ['element'];
+    }
+
+    public function getTargets()
+    {
+        return self::PROPERTY_CONSTRAINT;
+    }
 
     public function validatedBy()
     {
         return ExportElementConstraintValidator::class;
     }
-    
-    public function getRequiredOptions()
-    {
-        return array('element');
-    }
-    
-    public function getTargets()
-    {
-        return self::PROPERTY_CONSTRAINT;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
index b6a61a0b4..f395008d7 100644
--- a/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
+++ b/src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
@@ -1,40 +1,32 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Validator\Constraints\Export;
 
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
 /**
  * This validator validate the _export element_ if this element implements
- * {@link ExportElementValidatedInterface}. 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * {@link ExportElementValidatedInterface}.
  */
 class ExportElementConstraintValidator extends ConstraintValidator
 {
     public function validate($value, Constraint $constraint)
-    {        
+    {
         if ($constraint->element instanceof ExportElementValidatedInterface) {
-            if ($value["enabled"] === true) {
-                $constraint->element->validateForm($value["form"], $this->context);
-            } 
+            if (true === $value['enabled']) {
+                $constraint->element->validateForm($value['form'], $this->context);
+            }
         }
     }
 }
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 8252502ba..fba3cfc19 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -1,625 +1,728 @@
 ---
 openapi: "3.0.0"
 info:
-  version: "1.0.0"
-  title: "Chill api"
-  description: "Api documentation for chill. Currently, work in progress"
+    version: "1.0.0"
+    title: "Chill api"
+    description: "Api documentation for chill. Currently, work in progress"
 servers:
-  - url: "/api"
-    description: "Your current dev server"
+    -   url: "/api"
+        description: "Your current dev server"
 
 components:
-  schemas:
-    User:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - user
-        username:
-          type: string
-        text:
-          type: string
-    Center:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-    Address:
-      type: object
-      properties:
-        address_id:
-          type: integer
-        text:
-          type: string
-        postcode:
-          type: object
-          properties:
-            name:
-              type: string
-
-    Country:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: object
-        countryCode:
-          type: string
-
-    PostalCode:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-        code:
-          type: string
-        country:
-          type: object
-          properties:
-            id:
-              type: integer
-            name:
-              type: object
-            countryCode:
-              type: string
-
-    AddressReference:
-      type: object
-      properties:
-        id:
-          type: integer
-        refId:
-          type: string
-        street:
-          type: string
-        streetNumber:
-          type: string
-        postcode:
-          type: object
-          properties:
-            id:
-              type: integer
-            name:
-              type: string
-            code:
-              type: string
-            country:
-              type: object
-              properties:
+    schemas:
+        User:
+            type: object
+            properties:
                 id:
-                  type: integer
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - user
+                username:
+                    type: string
+                text:
+                    type: string
+        Center:
+            type: object
+            properties:
+                id:
+                    type: integer
                 name:
-                  type: object
+                    type: string
+        Address:
+            type: object
+            properties:
+                address_id:
+                    type: integer
+                text:
+                    type: string
+                postcode:
+                    type: object
+                    properties:
+                        name:
+                            type: string
+
+        Country:
+            type: object
+            properties:
+                id:
+                    type: integer
+                name:
+                    type: object
                 countryCode:
-                  type: string
-        municipalityCode:
-          type: string
-        source:
-          type: string
-        point:
-          type: object
-          properties:
-            type:
-              type: string
-            coordinates:
-              type: array
-              items:
-                type: number
-              minItems: 2
-              maxItems: 2
+                    type: string
+
+        PostalCode:
+            type: object
+            properties:
+                id:
+                    type: integer
+                name:
+                    type: string
+                code:
+                    type: string
+                country:
+                    type: object
+                    properties:
+                        id:
+                            type: integer
+                        name:
+                            type: object
+                        countryCode:
+                            type: string
+
+        AddressReference:
+            type: object
+            properties:
+                id:
+                    type: integer
+                refId:
+                    type: string
+                street:
+                    type: string
+                streetNumber:
+                    type: string
+                postcode:
+                    type: object
+                    properties:
+                        id:
+                            type: integer
+                        name:
+                            type: string
+                        code:
+                            type: string
+                        country:
+                            type: object
+                            properties:
+                                id:
+                                    type: integer
+                                name:
+                                    type: object
+                                countryCode:
+                                    type: string
+                municipalityCode:
+                    type: string
+                source:
+                    type: string
+                point:
+                    type: object
+                    properties:
+                        type:
+                            type: string
+                        coordinates:
+                            type: array
+                            items:
+                                type: number
+                            minItems: 2
+                            maxItems: 2
 
 
 paths:
-  /1.0/search.json:
-    get:
-      summary: perform a search across multiple entities
-      tags:
-        - search
-        - person
-        - thirdparty
-      description: >
-        The search is performed across multiple entities. The entities must be listed into
-        `type` parameters.
-
-        The results are ordered by relevance, from the most to the lowest relevant.
-
-      parameters:
-        - name: q
-          in: query
-          required: true
-          description: the pattern to search
-          schema:
-            type: string
-        - name: type[]
-          in: query
-          required: true
-          description: the type entities amongst the search is performed
-          schema:
-            type: array
-            items:
-              type: string
-              enum:
+    /1.0/search.json:
+        get:
+            summary: perform a search across multiple entities
+            tags:
+                - search
                 - person
                 - thirdparty
+            description: >
+                The search is performed across multiple entities. The entities must be listed into
+                `type` parameters.
+
+                The results are ordered by relevance, from the most to the lowest relevant.
+
+            parameters:
+                -   name: q
+                    in: query
+                    required: true
+                    description: the pattern to search
+                    schema:
+                        type: string
+                -   name: type[]
+                    in: query
+                    required: true
+                    description: the type entities amongst the search is performed
+                    schema:
+                        type: array
+                        items:
+                            type: string
+                            enum:
+                                - person
+                                - thirdparty
+                                - user
+            responses:
+                200:
+                    description: "OK"
+    /1.0/main/address.json:
+        get:
+            tags:
+                - address
+            summary: Return a list of all Chill addresses
+            responses:
+                200:
+                    description: "ok"
+        post:
+            tags:
+                - address
+            summary: create a new address
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                buildingName:
+                                    type: string
+                                corridor:
+                                    type: string
+                                distribution:
+                                    type: string
+                                extra:
+                                    type: string
+                                flat:
+                                    type: string
+                                floor:
+                                    type: string
+                                isNoAddress:
+                                    type: boolean
+                                point:
+                                    type: array
+                                    items:
+                                        type: number
+                                    minItems: 2
+                                    maxItems: 2
+                                postcode:
+                                    $ref: '#/components/schemas/PostalCode'
+                                steps:
+                                    type: string
+                                street:
+                                    type: string
+                                streetNumber:
+                                    type: string
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applyed"
+        patch:
+            tags:
+                - address
+            summary: patch an address
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                buildingName:
+                                    type: string
+                                corridor:
+                                    type: string
+                                distribution:
+                                    type: string
+                                extra:
+                                    type: string
+                                flat:
+                                    type: string
+                                floor:
+                                    type: string
+                                isNoAddress:
+                                    type: boolean
+                                point:
+                                    type: array
+                                    items:
+                                        type: number
+                                    minItems: 2
+                                    maxItems: 2
+                                postcode:
+                                    $ref: '#/components/schemas/PostalCode'
+                                steps:
+                                    type: string
+                                street:
+                                    type: string
+                                streetNumber:
+                                    type: string
+                                validFrom:
+                                    type: string
+                                validTo:
+                                    type: string
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applyed"
+
+    /1.0/main/address/{id}.json:
+        get:
+            tags:
+                - address
+            summary: Return an address by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/Address'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
+
+    /1.0/main/address/{id}/duplicate.json:
+        post:
+            tags:
+                - address
+            summary: Duplicate an existing address
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The address id that will be duplicated
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/Address'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
+
+    /1.0/main/address-reference.json:
+        get:
+            tags:
+                - address
+            summary: Return a list of all reference addresses
+            parameters:
+                -   in: query
+                    name: postal_code
+                    required: false
+                    schema:
+                        type: integer
+                    description: The id of a postal code to filter the reference addresses
+            responses:
+                200:
+                    description: "ok"
+    /1.0/main/address-reference/{id}.json:
+        get:
+            tags:
+                - address
+            summary: Return a reference address by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The reference address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/AddressReference'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
+
+    /1.0/main/address-reference/by-postal-code/{id}/search.json:
+        get:
+            tags:
+                - address
+                - search
+            summary: Return a reference address by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The reference address id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+                -   name: q
+                    in: query
+                    required: true
+                    description: The search pattern
+                    schema:
+                        type: string
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/AddressReference'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
+                400:
+                    description: "Bad request"
+    /1.0/main/postal-code.json:
+        get:
+            tags:
+                - address
+            summary: Return a list of all postal-code
+            parameters:
+                -   in: query
+                    name: country
+                    required: false
+                    schema:
+                        type: integer
+                    description: The id of a country to filter the postal code
+            responses:
+                200:
+                    description: "ok"
+        post:
+            tags:
+                - address
+            summary: create a new PostalCode
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                name:
+                                    type: string
+                                code:
+                                    type: string
+                                country:
+                                    $ref: '#/components/schemas/Country'
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applyed"
+
+    /1.0/main/postal-code/{id}.json:
+        get:
+            tags:
+                - address
+            summary: Return a postal code by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The postal code id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/PostalCode'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
+
+    /1.0/main/postal-code/search.json:
+        get:
+            tags:
+                - address
+                - search
+            summary: Search a postal code
+            parameters:
+                -   name: q
+                    in: query
+                    required: true
+                    description: The search pattern
+                    schema:
+                        type: string
+                -   name: country
+                    in: query
+                    required: false
+                    description: The country id
+                    schema:
+                        type: integer
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/PostalCode'
+                404:
+                    description: "not found"
+                400:
+                    description: "Bad Request"
+
+    /1.0/main/country.json:
+        get:
+            tags:
+                - address
+            summary: Return a list of all countries
+            responses:
+                200:
+                    description: "ok"
+    /1.0/main/country/{id}.json:
+        get:
+            tags:
+                - address
+            summary: Return a country by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The country id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/Country'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
+
+
+    /1.0/main/user.json:
+        get:
+            tags:
                 - user
-      responses:
-        200:
-          description: "OK"
-  /1.0/main/address.json:
-    get:
-      tags:
-        - address
-      summary: Return a list of all Chill addresses
-      responses:
-        200:
-          description: "ok"
-    post:
-      tags:
-        - address
-      summary: create a new address
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                buildingName:
-                  type: string
-                corridor:
-                  type: string
-                distribution:
-                  type: string
-                extra:
-                  type: string
-                flat:
-                  type: string
-                floor:
-                  type: string
-                isNoAddress:
-                  type: boolean
-                point:
-                  type: array
-                  items:
-                    type: number
-                  minItems: 2
-                  maxItems: 2
-                postcode:
-                  $ref: '#/components/schemas/PostalCode'
-                steps:
-                  type: string
-                street:
-                  type: string
-                streetNumber:
-                  type: string
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applyed"
-    patch:
-      tags:
-        - address
-      summary: patch an address
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                buildingName:
-                  type: string
-                corridor:
-                  type: string
-                distribution:
-                  type: string
-                extra:
-                  type: string
-                flat:
-                  type: string
-                floor:
-                  type: string
-                isNoAddress:
-                  type: boolean
-                point:
-                  type: array
-                  items:
-                    type: number
-                  minItems: 2
-                  maxItems: 2
-                postcode:
-                  $ref: '#/components/schemas/PostalCode'
-                steps:
-                  type: string
-                street:
-                  type: string
-                streetNumber:
-                  type: string
-                validFrom:
-                  type: string
-                validTo:
-                  type: string
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applyed"
+            summary: Return a list of all user
+            responses:
+                200:
+                    description: "ok"
+    /1.0/main/whoami.json:
+        get:
+            tags:
+                - user
+            summary: Return the currently authenticated user
+            responses:
+                200:
+                    description: "ok"
+    /1.0/main/user/{id}.json:
+        get:
+            tags:
+                - user
+            summary: Return a user by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The user id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/User'
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/main/address/{id}.json:
-    get:
-      tags:
-        - address
-      summary: Return an address by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The address id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Address'
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/main/scope.json:
+        get:
+            tags:
+                - scope
+            summary: return a list of scopes
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/main/address/{id}/duplicate.json:
-    post:
-      tags:
-        - address
-      summary: Duplicate an existing address
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The address id that will be duplicated
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Address'
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/main/scope/{id}.json:
+        get:
+            tags:
+                - scope
+            summary: return a list of scopes
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The scope id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/main/address-reference.json:
-    get:
-      tags:
-        - address
-      summary: Return a list of all reference addresses
-      parameters:
-        - in: query
-          name: postal_code
-          required: false
-          schema:
-            type: integer
-          description: The id of a postal code to filter the reference addresses
-      responses:
-        200:
-          description: "ok"
-  /1.0/main/address-reference/{id}.json:
-    get:
-      tags:
-        - address
-      summary: Return a reference address by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The reference address id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/AddressReference'
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/main/location.json:
+        get:
+            tags:
+                - location
+            summary: Return a list of locations
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
+        post:
+            tags:
+                - location
+            summary: create a new location
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                type:
+                                    type: string
+                                name:
+                                    type: string
+                                phonenumber1:
+                                    type: string
+                                phonenumber2:
+                                    type: string
+                                email:
+                                    type: string
+                                address:
+                                    type: object
+                                    properties:
+                                        id:
+                                            type: integer
+                                locationType:
+                                    type: object
+                                    properties:
+                                        id:
+                                            type: integer
+                                        type:
+                                            type: string
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applyed"
 
-  /1.0/main/postal-code.json:
-    get:
-      tags:
-        - address
-      summary: Return a list of all postal-code
-      parameters:
-        - in: query
-          name: country
-          required: false
-          schema:
-            type: integer
-          description: The id of a country to filter the postal code
-      responses:
-        200:
-          description: "ok"
-    post:
-      tags:
-        - address
-      summary: create a new PostalCode
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                name:
-                  type: string
-                code:
-                  type: string
-                country:
-                  $ref: '#/components/schemas/Country'
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applyed"
+    /1.0/main/location/{id}.json:
+        get:
+            tags:
+                - location
+            summary: Return the given location
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The location id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/main/postal-code/{id}.json:
-    get:
-      tags:
-        - address
-      summary: Return a postal code by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The postal code id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PostalCode'
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/main/location-type.json:
+        get:
+            tags:
+                - location
+            summary: Return a list of location types
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/main/country.json:
-    get:
-      tags:
-        - address
-      summary: Return a list of all countries
-      responses:
-        200:
-          description: "ok"
-  /1.0/main/country/{id}.json:
-    get:
-      tags:
-        - address
-      summary: Return a country by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The country id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Country'
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/main/permissions/info.json:
+        post:
+            tags:
+                - permissions
+            summary: Return info about permissions on entity
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
+                400:
+                    description: "Bad request"
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                object:
+                                    type: object
+                                class:
+                                    type: string
+                                roles:
+                                    type: array
+                                    items:
+                                        type: string
+                        examples:
+                            an-accompanying-period:
+                                value:
+                                    object:
+                                        type: accompanying_period
+                                        id: 1
+                                    class: 'Chill\PersonBundle\Entity\AccompanyingPeriod'
+                                    roles:
+                                        - 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE'
 
-
-  /1.0/main/user.json:
-    get:
-      tags:
-        - user
-      summary: Return a list of all user
-      responses:
-        200:
-          description: "ok"
-  /1.0/main/whoami.json:
-    get:
-      tags:
-        - user
-      summary: Return the currently authenticated user
-      responses:
-        200:
-          description: "ok"
-  /1.0/main/user/{id}.json:
-    get:
-      tags:
-        - user
-      summary: Return a user by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The user id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
-
-  /1.0/main/scope.json:
-    get:
-      tags:
-        - scope
-      summary: return a list of scopes
-      responses:
-        200:
-          description: "ok"
-        401:
-          description: "Unauthorized"
-
-  /1.0/main/scope/{id}.json:
-    get:
-      tags:
-        - scope
-      summary: return a list of scopes
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The scope id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-        401:
-          description: "Unauthorized"
-
-  /1.0/main/location.json:
-    get:
-      tags:
-        - location
-      summary: Return a list of locations
-      responses:
-        200:
-          description: "ok"
-        401:
-          description: "Unauthorized"
-    post:
-      tags:
-        - location
-      summary: create a new location
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                type:
-                  type: string
-                name:
-                  type: string
-                phonenumber1:
-                  type: string
-                phonenumber2:
-                  type: string
-                email:
-                  type: string
-                address:
-                  type: object
-                  properties:
-                    id:
-                      type: integer
-                locationType:
-                  type: object
-                  properties:
-                    id:
-                      type: integer
-                    type:
-                      type: string
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applyed"
-
-  /1.0/main/location/{id}.json:
-    get:
-      tags:
-        - location
-      summary: Return the given location
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The location id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-        401:
-          description: "Unauthorized"
-
-  /1.0/main/location-type.json:
-    get:
-      tags:
-        - location
-      summary: Return a list of location types
-      responses:
-        200:
-          description: "ok"
-        401:
-          description: "Unauthorized"
diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index 6540069fa..8ee24d7b7 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -8,36 +8,29 @@ services:
 
     Chill\MainBundle\Repository\:
         resource: '../Repository/'
-        autowire: true
-        autoconfigure: true
+
+    Chill\MainBundle\Repository\UserACLAwareRepositoryInterface: '@Chill\MainBundle\Repository\UserACLAwareRepository'
 
     Chill\MainBundle\Serializer\Normalizer\:
         resource: '../Serializer/Normalizer'
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 64 }
 
     Chill\MainBundle\Form\Type\:
         resource: '../Form/Type'
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: form.type }
 
     Chill\MainBundle\Doctrine\Event\:
         resource: '../Doctrine/Event/'
-        autowire: true
         tags:
             - { name: 'doctrine.event_subscriber' }
 
     chill.main.helper.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringHelper
-        arguments:
-            - "@request_stack"
-            - "@translator.default"
 
     Chill\MainBundle\Templating\TranslatableStringHelper: '@chill.main.helper.translatable_string'
+    Chill\MainBundle\Templating\TranslatableStringHelperInterface: '@Chill\MainBundle\Templating\TranslatableStringHelper'
 
     chill.main.twig.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringTwig
@@ -77,3 +70,4 @@ services:
             - "@chill.main.security.authorization.helper"
             - "@security.token_storage"
 
+    Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface: '@Chill\MainBundle\Security\Resolver\CenterResolverDispatcher'
diff --git a/src/Bundle/ChillMainBundle/config/services/cache.yaml b/src/Bundle/ChillMainBundle/config/services/cache.yaml
index de362ea30..ce2bb3e08 100644
--- a/src/Bundle/ChillMainBundle/config/services/cache.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/cache.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.tag_aware_cache:
         class: Symfony\Component\Cache\Adapter\TagAwareAdapter
         arguments:
diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index 5df80c2ad..87220bc1f 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -1,10 +1,9 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Command\ChillImportUsersCommand:
-        arguments:
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-            $logger: '@Psr\Log\LoggerInterface'
-            $passwordEncoder: '@Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface'
-            $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags:
             - { name: console.command }
 
diff --git a/src/Bundle/ChillMainBundle/config/services/controller.yaml b/src/Bundle/ChillMainBundle/config/services/controller.yaml
index a74755ffd..28abc94e8 100644
--- a/src/Bundle/ChillMainBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/controller.yaml
@@ -1,12 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     Chill\MainBundle\Controller\:
-        autowire: true
         resource: '../../Controller'
         tags: ['controller.service_arguments']
 
     Chill\MainBundle\Controller\PasswordController:
-        autowire: true
         arguments:
             $chillLogger: '@monolog.logger.chill'
         tags: ['controller.service_arguments']
@@ -28,10 +29,6 @@ services:
             $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags: ['controller.service_arguments']
 
-    Chill\MainBundle\Controller\UserController:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Controller\NotificationController:
         arguments:
             $security: '@Symfony\Component\Security\Core\Security'
diff --git a/src/Bundle/ChillMainBundle/config/services/crud.yaml b/src/Bundle/ChillMainBundle/config/services/crud.yaml
index c5c05f344..02533f433 100644
--- a/src/Bundle/ChillMainBundle/config/services/crud.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/crud.yaml
@@ -1,15 +1,19 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\CRUD\Routing\CRUDRoutesLoader:
         arguments:
             $crudConfig: '%chill_main_crud_route_loader_config%'
-            $apiConfig:  '%chill_main_api_route_loader_config%'
+            $apiCrudConfig:  '%chill_main_api_route_loader_config%'
         tags: [ routing.loader ]
 
     Chill\MainBundle\CRUD\Resolver\Resolver:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'
             $crudConfig: '%chill_main_crud_route_loader_config%'
-    
+
     Chill\MainBundle\CRUD\Templating\TwigCRUDResolver:
         arguments:
             $resolver: '@Chill\MainBundle\CRUD\Resolver\Resolver'
diff --git a/src/Bundle/ChillMainBundle/config/services/doctrine.yaml b/src/Bundle/ChillMainBundle/config/services/doctrine.yaml
index 09b68f03b..e59088fc4 100644
--- a/src/Bundle/ChillMainBundle/config/services/doctrine.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/doctrine.yaml
@@ -1,3 +1,7 @@
 ---
 services:
-  'Chill\MainBundle\Doctrine\Migrations\VersionComparator': ~
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\MainBundle\Doctrine\Migrations\VersionComparator: ~
diff --git a/src/Bundle/ChillMainBundle/config/services/export.yaml b/src/Bundle/ChillMainBundle/config/services/export.yaml
index ac49199af..ce361677b 100644
--- a/src/Bundle/ChillMainBundle/config/services/export.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/export.yaml
@@ -1,9 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.export_element_validator:
         class: Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraintValidator
         tags:
             - { name: validator.constraint_validator }
-       
+
 #    deprecated in favor of spreadsheet_formatter
 #    chill.main.export.csv_formatter:
 #        class: Chill\MainBundle\Export\Formatter\CSVFormatter
@@ -11,7 +15,7 @@ services:
 #            - "@translator"
 #        tags:
 #            - { name: chill.export_formatter, alias: 'csv' }
-            
+
     chill.main.export.spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadSheetFormatter
         arguments:
@@ -19,7 +23,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadsheet' }
-            
+
     chill.main.export.list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVListFormatter
         arguments:
@@ -27,7 +31,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csvlist' }
-            
+
     chill.main.export.list_spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadsheetListFormatter
         arguments:
@@ -35,7 +39,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadlist' }
-            
+
     chill.main.export.pivoted_list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVPivotedListFormatter
         arguments:
@@ -43,4 +47,3 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
-            
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/services/fixtures.yaml b/src/Bundle/ChillMainBundle/config/services/fixtures.yaml
index ccae65867..29aabb25f 100644
--- a/src/Bundle/ChillMainBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/fixtures.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\DataFixtures\ORM\:
         resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index b3eb0ca98..0d0a17201 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -1,4 +1,7 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     chill.main.form.type.translatable.string:
         class: Chill\MainBundle\Form\Type\TranslatableStringFormType
@@ -25,6 +28,7 @@ services:
             - "@request_stack"
             - "@doctrine.orm.entity_manager"
             - "@chill.main.helper.translatable_string"
+            - '@Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface'
         tags:
             - { name: form.type, alias: select2_chill_country }
 
@@ -34,12 +38,11 @@ services:
             - "@request_stack"
             - "@doctrine.orm.entity_manager"
             - "@chill.main.helper.translatable_string"
+            - '@Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface'
         tags:
             - { name: form.type, alias: select2_chill_language }
 
-    Chill\MainBundle\Form\Type\PickCenterType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\PickCenterType: ~
 
     chill.main.form.type.composed_role_scope:
         class: Chill\MainBundle\Form\Type\ComposedRoleScopeType
@@ -60,9 +63,7 @@ services:
         tags:
             - { name: form.type }
 
-    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader: ~
 
     chill.main.form.type.export:
         class: Chill\MainBundle\Form\Type\Export\ExportType
@@ -94,14 +95,10 @@ services:
         arguments:
             - '@Chill\MainBundle\Export\ExportManager'
 
-    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer: ~
 
     chill.main.form.advanced_search_type:
         class: Chill\MainBundle\Form\AdvancedSearchType
-        autowire: true
-        autoconfigure: true
         arguments:
             - "@chill_main.search_provider"
         tags:
@@ -114,9 +111,7 @@ services:
         tags:
             - { name: form.type }
 
-    Chill\MainBundle\Form\UserType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\UserType: ~
 
     Chill\MainBundle\Form\PermissionsGroupType:
         tags:
@@ -129,15 +124,20 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\Type\PickAddressType: ~
 
-    Chill\MainBundle\Form\Type\PickAddressType:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer: ~
 
     Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer:
         autoconfigure: true
         autowire: true
 
-    Chill\MainBundle\Form\Type\LocationFormType:
+    Chill\MainBundle\Form\LocationFormType:
         autowire: true
-        autoconfigure: true
\ No newline at end of file
+        autoconfigure: true
+
+    Chill\MainBundle\Form\UserCurrentLocationType:
+        autowire: true
+        autoconfigure: true
+
+    Chill\MainBundle\Form\Type\LocationFormType: ~
diff --git a/src/Bundle/ChillMainBundle/config/services/logger.yaml b/src/Bundle/ChillMainBundle/config/services/logger.yaml
index 2da5a4a4c..a8c8dce58 100644
--- a/src/Bundle/ChillMainBundle/config/services/logger.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/logger.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.logger:
         # a logger to log events from the app (deletion, remove, etc.)
         alias: monolog.logger.chill
diff --git a/src/Bundle/ChillMainBundle/config/services/menu.yaml b/src/Bundle/ChillMainBundle/config/services/menu.yaml
index cf31dccf1..97a1d5e89 100644
--- a/src/Bundle/ChillMainBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/menu.yaml
@@ -1,12 +1,14 @@
 services:
-    Chill\MainBundle\Routing\MenuBuilder\:
-        resource: '../../Routing/MenuBuilder'
+    _defaults:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Routing\MenuBuilder\:
+        resource: '../../Routing/MenuBuilder'
+
     Chill\MainBundle\Routing\MenuBuilder\UserMenuBuilder:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
+        autowire: true
+        autoconfigure: true
         tags:
             - { name: 'chill.menu_builder' }
 
diff --git a/src/Bundle/ChillMainBundle/config/services/notification.yaml b/src/Bundle/ChillMainBundle/config/services/notification.yaml
index c8d970c5d..efb25c5b5 100644
--- a/src/Bundle/ChillMainBundle/config/services/notification.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/notification.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Notification\Mailer:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'
@@ -9,6 +13,4 @@ services:
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
 
-    Chill\MainBundle\Notification\NotificationRenderer:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Notification\NotificationRenderer: ~
diff --git a/src/Bundle/ChillMainBundle/config/services/pagination.yaml b/src/Bundle/ChillMainBundle/config/services/pagination.yaml
index cb0855a3d..f94bc31be 100644
--- a/src/Bundle/ChillMainBundle/config/services/pagination.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/pagination.yaml
@@ -1,9 +1,11 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.paginator_factory:
         class: Chill\MainBundle\Pagination\PaginatorFactory
         public: true
-        autowire: true
-        autoconfigure: true
         arguments:
             - "@request_stack"
             - "@router"
diff --git a/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml b/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml
index f297c03e0..46fa853ee 100644
--- a/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/phonenumber.yaml
@@ -1,19 +1,21 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Phonenumber\PhonenumberHelper:
         arguments:
-            $logger: '@Psr\Log\LoggerInterface'
             $config: '%chill_main.phone_helper%'
             $cachePool: '@cache.user_data'
-            
+
     Chill\MainBundle\Phonenumber\Templating:
         arguments:
             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
         tags:
             - { name: twig.extension }
-    
+
     Chill\MainBundle\Validation\Validator\ValidPhonenumber:
         arguments:
-            $logger: '@Psr\Log\LoggerInterface'
             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
         tags:
             - { name: validator.constraint_validator }
diff --git a/src/Bundle/ChillMainBundle/config/services/redis.yaml b/src/Bundle/ChillMainBundle/config/services/redis.yaml
index c8d5c2879..6ccbfee7f 100644
--- a/src/Bundle/ChillMainBundle/config/services/redis.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/redis.yaml
@@ -1,10 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Redis\RedisConnectionFactory:
         arguments:
             $parameters: "%chill_main.redis%"
         tags:
             - { name: kernel.event_subcriber }
-            
+
     Chill\MainBundle\Redis\ChillRedis:
         factory: [ '@Chill\MainBundle\Redis\RedisConnectionFactory', 'create' ]
-            
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/services/routing.yaml b/src/Bundle/ChillMainBundle/config/services/routing.yaml
index c935f1a4d..fa8a56696 100644
--- a/src/Bundle/ChillMainBundle/config/services/routing.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/routing.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.menu_composer:
         class: Chill\MainBundle\Routing\MenuComposer
         arguments:
@@ -6,7 +10,7 @@ services:
             - '@Knp\Menu\FactoryInterface'
             - '@Symfony\Component\Translation\TranslatorInterface'
     Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'
-    
+
     chill.main.routes_loader:
         class: Chill\MainBundle\Routing\Loader\ChillRoutesLoader
         arguments:
diff --git a/src/Bundle/ChillMainBundle/config/services/search.yaml b/src/Bundle/ChillMainBundle/config/services/search.yaml
index 38e421eaf..91cfb120b 100644
--- a/src/Bundle/ChillMainBundle/config/services/search.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/search.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.search_provider:
         class: Chill\MainBundle\Search\SearchProvider
 
@@ -7,8 +11,13 @@ services:
     Chill\MainBundle\Search\SearchApi:
         autowire: true
         autoconfigure: true
+        arguments:
+            $providers: !tagged_iterator chill.search_api_provider
 
     Chill\MainBundle\Search\Entity\:
+        resource: '../../Search/Entity'
+
+    Chill\MainBundle\Search\Utils\:
         autowire: true
         autoconfigure: true
-        resource: '../../Search/Entity'
+        resource: './../Search/Utils/'
diff --git a/src/Bundle/ChillMainBundle/config/services/security.yaml b/src/Bundle/ChillMainBundle/config/services/security.yaml
index 15d6f7da5..163b86d8e 100644
--- a/src/Bundle/ChillMainBundle/config/services/security.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/security.yaml
@@ -3,43 +3,36 @@ services:
         autowire: true
         autoconfigure: true
 
-    # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Resolver\CenterResolverDispatcher:
         arguments:
             - !tagged_iterator chill_main.center_resolver
 
+    Chill\MainBundle\Security\Resolver\CenterResolverManager:
+        arguments:
+            - !tagged_iterator chill_main.center_resolver
+    Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface: '@Chill\MainBundle\Security\Resolver\CenterResolverManager'
+
     Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher:
         arguments:
             - !tagged_iterator chill_main.scope_resolver
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\DefaultCenterResolver: ~
 
-    Chill\MainBundle\Security\Resolver\DefaultScopeResolver:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\DefaultScopeResolver: ~
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\ResolverTwigExtension: ~
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory:
-        autowire: true
+    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory: ~
 
-    # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory'
 
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
-        autowire: true
-        autoconfigure: true
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
     Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface: '@chill.main.security.authorization.helper'
 
+    Chill\MainBundle\Security\ParentRoleHelper: ~
+
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
     Chill\MainBundle\Security\RoleProvider: '@chill.main.role_provider'
@@ -50,20 +43,16 @@ services:
     Symfony\Component\Security\Core\User\UserProviderInterface: "@chill.main.user_provider"
 
     Chill\MainBundle\Security\Authorization\ChillExportVoter:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags:
             - { name: security.voter }
 
     Chill\MainBundle\Security\PasswordRecover\TokenManager:
         arguments:
             $secret: '%kernel.secret%'
-            $logger: '@Psr\Log\LoggerInterface'
 
     Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper:
         arguments:
             $tokenManager: '@Chill\MainBundle\Security\PasswordRecover\TokenManager'
-            $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
             $mailer: '@Chill\MainBundle\Notification\Mailer'
             $routeParameters: "%chill_main.notifications%"
 
@@ -76,11 +65,9 @@ services:
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker:
         arguments:
             $chillRedis: '@Chill\MainBundle\Redis\ChillRedis'
-            $logger: '@Psr\Log\LoggerInterface'
 
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter:
         arguments:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
-            $requestStack: '@Symfony\Component\HttpFoundation\RequestStack'
         tags:
             - { name: security.voter }
diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index efe98996e..4d8aa9954 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -1,11 +1,13 @@
 ---
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     # note: the autowiring for serializers and normalizers is declared
     # into ../services.yaml
 
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
-        autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
 
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index 02d806db4..ade26b946 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
 #    twig_intl:
 #        class: Twig_Extensions_Extension_Intl
 #        tags:
@@ -32,8 +36,6 @@ services:
             - { name: twig.extension }
 
     Chill\MainBundle\Templating\Entity\CommentRender:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: 'chill.render_entity' }
 
@@ -41,17 +43,11 @@ services:
         tags:
             - { name: twig.extension }
 
-    Chill\MainBundle\Templating\Entity\AddressRender:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Templating\Entity\AddressRender: ~
 
-    Chill\MainBundle\Templating\Entity\UserRender:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Templating\Entity\UserRender: ~
 
     Chill\MainBundle\Templating\Listing\:
         resource: './../../Templating/Listing'
-        autoconfigure: true
-        autowire: true
 
     Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface: '@Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory'
diff --git a/src/Bundle/ChillMainBundle/config/services/timeline.yaml b/src/Bundle/ChillMainBundle/config/services/timeline.yaml
index fe830c7ab..7b7987f5a 100644
--- a/src/Bundle/ChillMainBundle/config/services/timeline.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/timeline.yaml
@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.timeline_builder:
         class: Chill\MainBundle\Timeline\TimelineBuilder
         arguments:
diff --git a/src/Bundle/ChillMainBundle/config/services/validator.yaml b/src/Bundle/ChillMainBundle/config/services/validator.yaml
index c15b2181e..b3b60b9d6 100644
--- a/src/Bundle/ChillMainBundle/config/services/validator.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/validator.yaml
@@ -1,11 +1,15 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.validator_user_circle_consistency:
         class: Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistencyValidator
         arguments:
             - "@chill.main.security.authorization.helper"
         tags:
             - { name: "validator.constraint_validator" }
-            
+
     Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'
diff --git a/src/Bundle/ChillMainBundle/config/services/widget.yaml b/src/Bundle/ChillMainBundle/config/services/widget.yaml
index 53f29da5b..1f4bca2e3 100644
--- a/src/Bundle/ChillMainBundle/config/services/widget.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/widget.yaml
@@ -1,2 +1,6 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Templating\UI\CountNotificationUser: ~
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php b/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
new file mode 100644
index 000000000..89454c356
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20100000000000.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+class Version20100000000000 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE EXTENSION IF NOT EXISTS unaccent');
+        $this->addSql('CREATE EXTENSION IF NOT EXISTS pg_trgm');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php b/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php
index 2f75b9566..37de9c102 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20141128194409.php
@@ -1,56 +1,64 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Main;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Insert Main Bundle table and indexes
+ * Insert Main Bundle table and indexes.
  */
 class Version20141128194409 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("CREATE TABLE Country (id INT NOT NULL, name JSON NOT NULL, countryCode VARCHAR(3) NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE TABLE centers (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE TABLE Language (id VARCHAR(255) NOT NULL, name JSON NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE TABLE group_centers (id INT NOT NULL, center_id INT DEFAULT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_A14D8F3D5932F377 ON group_centers (center_id);");
-        $this->addSql("CREATE TABLE groupcenter_permissionsgroup (groupcenter_id INT NOT NULL, permissionsgroup_id INT NOT NULL, PRIMARY KEY(groupcenter_id, permissionsgroup_id));");
-        $this->addSql("CREATE INDEX IDX_55DFEC607EC2FA68 ON groupcenter_permissionsgroup (groupcenter_id);");
-        $this->addSql("CREATE INDEX IDX_55DFEC606FA97D46 ON groupcenter_permissionsgroup (permissionsgroup_id);");
-        $this->addSql("CREATE TABLE role_scopes (id INT NOT NULL, scope_id INT DEFAULT NULL, role VARCHAR(255) NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_AFF20281682B5931 ON role_scopes (scope_id);");
-        $this->addSql("CREATE TABLE permission_groups (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE TABLE permissionsgroup_rolescope (permissionsgroup_id INT NOT NULL, rolescope_id INT NOT NULL, PRIMARY KEY(permissionsgroup_id, rolescope_id));");
-        $this->addSql("CREATE INDEX IDX_B22441DC6FA97D46 ON permissionsgroup_rolescope (permissionsgroup_id);");
-        $this->addSql("CREATE INDEX IDX_B22441DCA0AE1DB7 ON permissionsgroup_rolescope (rolescope_id);");
-        $this->addSql("CREATE TABLE users (id INT NOT NULL, username VARCHAR(80) NOT NULL, password VARCHAR(255) NOT NULL, salt VARCHAR(255) DEFAULT NULL, enabled BOOLEAN NOT NULL, locked BOOLEAN NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE TABLE user_groupcenter (user_id INT NOT NULL, groupcenter_id INT NOT NULL, PRIMARY KEY(user_id, groupcenter_id));");
-        $this->addSql("CREATE INDEX IDX_33FFE54AA76ED395 ON user_groupcenter (user_id);");
-        $this->addSql("CREATE INDEX IDX_33FFE54A7EC2FA68 ON user_groupcenter (groupcenter_id);");
-        $this->addSql("CREATE TABLE scopes (id INT NOT NULL, name JSON NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE SEQUENCE Country_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE centers_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE group_centers_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE role_scopes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE permission_groups_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE users_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE scopes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("ALTER TABLE group_centers ADD CONSTRAINT FK_A14D8F3D5932F377 FOREIGN KEY (center_id) REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE groupcenter_permissionsgroup ADD CONSTRAINT FK_55DFEC607EC2FA68 FOREIGN KEY (groupcenter_id) REFERENCES group_centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE groupcenter_permissionsgroup ADD CONSTRAINT FK_55DFEC606FA97D46 FOREIGN KEY (permissionsgroup_id) REFERENCES permission_groups (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE role_scopes ADD CONSTRAINT FK_AFF20281682B5931 FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE permissionsgroup_rolescope ADD CONSTRAINT FK_B22441DC6FA97D46 FOREIGN KEY (permissionsgroup_id) REFERENCES permission_groups (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE permissionsgroup_rolescope ADD CONSTRAINT FK_B22441DCA0AE1DB7 FOREIGN KEY (rolescope_id) REFERENCES role_scopes (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE user_groupcenter ADD CONSTRAINT FK_33FFE54AA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE user_groupcenter ADD CONSTRAINT FK_33FFE54A7EC2FA68 FOREIGN KEY (groupcenter_id) REFERENCES group_centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
+    }
 
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE Country (id INT NOT NULL, name JSON NOT NULL, countryCode VARCHAR(3) NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE TABLE centers (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE TABLE Language (id VARCHAR(255) NOT NULL, name JSON NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE TABLE group_centers (id INT NOT NULL, center_id INT DEFAULT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_A14D8F3D5932F377 ON group_centers (center_id);');
+        $this->addSql('CREATE TABLE groupcenter_permissionsgroup (groupcenter_id INT NOT NULL, permissionsgroup_id INT NOT NULL, PRIMARY KEY(groupcenter_id, permissionsgroup_id));');
+        $this->addSql('CREATE INDEX IDX_55DFEC607EC2FA68 ON groupcenter_permissionsgroup (groupcenter_id);');
+        $this->addSql('CREATE INDEX IDX_55DFEC606FA97D46 ON groupcenter_permissionsgroup (permissionsgroup_id);');
+        $this->addSql('CREATE TABLE role_scopes (id INT NOT NULL, scope_id INT DEFAULT NULL, role VARCHAR(255) NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_AFF20281682B5931 ON role_scopes (scope_id);');
+        $this->addSql('CREATE TABLE permission_groups (id INT NOT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE TABLE permissionsgroup_rolescope (permissionsgroup_id INT NOT NULL, rolescope_id INT NOT NULL, PRIMARY KEY(permissionsgroup_id, rolescope_id));');
+        $this->addSql('CREATE INDEX IDX_B22441DC6FA97D46 ON permissionsgroup_rolescope (permissionsgroup_id);');
+        $this->addSql('CREATE INDEX IDX_B22441DCA0AE1DB7 ON permissionsgroup_rolescope (rolescope_id);');
+        $this->addSql('CREATE TABLE users (id INT NOT NULL, username VARCHAR(80) NOT NULL, password VARCHAR(255) NOT NULL, salt VARCHAR(255) DEFAULT NULL, enabled BOOLEAN NOT NULL, locked BOOLEAN NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE TABLE user_groupcenter (user_id INT NOT NULL, groupcenter_id INT NOT NULL, PRIMARY KEY(user_id, groupcenter_id));');
+        $this->addSql('CREATE INDEX IDX_33FFE54AA76ED395 ON user_groupcenter (user_id);');
+        $this->addSql('CREATE INDEX IDX_33FFE54A7EC2FA68 ON user_groupcenter (groupcenter_id);');
+        $this->addSql('CREATE TABLE scopes (id INT NOT NULL, name JSON NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE SEQUENCE Country_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE centers_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE group_centers_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE role_scopes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE permission_groups_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE users_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE scopes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('ALTER TABLE group_centers ADD CONSTRAINT FK_A14D8F3D5932F377 FOREIGN KEY (center_id) REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE groupcenter_permissionsgroup ADD CONSTRAINT FK_55DFEC607EC2FA68 FOREIGN KEY (groupcenter_id) REFERENCES group_centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE groupcenter_permissionsgroup ADD CONSTRAINT FK_55DFEC606FA97D46 FOREIGN KEY (permissionsgroup_id) REFERENCES permission_groups (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE role_scopes ADD CONSTRAINT FK_AFF20281682B5931 FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE permissionsgroup_rolescope ADD CONSTRAINT FK_B22441DC6FA97D46 FOREIGN KEY (permissionsgroup_id) REFERENCES permission_groups (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE permissionsgroup_rolescope ADD CONSTRAINT FK_B22441DCA0AE1DB7 FOREIGN KEY (rolescope_id) REFERENCES role_scopes (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE user_groupcenter ADD CONSTRAINT FK_33FFE54AA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE user_groupcenter ADD CONSTRAINT FK_33FFE54A7EC2FA68 FOREIGN KEY (groupcenter_id) REFERENCES group_centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
index ffc3055ad..910a6b028 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821105642.php
@@ -1,145 +1,146 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Main;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Doctrine\Migrations\AbstractMigration;
 use Doctrine\ORM\Query\ResultSetMapping;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function count;
 
 /**
- * Migrate association from 
+ * Migrate association from
  *     ManyToMany between PermissionGroup <-> GroupCenter
  * to
- *     ManyToOne : a GroupCenter can have only one PermissionGroup
- * 
- * @link https://redmine.champs-libres.coop/issues/578 The issue describing the move
+ *     ManyToOne : a GroupCenter can have only one PermissionGroup.
+ *
+ * @see https://redmine.champs-libres.coop/issues/578 The issue describing the move
  */
-class Version20150821105642 extends AbstractMigration implements 
-    \Symfony\Component\DependencyInjection\ContainerAwareInterface
+class Version20150821105642 extends AbstractMigration implements \Symfony\Component\DependencyInjection\ContainerAwareInterface
 {
     /**
-     *
      * @var ContainerInterface
      */
     private $container;
 
-    
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
+    public function down(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE group_centers ADD permissionsGroup_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE group_centers ADD CONSTRAINT FK_A14D8F3D447BBB3B FOREIGN KEY (permissionsGroup_id) REFERENCES permission_groups (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_A14D8F3D447BBB3B ON group_centers (permissionsGroup_id)');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
+        $this->addSql('ALTER TABLE group_centers DROP CONSTRAINT FK_A14D8F3D447BBB3B');
+        $this->addSql('DROP INDEX IDX_A14D8F3D447BBB3B');
+        $this->addSql('ALTER TABLE group_centers DROP permissionGroup_id');
     }
-    
+
     public function postUp(Schema $schema): void
     {
         /*
          * Before the upgrade to symfony version 4, this code worked.
-         * 
+         *
          * But it doesn't work any more after the migration and currently this
          * code should note be necessary.
-         * 
+         *
          * This code is kept for reference, and may be re-activated if needed, but
          * the probability that this will happens is near 0
          */
         return;
-        
-        
         //transform data from groupcenter_permissionsgroup table
         $em = $this->container->get('doctrine.orm.entity_manager');
-        
+
         //get all existing associations
         $rsm = new ResultSetMapping();
         $rsm->addScalarResult('groupcenter_id', 'groupcenter_id');
         $rsm->addScalarResult('permissionsgroup_id', 'permissionsgroup_id');
-        
-        $groupPermissionsAssociations = $em->createNativeQuery(
-                "SELECT groupcenter_id, permissionsgroup_id "
-                . "FROM groupcenter_permissionsgroup",
-                $rsm
-                )
-                ->getScalarResult();
 
-        //update 
+        $groupPermissionsAssociations = $em->createNativeQuery(
+            'SELECT groupcenter_id, permissionsgroup_id '
+                . 'FROM groupcenter_permissionsgroup',
+            $rsm
+        )
+            ->getScalarResult();
+
+        //update
         foreach ($groupPermissionsAssociations as $groupPermissionAssociation) {
             //get the corresponding groupCenter
             $rsmGroupCenter = new ResultSetMapping();
             $rsmGroupCenter->addScalarResult('id', 'id');
             $rsmGroupCenter->addScalarResult('permissionsGroup_id', 'permissionsGroup_id');
             $rsmGroupCenter->addScalarResult('center_id', 'center_id');
-            
-            $groupCenters = $em->createNativeQuery("SELECT id, permissionsGroup_id, center_id "
-                    . "FROM group_centers "
-                    . "WHERE id = :groupcenter_id AND permissionsGroup_id IS NULL",
-                    $rsmGroupCenter)
-                    ->setParameter('groupcenter_id', $groupPermissionAssociation['groupcenter_id'])
-                    ->getResult();
-            
+
+            $groupCenters = $em->createNativeQuery(
+                'SELECT id, permissionsGroup_id, center_id '
+                    . 'FROM group_centers '
+                    . 'WHERE id = :groupcenter_id AND permissionsGroup_id IS NULL',
+                $rsmGroupCenter
+            )
+                ->setParameter('groupcenter_id', $groupPermissionAssociation['groupcenter_id'])
+                ->getResult();
+
             if (count($groupCenters) === 1) {
                 // we have to update this group with the current association
-                $em->getConnection()->executeUpdate("UPDATE group_centers "
-                        . "SET permissionsGroup_id = ? "
-                        . "WHERE id = ?", array(
-                            $groupPermissionAssociation['permissionsgroup_id'], 
-                            $groupPermissionAssociation['groupcenter_id'])
-                        );
+                $em->getConnection()->executeUpdate(
+                    'UPDATE group_centers '
+                        . 'SET permissionsGroup_id = ? '
+                        . 'WHERE id = ?',
+                    [
+                        $groupPermissionAssociation['permissionsgroup_id'],
+                        $groupPermissionAssociation['groupcenter_id'], ]
+                );
             } elseif (count($groupCenters) === 0) {
                 // the association was multiple. We have to create a new group_center
                 $rsmNewId = new ResultSetMapping();
                 $rsmNewId->addScalarResult('new_id', 'new_id');
-                $newId = $em->createNativeQuery("select nextval('group_centers_id_seq') as new_id",
-                        $rsmNewId)
-                        ->getSingleScalarResult();
-                
-                $em->getConnection()->insert("group_centers", array(
-                            'id' =>  $newId,
-                            'center_id' => $group_center['center_id'],
-                            'permissionsGroup_id' => $groupPermissionAssociation['permissionsgroup_id']
-                        ));
-                
+                $newId = $em->createNativeQuery(
+                    "select nextval('group_centers_id_seq') as new_id",
+                    $rsmNewId
+                )
+                    ->getSingleScalarResult();
+
+                $em->getConnection()->insert('group_centers', [
+                    'id' => $newId,
+                    'center_id' => $group_center['center_id'],
+                    'permissionsGroup_id' => $groupPermissionAssociation['permissionsgroup_id'],
+                ]);
+
                 // we have to link existing users to new created groupcenter
                 $em->getConnection()->executeQuery('INSERT INTO user_groupcenter '
-                        . '(user_id, groupcenter_id) SELECT user_id, '.$newId.' '
+                        . '(user_id, groupcenter_id) SELECT user_id, ' . $newId . ' '
                         . 'FROM user_groupcenter WHERE groupcenter_id = '
-                        .$groupPermissionAssociation['groupcenter_id']);
+                        . $groupPermissionAssociation['groupcenter_id']);
             } else {
-                throw new \RuntimeException("Error in the data : we should not have two groupCenter "
-                        . "with the same id !");
+                throw new RuntimeException('Error in the data : we should not have two groupCenter '
+                        . 'with the same id !');
             }
         }
-        
-        
     }
 
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
+    public function setContainer(?ContainerInterface $container = null)
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE group_centers DROP CONSTRAINT FK_A14D8F3D447BBB3B');
-        $this->addSql('DROP INDEX IDX_A14D8F3D447BBB3B');
-        $this->addSql('ALTER TABLE group_centers DROP permissionGroup_id');
-        
-    }
-
-    public function setContainer(\Symfony\Component\DependencyInjection\ContainerInterface $container = null)
-    {
-        if ($container === NULL) {
-            throw new \RuntimeException('Container is not provided. This migration '
+        if (null === $container) {
+            throw new RuntimeException('Container is not provided. This migration '
                     . 'need container to set a default center');
         }
-        
+
         $this->container = $container;
     }
 
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE group_centers ADD permissionsGroup_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE group_centers ADD CONSTRAINT FK_A14D8F3D447BBB3B FOREIGN KEY (permissionsGroup_id) REFERENCES permission_groups (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_A14D8F3D447BBB3B ON group_centers (permissionsGroup_id)');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php b/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php
index f20b9d927..500ac9de4 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20150821122935.php
@@ -1,39 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Main;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * drop table groupcenter_permissionsgroup, not necessary after 
- * 20150821105642
+ * drop table groupcenter_permissionsgroup, not necessary after
+ * 20150821105642.
  */
 class Version20150821122935 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        
-        $this->addSql('DROP TABLE groupcenter_permissionsgroup');
-        $this->addSql('ALTER TABLE group_centers ALTER permissionsGroup_id SET NOT NULL');
-
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE group_centers ALTER permissionsGroup_id SET DEFAULT NULL');
         $this->addSql('CREATE TABLE groupcenter_permissionsgroup (groupcenter_id INT NOT NULL, permissionsgroup_id INT NOT NULL, PRIMARY KEY(groupcenter_id, permissionsgroup_id))');
         $this->addSql('CREATE INDEX idx_55dfec607ec2fa68 ON groupcenter_permissionsgroup (groupcenter_id)');
         $this->addSql('CREATE INDEX idx_55dfec606fa97d46 ON groupcenter_permissionsgroup (permissionsgroup_id)');
-       
+
         $this->addSql('ALTER TABLE groupcenter_permissionsgroup ADD CONSTRAINT fk_55dfec607ec2fa68 FOREIGN KEY (groupcenter_id) REFERENCES group_centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE groupcenter_permissionsgroup ADD CONSTRAINT fk_55dfec606fa97d46 FOREIGN KEY (permissionsgroup_id) REFERENCES permission_groups (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
 
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE groupcenter_permissionsgroup');
+        $this->addSql('ALTER TABLE group_centers ALTER permissionsGroup_id SET NOT NULL');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
index 25220555b..d1a8a31d1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20160310122322.php
@@ -1,21 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Main;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add postal code and addresses
+ * Add postal code and addresses.
  */
 class Version20160310122322 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_main_address '
+              . 'DROP CONSTRAINT FK_165051F6EECBFDF1');
+        $this->addSql('DROP SEQUENCE chill_main_address_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_main_postal_code_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_address');
+        $this->addSql('DROP TABLE chill_main_postal_code');
+    }
+
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE SEQUENCE chill_main_address_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_main_postal_code_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -46,21 +64,5 @@ class Version20160310122322 extends AbstractMigration
               . 'FOREIGN KEY (country_id) '
               . 'REFERENCES Country (id) '
               . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
-
-    }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_main_address '
-              . 'DROP CONSTRAINT FK_165051F6EECBFDF1');
-        $this->addSql('DROP SEQUENCE chill_main_address_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_main_postal_code_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_main_address');
-        $this->addSql('DROP TABLE chill_main_postal_code');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
index 2546018c0..a15ee7c8c 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180703191509.php
@@ -1,15 +1,32 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use Exception;
 
 /**
- * Add index to postal code
+ * Add index to postal code.
  */
 final class Version20180703191509 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP INDEX search_name_code');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -17,17 +34,8 @@ final class Version20180703191509 extends AbstractMigration
         try {
             $this->addSql('CREATE EXTENSION IF NOT EXISTS pg_trgm');
             $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code USING GIN (LOWER(code) gin_trgm_ops, LOWER(label) gin_trgm_ops)');
-        } catch (\Exception $e) {
-            $this->skipIf(true, "Could not create extension pg_trgm");
+        } catch (Exception $e) {
+            $this->skipIf(true, 'Could not create extension pg_trgm');
         }
-        
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP INDEX search_name_code');
-        
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
index 3a23657f9..7771756a7 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180709181423.php
@@ -1,16 +1,40 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * add username and username canonical, email and email canonical columns
- * to users
+ * to users.
  */
 final class Version20180709181423 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP INDEX UNIQ_1483A5E9F5A5DC32');
+        $this->addSql('DROP INDEX UNIQ_1483A5E9885281E');
+        $this->addSql('ALTER TABLE users DROP usernameCanonical');
+        $this->addSql('ALTER TABLE users DROP email');
+        $this->addSql('ALTER TABLE users DROP emailCanonical');
+        $this->addSql('DROP TRIGGER canonicalize_user_on_insert ON users');
+        $this->addSql('DROP FUNCTION canonicalize_user_on_insert()');
+        $this->addSql('DROP TRIGGER canonicalize_user_on_update ON users');
+        $this->addSql('DROP FUNCTION canonicalize_user_on_update()');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -23,65 +47,53 @@ final class Version20180709181423 extends AbstractMigration
         $this->addSql('ALTER TABLE users ADD emailCanonical VARCHAR(150) DEFAULT NULL');
         $this->addSql('CREATE UNIQUE INDEX UNIQ_1483A5E9F5A5DC32 ON users (usernameCanonical)');
         $this->addSql('CREATE UNIQUE INDEX UNIQ_1483A5E9885281E ON users (emailCanonical)');
-        
-        $this->addSql(<<<'SQL'
-            CREATE OR REPLACE FUNCTION canonicalize_user_on_update() RETURNS TRIGGER AS
-            $BODY$
-            BEGIN
-            IF NEW.username <> OLD.username OR NEW.email <> OLD.email OR OLD.emailcanonical IS NULL OR OLD.usernamecanonical IS NULL THEN
-               UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id;
-            END IF;
 
-            RETURN NEW;
-            END;
-            $BODY$ LANGUAGE PLPGSQL
-SQL
+        $this->addSql(
+            <<<'SQL'
+                            CREATE OR REPLACE FUNCTION canonicalize_user_on_update() RETURNS TRIGGER AS
+                            $BODY$
+                            BEGIN
+                            IF NEW.username <> OLD.username OR NEW.email <> OLD.email OR OLD.emailcanonical IS NULL OR OLD.usernamecanonical IS NULL THEN
+                               UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id;
+                            END IF;
+
+                            RETURN NEW;
+                            END;
+                            $BODY$ LANGUAGE PLPGSQL
+                SQL
         );
 
-        $this->addSql(<<<SQL
-            CREATE TRIGGER canonicalize_user_on_update
-              AFTER UPDATE
-              ON users
-              FOR EACH ROW 
-              EXECUTE PROCEDURE canonicalize_user_on_update();
-SQL
+        $this->addSql(
+            <<<'SQL'
+                            CREATE TRIGGER canonicalize_user_on_update
+                              AFTER UPDATE
+                              ON users
+                              FOR EACH ROW
+                              EXECUTE PROCEDURE canonicalize_user_on_update();
+                SQL
         );
 
-        $this->addSql(<<<'SQL'
-            CREATE OR REPLACE FUNCTION canonicalize_user_on_insert() RETURNS TRIGGER AS
-            $BODY$
-            BEGIN
-            UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id;
+        $this->addSql(
+            <<<'SQL'
+                            CREATE OR REPLACE FUNCTION canonicalize_user_on_insert() RETURNS TRIGGER AS
+                            $BODY$
+                            BEGIN
+                            UPDATE users SET usernamecanonical=LOWER(UNACCENT(NEW.username)), emailcanonical=LOWER(UNACCENT(NEW.email)) WHERE id=NEW.id;
 
-            RETURN NEW;
-            END;
-            $BODY$ LANGUAGE PLPGSQL;
-SQL
+                            RETURN NEW;
+                            END;
+                            $BODY$ LANGUAGE PLPGSQL;
+                SQL
         );
 
-        $this->addSql(<<<SQL
-            CREATE TRIGGER canonicalize_user_on_insert
-              AFTER INSERT
-              ON users
-              FOR EACH ROW 
-              EXECUTE PROCEDURE canonicalize_user_on_insert();
-SQL
-            );
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-        
-        $this->addSql('DROP INDEX UNIQ_1483A5E9F5A5DC32');
-        $this->addSql('DROP INDEX UNIQ_1483A5E9885281E');
-        $this->addSql('ALTER TABLE users DROP usernameCanonical');
-        $this->addSql('ALTER TABLE users DROP email');
-        $this->addSql('ALTER TABLE users DROP emailCanonical');
-        $this->addSql('DROP TRIGGER canonicalize_user_on_insert ON users');
-        $this->addSql('DROP FUNCTION canonicalize_user_on_insert()');
-        $this->addSql('DROP TRIGGER canonicalize_user_on_update ON users');
-        $this->addSql('DROP FUNCTION canonicalize_user_on_update()');
-
+        $this->addSql(
+            <<<'SQL'
+                            CREATE TRIGGER canonicalize_user_on_insert
+                              AFTER INSERT
+                              ON users
+                              FOR EACH ROW
+                              EXECUTE PROCEDURE canonicalize_user_on_insert();
+                SQL
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php b/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
index 841a68750..e56936aed 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
@@ -10,16 +19,15 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20180905101426 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE permission_groups DROP COLUMN flags');
+        $this->addSql('ALTER TABLE group_centers ALTER permissionsgroup_id SET DEFAULT NULL');
+    }
+
     public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE permission_groups ADD flags JSONB DEFAULT \'[]\' NOT NULL');
         $this->addSql('ALTER TABLE group_centers ALTER permissionsgroup_id DROP NOT NULL');
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE permission_groups DROP COLUMN flags');
-        $this->addSql('ALTER TABLE group_centers ALTER permissionsgroup_id SET DEFAULT NULL'); 
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php b/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php
index 6ff24bc5a..86e5585e3 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20180911093642.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
@@ -6,38 +15,38 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Fix error with recursive trigger on update
+ * Fix error with recursive trigger on update.
  */
 final class Version20180911093642 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("DROP TRIGGER canonicalize_user_on_update ON users");
-        
-        $this->addSql(<<<SQL
-            CREATE TRIGGER canonicalize_user_on_update
-              AFTER UPDATE
-              ON users
-              FOR EACH ROW 
-              WHEN (pg_trigger_depth() = 0)
-              EXECUTE PROCEDURE canonicalize_user_on_update();
-SQL
-        );
-
-    }
-
     public function down(Schema $schema): void
     {
-        $this->addSql("DROP TRIGGER canonicalize_user_on_update ON users");
-            
-        $this->addSql(<<<SQL
-            CREATE TRIGGER canonicalize_user_on_update
-              AFTER UPDATE
-              ON users
-              FOR EACH ROW 
-              EXECUTE PROCEDURE canonicalize_user_on_update();
-SQL
-        );
+        $this->addSql('DROP TRIGGER canonicalize_user_on_update ON users');
 
+        $this->addSql(
+            <<<'SQL'
+                            CREATE TRIGGER canonicalize_user_on_update
+                              AFTER UPDATE
+                              ON users
+                              FOR EACH ROW
+                              EXECUTE PROCEDURE canonicalize_user_on_update();
+                SQL
+        );
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP TRIGGER canonicalize_user_on_update ON users');
+
+        $this->addSql(
+            <<<'SQL'
+                            CREATE TRIGGER canonicalize_user_on_update
+                              AFTER UPDATE
+                              ON users
+                              FOR EACH ROW
+                              WHEN (pg_trigger_depth() = 0)
+                              EXECUTE PROCEDURE canonicalize_user_on_update();
+                SQL
+        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php b/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php
index 3449e5f28..95a9abe51 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20200422122715.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
@@ -6,17 +15,17 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a field "isNoAddress" on addresses
+ * Add a field "isNoAddress" on addresses.
  */
 final class Version20200422122715 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_address ADD isNoAddress BOOLEAN NOT NULL DEFAULT FALSE');
-    }
-
     public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_main_address DROP isNoAddress');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address ADD isNoAddress BOOLEAN NOT NULL DEFAULT FALSE');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php b/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php
index 5f1fb6869..5f15147e4 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210304085819.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -12,19 +19,18 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210304085819 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP attributes');
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('ALTER TABLE users ADD attributes JSONB DEFAULT NULL');
-        $this->addSql('COMMENT ON COLUMN users.attributes IS \'(DC2Type:json_array)\'');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE users DROP attributes');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
index fa4f001bb..3e5d17a4a 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210308111926.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
@@ -6,27 +15,26 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add custom data in address
+ * Add custom data in address.
  */
 final class Version20210308111926 extends AbstractMigration
 {
-    public function up(Schema $schema) : void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB DEFAULT \'[]\'');
-        
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_main_address DROP customs');
     }
-    
+
     public function getDescription(): string
     {
-        return "Add custom data in addresses";
+        return 'Add custom data in addresses';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB DEFAULT \'[]\'');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
index db207c594..3eaa4630d 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210414091001.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
 
@@ -6,19 +15,11 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create the postgis extension
+ * Create the postgis extension.
  */
 final class Version20210414091001 extends AbstractMigration
 {
-    public function up(Schema $schema) : void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE EXTENSION IF NOT EXISTS postgis;');
-
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
@@ -27,6 +28,13 @@ final class Version20210414091001 extends AbstractMigration
 
     public function getDescription(): string
     {
-        return "Enable the postgis extension in public schema";
+        return 'Enable the postgis extension in public schema';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('CREATE EXTENSION IF NOT EXISTS postgis;');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php b/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php
index 79dea4853..b0b281d06 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210420115006.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -12,28 +19,7 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210420115006 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return 'Add a Point data type and modify the Address entity';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_main_address RENAME COLUMN streetaddress1 TO street;');
-        $this->addSql('ALTER TABLE chill_main_address RENAME COLUMN streetaddress2 TO streetNumber;');
-        $this->addSql('ALTER TABLE chill_main_address ADD floor VARCHAR(16) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD corridor VARCHAR(16) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD steps VARCHAR(16) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD buildingName VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD flat VARCHAR(16) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD distribution VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD extra VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD validTo DATE DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_main_address ADD point geometry(POINT,4326) DEFAULT NULL');
-    }
-
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_main_address RENAME COLUMN street TO streetaddress1;');
         $this->addSql('ALTER TABLE chill_main_address RENAME COLUMN streetNumber TO streetaddress2;');
@@ -47,4 +33,24 @@ final class Version20210420115006 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_address DROP validTo');
         $this->addSql('ALTER TABLE chill_main_address DROP point');
     }
+
+    public function getDescription(): string
+    {
+        return 'Add a Point data type and modify the Address entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address RENAME COLUMN streetaddress1 TO street;');
+        $this->addSql('ALTER TABLE chill_main_address RENAME COLUMN streetaddress2 TO streetNumber;');
+        $this->addSql('ALTER TABLE chill_main_address ADD floor VARCHAR(16) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD corridor VARCHAR(16) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD steps VARCHAR(16) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD buildingName VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD flat VARCHAR(16) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD distribution VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD extra VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD validTo DATE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address ADD point geometry(POINT,4326) DEFAULT NULL');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php b/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php
index f693777a0..0f664e2b2 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210503085107.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a AddressReference table for storing authoritative address data
+ * Add a AddressReference table for storing authoritative address data.
  */
 final class Version20210503085107 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_address_reference_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_address_reference');
+    }
+
     public function getDescription(): string
     {
         return 'Add a AddressReference table for storing authoritative address data';
@@ -24,10 +37,4 @@ final class Version20210503085107 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_CA6C1BD7EECBFDF1 ON chill_main_address_reference (postcode_id)');
         $this->addSql('ALTER TABLE chill_main_address_reference ADD CONSTRAINT FK_CA6C1BD7EECBFDF1 FOREIGN KEY (postcode_id) REFERENCES chill_main_postal_code (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_main_address_reference_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_main_address_reference');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php b/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php
index 42161ba84..34c3c10b9 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210505153727.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,22 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add linkedToThirdParty field to Address
+ * Add linkedToThirdParty field to Address.
  */
 final class Version20210505153727 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address DROP CONSTRAINT FK_165051F6114B8DD9');
+        $this->addSql('DROP INDEX IDX_165051F6114B8DD9');
+        $this->addSql('ALTER TABLE chill_main_address DROP linkedToThirdParty_id');
+        $this->addSql('DROP TABLE IF EXISTS chill_main_address_legacy');
+        $this->addSql('
+            UPDATE chill_main_address
+            SET validto = null;
+        ');
+    }
+
     public function getDescription(): string
     {
         return 'Add linkedToThirdParty field to Address';
@@ -43,16 +62,4 @@ final class Version20210505153727 extends AbstractMigration
             );
         ');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_address DROP CONSTRAINT FK_165051F6114B8DD9');
-        $this->addSql('DROP INDEX IDX_165051F6114B8DD9');
-        $this->addSql('ALTER TABLE chill_main_address DROP linkedToThirdParty_id');
-        $this->addSql('DROP TABLE IF EXISTS chill_main_address_legacy');
-        $this->addSql('
-            UPDATE chill_main_address
-            SET validto = null;
-        ');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php b/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php
index 3be8d9ea1..f917a5bf1 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210525144016.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Specify ON DELETE behaviour to handle deletion of parents in associated tables
+ * Specify ON DELETE behaviour to handle deletion of parents in associated tables.
  */
 final class Version20210525144016 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address DROP CONSTRAINT fk_165051f6114b8dd9');
+        $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT fk_165051f6114b8dd9 FOREIGN KEY (linkedtothirdparty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
     public function getDescription(): string
     {
         return 'Specify ON DELETE behaviour to handle deletion of parents in associated tables';
@@ -22,10 +35,4 @@ final class Version20210525144016 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_address DROP CONSTRAINT FK_165051F6114B8DD9');
         $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT FK_165051F6114B8DD9 FOREIGN KEY (linkedToThirdParty_id) REFERENCES chill_3party.third_party (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_address DROP CONSTRAINT fk_165051f6114b8dd9');
-        $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT fk_165051f6114b8dd9 FOREIGN KEY (linkedtothirdparty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php b/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
index d2a33230f..09a0a52fd 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210528090000.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add extension btree_gist
+ * Add extension btree_gist.
  */
 final class Version20210528090000 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP EXTENSION btree_gist');
+    }
+
     public function getDescription(): string
     {
         return 'add extension btree_gist';
@@ -21,9 +33,4 @@ final class Version20210528090000 extends AbstractMigration
     {
         $this->addSql('CREATE EXTENSION IF NOT EXISTS btree_gist');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP EXTENSION btree_gist');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php
index d54ff4634..54160273e 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210610140248.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,18 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add table for ChillMain/Notification
+ * Add table for ChillMain/Notification.
  */
 final class Version20210610140248 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_notification_addresses_user DROP CONSTRAINT FK_E52C5D2BEF1A9D84');
+        $this->addSql('DROP SEQUENCE chill_main_notification_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_notification');
+        $this->addSql('DROP TABLE chill_main_notification_addresses_user');
+    }
+
     public function getDescription(): string
     {
         return 'Add table for ChillMain/Notification';
@@ -31,12 +46,4 @@ final class Version20210610140248 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_notification_addresses_user ADD CONSTRAINT FK_E52C5D2BEF1A9D84 FOREIGN KEY (notification_id) REFERENCES chill_main_notification (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_main_notification_addresses_user ADD CONSTRAINT FK_E52C5D2BA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_notification_addresses_user DROP CONSTRAINT FK_E52C5D2BEF1A9D84');
-        $this->addSql('DROP SEQUENCE chill_main_notification_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_main_notification');
-        $this->addSql('DROP TABLE chill_main_notification_addresses_user');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php b/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php
index c54f0a183..ed4603b17 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210616134328.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -12,6 +19,11 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210616134328 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_postal_code DROP origin');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -21,9 +33,4 @@ final class Version20210616134328 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_main_postal_code ADD origin INT DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_postal_code DROP origin');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
index 7fe6b8e72..cfd449dd0 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210903144853.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,24 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add metadata on users
+ * Add metadata on users.
  */
 final class Version20210903144853 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E964B65C5B');
+        $this->addSql('DROP SEQUENCE chill_main_user_job_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_user_job');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E92C2125C1');
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E9115E73F3');
+        $this->addSql('ALTER TABLE users DROP label');
+        $this->addSql('ALTER TABLE users DROP mainCenter_id');
+        $this->addSql('ALTER TABLE users DROP mainScope_id');
+        $this->addSql('ALTER TABLE users DROP userJob_id');
+        $this->addSql('ALTER TABLE users ALTER usernameCanonical DROP NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Add metadata on users';
@@ -35,18 +56,4 @@ final class Version20210903144853 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_1483A5E9115E73F3 ON users (mainScope_id)');
         $this->addSql('CREATE INDEX IDX_1483A5E964B65C5B ON users (userJob_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E964B65C5B');
-        $this->addSql('DROP SEQUENCE chill_main_user_job_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_main_user_job');
-        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E92C2125C1');
-        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E9115E73F3');
-        $this->addSql('ALTER TABLE users DROP label');
-        $this->addSql('ALTER TABLE users DROP mainCenter_id');
-        $this->addSql('ALTER TABLE users DROP mainScope_id');
-        $this->addSql('ALTER TABLE users DROP userJob_id');
-        $this->addSql('ALTER TABLE users ALTER usernameCanonical DROP NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php b/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php
index a2fbefa69..5e22201c3 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20210929192242.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a link between address and address reference
+ * Add a link between address and address reference.
  */
 final class Version20210929192242 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address DROP addressReference_id');
+    }
+
     public function getDescription(): string
     {
         return 'Add a link between address and address reference';
@@ -23,9 +35,4 @@ final class Version20210929192242 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_address ADD CONSTRAINT FK_165051F647069464 FOREIGN KEY (addressReference_id) REFERENCES chill_main_address_reference (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_165051F647069464 ON chill_main_address (addressReference_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_address DROP addressReference_id');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php b/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php
index 9f4508ba8..c564c30eb 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211006151653.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,17 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add some fields to PostalCode
+ * Add some fields to PostalCode.
  */
 final class Version20211006151653 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_postal_code DROP refPostalCodeId');
+        $this->addSql('ALTER TABLE chill_main_postal_code DROP postalCodeSource');
+        $this->addSql('ALTER TABLE chill_main_postal_code DROP center');
+    }
+
     public function getDescription(): string
     {
         return 'Add some fields to PostalCode';
@@ -23,11 +37,4 @@ final class Version20211006151653 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_postal_code ADD postalCodeSource VARCHAR(255) DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_main_postal_code ADD center geometry(POINT,4326) DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_postal_code DROP refPostalCodeId');
-        $this->addSql('ALTER TABLE chill_main_postal_code DROP postalCodeSource');
-        $this->addSql('ALTER TABLE chill_main_postal_code DROP center');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php b/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php
index b81c7f74e..33cb2fd42 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211007150019.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create civility table
+ * Create civility table.
  */
 final class Version20211007150019 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_civility_id_seq');
+        $this->addSql('DROP TABLE chill_main_civility');
+    }
+
     public function getDescription(): string
     {
         return 'create civility table';
@@ -22,10 +35,4 @@ final class Version20211007150019 extends AbstractMigration
         $this->addSql('CREATE SEQUENCE chill_main_civility_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_main_civility (id INT NOT NULL, name JSON NOT NULL, abbreviation JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_main_civility_id_seq');
-        $this->addSql('DROP TABLE chill_main_civility');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php b/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php
index 4ed8da1dc..4d1050b94 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211012141336.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -12,6 +19,23 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20211012141336 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095A64D218E');
+        $this->addSql('ALTER TABLE activity DROP location_id');
+
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315AC64D218E');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP location_id');
+
+        $this->addSql('ALTER TABLE chill_main_location DROP CONSTRAINT FK_90E4736AB8B0DA8E');
+
+        $this->addSql('DROP SEQUENCE chill_main_location_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_main_location_type_id_seq CASCADE');
+
+        $this->addSql('DROP TABLE chill_main_location');
+        $this->addSql('DROP TABLE chill_main_location_type');
+    }
+
     public function getDescription(): string
     {
         return 'Add Location and LocationType Entities (for activity and calendar)';
@@ -45,22 +69,4 @@ final class Version20211012141336 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315AC64D218E FOREIGN KEY (location_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_712315AC64D218E ON chill_calendar.calendar (location_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-
-        $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095A64D218E');
-        $this->addSql('ALTER TABLE activity DROP location_id');
-
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315AC64D218E');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP location_id');
-
-        $this->addSql('ALTER TABLE chill_main_location DROP CONSTRAINT FK_90E4736AB8B0DA8E');
-
-        $this->addSql('DROP SEQUENCE chill_main_location_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_main_location_type_id_seq CASCADE');
-
-        $this->addSql('DROP TABLE chill_main_location');
-        $this->addSql('DROP TABLE chill_main_location_type');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php b/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php
index 0d30cece5..c40446834 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211013124455.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -9,6 +16,15 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20211013124455 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activitytype DROP locationVisible');
+        $this->addSql('ALTER TABLE activitytype DROP locationLabel');
+
+        // fix old migration !?
+        $this->addSql('ALTER TABLE activitytype ALTER category_id SET DEFAULT 1');
+    }
+
     public function getDescription(): string
     {
         return 'add location visible admin option';
@@ -21,16 +37,5 @@ final class Version20211013124455 extends AbstractMigration
 
         // fix old migration !?
         $this->addSql('ALTER TABLE activitytype ALTER category_id DROP DEFAULT');
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activitytype DROP locationVisible');
-        $this->addSql('ALTER TABLE activitytype DROP locationLabel');
-
-        // fix old migration !?
-        $this->addSql('ALTER TABLE activitytype ALTER category_id SET DEFAULT 1');
-
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php b/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php
index 12b230f10..52cf53aac 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211015084653.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -9,6 +16,12 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20211015084653 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX IDX_90E4736AF5B7AF75');
+        $this->addSql('CREATE UNIQUE INDEX uniq_90e4736af5b7af75 ON chill_main_location (address_id)');
+    }
+
     public function getDescription(): string
     {
         return 'Location entity: change Address to ManyToOne';
@@ -16,13 +29,7 @@ final class Version20211015084653 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-      $this->addSql('DROP INDEX uniq_90e4736af5b7af75');
-      $this->addSql('CREATE INDEX IDX_90E4736AF5B7AF75 ON chill_main_location (address_id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-      $this->addSql('DROP INDEX IDX_90E4736AF5B7AF75');
-      $this->addSql('CREATE UNIQUE INDEX uniq_90e4736af5b7af75 ON chill_main_location (address_id)');
+        $this->addSql('DROP INDEX uniq_90e4736af5b7af75');
+        $this->addSql('CREATE INDEX IDX_90E4736AF5B7AF75 ON chill_main_location (address_id)');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php b/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php
index 1bc4f68d0..f11dbf42b 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211022094429.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add active on Location and LocationType
+ * Add active on Location and LocationType.
  */
 final class Version20211022094429 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_location_type DROP active');
+        $this->addSql('ALTER TABLE chill_main_location DROP active');
+    }
+
     public function getDescription(): string
     {
         return 'Add active on Location and LocationType';
@@ -22,10 +35,4 @@ final class Version20211022094429 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_location ADD active BOOLEAN DEFAULT TRUE;');
         $this->addSql('ALTER TABLE chill_main_location_type ADD active BOOLEAN DEFAULT TRUE;');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_main_location_type DROP active');
-        $this->addSql('ALTER TABLE chill_main_location DROP active');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php b/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
new file mode 100644
index 000000000..d9011049f
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211116162847.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add current location to User entity.
+ */
+final class Version20211116162847 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP CONSTRAINT FK_1483A5E93C219753');
+        $this->addSql('DROP INDEX IDX_1483A5E93C219753');
+        $this->addSql('ALTER TABLE users DROP currentLocation_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add current location to User entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users ADD currentLocation_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE users ADD CONSTRAINT FK_1483A5E93C219753 FOREIGN KEY (currentLocation_id) REFERENCES chill_main_location (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_1483A5E93C219753 ON users (currentLocation_id)');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php b/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php
new file mode 100644
index 000000000..9494337fd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211119173554.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20211119173554 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+
+    public function getDescription(): string
+    {
+        return 'remove comment on deprecated json_array type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $columns = [
+            'users.attributes',
+        ];
+
+        foreach ($columns as $col) {
+            $this->addSql("COMMENT ON COLUMN {$col} IS NULL");
+        }
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php b/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php
new file mode 100644
index 000000000..b6618d25e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211123093355.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add defaultFor to LocationType.
+ */
+final class Version20211123093355 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX UNIQ_A459B5CADD3E4105');
+        $this->addSql('ALTER TABLE chill_main_location_type DROP defaultFor');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add defaultFor to LocationType';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_location_type ADD defaultFor VARCHAR(32) DEFAULT NULL');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_A459B5CADD3E4105 ON chill_main_location_type (defaultFor)');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php b/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php
new file mode 100644
index 000000000..08f3815de
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211125142016.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211125142016 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TRIGGER canonicalize_address_reference_on_insert ON chill_main_address_reference');
+        $this->addSql('DROP TRIGGER canonicalize_address_reference_on_update ON chill_main_address_reference');
+        $this->addSql('DROP FUNCTION canonicalize_address_reference()');
+        $this->addSql('ALTER TABLE chill_main_address_reference DROP COLUMN addressCanonical');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add a column "canonicalized" on chill_main_address_reference and add trigger and indexed on it';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address_reference ADD addressCanonical TEXT DEFAULT \'\' NOT NULL');
+
+        $this->addSql('UPDATE chill_main_address_reference
+        SET addresscanonical =
+                TRIM(
+                    UNACCENT(
+                        LOWER(
+                            street ||
+                            \' \' ||
+                            streetnumber
+                        )
+                    )
+
+                )');
+
+        $this->addSql('CREATE OR REPLACE FUNCTION public.canonicalize_address_reference() RETURNS TRIGGER
+            LANGUAGE plpgsql
+        AS
+        $$
+        BEGIN
+            NEW.addresscanonical =
+                TRIM(
+                    UNACCENT(
+                        LOWER(
+                            NEW.street ||
+                            \' \' ||
+                            NEW.streetnumber
+                        )
+                    )
+
+                )
+            ;
+
+            return NEW;
+        END
+        $$');
+
+        $this->addSql('CREATE TRIGGER canonicalize_address_reference_on_insert
+            BEFORE INSERT
+            ON chill_main_address_reference
+            FOR EACH ROW
+                EXECUTE procedure canonicalize_address_reference()');
+
+        $this->addSql('CREATE TRIGGER canonicalize_address_reference_on_update
+            BEFORE UPDATE
+            ON chill_main_address_reference
+            FOR EACH ROW
+                EXECUTE procedure canonicalize_address_reference()');
+
+        $this->addSql('CREATE INDEX chill_internal_address_reference_canonicalized ON chill_main_address_reference USING GIST (postcode_id, addressCanonical gist_trgm_ops)');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php b/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php
new file mode 100644
index 000000000..7f938b241
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20211125142017.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211125142017 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TRIGGER canonicalize_postal_code_on_insert ON chill_main_postal_code');
+        $this->addSql('DROP TRIGGER canonicalize_postal_code_on_update ON chill_main_postal_code');
+        $this->addSql('DROP FUNCTION canonicalize_postal_code()');
+        $this->addSql('ALTER TABLE chill_main_postal_code DROP COLUMN canonical');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add a column "canonicalized" on postal code';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_postal_code ADD canonical TEXT DEFAULT \'\' NOT NULL');
+
+        $this->addSql('UPDATE chill_main_postal_code
+        SET canonical =
+                TRIM(
+                    UNACCENT(
+                        LOWER(
+                            code ||
+                            \' \' ||
+                            label
+                        )
+                    )
+
+                )');
+
+        $this->addSql('CREATE OR REPLACE FUNCTION public.canonicalize_postal_code() RETURNS TRIGGER
+            LANGUAGE plpgsql
+        AS
+        $$
+        BEGIN
+            NEW.canonical =
+                TRIM(
+                    UNACCENT(
+                        LOWER(
+                            NEW.code ||
+                            \' \' ||
+                            NEW.label
+                        )
+                    )
+
+                )
+            ;
+
+            return NEW;
+        END
+        $$');
+
+        $this->addSql('CREATE TRIGGER canonicalize_postal_code_on_insert
+            BEFORE INSERT
+            ON chill_main_postal_code
+            FOR EACH ROW
+                EXECUTE procedure canonicalize_postal_code()');
+
+        $this->addSql('CREATE TRIGGER canonicalize_postal_code_on_update
+            BEFORE UPDATE
+            ON chill_main_postal_code
+            FOR EACH ROW
+                EXECUTE procedure canonicalize_postal_code()');
+
+        $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code USING GIST (canonical gist_trgm_ops) WHERE origin = 0');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 7737e1d04..78363d080 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -37,7 +37,7 @@ Choose an user: Choisir un utilisateur
 No value: Aucune information
 Last updated by: Dernière mise à jour par
 Last updated on: Dernière mise à jour le
-on: le
+on: "le "
 
 Edit: Modifier
 Update: Mettre à jour
@@ -74,7 +74,7 @@ Choose a postal code: Choisir un code postal
 address:
   address_homeless: L'adresse est-elle celle d'un domicile fixe ?
   real address: Adresse d'un domicile
-  consider homeless: N'est pas l'adresse d'un domicile (SDF)
+  consider homeless: Cette adresse est incomplète
 address more:
   floor: ét
   corridor: coul
@@ -86,6 +86,10 @@ address more:
 Create a new address: Créer une nouvelle adresse
 Create an address: Créer une adresse
 Update address: Modifier l'adresse
+City or postal code: Ville ou code postal
+
+# contact
+Part of the phonenumber: Partie du numéro de téléphone
 
 #serach
 Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche.
@@ -176,6 +180,13 @@ Flags: Drapeaux
 # admin section for users jobs
 User jobs: Métiers
 
+# user page for current location
+Current location: Localisation actuelle
+Edit my current location: Éditer ma localisation actuelle
+Change current location: Changer ma localisation actuelle
+Set a location: Indiquer une localisation
+Current location successfully updated: Localisation actuelle mise à jour
+Pick a location: Choisir un lieu
 
 #admin section for circles (old: scopes)
 List circles: Cercles
@@ -190,7 +201,7 @@ Location: Localisation
 Location type list: Liste des types de localisation
 Create a new location type: Créer un nouveau type de localisation
 Available for users: Disponible aux utilisateurs
-Address required: Adresse requise? 
+Address required: Adresse requise?
 Contact data: Données de contact?
 optional: optionnel
 required: requis
@@ -200,11 +211,15 @@ Location list: Liste des localisations
 Location type: Type de localisation
 Phonenumber1: Numéro de téléphone
 Phonenumber2: Autre numéro de téléphone
-Configure location: Configuration des localisations
-Configure location type: Configuration des types de localisations
+Configure location and location type: Configuration des localisations
+Default for: Type de localisation par défaut pour
+none: aucun
+person: usager
+thirdparty: tiers
 
 # circles / scopes
 Choose the circle: Choisir le cercle
+Scopes: Services
 
 #export
 
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php
index 0f1922435..566e05440 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodLinkedWithSocialIssuesEntityInterface.php
@@ -1,13 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
 
-use Doctrine\Common\Collections\Collection;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\Common\Collections\Collection;
 
 /**
- * This interface must be implemented on entities which:
+ * This interface must be implemented on entities which:.
  *
  * * have both social issue and is linked to an AccompanyingPeriod
  * * when the social issues in the entity should be added to the accompanying period
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
index 847331180..05d25104e 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -22,37 +31,18 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListener
         $this->ensureConsistencyEntity($entity);
     }
 
-    public function preUpdate(AccompanyingPeriodLinkedWithSocialIssuesEntityInterface $entity, LifecycleEventArgs $eventArgs)
-    {
-        $this->ensureConsistencyEntity($entity);
-    }
-
     public function prePersistAccompanyingPeriod(AccompanyingPeriod $period, LifecycleEventArgs $eventArgs)
     {
         $this->ensureConsistencyAccompanyingPeriod($period);
     }
 
-    public function preUpdateAccompanyingPeriod(AccompanyingPeriod $period, LifecycleEventArgs $eventArgs)
+    public function preUpdate(AccompanyingPeriodLinkedWithSocialIssuesEntityInterface $entity, LifecycleEventArgs $eventArgs)
     {
-        $this->ensureConsistencyAccompanyingPeriod($period);
+        $this->ensureConsistencyEntity($entity);
     }
 
-    private function ensureConsistencyEntity(AccompanyingPeriodLinkedWithSocialIssuesEntityInterface $entity): void
+    public function preUpdateAccompanyingPeriod(AccompanyingPeriod $period, LifecycleEventArgs $eventArgs)
     {
-        if (NULL === $period = $entity->getAccompanyingPeriod()) {
-            return;
-        }
-        // remove issues parents on the entity itself
-        $ancestors = SocialIssue::findAncestorSocialIssues($entity->getSocialIssues());
-        foreach ($ancestors as $ancestor) {
-            $entity->removeSocialIssue($ancestor);
-        }
-
-        foreach ($entity->getSocialIssues() as $issue) {
-            // the entity itself test if the social issue is already associated, or not
-            $period->addSocialIssue($issue);
-        }
-
         $this->ensureConsistencyAccompanyingPeriod($period);
     }
 
@@ -64,4 +54,24 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListener
             $period->removeSocialIssue($ancestor);
         }
     }
+
+    private function ensureConsistencyEntity(AccompanyingPeriodLinkedWithSocialIssuesEntityInterface $entity): void
+    {
+        if (null === $period = $entity->getAccompanyingPeriod()) {
+            return;
+        }
+        // remove issues parents on the entity itself
+        $ancestors = SocialIssue::findAncestorSocialIssues($entity->getSocialIssues());
+
+        foreach ($ancestors as $ancestor) {
+            $entity->removeSocialIssue($ancestor);
+        }
+
+        foreach ($entity->getSocialIssues() as $issue) {
+            // the entity itself test if the social issue is already associated, or not
+            $period->addSocialIssue($issue);
+        }
+
+        $this->ensureConsistencyAccompanyingPeriod($period);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php
index b28dcce79..552a7a879 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestion.php
@@ -1,12 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\AccompanyingPeriod\Suggestion;
 
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
- * Basic implementation: this suggestion does not return any suggestion
+ * Basic implementation: this suggestion does not return any suggestion.
  */
 final class ReferralsSuggestion implements ReferralsSuggestionInterface
 {
@@ -16,7 +25,6 @@ final class ReferralsSuggestion implements ReferralsSuggestionInterface
     }
 
     /**
-     * @param AccompanyingPeriod $period
      * @return array|User[]
      */
     public function findReferralSuggested(AccompanyingPeriod $period, int $limit = 50, int $start = 0): array
diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php
index 02d044fb1..2abf4ce40 100644
--- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php
+++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/Suggestion/ReferralsSuggestionInterface.php
@@ -1,12 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\AccompanyingPeriod\Suggestion;
 
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
- * Process the suggestion of referral for a given accompanying period
+ * Process the suggestion of referral for a given accompanying period.
  */
 interface ReferralsSuggestionInterface
 {
@@ -16,5 +25,4 @@ interface ReferralsSuggestionInterface
      * @return array|User[]
      */
     public function findReferralSuggested(AccompanyingPeriod $period, int $limit = 50, int $start = 0): array;
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
index 5ac3055cb..92306dd05 100644
--- a/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+++ b/src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
@@ -1,73 +1,63 @@
 <?php
-/*
- * Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Actions;
 
 use Symfony\Component\EventDispatcher\Event;
 
 /**
  * Event triggered when an entity attached to a person is removed.
- * 
- *
  */
 class ActionEvent extends Event
 {
-    const DELETE = 'CHILL_PERSON.DELETE_ASSOCIATED_ENTITY';
-    const MOVE   = 'CHILL_PERSON.MOVE_ASSOCIATED_ENTITY';
-    
+    public const DELETE = 'CHILL_PERSON.DELETE_ASSOCIATED_ENTITY';
+
+    public const MOVE = 'CHILL_PERSON.MOVE_ASSOCIATED_ENTITY';
+
     /**
-     *
-     * @var int
-     */
-    protected $personId;
-    
-    /**
-     * the FQDN class name as recorded in doctrine
+     * the FQDN class name as recorded in doctrine.
      *
      * @var string
      */
     protected $entity;
-    
+
     /**
-     * an array of key value data to describe the movement
+     * an array of key value data to describe the movement.
      *
      * @var array
      */
     protected $metadata;
-    
+
     /**
-     * the sql statement
-     *
-     * @var string 
+     * @var int
      */
-    protected $sqlStatement;
-    
+    protected $personId;
+
     /**
-     *
-     * @var string[]
-     */
-    protected $preSql = [];
-    
-    /**
-     *
      * @var string[]
      */
     protected $postSql = [];
-    
+
+    /**
+     * @var string[]
+     */
+    protected $preSql = [];
+
+    /**
+     * the sql statement.
+     *
+     * @var string
+     */
+    protected $sqlStatement;
+
     public function __construct($personId, $entity, $sqlStatement, $metadata = [])
     {
         $this->personId = $personId;
@@ -77,21 +67,17 @@ class ActionEvent extends Event
     }
 
     /**
-     * 
-     * @return string[]
+     * Add Sql which will be executed **after** the delete statement.
+     *
+     * @param type $postSql
+     *
+     * @return $this
      */
-    public function getPreSql(): array
+    public function addPostSql(string $postSql)
     {
-        return $this->preSql;
-    }
+        $this->postSql[] = $postSql;
 
-    /**
-     * 
-     * @return string[]
-     */
-    public function getPostSql(): array
-    {
-        return $this->postSql;
+        return $this;
     }
 
     /*
@@ -100,19 +86,21 @@ class ActionEvent extends Event
     public function addPreSql(string $preSql)
     {
         $this->preSql[] = $preSql;
+
         return $this;
     }
 
     /**
-     * Add Sql which will be executed **after** the delete statement
-     * 
-     * @param type $postSql
-     * @return $this
+     * get the entity name, as recorded in doctrine.
      */
-    public function addPostSql(string $postSql)
+    public function getEntity(): string
     {
-        $this->postSql[] = $postSql;
-        return $this;
+        return $this->entity;
+    }
+
+    public function getMetadata()
+    {
+        return $this->metadata;
     }
 
     public function getPersonId(): int
@@ -121,23 +109,23 @@ class ActionEvent extends Event
     }
 
     /**
-     * get the entity name, as recorded in doctrine
-     * 
-     * @return string
+     * @return string[]
      */
-    public function getEntity(): string
+    public function getPostSql(): array
     {
-        return $this->entity;
+        return $this->postSql;
     }
-    
+
+    /**
+     * @return string[]
+     */
+    public function getPreSql(): array
+    {
+        return $this->preSql;
+    }
+
     public function getSqlStatement()
     {
         return $this->sqlStatement;
     }
-    
-    public function getMetadata()
-    {
-        return $this->metadata;
-    }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
index bb5d9bdac..930b96e07 100644
--- a/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
@@ -1,54 +1,47 @@
 <?php
-/*
- * Copyright (C) 2016-2019 Champs-Libres <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\Actions\Remove;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Chill\PersonBundle\Actions\ActionEvent;
 
 /**
- * Move or delete entities associated to a person to a new one, and delete the 
- * old person. The data associated to a person (birthdate, name, ...) are left 
- * untouched on the "new one".
- * 
- * See `getSql` for details.
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Actions\Remove;
+
+use Chill\PersonBundle\Actions\ActionEvent;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use function array_merge;
+use function implode;
+use function in_array;
+
+/**
+ * Move or delete entities associated to a person to a new one, and delete the
+ * old person. The data associated to a person (birthdate, name, ...) are left
+ * untouched on the "new one".
+ *
+ * See `getSql` for details.
  */
 class PersonMove
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     /**
-     *
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-    
+
     public function __construct(
-        EntityManagerInterface $em, 
+        EntityManagerInterface $em,
         EventDispatcherInterface $eventDispatcher
     ) {
         $this->em = $em;
@@ -56,128 +49,136 @@ class PersonMove
     }
 
     /**
-     * Return the sql used to move or delete entities associated to a person to 
-     * a new one, and delete the old person. The data associated to a person 
+     * Return the sql used to move or delete entities associated to a person to
+     * a new one, and delete the old person. The data associated to a person
      * (birthdate, name, ...) are left untouched on the "new one".
-     * 
-     * The accompanying periods associated to a person are always removed. The other 
+     *
+     * The accompanying periods associated to a person are always removed. The other
      * associated entity are updated: the new person id is associated to the entity.
-     * 
+     *
      * Optionnaly, you can ask for removing entity by passing them in $deleteEntities
-     * parameters. 
-     * 
+     * parameters.
+     *
      * The following events are triggered:
      * - `'CHILL_PERSON.DELETE_ASSOCIATED_ENTITY'` is triggered when an entity
      *     will be removed ;
      * - `'CHILL_PERSON.MOVE_ASSOCIATED_ENTITY'` is triggered when an entity
      *     will be moved ;
-     * 
+     *
      * Those events have the following metadata:
-     * 
+     *
      * - 'original_action' : always 'move' ;
      * - 'to': the person id to move ;
-     * 
-     * @param Person $from
-     * @param Person $to
-     * @param array $deleteEntities
+     *
      * @return type
      */
     public function getSQL(Person $from, Person $to, array $deleteEntities = [])
     {
         $sqls = [];
-        $toDelete = \array_merge($deleteEntities, $this->getDeleteEntities());
-        
+        $toDelete = array_merge($deleteEntities, $this->getDeleteEntities());
+
         foreach ($this->em->getMetadataFactory()->getAllMetadata() as $metadata) {
             if ($metadata->isMappedSuperclass) {
                 continue;
             }
-            
+
             foreach ($metadata->getAssociationMappings() as $field => $mapping) {
-                if ($mapping['targetEntity'] === Person::class) {
-                    if (\in_array($metadata->getName(), $toDelete)) {
+                if (Person::class === $mapping['targetEntity']) {
+                    if (in_array($metadata->getName(), $toDelete, true)) {
                         $sql = $this->createDeleteSQL($metadata, $from, $field);
-                        $event = new ActionEvent($from->getId(), $metadata->getName(), $sql, 
-                            ['to' => $to->getId(), 'original_action' => 'move']);
+                        $event = new ActionEvent(
+                            $from->getId(),
+                            $metadata->getName(),
+                            $sql,
+                            ['to' => $to->getId(), 'original_action' => 'move']
+                        );
                         $this->eventDispatcher->dispatch(ActionEvent::DELETE, $event);
-                        
                     } else {
                         $sql = $this->createMoveSQL($metadata, $from, $to, $field);
-                        $event = new ActionEvent($from->getId(), $metadata->getName(), $sql, 
-                            ['to' => $to->getId(), 'original_action' => 'move']);
+                        $event = new ActionEvent(
+                            $from->getId(),
+                            $metadata->getName(),
+                            $sql,
+                            ['to' => $to->getId(), 'original_action' => 'move']
+                        );
                         $this->eventDispatcher->dispatch(ActionEvent::MOVE, $event);
                     }
 
-                    $sqls = \array_merge($sqls, $event->getPreSql(), [$event->getSqlStatement()], $event->getPostSql());
+                    $sqls = array_merge($sqls, $event->getPreSql(), [$event->getSqlStatement()], $event->getPostSql());
                 }
             }
         }
-        
+
         $personMetadata = $this->em->getClassMetadata(Person::class);
-        $sqls[] = sprintf("DELETE FROM %s WHERE id = %d", 
+        $sqls[] = sprintf(
+            'DELETE FROM %s WHERE id = %d',
             $this->getTableName($personMetadata),
-            $from->getId());
-        
+            $from->getId()
+        );
+
         return $sqls ?? [];
     }
-    
-    protected function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
-    {
-        $mapping = $metadata->getAssociationMapping($field);
-        
-        // Set part of the query, aka <here> in  "UPDATE table SET <here>                                                                                                                                                                            "
-        $sets = [];
-        foreach ($mapping["joinColumns"] as $columns) {
-            $sets[] = sprintf("%s = %d", $columns["name"], $to->getId());
-        }
-        
-        $conditions = [];
-        foreach ($mapping["joinColumns"] as $columns) {
-            $conditions[] = sprintf("%s = %d", $columns["name"], $from->getId());
-        }
-        
-        return \sprintf("UPDATE %s SET %s WHERE %s",
-            $this->getTableName($metadata),
-            \implode(" ", $sets),
-            \implode(" AND ", $conditions)
-            );
-    }
-    
+
     protected function createDeleteSQL(ClassMetadata $metadata, Person $from, $field): string
     {
         $mapping = $metadata->getAssociationMapping($field);
-        
+
         $conditions = [];
-        foreach ($mapping["joinColumns"] as $columns) {
-            $conditions[] = sprintf("%s = %d", $columns["name"], $from->getId());
+
+        foreach ($mapping['joinColumns'] as $columns) {
+            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
         }
-        
-         return \sprintf("DELETE FROM %s WHERE %s",
+
+        return sprintf(
+            'DELETE FROM %s WHERE %s',
             $this->getTableName($metadata),
-            \implode(" AND ", $conditions)
-            );
+            implode(' AND ', $conditions)
+        );
     }
-    
+
+    protected function createMoveSQL(ClassMetadata $metadata, Person $from, Person $to, $field): string
+    {
+        $mapping = $metadata->getAssociationMapping($field);
+
+        // Set part of the query, aka <here> in  "UPDATE table SET <here>                                                                                                                                                                            "
+        $sets = [];
+
+        foreach ($mapping['joinColumns'] as $columns) {
+            $sets[] = sprintf('%s = %d', $columns['name'], $to->getId());
+        }
+
+        $conditions = [];
+
+        foreach ($mapping['joinColumns'] as $columns) {
+            $conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
+        }
+
+        return sprintf(
+            'UPDATE %s SET %s WHERE %s',
+            $this->getTableName($metadata),
+            implode(' ', $sets),
+            implode(' AND ', $conditions)
+        );
+    }
+
     /**
-     * return an array of classes where entities should be deleted 
-     * instead of moved
-     * 
-     * @return array
+     * return an array of classes where entities should be deleted
+     * instead of moved.
      */
     protected function getDeleteEntities(): array
     {
         return [
-            AccompanyingPeriod::class
+            AccompanyingPeriod::class,
         ];
     }
-    
+
     /**
-     * get the full table name with schema if it does exists
+     * get the full table name with schema if it does exists.
      */
     private function getTableName(ClassMetadata $metadata): string
     {
-        return empty($metadata->getSchemaName()) ? 
-                $metadata->getTableName() : 
-                $metadata->getSchemaName().".".$metadata->getTableName();
+        return empty($metadata->getSchemaName()) ?
+                $metadata->getTableName() :
+                $metadata->getSchemaName() . '.' . $metadata->getTableName();
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
index 549792e51..d3de0bd3d 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
@@ -1,113 +1,127 @@
 <?php
-/*
- * Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\CRUD\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Symfony\Component\HttpFoundation\Request;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\QueryBuilder;
+use Exception;
+use Symfony\Component\HttpFoundation\Request;
+use function array_merge;
 
 /**
  * Class EntityPersonCRUDController
- * CRUD Controller for entities attached to a Person
- *
- * @package Chill\PersonBundle\CRUD\Controller
+ * CRUD Controller for entities attached to a Person.
  */
 class EntityPersonCRUDController extends CRUDController
 {
     /**
-     * Extract the person from the request
-     * 
-     * the person parameter will be `person_id` and must be 
+     * Override the base method to add a filtering step to a person.
+     *
+     * @return QueryBuilder
+     */
+    protected function buildQueryEntities(string $action, Request $request)
+    {
+        $qb = parent::buildQueryEntities($action, $request);
+
+        return $this->filterQueryEntitiesByPerson($action, $qb, $request);
+    }
+
+    /**
+     * @param \Chill\MainBundle\CRUD\Controller\string|string $action
+     */
+    protected function createEntity($action, Request $request): object
+    {
+        $entity = parent::createEntity($action, $request);
+
+        $person = $this->getPerson($request);
+
+        $entity->setPerson($person);
+
+        return $entity;
+    }
+
+    /**
+     * Add a where clause to the buildQuery.
+     *
+     * @param \Chill\PersonBundle\CRUD\Controller\QueryBuilder $qb
+     *
+     * @return \Chill\PersonBundle\CRUD\Controller\QueryBuilder
+     */
+    protected function filterQueryEntitiesByPerson(string $action, QueryBuilder $qb, Request $request): QueryBuilder
+    {
+        $qb->andWhere($qb->expr()->eq('e.person', ':person'));
+        $qb->setParameter('person', $this->getPerson($request));
+
+        return $qb;
+    }
+
+    /**
+     * @param mixed $entity
+     *
+     * @throws Exception
+     */
+    protected function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = []): array
+    {
+        $person = $this->getPerson($request);
+
+        if (null === $person) {
+            throw new Exception('the `person_id` parameter is not set in the query. '
+                . 'You should set it or override the current method to allow another '
+                . 'behaviour: ' . __METHOD__);
+        }
+
+        return parent::generateTemplateParameter(
+            $action,
+            $entity,
+            $request,
+            array_merge(['person' => $person], $defaultTemplateParameters)
+        );
+    }
+
+    /**
+     * Extract the person from the request.
+     *
+     * the person parameter will be `person_id` and must be
      * present in the query
-     * 
+     *
      * If the parameter is not set, this method will return null.
-     * 
-     * If the person id does not exists, the method will throw a 
+     *
+     * If the person id does not exists, the method will throw a
      * Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     * 
-     * @param Request $request
+     *
      * @throws Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the person with given id is not found
      */
     protected function getPerson(Request $request): ?Person
     {
-        if (FALSE === $request->query->has('person_id')) {
+        if (false === $request->query->has('person_id')) {
             return null;
         }
-        
+
         $person = $this->getDoctrine()
             ->getRepository(Person::class)
-            ->find($request->query->getInt('person_id'))
-            ;
-        
-        if (NULL === $person) {
+            ->find($request->query->getInt('person_id'));
+
+        if (null === $person) {
             throw $this->createNotFoundException('the person with this id is not found');
         }
-        
+
         return $person;
     }
-    
-    /**
-     * @param \Chill\MainBundle\CRUD\Controller\string|string $action
-     * @param Request $request
-     * @return object
-     */
-    protected function createEntity($action, Request $request): object
-    {       
-        $entity = parent::createEntity($action, $request);
-        
-        $person = $this->getPerson($request);
-        
-        $entity->setPerson($person);
-        
-        return $entity;
-    }
-    
+
     /**
      * @param string $action
      * @param mixed $entity
-     * @param Request $request
-     * @param array $defaultTemplateParameters
-     * @return array
-     * @throws \Exception
-     */
-    protected function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = array()): array
-    {
-        $person = $this->getPerson($request);
-        
-        if (NULL === $person) {
-            throw new \Exception("the `person_id` parameter is not set in the query. "
-                . "You should set it or override the current method to allow another "
-                . "behaviour: ".__METHOD__);
-        }
-        
-        return parent::generateTemplateParameter(
-            $action, 
-            $entity, 
-            $request, 
-            \array_merge([ 'person' => $person ], $defaultTemplateParameters)
-            );
-    }
-    
-    /**
-     * @param string $action
-     * @param mixed $entity
-     * @param Request $request
+     *
      * @return string
      */
     protected function getTemplateFor($action, $entity, Request $request)
@@ -115,83 +129,59 @@ class EntityPersonCRUDController extends CRUDController
         if ($this->hasCustomTemplate($action, $entity, $request)) {
             return $this->getActionConfig($action)['template'];
         }
-        
+
         switch ($action) {
             case 'new':
                 return '@ChillPerson/CRUD/new.html.twig';
-            case 'edit': 
+
+            case 'edit':
                 return '@ChillPerson/CRUD/edit.html.twig';
+
             case 'view':
                 return '@ChillPerson/CRUD/view.html.twig';
+
             case 'delete':
                 return '@ChillPerson/CRUD/delete.html.twig';
+
             case 'index':
                 return '@ChillPerson/CRUD/index.html.twig';
+
             default:
                 return parent::getTemplateFor($action, $entity, $request);
         }
     }
-    
+
     /**
-     * @param string $action
      * @param mixed $entity
-     * @param \Symfony\Component\Form\FormInterface $form
-     * @param Request $request
+     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     protected function onBeforeRedirectAfterSubmission(string $action, $entity, \Symfony\Component\Form\FormInterface $form, Request $request)
     {
-        $next = $request->request->get("submit", "save-and-close");
-            
+        $next = $request->request->get('submit', 'save-and-close');
+
         switch ($next) {
-            case "save-and-close":
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_index', [
-                    'person_id' => $this->getPerson($request)->getId()
+            case 'save-and-close':
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_index', [
+                    'person_id' => $this->getPerson($request)->getId(),
                 ]);
-            case "save-and-new":
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_new', [
-                    'person_id' => $this->getPerson($request)->getId()
+
+            case 'save-and-new':
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_new', [
+                    'person_id' => $this->getPerson($request)->getId(),
                 ]);
-            case "new":
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
+
+            case 'new':
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
                     'id' => $entity->getId(),
-                    'person_id' => $this->getPerson($request)->getId()
+                    'person_id' => $this->getPerson($request)->getId(),
                 ]);
+
             default:
-                return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', [
+                return $this->redirectToRoute('chill_crud_' . $this->getCrudName() . '_view', [
                     'id' => $entity->getId(),
-                    'person_id' => $this->getPerson($request)->getId()
-                    ]);
+                    'person_id' => $this->getPerson($request)->getId(),
+                ]);
         }
     }
-    
-    /**
-     * Override the base method to add a filtering step to a person.
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return QueryBuilder
-     */
-    protected function buildQueryEntities(string $action, Request $request)
-    {
-        $qb = parent::buildQueryEntities($action, $request);
-        
-        return $this->filterQueryEntitiesByPerson($action, $qb, $request);
-    }
-    
-    /**
-     * Add a where clause to the buildQuery
-     * 
-     * @param string $action
-     * @param \Chill\PersonBundle\CRUD\Controller\QueryBuilder $qb
-     * @param Request $request
-     * @return \Chill\PersonBundle\CRUD\Controller\QueryBuilder
-     */
-    protected function filterQueryEntitiesByPerson(string $action, QueryBuilder $qb, Request $request): QueryBuilder
-    {
-        $qb->andWhere($qb->expr()->eq('e.person', ':person'));
-        $qb->setParameter('person', $this->getPerson($request));
-        
-        return $qb;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
index 720de560c..684f78d61 100644
--- a/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
+++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
@@ -1,89 +1,83 @@
 <?php
-/*
- * Copyright (C) 2016-2019 Champs-Libres <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\CRUD\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
- * Controller for entities attached as one-to-on to a person
- * 
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\CRUD\Controller;
+
+use BadMethodCallException;
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\PersonBundle\Entity\Person;
+use LogicException;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
 class OneToOneEntityPersonCRUDController extends CRUDController
 {
-    protected function getTemplateFor($action, $entity, Request $request)
+    protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
     {
-        if (!empty($this->crudConfig[$action]['template'])) {
-            return $this->crudConfig[$action]['template'];
-        }
-        
-        switch ($action) {
-            case 'new':
-                return '@ChillPerson/CRUD/new.html.twig';
-            case 'edit': 
-                return '@ChillPerson/CRUD/edit.html.twig';
-            case 'index':
-                return '@ChillPerson/CRUD/index.html.twig';
-            default:
-                throw new \LogicException("the view for action $action is not "
-                    . "defined. You should override ".__METHOD__." to add this "
-                    . "action");
-        }
+        throw new BadMethodCallException('Not implemented yet.');
     }
-    
+
     protected function getEntity($action, $id, Request $request): ?object
     {
         $entity = parent::getEntity($action, $id, $request);
-        
-        if (NULL === $entity) {
+
+        if (null === $entity) {
             $entity = $this->createEntity($action, $request);
             $person = $this->getDoctrine()
                 ->getManager()
                 ->getRepository(Person::class)
                 ->find($id);
-            
+
             $entity->setPerson($person);
         }
-        
+
         return $entity;
     }
-    
+
+    protected function getTemplateFor($action, $entity, Request $request)
+    {
+        if (!empty($this->crudConfig[$action]['template'])) {
+            return $this->crudConfig[$action]['template'];
+        }
+
+        switch ($action) {
+            case 'new':
+                return '@ChillPerson/CRUD/new.html.twig';
+
+            case 'edit':
+                return '@ChillPerson/CRUD/edit.html.twig';
+
+            case 'index':
+                return '@ChillPerson/CRUD/index.html.twig';
+
+            default:
+                throw new LogicException("the view for action {$action} is not "
+                    . 'defined. You should override ' . __METHOD__ . ' to add this '
+                    . 'action');
+        }
+    }
+
+    protected function onPostFetchEntity($action, Request $request, $entity): ?Response
+    {
+        if (false === $this->getDoctrine()->getManager()->contains($entity)) {
+            return new RedirectResponse($this->generateRedirectOnCreateRoute($action, $request, $entity));
+        }
+
+        return null;
+    }
+
     protected function onPreFlush(string $action, $entity, FormInterface $form, Request $request)
     {
         $this->getDoctrine()->getManager()->persist($entity);
     }
-    
-    protected function onPostFetchEntity($action, Request $request, $entity): ?Response
-    {
-        if (FALSE === $this->getDoctrine()->getManager()->contains($entity)) {
-            return new RedirectResponse($this->generateRedirectOnCreateRoute($action, $request, $entity));
-        }
-        
-        return null;
-    }
-    
-    protected function generateRedirectOnCreateRoute($action, Request $request, $entity)
-    {
-        throw new BadMethodCallException("not implemtented yet");
-    }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/ChillPersonBundle.php b/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
index 18bf8fb79..4e73d2137 100644
--- a/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
+++ b/src/Bundle/ChillPersonBundle/ChillPersonBundle.php
@@ -1,21 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle;
 
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Chill\PersonBundle\Widget\PersonListWidgetFactory;
 use Chill\PersonBundle\DependencyInjection\CompilerPass\AccompanyingPeriodTimelineCompilerPass;
+use Chill\PersonBundle\Widget\PersonListWidgetFactory;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillPersonBundle extends Bundle
 {
-    public function build(ContainerBuilder $container) 
+    public function build(ContainerBuilder $container)
     {
         parent::build($container);
-        
+
         $container->getExtension('chill_main')
             ->addWidgetFactory(new PersonListWidgetFactory());
-        
+
         $container->addCompilerPass(new AccompanyingPeriodTimelineCompilerPass());
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
index b68997ed6..3af14fb0b 100644
--- a/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
@@ -1,24 +1,34 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Command;
 
+use Chill\PersonBundle\Actions\Remove\PersonMove;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Chill\PersonBundle\Actions\Remove\PersonMove;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Console\Exception\RuntimeException;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Command\Command;
+use function ctype_digit;
 
 final class ChillPersonMoveCommand extends Command
 {
-    private PersonMove $mover;
+    private LoggerInterface $chillLogger;
 
     private EntityManagerInterface $em;
 
-    private LoggerInterface $chillLogger;
+    private PersonMove $mover;
 
     public function __construct(
         PersonMove $mover,
@@ -32,64 +42,64 @@ final class ChillPersonMoveCommand extends Command
         $this->chillLogger = $chillLogger;
     }
 
+    protected function buildLoggingContext(Person $from, Person $to, $deleteEntities, $sqls)
+    {
+        $ctxt = [
+            'from' => $from->getId(),
+            'to' => $to->getId(),
+        ];
+
+        foreach ($deleteEntities as $key => $de) {
+            $ctxt['delete_entity_' . $key] = $de;
+        }
+
+        foreach ($sqls as $key => $sql) {
+            $ctxt['sql_' . $key] = $sql;
+        }
+
+        return $ctxt;
+    }
+
     protected function configure()
     {
         $this
             ->setName('chill:person:move')
             ->setDescription('Move all the associated entities on a "from" person to a "to" person and remove the old person')
-            ->addOption('from', 'f', InputOption::VALUE_REQUIRED, "The person id to delete, all associated data will be moved before")
-            ->addOption('to', 't', InputOption::VALUE_REQUIRED, "The person id which will received data")
-            ->addOption('dump-sql', null, InputOption::VALUE_NONE, "dump sql to stdout")
-            ->addOption('force', null, InputOption::VALUE_NONE, "execute sql instead of dumping it")
-            ->addOption('delete-entity', null, InputOption::VALUE_REQUIRED|InputOption::VALUE_IS_ARRAY, "entity to delete", [])
-        ;
-    }
-
-    protected function interact(InputInterface $input, OutputInterface $output)
-    {
-        if (FALSE === $input->hasOption('dump-sql') && FALSE === $input->hasOption('force')) {
-            $msg = "You must use \"--dump-sql\" or \"--force\"";
-            throw new RuntimeException($msg);
-        }
-
-        foreach (["from", "to"] as $name) {
-            if (empty($input->getOption($name))) {
-                throw new RuntimeException("You must set a \"$name\" option");
-            }
-            $id = $input->getOption($name);
-            if (\ctype_digit($id) === FALSE) {
-                throw new RuntimeException("The id in \"$name\" field does not contains "
-                    . "only digits: $id");
-            }
-        }
+            ->addOption('from', 'f', InputOption::VALUE_REQUIRED, 'The person id to delete, all associated data will be moved before')
+            ->addOption('to', 't', InputOption::VALUE_REQUIRED, 'The person id which will received data')
+            ->addOption('dump-sql', null, InputOption::VALUE_NONE, 'dump sql to stdout')
+            ->addOption('force', null, InputOption::VALUE_NONE, 'execute sql instead of dumping it')
+            ->addOption('delete-entity', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'entity to delete', []);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $repository = $this->em->getRepository(Person::class);
         $from = $repository->find($input->getOption('from'));
-        $to   = $repository->find($input->getOption('to'));
+        $to = $repository->find($input->getOption('to'));
         $deleteEntities = $input->getOption('delete-entity');
 
-        if ($from === NULL) {
-            throw new RuntimeException(sprintf("Person \"from\" with id %d not found", $input->getOption('from')));
+        if (null === $from) {
+            throw new RuntimeException(sprintf('Person "from" with id %d not found', $input->getOption('from')));
         }
-        if ($to === NULL) {
-            throw new RuntimeException(sprintf("Person \"to\" with id %d not found", $input->getOption('to')));
+
+        if (null === $to) {
+            throw new RuntimeException(sprintf('Person "to" with id %d not found', $input->getOption('to')));
         }
 
         $sqls = $this->mover->getSQL($from, $to, $deleteEntities);
 
         if ($input->getOption('dump-sql')) {
-            foreach($sqls as $sql) {
+            foreach ($sqls as $sql) {
                 $output->writeln($sql);
             }
         } else {
             $ctxt = $this->buildLoggingContext($from, $to, $deleteEntities, $sqls);
-            $this->chillLogger->notice("Trying to move a person from command line", $ctxt);
+            $this->chillLogger->notice('Trying to move a person from command line', $ctxt);
             $connection = $this->em->getConnection();
             $connection->beginTransaction();
-            foreach($sqls as $sql) {
+
+            foreach ($sqls as $sql) {
                 if ($output->isVerbose()) {
                     $output->writeln($sql);
                 }
@@ -97,25 +107,28 @@ final class ChillPersonMoveCommand extends Command
             }
             $connection->commit();
 
-            $this->chillLogger->notice("Move a person from command line succeeded", $ctxt);
+            $this->chillLogger->notice('Move a person from command line succeeded', $ctxt);
         }
     }
 
-    protected function buildLoggingContext(Person $from, Person $to, $deleteEntities, $sqls)
+    protected function interact(InputInterface $input, OutputInterface $output)
     {
-        $ctxt = [
-            'from' => $from->getId(),
-            'to' => $to->getId()
-        ];
+        if (false === $input->hasOption('dump-sql') && false === $input->hasOption('force')) {
+            $msg = 'You must use "--dump-sql" or "--force"';
 
-        foreach ($deleteEntities as $key => $de) {
-            $ctxt['delete_entity_'.$key] = $de;
-        }
-        foreach ($sqls as $key => $sql) {
-            $ctxt['sql_'.$key] = $sql;
+            throw new RuntimeException($msg);
         }
 
-        return $ctxt;
+        foreach (['from', 'to'] as $name) {
+            if (empty($input->getOption($name))) {
+                throw new RuntimeException("You must set a \"{$name}\" option");
+            }
+            $id = $input->getOption($name);
+
+            if (ctype_digit($id) === false) {
+                throw new RuntimeException("The id in \"{$name}\" field does not contains "
+                    . "only digits: {$id}");
+            }
+        }
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
index 35f596295..d3500acd6 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
@@ -1,55 +1,64 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Command;
 
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person;
+use DateInterval;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Exception;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Logger\ConsoleLogger;
-use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Helper\Table;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Entity\PostalCode;
-use Chill\MainBundle\Entity\Center;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Form\FormFactoryInterface;
+use function array_key_exists;
+use function count;
+use function file_get_contents;
+use function get_class;
+use function in_array;
+use function is_array;
+use function json_decode;
+use const JSON_PRETTY_PRINT;
+use const LC_TIME;
 
 final class ImportPeopleFromCSVCommand extends Command
 {
-    private InputInterface $input;
-
-    private OutputInterface $output;
-
-    private LoggerInterface $logger;
-
-    private TranslatableStringHelper $helper;
-
-    private EntityManagerInterface $em;
-
-    private EventDispatcherInterface $eventDispatcher;
+    protected $cacheAnswersMapping = [];
 
     /**
-     * The line currently read
+     * Different possible format to interpret a date.
+     *
+     * @var string
      */
-    private int $line;
-
-    /**
-     * Where key are column names, and value the custom field slug
-     */
-    private array $customFieldMapping = [];
-
-    private CustomFieldProvider $customFieldProvider;
+    protected static $defaultDateInterpreter = '%d/%m/%Y|%e/%m/%y|%d/%m/%Y|%e/%m/%Y';
 
     /**
      * Contains an array of information searched in the file.
@@ -60,7 +69,7 @@ final class ImportPeopleFromCSVCommand extends Command
      *
      * @var array
      */
-    protected static $mapping = array(
+    protected static $mapping = [
         ['firstname',       'The column header for firstname',   'firstname'],
         ['lastname',        'The column header for lastname',  'lastname'],
         ['birthdate',       'The column header for birthdate', 'birthdate'],
@@ -74,26 +83,38 @@ final class ImportPeopleFromCSVCommand extends Command
         ['street1',         'The column header for street 1',      'street1'],
         ['postalcode',      'The column header for postal code',   'postalcode'],
         ['locality',        'The column header for locality',      'locality'],
-        ['center',          'The column header for center',        'center']
-    );
+        ['center',          'The column header for center',        'center'],
+    ];
 
     /**
-     * Different possible format to interpret a date
-     *
-     * @var string
+     * Where key are column names, and value the custom field slug.
      */
-    protected static $defaultDateInterpreter = "%d/%m/%Y|%e/%m/%y|%d/%m/%Y|%e/%m/%Y";
+    private array $customFieldMapping = [];
+
+    private CustomFieldProvider $customFieldProvider;
+
+    private EntityManagerInterface $em;
+
+    private EventDispatcherInterface $eventDispatcher;
 
     private FormFactoryInterface $formFactory;
 
+    private TranslatableStringHelper $helper;
+
+    private InputInterface $input;
+
+    /**
+     * The line currently read.
+     */
+    private int $line;
+
+    private LoggerInterface $logger;
+
+    private OutputInterface $output;
+
     /**
      * ImportPeopleFromCSVCommand constructor.
      *
-     * @param LoggerInterface $logger
-     * @param TranslatableStringHelper $helper
-     * @param EntityManagerInterface $em
-     * @param CustomFieldProvider $customFieldProvider
-     * @param EventDispatcherInterface $eventDispatcher
      * @param FormFactory $formFactory
      */
     public function __construct(
@@ -114,110 +135,13 @@ final class ImportPeopleFromCSVCommand extends Command
         parent::__construct('chill:person:import');
     }
 
-    /**
-     *
-     */
-    protected function configure()
-    {
-        $this
-                ->addArgument('csv_file', InputArgument::REQUIRED, "The CSV file to import")
-                ->setDescription("Import people from a csv file")
-                ->setHelp(<<<EOF
-Import people from a csv file. The first row must contains the header column and will determines where the value will be matched.
-
-Date format: the possible date format may be separatedby an |. The possible format will be tryed from the first to the last. The format should be explained as http://php.net/manual/en/function.strftime.php
-
-php app/console chill:person:import /tmp/hepc.csv fr_FR.utf8  \
-        --firstname="Prénom" --lastname="Nom" \
-        --birthdate="D.N." --birthdate_format="%d/%m/%Y" \
-        --opening_date_format="%B %Y|%Y" --closing_date="der.contact" \
-        --closing_date_format="%Y" --custom-field="3=code" -vvv
-EOF
-            )
-                ->addArgument('locale', InputArgument::REQUIRED,
-                        "The locale to use in displaying translatable strings from entities")
-                ->addOption(
-                        'force-center',
-                        null,
-                        InputOption::VALUE_REQUIRED,
-                        "The id of the center"
-                        )
-                ->addOption(
-                        'force',
-                        null,
-                        InputOption::VALUE_NONE,
-                        "Persist people in the database (default is not to persist people)"
-                        )
-                ->addOption(
-                        'delimiter',
-                        'd',
-                        InputOption::VALUE_OPTIONAL,
-                        "The delimiter character of the csv file",
-                        ",")
-                ->addOption(
-                        'enclosure',
-                        null,
-                        InputOption::VALUE_OPTIONAL,
-                        "The enclosure character of the csv file",
-                        '"'
-                        )
-                ->addOption(
-                        'escape',
-                        null,
-                        InputOption::VALUE_OPTIONAL,
-                        "The escape character of the csv file",
-                        "\\"
-                        )
-                ->addOption(
-                        'length',
-                        null,
-                        InputOption::VALUE_OPTIONAL,
-                        "The length of line to read. 0 means unlimited.",
-                        0
-                        )
-                ->addOption(
-                        'dump-choice-matching',
-                        null,
-                        InputOption::VALUE_REQUIRED,
-                        "The path of the file to dump the matching between label in CSV and answers"
-                        )
-                ->addOption(
-                        'load-choice-matching',
-                        null,
-                        InputOption::VALUE_OPTIONAL,
-                        "The path of the file to load the matching between label in CSV and answers"
-                        )
-                ;
-
-        // mapping columns
-        foreach (self::$mapping as $m) {
-            $this->addOptionShortcut($m[0], $m[1], $m[2]);
-        }
-
-        // other information
-        $this->addOptionShortcut('birthdate_format', 'Format preference for '
-                . 'birthdate. See help for date formats preferences.',
-                self::$defaultDateInterpreter);
-        $this->addOptionShortcut('opening_date_format', 'Format preference for '
-                . 'opening date. See help for date formats preferences.',
-                self::$defaultDateInterpreter);
-        $this->addOptionShortcut('closing_date_format', 'Format preference for '
-                . 'closing date. See help for date formats preferences.',
-                self::$defaultDateInterpreter);
-
-        // mapping column to custom fields
-        $this->addOption('custom-field', NULL, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-                "Mapping a column to a custom fields key. Example: 1=cf_slug");
-        $this->addOption('skip-interactive-field-mapping', null, InputOption::VALUE_NONE,
-                "Do not ask for interactive mapping");
-    }
-
     /**
      * This function is a shortcut to addOption.
      *
      * @param string $name
      * @param string $description
      * @param string $default
+     *
      * @return ImportPeopleFromCSVCommand
      */
     protected function addOptionShortcut($name, $description, $default)
@@ -227,122 +151,242 @@ EOF
         return $this;
     }
 
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     */
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function configure()
     {
-        // preparing the basic
-        $this->input = $input;
-        $this->output = $output;
-        $this->logger = new ConsoleLogger($output);
+        $this
+            ->addArgument('csv_file', InputArgument::REQUIRED, 'The CSV file to import')
+            ->setDescription('Import people from a csv file')
+            ->setHelp(
+                <<<'EOF'
+                    Import people from a csv file. The first row must contains the header column and will determines where the value will be matched.
 
-        $csv = $this->openCSV();
+                    Date format: the possible date format may be separatedby an |. The possible format will be tryed from the first to the last. The format should be explained as http://php.net/manual/en/function.strftime.php
 
-        // getting the first row
-        if (($row = fgetcsv(
-                $csv,
-                $input->getOption('length'),
-                $input->getOption('delimiter'),
-                $input->getOption('enclosure'),
-                $input->getOption('escape'))) !== false) {
+                    php app/console chill:person:import /tmp/hepc.csv fr_FR.utf8  \
+                            --firstname="Prénom" --lastname="Nom" \
+                            --birthdate="D.N." --birthdate_format="%d/%m/%Y" \
+                            --opening_date_format="%B %Y|%Y" --closing_date="der.contact" \
+                            --closing_date_format="%Y" --custom-field="3=code" -vvv
+                    EOF
+            )
+            ->addArgument(
+                'locale',
+                InputArgument::REQUIRED,
+                'The locale to use in displaying translatable strings from entities'
+            )
+            ->addOption(
+                'force-center',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The id of the center'
+            )
+            ->addOption(
+                'force',
+                null,
+                InputOption::VALUE_NONE,
+                'Persist people in the database (default is not to persist people)'
+            )
+            ->addOption(
+                'delimiter',
+                'd',
+                InputOption::VALUE_OPTIONAL,
+                'The delimiter character of the csv file',
+                ','
+            )
+            ->addOption(
+                'enclosure',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The enclosure character of the csv file',
+                '"'
+            )
+            ->addOption(
+                'escape',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The escape character of the csv file',
+                '\\'
+            )
+            ->addOption(
+                'length',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The length of line to read. 0 means unlimited.',
+                0
+            )
+            ->addOption(
+                'dump-choice-matching',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The path of the file to dump the matching between label in CSV and answers'
+            )
+            ->addOption(
+                'load-choice-matching',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The path of the file to load the matching between label in CSV and answers'
+            );
 
-            try {
-                $this->matchColumnToCustomField($row);
-            } finally {
-                $this->logger->debug('closing csv', array('method' => __METHOD__));
-                fclose($csv);
-            }
+        // mapping columns
+        foreach (self::$mapping as $m) {
+            $this->addOptionShortcut($m[0], $m[1], $m[2]);
         }
 
-        // load the matching between csv and label
-        $this->loadAnswerMatching();
-    }
-
-    /**
-     * @param $row
-     */
-    protected function matchColumnToCustomField($row)
-    {
-
-        $cfMappingsOptions = $this->input->getOption('custom-field');
-        /* @var $em \Doctrine\Persistence\ObjectManager */
-        $em = $this->em;
-
-        foreach($cfMappingsOptions as $cfMappingStringOption) {
-            list($rowNumber, $cfSlug) = preg_split('|=|', $cfMappingStringOption);
-
-            // check that the column exists, getting the column name
-            $column = $row[$rowNumber];
-
-            if (empty($column)) {
-                $message = "The column with row $rowNumber is empty.";
-                $this->logger->error($message);
-                throw new \RuntimeException($message);
-            }
-
-            // check a custom field exists
-            try {
-                $customField = $em->createQuery("SELECT cf "
-                        . "FROM ChillCustomFieldsBundle:CustomField cf "
-                        . "JOIN cf.customFieldGroup g "
-                        . "WHERE cf.slug = :slug "
-                        . "AND g.entity = :entity")
-                        ->setParameters(array(
-                            'slug' => $cfSlug,
-                            'entity' => Person::class
-                        ))
-                        ->getSingleResult();
-            } catch (\Doctrine\ORM\NoResultException $e) {
-                $message = sprintf(
-                        "The customfield with slug '%s' does not exists. It was associated with column number %d",
-                        $cfSlug,
-                        $rowNumber
-                        );
-                $this->logger->error($message);
-                throw new \RuntimeException($message);
-            }
-            // skip if custom field does not exists
-            if ($customField === NULL) {
-                $this->logger->error("The custom field with slug $cfSlug could not be found. "
-                        . "Stopping this command.");
-                throw new \RuntimeException("The custom field with slug $cfSlug could not be found. "
-                        . "Stopping this command.");
-            }
-
-            $this->logger->notice(sprintf("Matched custom field %s (question : '%s') on column %d (displayed in the file as '%s')",
-                    $customField->getSlug(), $this->helper->localize($customField->getName()), $rowNumber, $column));
-
-            $this->customFieldMapping[$rowNumber] = $customField;
-        }
-    }
-
-    /**
-     * Load the mapping between answer in CSV and value in choices from a json file
-     */
-    protected function loadAnswerMatching()
-    {
-        if ($this->input->hasOption('load-choice-matching')) {
-            $fs = new Filesystem();
-            $filename = $this->input->getOption('load-choice-matching');
-
-            if (!$fs->exists($filename)) {
-                $this->logger->warning("The file $filename is not found. Choice matching not loaded");
-            } else {
-                $this->logger->debug("Loading $filename as choice matching");
-                $this->cacheAnswersMapping = \json_decode(\file_get_contents($filename), true);
-            }
-        }
+        // other information
+        $this->addOptionShortcut(
+            'birthdate_format',
+            'Format preference for '
+                . 'birthdate. See help for date formats preferences.',
+            self::$defaultDateInterpreter
+        );
+        $this->addOptionShortcut(
+            'opening_date_format',
+            'Format preference for '
+                . 'opening date. See help for date formats preferences.',
+            self::$defaultDateInterpreter
+        );
+        $this->addOptionShortcut(
+            'closing_date_format',
+            'Format preference for '
+                . 'closing date. See help for date formats preferences.',
+            self::$defaultDateInterpreter
+        );
+
+        // mapping column to custom fields
+        $this->addOption(
+            'custom-field',
+            null,
+            InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+            'Mapping a column to a custom fields key. Example: 1=cf_slug'
+        );
+        $this->addOption(
+            'skip-interactive-field-mapping',
+            null,
+            InputOption::VALUE_NONE,
+            'Do not ask for interactive mapping'
+        );
     }
 
     /**
+     * @param array $headers the processed header : an array as prepared by self::processingHeaders
      *
+     * @throws Exception
      */
+    protected function createPerson(array $row, array $headers): Person
+    {
+        // trying to get the opening date
+        $openingDateString = trim($row[array_search('opening_date', $headers, true)]);
+        $openingDate = $this->processDate($openingDateString, $this->input->getOption('opening_date_format'));
+
+        // @TODO: Fix the constructor parameter, $openingDate does not exists.
+        $person = $openingDate instanceof DateTime ? new Person($openingDate) : new Person();
+        // add the center
+        $center = $this->getCenter($row, $headers);
+
+        if (null === $center) {
+            throw new Exception('center not found');
+        }
+
+        $person->setCenter($center);
+
+        foreach ($headers as $column => $info) {
+            $value = trim($row[$column]);
+
+            switch ($info) {
+                case 'firstname':
+                    $person->setFirstName($value);
+
+                    break;
+
+                case 'lastname':
+                    $person->setLastName($value);
+
+                    break;
+
+                case 'birthdate':
+                    $this->processBirthdate($person, $value);
+
+                    break;
+
+                case 'gender':
+                    $person->setGender($value);
+
+                    break;
+
+                case 'opening_date':
+                    // we have processed this when creating the person object, skipping;
+                    break;
+
+                case 'closing_date':
+                    $this->processClosingDate($person, $value);
+
+                    break;
+
+                case 'memo':
+                    $person->setMemo($value);
+
+                    break;
+
+                case 'email':
+                    $person->setEmail($value);
+
+                    break;
+
+                case 'phonenumber':
+                    $person->setPhonenumber($value);
+
+                    break;
+
+                case 'mobilenumber':
+                    $person->setMobilenumber($value);
+
+                    break;
+                // we just keep the column number for those data
+                case 'postalcode':
+                    $postalCodeValue = $value;
+
+                    break;
+
+                case 'street1':
+                    $street1Value = $value;
+
+                    break;
+
+                case 'locality':
+                    $localityValue = $value;
+
+                    break;
+            }
+        }
+
+        // handle address
+        if (in_array('postalcode', $headers, true)) {
+            if (!empty($postalCodeValue)) {
+                $address = new Address();
+                $postalCode = $this->guessPostalCode($postalCodeValue, $localityValue ?? '');
+
+                if (null === $postalCode) {
+                    throw new Exception('The locality is not found');
+                }
+
+                $address->setPostcode($postalCode);
+
+                if (in_array('street1', $headers, true)) {
+                    $address->setStreetAddress1($street1Value);
+                }
+                $address->setValidFrom(new DateTime('today'));
+
+                $person->addAddress($address);
+            }
+        }
+
+        return $person;
+    }
+
     protected function dumpAnswerMatching()
     {
         if ($this->input->hasOption('dump-choice-matching') && !empty($this->input->getOption('dump-choice-matching'))) {
-            $this->logger->debug("Dump the matching between answer and choices");
+            $this->logger->debug('Dump the matching between answer and choices');
             $str = json_encode($this->cacheAnswersMapping, JSON_PRETTY_PRINT);
 
             $fs = new Filesystem();
@@ -353,17 +397,17 @@ EOF
     }
 
     /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @return int|null|void
-     * @throws \Exception
+     * @throws Exception
+     *
+     * @return int|void|null
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $headers = $rawHeaders = [];
         $this->input = $input;
         $this->output = $output;
 
-        $this->logger->debug("Setting locale to ".$input->getArgument('locale'));
+        $this->logger->debug('Setting locale to ' . $input->getArgument('locale'));
         setlocale(LC_TIME, $input->getArgument('locale'));
 
         // opening csv as resource
@@ -373,14 +417,16 @@ EOF
         $line = $this->line = 1;
 
         try {
-            while (($row = fgetcsv(
-                    $csv,
-                    $input->getOption('length'),
-                    $input->getOption('delimiter'),
-                    $input->getOption('enclosure'),
-                    $input->getOption('escape'))) !== false) {
-                $this->logger->debug("Processing line ".$this->line);
-                if ($line === 1 ) {
+            while (false !== ($row = fgetcsv(
+                $csv,
+                $input->getOption('length'),
+                $input->getOption('delimiter'),
+                $input->getOption('enclosure'),
+                $input->getOption('escape')
+            ))) {
+                $this->logger->debug('Processing line ' . $this->line);
+
+                if (1 === $line) {
                     $this->logger->debug('Processing line 1, headers');
                     $rawHeaders = $row;
                     $headers = $this->processingHeaders($row);
@@ -404,16 +450,16 @@ EOF
 
                     $this->eventDispatcher->dispatch('chill_person.person_import', $event);
 
-                    if ($this->input->getOption('force') === TRUE
-                        && $event->skipPerson === false) {
+                    if ($this->input->getOption('force') === true
+                        && false === $event->skipPerson) {
                         $this->em->persist($person);
                     }
 
-                    $num ++;
+                    ++$num;
                 }
 
-                $line ++;
-                $this->line++;
+                ++$line;
+                ++$this->line;
             }
 
             if ($this->input->getOption('force') === true) {
@@ -421,7 +467,7 @@ EOF
                 $this->em->flush();
             }
         } finally {
-            $this->logger->debug('closing csv', array('method' => __METHOD__));
+            $this->logger->debug('closing csv', ['method' => __METHOD__]);
             fclose($csv);
             // dump the matching between answer and choices
             $this->dumpAnswerMatching();
@@ -429,240 +475,87 @@ EOF
     }
 
     /**
-     *
-     * @return resource
-     * @throws \RuntimeException
+     * @return Center|mixed|object|null
      */
-    protected function openCSV()
-    {
-        $fs = new Filesystem();
-        $filename = $this->input->getArgument('csv_file');
-
-        if (!$fs->exists($filename)) {
-            throw new \RuntimeException("The file does not exists or you do not "
-                    . "have the right to read it.");
-        }
-
-        $resource = fopen($filename, 'r');
-
-        if ($resource == FALSE) {
-            throw new \RuntimeException("The file '$filename' could not be opened.");
-        }
-
-        return $resource;
-    }
-
-    /**
-     *
-     * @param type $firstRow
-     * @return array where keys are column number, and value is information mapped
-     */
-    protected function processingHeaders($firstRow)
-    {
-        $availableOptions = array_map(function($m) { return $m[0]; }, self::$mapping);
-        $matchedColumnHeaders = array();
-        $headers = array();
-
-        foreach($availableOptions as $option) {
-            $matchedColumnHeaders[$option] = $this->input->getOption($option);
-        }
-
-        foreach($firstRow as $key => $content) {
-            $content = trim($content);
-            if (in_array($content, $matchedColumnHeaders)) {
-                $information = array_search($content, $matchedColumnHeaders);
-                $headers[$key] = $information;
-                $this->logger->notice("Matched $information on column $key (displayed in the file as '$content')");
-            } else {
-                $this->logger->notice("Column with content '$content' is ignored");
-            }
-        }
-
-        return $headers;
-    }
-
-    /**
-     *
-     * @param array $row
-     * @param array $headers the processed header : an array as prepared by self::processingHeaders
-     * @return Person
-     * @throws \Exception
-     */
-    protected function createPerson($row, $headers)
-    {
-        // trying to get the opening date
-        $openingDateString = trim($row[array_search('opening_date', $headers)]);
-        $openingDate = $this->processDate($openingDateString, $this->input->getOption('opening_date_format'));
-
-        $person = $openingDate instanceof \DateTime ? new Person($openingDate) : new Person();
-        // add the center
-        $center = $this->getCenter($row, $headers);
-
-        if ($center === null) {
-            throw new \Exception("center not found");
-        }
-
-        $person->setCenter($center);
-
-        foreach($headers as $column => $info) {
-
-            $value = trim($row[$column]);
-
-            switch($info) {
-                case 'firstname':
-                    $person->setFirstName($value);
-                    break;
-                case 'lastname':
-                    $person->setLastName($value);
-                    break;
-                case 'birthdate':
-                    $this->processBirthdate($person, $value);
-                    break;
-                case 'gender':
-                    $person->setGender($value);
-                    break;
-                case 'opening_date':
-                    // we have processed this when creating the person object, skipping;
-                    break;
-                case 'closing_date':
-                    $this->processClosingDate($person, $value);
-                    break;
-                case 'memo':
-                    $person->setMemo($value);
-                    break;
-                case 'email':
-                    $person->setEmail($value);
-                    break;
-                case 'phonenumber':
-                    $person->setPhonenumber($value);
-                    break;
-                case 'mobilenumber':
-                    $person->setMobilenumber($value);
-                    break;
-
-                // we just keep the column number for those data
-                case 'postalcode':
-                    $postalCodeValue = $value;
-                    break;
-                case 'street1':
-                    $street1Value = $value;
-                    break;
-                case 'locality':
-                    $localityValue = $value;
-                    break;
-            }
-        }
-
-        // handle address
-        if (\in_array('postalcode', $headers)) {
-
-            if (! empty($postalCodeValue)) {
-
-                $address = new Address();
-                $postalCode = $this->guessPostalCode($postalCodeValue, $localityValue ?? '');
-
-                if ($postalCode === null) {
-                    throw new \Exception("The locality is not found");
-                }
-
-                $address->setPostcode($postalCode);
-
-                if (\in_array('street1', $headers)) {
-                    $address->setStreetAddress1($street1Value);
-                }
-                $address->setValidFrom(new \DateTime('today'));
-
-                $person->addAddress($address);
-            }
-        }
-
-        return $person;
-    }
-
-    /**
-     * @param $row
-     * @param $headers
-     * @return Center|mixed|null|object
-     */
-    protected function getCenter($row, $headers)
+    protected function getCenter(array $row, array $headers)
     {
         if ($this->input->hasOption('force-center') && !empty($this->input->getOption('force-center'))) {
-            return $this->em->getRepository('ChillMainBundle:Center')
-                ->find($this->input->getOption('force-center'));
-        } else {
-            $columnCenter = \array_search('center', $headers);
-            $centerName = \trim($row[$columnCenter]);
+            return $this->em->getRepository(Center::class)->find($this->input->getOption('force-center'));
+        }
 
-            try {
-                return $this->em->createQuery('SELECT c FROM ChillMainBundle:Center c '
-                    . 'WHERE c.name = :center_name')
-                    ->setParameter('center_name', $centerName)
-                    ->getSingleResult()
-                    ;
-            } catch (\Doctrine\ORM\NonUniqueResultException $e) {
-                return $this->guessCenter($centerName);
-            } catch (\Doctrine\ORM\NoResultException $e) {
-                return $this->guessCenter($centerName);
-            }
+        $columnCenter = array_search('center', $headers, true);
+        $centerName = trim($row[$columnCenter]);
+
+        try {
+            return $this
+                ->em
+                ->createQuery('SELECT c FROM ChillMainBundle:Center c WHERE c.name = :center_name')
+                ->setParameter('center_name', $centerName)
+                ->getSingleResult();
+        } catch (NonUniqueResultException $e) {
+            return $this->guessCenter($centerName);
+        } catch (NoResultException $e) {
+            return $this->guessCenter($centerName);
         }
     }
 
     /**
      * @param $centerName
-     * @return Center|mixed|null|object
+     *
+     * @return Center|mixed|object|null
      */
     protected function guessCenter($centerName)
     {
-        if (!\array_key_exists('_center_picked', $this->cacheAnswersMapping)) {
+        if (!array_key_exists('_center_picked', $this->cacheAnswersMapping)) {
             $this->cacheAnswersMapping['_center_picked'] = [];
         }
 
-        if (\array_key_exists($centerName, $this->cacheAnswersMapping['_center_picked'])) {
+        if (array_key_exists($centerName, $this->cacheAnswersMapping['_center_picked'])) {
             $id = $this->cacheAnswersMapping['_center_picked'][$centerName];
 
             return $this->em->getRepository(Center::class)
                 ->find($id);
         }
 
-        $centers = $this->em->createQuery("SELECT c FROM ChillMainBundle:Center c "
-            . "ORDER BY SIMILARITY(c.name, :center_name) DESC")
+        $centers = $this->em->createQuery('SELECT c FROM ChillMainBundle:Center c '
+            . 'ORDER BY SIMILARITY(c.name, :center_name) DESC')
             ->setParameter('center_name', $centerName)
             ->setMaxResults(10)
-            ->getResult()
-            ;
+            ->getResult();
 
         if (count($centers) > 1) {
-            if (\strtolower($centers[0]->getName()) === \strtolower($centerName)) {
+            if (strtolower($centers[0]->getName()) === strtolower($centerName)) {
                 return $centers[0];
             }
         }
 
         $centersByName = [];
-        $names = \array_map(function(Center $c) use (&$centersByName) {
+        $names = array_map(static function (Center $c) use (&$centersByName) {
             $n = $c->getName();
             $centersByName[$n] = $c;
-            return $n;
 
+            return $n;
         }, $centers);
-        $names[] = "none of them";
+        $names[] = 'none of them';
 
         $helper = $this->getHelper('question');
-        $question = new ChoiceQuestion(sprintf("Which center match the name \"%s\" ? (default to \"%s\")", $centerName, $names[0]),
+        $question = new ChoiceQuestion(
+            sprintf('Which center match the name "%s" ? (default to "%s")', $centerName, $names[0]),
             $names,
-            0);
+            0
+        );
 
         $answer = $helper->ask($this->input, $this->output, $question);
 
-        if ($answer === 'none of them') {
-            $questionCreate = new ConfirmationQuestion("Would you like to create it ?", false);
+        if ('none of them' === $answer) {
+            $questionCreate = new ConfirmationQuestion('Would you like to create it ?', false);
             $create = $helper->ask($this->input, $this->output, $questionCreate);
 
             if ($create) {
                 $center = (new Center())
-                    ->setName($centerName)
-                    ;
+                    ->setName($centerName);
 
-                if ($this->input->getOption('force') === TRUE) {
+                if ($this->input->getOption('force') === true) {
                     $this->em->persist($center);
                     $this->em->flush();
                 }
@@ -681,31 +574,32 @@ EOF
     /**
      * @param $postalCode
      * @param $locality
+     *
      * @return mixed|null
      */
     protected function guessPostalCode($postalCode, $locality)
     {
-        if (!\array_key_exists('_postal_code_picked', $this->cacheAnswersMapping)) {
+        if (!array_key_exists('_postal_code_picked', $this->cacheAnswersMapping)) {
             $this->cacheAnswersMapping['_postal_code_picked'] = [];
         }
 
-        if (\array_key_exists($postalCode, $this->cacheAnswersMapping['_postal_code_picked'])) {
-            if (\array_key_exists($locality, $this->cacheAnswersMapping['_postal_code_picked'][$postalCode])) {
+        if (array_key_exists($postalCode, $this->cacheAnswersMapping['_postal_code_picked'])) {
+            if (array_key_exists($locality, $this->cacheAnswersMapping['_postal_code_picked'][$postalCode])) {
                 $id = $this->cacheAnswersMapping['_postal_code_picked'][$postalCode][$locality];
 
                 return $this->em->getRepository(PostalCode::class)->find($id);
             }
         }
 
-        $postalCodes = $this->em->createQuery("SELECT pc FROM ".PostalCode::class." pc "
-            . "WHERE pc.code = :postal_code "
-            . "ORDER BY SIMILARITY(pc.name, :locality) DESC "
-            )
+        $postalCodes = $this->em->createQuery(
+            'SELECT pc FROM ' . PostalCode::class . ' pc '
+            . 'WHERE pc.code = :postal_code '
+            . 'ORDER BY SIMILARITY(pc.name, :locality) DESC '
+        )
             ->setMaxResults(10)
             ->setParameter('postal_code', $postalCode)
             ->setParameter('locality', $locality)
-            ->getResult()
-            ;
+            ->getResult();
 
         if (count($postalCodes) >= 1) {
             if ($postalCodes[0]->getCode() === $postalCode
@@ -719,7 +613,7 @@ EOF
         }
 
         $postalCodeByName = [];
-        $names = \array_map(function(PostalCode $pc) use (&$postalCodeByName) {
+        $names = array_map(static function (PostalCode $pc) use (&$postalCodeByName) {
             $n = $pc->getName();
             $postalCodeByName[$n] = $pc;
 
@@ -728,15 +622,21 @@ EOF
         $names[] = 'none of them';
 
         $helper = $this->getHelper('question');
-        $question = new ChoiceQuestion(sprintf("Which postal code match the "
-            . "name \"%s\" with postal code \"%s\" ? (default to \"%s\")",
-            $locality, $postalCode, $names[0]),
+        $question = new ChoiceQuestion(
+            sprintf(
+                'Which postal code match the '
+            . 'name "%s" with postal code "%s" ? (default to "%s")',
+                $locality,
+                $postalCode,
+                $names[0]
+            ),
             $names,
-            0);
+            0
+        );
 
         $answer = $helper->ask($this->input, $this->output, $question);
 
-        if ($answer === 'none of them') {
+        if ('none of them' === $answer) {
             return null;
         }
 
@@ -748,22 +648,160 @@ EOF
         return $pc;
     }
 
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        // preparing the basic
+        $this->input = $input;
+        $this->output = $output;
+        $this->logger = new ConsoleLogger($output);
+
+        $csv = $this->openCSV();
+
+        // getting the first row
+        if (false !== ($row = fgetcsv(
+            $csv,
+            $input->getOption('length'),
+            $input->getOption('delimiter'),
+            $input->getOption('enclosure'),
+            $input->getOption('escape')
+        ))) {
+            try {
+                $this->matchColumnToCustomField($row);
+            } finally {
+                $this->logger->debug('closing csv', ['method' => __METHOD__]);
+                fclose($csv);
+            }
+        }
+
+        // load the matching between csv and label
+        $this->loadAnswerMatching();
+    }
+
+    /**
+     * Load the mapping between answer in CSV and value in choices from a json file.
+     */
+    protected function loadAnswerMatching()
+    {
+        if ($this->input->hasOption('load-choice-matching')) {
+            $fs = new Filesystem();
+            $filename = $this->input->getOption('load-choice-matching');
+
+            if (!$fs->exists($filename)) {
+                $this->logger->warning("The file {$filename} is not found. Choice matching not loaded");
+            } else {
+                $this->logger->debug("Loading {$filename} as choice matching");
+                $this->cacheAnswersMapping = json_decode(file_get_contents($filename), true);
+            }
+        }
+    }
+
+    /**
+     * @param $row
+     */
+    protected function matchColumnToCustomField($row)
+    {
+        $cfMappingsOptions = $this->input->getOption('custom-field');
+        /** @var \Doctrine\Persistence\ObjectManager $em */
+        $em = $this->em;
+
+        foreach ($cfMappingsOptions as $cfMappingStringOption) {
+            [$rowNumber, $cfSlug] = preg_split('|=|', $cfMappingStringOption);
+
+            // check that the column exists, getting the column name
+            $column = $row[$rowNumber];
+
+            if (empty($column)) {
+                $message = "The column with row {$rowNumber} is empty.";
+                $this->logger->error($message);
+
+                throw new RuntimeException($message);
+            }
+
+            // check a custom field exists
+            try {
+                $customField = $em->createQuery('SELECT cf '
+                        . 'FROM ChillCustomFieldsBundle:CustomField cf '
+                        . 'JOIN cf.customFieldGroup g '
+                        . 'WHERE cf.slug = :slug '
+                        . 'AND g.entity = :entity')
+                    ->setParameters([
+                        'slug' => $cfSlug,
+                        'entity' => Person::class,
+                    ])
+                    ->getSingleResult();
+            } catch (\Doctrine\ORM\NoResultException $e) {
+                $message = sprintf(
+                    "The customfield with slug '%s' does not exists. It was associated with column number %d",
+                    $cfSlug,
+                    $rowNumber
+                );
+                $this->logger->error($message);
+
+                throw new RuntimeException($message);
+            }
+            // skip if custom field does not exists
+            if (null === $customField) {
+                $this->logger->error("The custom field with slug {$cfSlug} could not be found. "
+                        . 'Stopping this command.');
+
+                throw new RuntimeException("The custom field with slug {$cfSlug} could not be found. "
+                        . 'Stopping this command.');
+            }
+
+            $this->logger->notice(sprintf(
+                "Matched custom field %s (question : '%s') on column %d (displayed in the file as '%s')",
+                $customField->getSlug(),
+                $this->helper->localize($customField->getName()),
+                $rowNumber,
+                $column
+            ));
+
+            $this->customFieldMapping[$rowNumber] = $customField;
+        }
+    }
+
+    /**
+     * @throws RuntimeException
+     *
+     * @return resource
+     */
+    protected function openCSV()
+    {
+        $fs = new Filesystem();
+        $filename = $this->input->getArgument('csv_file');
+
+        if (!$fs->exists($filename)) {
+            throw new RuntimeException('The file does not exists or you do not '
+                    . 'have the right to read it.');
+        }
+
+        $resource = fopen($filename, 'rb');
+
+        if (false === $resource) {
+            throw new RuntimeException("The file '{$filename}' could not be opened.");
+        }
+
+        return $resource;
+    }
+
     /**
-     * @param Person $person
      * @param $value
-     * @throws \Exception
+     *
+     * @throws Exception
      */
     protected function processBirthdate(Person $person, $value)
     {
-        if (empty($value)) { return; }
+        if (empty($value)) {
+            return;
+        }
 
         $date = $this->processDate($value, $this->input->getOption('birthdate_format'));
 
-        if ($date instanceof \DateTime) {
+        if ($date instanceof DateTime) {
             // we correct birthdate if the date is in the future
             // the most common error is to set date 100 years to late (ex. 2063 instead of 1963)
-            if ($date > new \DateTime('yesterday')) {
-                $date = $date->sub(new \DateInterval('P100Y'));
+            if ($date > new DateTime('yesterday')) {
+                $date = $date->sub(new DateInterval('P100Y'));
             }
 
             $person->setBirthdate($date);
@@ -773,120 +811,12 @@ EOF
 
         // if we arrive here, we could not process the date
         $this->logger->warning(sprintf(
-                "Line %d : the birthdate could not be interpreted. Was %s.",
-                $this->line,
-                $value));
-
+            'Line %d : the birthdate could not be interpreted. Was %s.',
+            $this->line,
+            $value
+        ));
     }
 
-    /**
-     * @param Person $person
-     * @param $value
-     * @throws \Exception
-     */
-    protected function processClosingDate(Person $person, $value)
-    {
-        if (empty($value)) { return; }
-
-        // we skip if the opening date is now (or after yesterday)
-        /* @var $period \Chill\PersonBundle\Entity\AccompanyingPeriod */
-        $period = $person->getCurrentAccompanyingPeriod();
-
-        if ($period->getOpeningDate() > new \DateTime('yesterday')) {
-            $this->logger->debug(sprintf("skipping a closing date because opening date is after yesterday (%s)",
-                    $period->getOpeningDate()->format('Y-m-d')));
-            return;
-        }
-
-
-        $date = $this->processDate($value, $this->input->getOption('closing_date_format'));
-
-        if ($date instanceof \DateTime) {
-            // we correct birthdate if the date is in the future
-            // the most common error is to set date 100 years to late (ex. 2063 instead of 1963)
-            if ($date > new \DateTime('yesterday')) {
-                $date = $date->sub(new \DateInterval('P100Y'));
-            }
-
-            $period->setClosingDate($date);
-            $person->close();
-            return;
-        }
-
-        // if we arrive here, we could not process the date
-        $this->logger->warning(sprintf(
-                "Line %d : the closing date could not be interpreted. Was %s.",
-                $this->line,
-                $value));
-    }
-
-    /**
-     * @param Person $person
-     * @param $row
-     * @throws \Exception
-     */
-    protected function processingCustomFields(Person $person, $row)
-    {
-
-        /* @var $cfProvider \Chill\CustomFieldsBundle\Service\CustomFieldProvider */
-        $cfProvider = $this->customFieldProvider;
-        $cfData = array();
-
-        /* @var $$customField \Chill\CustomFieldsBundle\Entity\CustomField */
-        foreach($this->customFieldMapping as $rowNumber => $customField) {
-            $builder = $this->formFactory->createBuilder();
-            $cfProvider->getCustomFieldByType($customField->getType())
-                    ->buildForm($builder, $customField);
-            $form = $builder->getForm();
-
-            // get the type of the form
-            $type = get_class($form->get($customField->getSlug())
-                    ->getConfig()->getType()->getInnerType());
-            $this->logger->debug(sprintf("Processing a form of type %s",
-                    $type));
-
-            switch ($type) {
-                case \Symfony\Component\Form\Extension\Core\Type\TextType::class:
-                    $cfData[$customField->getSlug()] =
-                        $this->processTextType($row[$rowNumber], $form, $customField);
-                    break;
-                case \Symfony\Component\Form\Extension\Core\Type\ChoiceType::class:
-                case \Chill\MainBundle\Form\Type\Select2ChoiceType::class:
-                    $cfData[$customField->getSlug()] =
-                        $this->processChoiceType($row[$rowNumber], $form, $customField);
-            }
-
-        }
-
-        $person->setCFData($cfData);
-    }
-
-    /**
-     * Process a text type on a custom field
-     *
-     * @param type $value
-     * @param \Symfony\Component\Form\FormInterface $form
-     * @return type
-     */
-    protected function processTextType(
-            $value,
-            \Symfony\Component\Form\FormInterface $form,
-            \Chill\CustomFieldsBundle\Entity\CustomField $cf
-            )
-    {
-        $form->submit(array($cf->getSlug() => $value));
-
-        $value = $form->getData()[$cf->getSlug()];
-
-        $this->logger->debug(sprintf("Found value : %s for custom field with question "
-                . "'%s'", $value, $this->helper->localize($cf->getName())));
-
-        return $value;
-    }
-
-    protected $cacheAnswersMapping = array();
-
-
     /**
      * Process a custom field choice.
      *
@@ -894,17 +824,16 @@ EOF
      * choices. If the texts exists, then this is picked. Else, ask the user.
      *
      * @param string $value
-     * @param \Symfony\Component\Form\FormInterface $form
-     * @param \Chill\CustomFieldsBundle\Entity\CustomField $cf
+     *
+     * @throws Exception
+     *
      * @return string
-     * @throws \Exception
      */
     protected function processChoiceType(
-            $value,
-            \Symfony\Component\Form\FormInterface $form,
-            \Chill\CustomFieldsBundle\Entity\CustomField $cf
-            )
-    {
+        $value,
+        \Symfony\Component\Form\FormInterface $form,
+        \Chill\CustomFieldsBundle\Entity\CustomField $cf
+    ) {
         // getting the possible answer and their value :
         $view = $form->get($cf->getSlug())->createView();
         $answers = $this->collectChoicesAnswers($view->vars['choices']);
@@ -912,100 +841,294 @@ EOF
         // if we do not have any answer on the question, throw an error.
         if (count($answers) === 0) {
             $message = sprintf(
-                    "The question '%s' with slug '%s' does not count any answer.",
-                    $this->helper->localize($cf->getName()),
-                    $cf->getSlug()
-                    );
+                "The question '%s' with slug '%s' does not count any answer.",
+                $this->helper->localize($cf->getName()),
+                $cf->getSlug()
+            );
 
-            $this->logger->error($message, array(
+            $this->logger->error($message, [
                 'method' => __METHOD__,
                 'slug' => $cf->getSlug(),
-                'question' => $this->helper->localize($cf->getName())
-            ));
+                'question' => $this->helper->localize($cf->getName()),
+            ]);
 
-            throw new \RuntimeException($message);
+            throw new RuntimeException($message);
         }
 
-        if ($view->vars['required'] === false) {
+        if (false === $view->vars['required']) {
             $answers[null] = '** no answer';
         }
 
         // the answer does not exists in cache. Try to find it, or asks the user
         if (!isset($this->cacheAnswersMapping[$cf->getSlug()][$value])) {
-
             // try to find the answer (with array_keys and a search value
             $values = array_keys(
-                    array_map(function($label) { return trim(strtolower($label)); }, $answers),
-                    trim(strtolower($value)),
-                    true
-                    );
+                array_map(static function ($label) { return trim(strtolower($label)); }, $answers),
+                trim(strtolower($value)),
+                true
+            );
 
             if (count($values) === 1) {
                 // we could guess an answer !
-                $this->logger->info("This question accept multiple answers");
+                $this->logger->info('This question accept multiple answers');
                 $this->cacheAnswersMapping[$cf->getSlug()][$value] =
-                        $view->vars['multiple'] == false ? $values[0] : array($values[0]);
-                $this->logger->info(sprintf("Guessed that value '%s' match with key '%s' "
-                        . "because the CSV and the label are equals.",
-                        $value, $values[0]));
+                        false === $view->vars['multiple'] ? $values[0] : [$values[0]];
+                $this->logger->info(sprintf(
+                    "Guessed that value '%s' match with key '%s' "
+                        . 'because the CSV and the label are equals.',
+                    $value,
+                    $values[0]
+                ));
             } else {
                 // we could nog guess an answer. Asking the user.
-                $this->output->writeln("<info>I do not know the answer to this question : </info>");
+                $this->output->writeln('<info>I do not know the answer to this question : </info>');
                 $this->output->writeln($this->helper->localize($cf->getName()));
 
                 // printing the possible answers
-                /* @var $table \Symfony\Component\Console\Helper\Table */
+                /** @var \Symfony\Component\Console\Helper\Table $table */
                 $table = new Table($this->output);
-                $table->setHeaders(array('#', 'label', 'value'));
+                $table->setHeaders(['#', 'label', 'value']);
                 $i = 0;
 
-                foreach($answers as $key => $answer) {
-                    $table->addRow(array(
-                        $i, $answer, $key
-                    ));
+                $matchingTableRowAnswer = [];
+
+                foreach ($answers as $key => $answer) {
+                    $table->addRow([
+                        $i, $answer, $key,
+                    ]);
                     $matchingTableRowAnswer[$i] = $key;
-                    $i++;
+                    ++$i;
                 }
                 $table->render($this->output);
 
                 $question = new ChoiceQuestion(
-                        sprintf('Please pick your choice for the value "%s"', $value),
-                        array_keys($matchingTableRowAnswer)
-                        );
-                $question->setErrorMessage("This choice is not possible");
+                    sprintf('Please pick your choice for the value "%s"', $value),
+                    array_keys($matchingTableRowAnswer)
+                );
+                $question->setErrorMessage('This choice is not possible');
 
                 if ($view->vars['multiple']) {
-                    $this->logger->debug("this question is multiple");
+                    $this->logger->debug('this question is multiple');
                     $question->setMultiselect(true);
                 }
 
                 $selected = $this->getHelper('question')->ask($this->input, $this->output, $question);
 
-                $this->output->writeln(sprintf('You have selected "%s"',
-                    is_array($answers[$matchingTableRowAnswer[$selected]]) ?
+                $this->output->writeln(
+                    sprintf(
+                        'You have selected "%s"',
+                        is_array($answers[$matchingTableRowAnswer[$selected]]) ?
                         implode(',', $answers[$matchingTableRowAnswer[$selected]]) :
-                        $answers[$matchingTableRowAnswer[$selected]])
-                    );
+                        $answers[$matchingTableRowAnswer[$selected]]
+                    )
+                );
 
                 // recording value in cache
                 $this->cacheAnswersMapping[$cf->getSlug()][$value] = $matchingTableRowAnswer[$selected];
-                $this->logger->debug(sprintf("Setting the value '%s' in cache for customfield '%s' and answer '%s'",
-                        is_array($this->cacheAnswersMapping[$cf->getSlug()][$value]) ?
+                $this->logger->debug(sprintf(
+                    "Setting the value '%s' in cache for customfield '%s' and answer '%s'",
+                    is_array($this->cacheAnswersMapping[$cf->getSlug()][$value]) ?
                             implode(', ', $this->cacheAnswersMapping[$cf->getSlug()][$value]) :
                             $this->cacheAnswersMapping[$cf->getSlug()][$value],
-                        $cf->getSlug(),
-                        $value));
+                    $cf->getSlug(),
+                    $value
+                ));
             }
         }
 
-        $form->submit(array($cf->getSlug() => $this->cacheAnswersMapping[$cf->getSlug()][$value]));
+        $form->submit([$cf->getSlug() => $this->cacheAnswersMapping[$cf->getSlug()][$value]]);
         $value = $form->getData()[$cf->getSlug()];
 
-        $this->logger->debug(sprintf(
+        $this->logger->debug(
+            sprintf(
                 "Found value : %s for custom field with question '%s'",
                 is_array($value) ? implode(',', $value) : $value,
-                $this->helper->localize($cf->getName()))
+                $this->helper->localize($cf->getName())
+            )
+        );
+
+        return $value;
+    }
+
+    /**
+     * @param $value
+     *
+     * @throws Exception
+     */
+    protected function processClosingDate(Person $person, $value)
+    {
+        if (empty($value)) {
+            return;
+        }
+
+        // we skip if the opening date is now (or after yesterday)
+        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $period */
+        $period = $person->getCurrentAccompanyingPeriod();
+
+        if ($period->getOpeningDate() > new DateTime('yesterday')) {
+            $this->logger->debug(sprintf(
+                'skipping a closing date because opening date is after yesterday (%s)',
+                $period->getOpeningDate()->format('Y-m-d')
+            ));
+
+            return;
+        }
+
+        $date = $this->processDate($value, $this->input->getOption('closing_date_format'));
+
+        if ($date instanceof DateTime) {
+            // we correct birthdate if the date is in the future
+            // the most common error is to set date 100 years to late (ex. 2063 instead of 1963)
+            if ($date > new DateTime('yesterday')) {
+                $date = $date->sub(new DateInterval('P100Y'));
+            }
+
+            $period->setClosingDate($date);
+            $person->close();
+
+            return;
+        }
+
+        // if we arrive here, we could not process the date
+        $this->logger->warning(sprintf(
+            'Line %d : the closing date could not be interpreted. Was %s.',
+            $this->line,
+            $value
+        ));
+    }
+
+    /**
+     * @param $value
+     * @param $formats
+     *
+     * @return bool|DateTime
+     */
+    protected function processDate($value, $formats)
+    {
+        $possibleFormats = explode('|', $formats);
+
+        foreach ($possibleFormats as $format) {
+            $this->logger->debug("Trying format {$format}", [__METHOD__]);
+            $dateR = strptime($value, $format);
+
+            if (is_array($dateR) && '' === $dateR['unparsed']) {
+                $string = sprintf(
+                    '%04d-%02d-%02d %02d:%02d:%02d',
+                    ($dateR['tm_year'] + 1900),
+                    ($dateR['tm_mon'] + 1),
+                    ($dateR['tm_mday']),
+                    ($dateR['tm_hour']),
+                    ($dateR['tm_min']),
+                    ($dateR['tm_sec'])
                 );
+                $date = DateTime::createFromFormat('Y-m-d H:i:s', $string);
+                $this->logger->debug(sprintf('Interpreting %s as date %s', $value, $date->format('Y-m-d H:i:s')));
+
+                return $date;
+            }
+        }
+
+        // if we arrive here, we could not process the date
+        $this->logger->debug(sprintf(
+            'Line %d : a date could not be interpreted. Was %s.',
+            $this->line,
+            $value
+        ));
+
+        return false;
+    }
+
+    /**
+     * @param $row
+     *
+     * @throws Exception
+     */
+    protected function processingCustomFields(Person $person, $row)
+    {
+        /** @var \Chill\CustomFieldsBundle\Service\CustomFieldProvider $cfProvider */
+        $cfProvider = $this->customFieldProvider;
+        $cfData = [];
+
+        /** @var \Chill\CustomFieldsBundle\Entity\CustomField $$customField */
+        foreach ($this->customFieldMapping as $rowNumber => $customField) {
+            $builder = $this->formFactory->createBuilder();
+            $cfProvider->getCustomFieldByType($customField->getType())
+                ->buildForm($builder, $customField);
+            $form = $builder->getForm();
+
+            // get the type of the form
+            $type = get_class($form->get($customField->getSlug())
+                ->getConfig()->getType()->getInnerType());
+            $this->logger->debug(sprintf(
+                'Processing a form of type %s',
+                $type
+            ));
+
+            switch ($type) {
+                case \Symfony\Component\Form\Extension\Core\Type\TextType::class:
+                    $cfData[$customField->getSlug()] =
+                        $this->processTextType($row[$rowNumber], $form, $customField);
+
+                    break;
+
+                case \Symfony\Component\Form\Extension\Core\Type\ChoiceType::class:
+                case \Chill\MainBundle\Form\Type\Select2ChoiceType::class:
+                    $cfData[$customField->getSlug()] =
+                        $this->processChoiceType($row[$rowNumber], $form, $customField);
+            }
+        }
+
+        $person->setCFData($cfData);
+    }
+
+    /**
+     * @return array where keys are column number, and value is information mapped
+     */
+    protected function processingHeaders(array $firstRow): array
+    {
+        $availableOptions = array_map(
+            static fn (array $m) => $m[0],
+            self::$mapping
+        );
+        $matchedColumnHeaders = $headers = [];
+
+        foreach ($availableOptions as $option) {
+            $matchedColumnHeaders[$option] = $this->input->getOption($option);
+        }
+
+        foreach ($firstRow as $key => $content) {
+            $content = trim($content);
+
+            if (in_array($content, $matchedColumnHeaders, true)) {
+                $information = array_search($content, $matchedColumnHeaders, true);
+                $headers[$key] = $information;
+                $this->logger->notice("Matched {$information} on column {$key} (displayed in the file as '{$content}')");
+            } else {
+                $this->logger->notice("Column with content '{$content}' is ignored");
+            }
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Process a text type on a custom field.
+     *
+     * @param type $value
+     *
+     * @return type
+     */
+    protected function processTextType(
+        $value,
+        \Symfony\Component\Form\FormInterface $form,
+        \Chill\CustomFieldsBundle\Entity\CustomField $cf
+    ) {
+        $form->submit([$cf->getSlug() => $value]);
+
+        $value = $form->getData()[$cf->getSlug()];
+
+        $this->logger->debug(sprintf('Found value : %s for custom field with question '
+                . "'%s'", $value, $this->helper->localize($cf->getName())));
 
         return $value;
     }
@@ -1014,69 +1137,32 @@ EOF
      * Recursive method to collect the possibles answer from a ChoiceType (or
      * its inherited types).
      *
-     * @param \Symfony\Component\Form\FormInterface $form
+     * @param mixed $choices
+     *
+     * @throws Exception
+     *
      * @return array where
-     * @throws \Exception
      */
     private function collectChoicesAnswers($choices)
     {
-        $answers = array();
+        $answers = [];
 
-        /* @var $choice \Symfony\Component\Form\ChoiceList\View\ChoiceView */
-        foreach($choices as $choice) {
+        /** @var \Symfony\Component\Form\ChoiceList\View\ChoiceView $choice */
+        foreach ($choices as $choice) {
             if ($choice instanceof \Symfony\Component\Form\ChoiceList\View\ChoiceView) {
                 $answers[$choice->value] = $choice->label;
             } elseif ($choice instanceof \Symfony\Component\Form\ChoiceList\View\ChoiceGroupView) {
                 $answers = $answers + $this->collectChoicesAnswers($choice->choices);
             } else {
-                throw new \Exception(sprintf(
-                        "The choice type is not know. Expected '%s' or '%s', get '%s'",
-                        \Symfony\Component\Form\ChoiceList\View\ChoiceView::class,
-                        \Symfony\Component\Form\ChoiceList\View\ChoiceGroupView::class,
-                        get_class($choice)
-                        ));
+                throw new Exception(sprintf(
+                    "The choice type is not know. Expected '%s' or '%s', get '%s'",
+                    \Symfony\Component\Form\ChoiceList\View\ChoiceView::class,
+                    \Symfony\Component\Form\ChoiceList\View\ChoiceGroupView::class,
+                    get_class($choice)
+                ));
             }
         }
 
         return $answers;
     }
-
-    /**
-     * @param $value
-     * @param $formats
-     * @return bool|\DateTime
-     */
-    protected function processDate($value, $formats)
-    {
-        $possibleFormats = explode("|", $formats);
-
-        foreach($possibleFormats as $format) {
-            $this->logger->debug("Trying format $format", array(__METHOD__));
-            $dateR = strptime($value, $format);
-
-            if (is_array($dateR) && $dateR['unparsed'] === '') {
-                $string = sprintf("%04d-%02d-%02d %02d:%02d:%02d",
-                        ($dateR['tm_year']+1900),
-                        ($dateR['tm_mon']+1),
-                        ($dateR['tm_mday']),
-                        ($dateR['tm_hour']),
-                        ($dateR['tm_min']),
-                        ($dateR['tm_sec']));
-                $date = \DateTime::createFromFormat("Y-m-d H:i:s", $string);
-                $this->logger->debug(sprintf("Interpreting %s as date %s", $value, $date->format("Y-m-d H:i:s")));
-
-                return $date;
-            }
-        }
-
-        // if we arrive here, we could not process the date
-        $this->logger->debug(sprintf(
-                "Line %d : a date could not be interpreted. Was %s.",
-                $this->line,
-                $value));
-
-        return false;
-    }
-
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
index e42f0ef26..b04cff13a 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
@@ -1,26 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\PersonBundle\Command;
 
 use Chill\PersonBundle\Service\Import\ChillImporter;
 use Chill\PersonBundle\Service\Import\SocialWorkMetadataInterface;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use League\Csv\Reader;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
 
 final class ImportSocialWorkMetadata extends Command
 {
-    /**
-     * @var EntityManagerInterface
-     */
     protected EntityManagerInterface $em;
 
     /**
@@ -51,13 +55,13 @@ final class ImportSocialWorkMetadata extends Command
         try {
             $csv = Reader::createFromPath($filepath);
         } catch (Throwable $e) {
-            throw new Exception('Error while loading CSV.',0, $e);
+            throw new Exception('Error while loading CSV.', 0, $e);
         }
 
         $csv->setDelimiter(';');
 
         return true === $this->importer->import($csv) ?
-            0:
+            0 :
             1;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
index 92c093385..ae291067b 100644
--- a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
+++ b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
@@ -1,61 +1,58 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Config;
 
+use function count;
 
 /**
- * Give help to interact with the config for alt names
- * 
- *
+ * Give help to interact with the config for alt names.
  */
 class ConfigPersonAltNamesHelper
 {
     /**
-     * the raw config, directly from the container parameter
+     * the raw config, directly from the container parameter.
      *
      * @var array
      */
     private $config = [];
-    
+
     public function __construct($config)
     {
         $this->config = $config;
     }
-    
+
     /**
-     * Return true if at least one alt name is configured
-     * 
-     * @return bool
-     */
-    public function hasAltNames(): bool
-    {
-        return count($this->config) > 0;
-    }
-    
-    /**
-     * get the choices as key => values
-     * 
-     * @return array
+     * get the choices as key => values.
      */
     public function getChoices(): array
     {
         $choices = [];
+
         foreach ($this->config as $entry) {
-            
             $labels = $entry['labels'];
             $lang = false;
             $label = false;
             $cur = reset($labels);
+
             while ($cur) {
                 if (key($labels) === 'lang') {
                     $lang = current($labels);
                 }
-                
+
                 if (key($labels) === 'label') {
                     $label = current($labels);
                 }
-                
-                if ($lang !== FALSE && $label !== FALSE) {
+
+                if (false !== $lang && false !== $label) {
                     $choices[$entry['key']][$lang] = $label;
                     $lang = false;
                     $label = false;
@@ -63,8 +60,15 @@ class ConfigPersonAltNamesHelper
                 $cur = next($labels);
             }
         }
-        
+
         return $choices;
     }
 
+    /**
+     * Return true if at least one alt name is configured.
+     */
+    public function hasAltNames(): bool
+    {
+        return count($this->config) > 0;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index bce888876..9445dc302 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -1,63 +1,92 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\AccompanyingPeriod\Suggestion\ReferralsSuggestionInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
+use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
-use Symfony\Component\HttpFoundation\Exception\BadRequestException;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Component\Serializer\Exception\RuntimeException;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\MainBundle\Entity\Scope;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
+use function array_values;
+use function count;
 
-class AccompanyingCourseApiController extends ApiController
+final class AccompanyingCourseApiController extends ApiController
 {
-    protected EventDispatcherInterface $eventDispatcher;
+    private AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
 
-    protected ValidatorInterface $validator;
+    private EventDispatcherInterface $eventDispatcher;
+
+    private ReferralsSuggestionInterface $referralAvailable;
 
     private Registry $registry;
 
-    private ReferralsSuggestionInterface $referralAvailable;
+    private ValidatorInterface $validator;
 
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         ValidatorInterface $validator,
         Registry $registry,
+        AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository,
         ReferralsSuggestionInterface $referralAvailable
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
         $this->registry = $registry;
+        $this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
         $this->referralAvailable = $referralAvailable;
     }
 
+    public function commentApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('comment', $id, $request, $_format, 'comment', Comment::class);
+    }
+
     public function confirmApi($id, Request $request, $_format): Response
     {
         /** @var AccompanyingPeriod $accompanyingPeriod */
         $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');
+        if (false === $workflow->can($accompanyingPeriod, 'confirm')) {
+            // 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');
@@ -65,10 +94,26 @@ $workflow = $this->registry->get($accompanyingPeriod);
         $this->getDoctrine()->getManager()->flush();
 
         return $this->json($accompanyingPeriod, Response::HTTP_OK, [], [
-            'groups' => [ 'read' ]
+            'groups' => ['read'],
         ]);
     }
 
+    /**
+     * @ParamConverter("person", options={"id": "person_id"})
+     */
+    public function getAccompanyingPeriodsByPerson(Person $person)
+    {
+        $accompanyingPeriods = $person->getCurrentAccompanyingPeriods();
+        $accompanyingPeriodsChecked = array_filter(
+            $accompanyingPeriods,
+            function (AccompanyingPeriod $period) {
+                return $this->isGranted(AccompanyingPeriodVoter::SEE, $period);
+            }
+        );
+
+        return $this->json(array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+
     public function participationApi($id, Request $request, $_format)
     {
         /** @var AccompanyingPeriod $accompanyingPeriod */
@@ -76,7 +121,7 @@ $workflow = $this->registry->get($accompanyingPeriod);
         $person = $this->getSerializer()
             ->deserialize($request->getContent(), Person::class, $_format, []);
 
-        if (NULL === $person) {
+        if (null === $person) {
             throw new BadRequestException('person id not found');
         }
 
@@ -87,12 +132,16 @@ $workflow = $this->registry->get($accompanyingPeriod);
         switch ($request->getMethod()) {
             case Request::METHOD_POST:
                 $participation = $accompanyingPeriod->createParticipationFor($person);
+
                 break;
+
             case Request::METHOD_DELETE:
                 $participation = $accompanyingPeriod->closeParticipationFor($person);
+
                 break;
+
             default:
-                throw new BadRequestException("This method is not supported");
+                throw new BadRequestException('This method is not supported');
         }
 
         $errors = $this->validator->validate($accompanyingPeriod);
@@ -104,41 +153,7 @@ $workflow = $this->registry->get($accompanyingPeriod);
 
         $this->getDoctrine()->getManager()->flush();
 
-        return $this->json($participation, 200, [], ['groups' => [ 'read' ]]);
-    }
-
-    public function resourceApi($id, Request $request, string $_format): Response
-    {
-        return $this->addRemoveSomething('resource', $id, $request, $_format, 'resource', Resource::class);
-    }
-
-    public function scopeApi($id, Request $request, string $_format): Response
-    {
-        return $this->addRemoveSomething('scope', $id, $request, $_format, 'scope', Scope::class, [ 'groups' => [ 'read' ] ]);
-    }
-
-    public function commentApi($id, Request $request, string $_format): Response
-    {
-        return $this->addRemoveSomething('comment', $id, $request, $_format, 'comment', Comment::class);
-    }
-
-    public function socialIssueApi($id, Request $request, string $_format): Response
-    {
-        return $this->addRemoveSomething('socialissue', $id, $request, $_format, 'socialIssue', SocialIssue::class, [ 'groups' => [ 'read' ] ]);
-    }
-
-    public function workApi($id, Request $request, string $_format): Response
-    {
-        return $this->addRemoveSomething(
-            'work',
-            $id,
-            $request,
-            $_format,
-            'work',
-            AccompanyingPeriodWork::class,
-            [ 'groups' => [ 'accompanying_period_work:create' ] ],
-            true // force persist
-        );
+        return $this->json($participation, 200, [], ['groups' => ['read']]);
     }
 
     public function requestorApi($id, Request $request, string $_format): Response
@@ -152,10 +167,11 @@ $workflow = $this->registry->get($accompanyingPeriod);
         $this->onPostCheckACL($action, $request, $_format, $accompanyingPeriod);
 
         if (Request::METHOD_DELETE === $request->getMethod()) {
-            $accompanyingPeriod->setRequestor(NULL);
+            $accompanyingPeriod->setRequestor(null);
         } elseif (Request::METHOD_POST === $request->getMethod()) {
             $requestor = null;
             $exceptions = [];
+
             foreach ([Person::class, ThirdParty::class] as $class) {
                 try {
                     $requestor = $this->getSerializer()
@@ -164,7 +180,8 @@ $workflow = $this->registry->get($accompanyingPeriod);
                     $exceptions[] = $e;
                 }
             }
-            if ($requestor === null) {
+
+            if (null === $requestor) {
                 throw new BadRequestException('Could not find any person or requestor', 0, $exceptions[0]);
             }
 
@@ -182,28 +199,35 @@ $workflow = $this->registry->get($accompanyingPeriod);
 
         $this->getDoctrine()->getManager()->flush();
 
-        return $this->json($accompanyingPeriod->getRequestor(), 200, [], ['groups' => [ 'read']]);
+        return $this->json($accompanyingPeriod->getRequestor(), 200, [], ['groups' => ['read']]);
     }
 
-    protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response
+    public function resourceApi($id, Request $request, string $_format): Response
     {
-        $this->eventDispatcher->dispatch(
-            AccompanyingPeriodPrivacyEvent::ACCOMPANYING_PERIOD_PRIVACY_EVENT,
-            new AccompanyingPeriodPrivacyEvent($entity, [
-                'action' => $action,
-                'request' => $request->getMethod()
-            ])
-        );
+        $accompanyingPeriod = $this->getEntity('resource', $id, $request);
+        $errors = $this->validator->validate($accompanyingPeriod);
 
-        return null;
+        if ($errors->count() > 0) {
+            return $this->json($errors, 422);
+        }
+
+        return $this->addRemoveSomething('resource', $id, $request, $_format, 'resource', Resource::class);
+    }
+
+    public function scopeApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('scope', $id, $request, $_format, 'scope', Scope::class, ['groups' => ['read']]);
+    }
+
+    public function socialIssueApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('socialissue', $id, $request, $_format, 'socialIssue', SocialIssue::class, ['groups' => ['read']]);
     }
 
     /**
      * @Route("/api/1.0/person/accompanying-course/{id}/referrers-suggested.{_format}",
-     *     requirements={ "_format"="json"},
-     *     name="chill_api_person_accompanying_period_referrers_suggested")
-     * @param AccompanyingPeriod $period
-     * @return JsonResponse
+     *     requirements={ "_format": "json"},
+     * name="chill_api_person_accompanying_period_referrers_suggested")
      */
     public function suggestReferrals(AccompanyingPeriod $period, string $_format = 'json'): JsonResponse
     {
@@ -213,13 +237,76 @@ $workflow = $this->registry->get($accompanyingPeriod);
         $paginator = $this->getPaginatorFactory()->create($total);
 
         if (0 < $total) {
-            $users = $this->referralAvailable->findReferralSuggested($period, $paginator->getItemsPerPage(),
-                $paginator->getCurrentPageFirstItemNumber());
+            $users = $this->referralAvailable->findReferralSuggested(
+                $period,
+                $paginator->getItemsPerPage(),
+                $paginator->getCurrentPageFirstItemNumber()
+            );
         } else {
             $users = [];
         }
 
-        return $this->json(new Collection($users, $paginator), Response::HTTP_OK,
-            [], [ AbstractNormalizer::GROUPS => [ 'read' ]]);
+        return $this->json(
+            new Collection($users, $paginator),
+            Response::HTTP_OK,
+            [],
+            [AbstractNormalizer::GROUPS => ['read']]
+        );
+    }
+
+    /**
+     * @Route("/api/1.0/person/accompanying-course/{id}/confidential.json", name="chill_api_person_accompanying_period_confidential")
+     * @ParamConverter("accompanyingCourse", options={"id": "id"})
+     */
+    public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, Request $request)
+    {
+        if ($request->getMethod() === 'POST') {
+            $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL, $accompanyingCourse);
+
+            $accompanyingCourse->setConfidential(!$accompanyingCourse->isConfidential());
+            $this->getDoctrine()->getManager()->flush();
+        }
+
+        return $this->json($accompanyingCourse->isConfidential(), Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+
+    public function workApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething(
+            'work',
+            $id,
+            $request,
+            $_format,
+            'work',
+            AccompanyingPeriodWork::class,
+            ['groups' => ['accompanying_period_work:create']],
+            true // force persist
+        );
+    }
+
+    protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response
+    {
+        $this->eventDispatcher->dispatch(
+            AccompanyingPeriodPrivacyEvent::ACCOMPANYING_PERIOD_PRIVACY_EVENT,
+            new AccompanyingPeriodPrivacyEvent($entity, [
+                'action' => $action,
+                'request' => $request->getMethod(),
+            ])
+        );
+
+        return null;
+    }
+
+    protected function validate(string $action, Request $request, string $_format, $entity, array $more = []): ConstraintViolationListInterface
+    {
+        if ('work' !== $action) {
+            return parent::validate($action, $request, $_format, $entity, $more);
+        }
+
+        if (Request::METHOD_POST === $request->getMethod()) {
+            return $this->getValidator()->validate($more[0], null);
+        }
+
+        return new ConstraintViolationList([]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index 5c11f4802..7d0e841cf 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -1,91 +1,150 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\AccompanyingCourseType;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Serializer\Encoder\JsonEncoder;
-use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\ConstraintViolationInterface;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Component\Workflow\Registry;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function is_array;
 
 /**
- * Class AccompanyingCourseController
- *
- * @package Chill\PersonBundle\Controller
+ * Class AccompanyingCourseController.
  */
 class AccompanyingCourseController extends Controller
 {
-    protected SerializerInterface $serializer;
-
     protected EventDispatcherInterface $dispatcher;
 
+    protected SerializerInterface $serializer;
+
     protected ValidatorInterface $validator;
 
+    private Registry $registry;
+
+    private TranslatorInterface $translator;
+
     private AccompanyingPeriodWorkRepository $workRepository;
 
     public function __construct(
         SerializerInterface $serializer,
         EventDispatcherInterface $dispatcher,
         ValidatorInterface $validator,
-        AccompanyingPeriodWorkRepository $workRepository
+        AccompanyingPeriodWorkRepository $workRepository,
+        Registry $registry,
+        TranslatorInterface $translator
     ) {
         $this->serializer = $serializer;
         $this->dispatcher = $dispatcher;
         $this->validator = $validator;
         $this->workRepository = $workRepository;
+        $this->registry = $registry;
+        $this->translator = $translator;
     }
 
     /**
-     * @Route("/{_locale}/person/parcours/new", name="chill_person_accompanying_course_new")
+     * @Route("/{_locale}/parcours/{accompanying_period_id}/close", name="chill_person_accompanying_course_close")
+     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
      */
-    public function newAction(Request $request): Response
+    public function closeAction(AccompanyingPeriod $accompanyingCourse, Request $request): Response
     {
-        $period = new AccompanyingPeriod();
-        $em = $this->getDoctrine()->getManager();
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::EDIT, $accompanyingCourse);
 
-        if ($request->query->has('person_id')) {
-            $personIds = $request->query->get('person_id');
+        $form = $this->createForm(AccompanyingCourseType::class, $accompanyingCourse, [
+            'validation_groups' => [AccompanyingPeriod::STEP_CLOSED],
+        ]);
 
-            if (FALSE === \is_array($personIds)) {
-                throw new BadRequestException("person_id parameter should be an array");
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+
+            $workflow = $this->registry->get($accompanyingCourse);
+
+            if ($workflow->can($accompanyingCourse, 'close')) {
+                $workflow->apply($accompanyingCourse, 'close');
+
+                $em->flush();
+
+                return $this->redirectToRoute('chill_person_accompanying_course_index', [
+                    'accompanying_period_id' => $accompanyingCourse->getId(),
+                ]);
             }
+            /** @var ConstraintViolationListInterface $errors */
+            $errors = $this->validator->validate($accompanyingCourse, null, [$accompanyingCourse::STEP_CLOSED]);
+            $this->addFlash('error', $this->translator->trans('It is not possible to close this course'));
 
-            foreach ($personIds as $personId) {
-                $person = $em->getRepository(Person::class)->find($personId);
-                if (NULL !== $person) {
-                    $period->addPerson($person);
-                }
+            foreach ($errors as $e) {
+                /** @var ConstraintViolationInterface $e */
+                $this->addFlash('error', $e->getMessage());
             }
         }
 
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE, $period);
-
-        $em->persist($period);
-        $em->flush();
-
-        return $this->redirectToRoute('chill_person_accompanying_course_edit', [
-            'accompanying_period_id' => $period->getId()
+        return $this->render('@ChillPerson/AccompanyingCourse/close.html.twig', [
+            'form' => $form->createView(),
+            'accompanyingCourse' => $accompanyingCourse,
         ]);
-
     }
 
     /**
-     * Homepage of Accompanying Course section
+     * Edit page of Accompanying Course section.
+     *
+     * the page edit all blocks managed by vuejs component
+     *
+     * @Route("/{_locale}/parcours/{accompanying_period_id}/edit", name="chill_person_accompanying_course_edit")
+     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
+     */
+    public function editAction(AccompanyingPeriod $accompanyingCourse): Response
+    {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
+        return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
+            'accompanyingCourse' => $accompanyingCourse,
+        ]);
+    }
+
+    /**
+     * History page of Accompanying Course section.
+     *
+     * the page show anti chronologic history with all actions, title of page is 'Accompanying Course History'
+     *
+     * @Route("/{_locale}/parcours/{accompanying_period_id}/history", name="chill_person_accompanying_course_history")
+     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
+     */
+    public function historyAction(AccompanyingPeriod $accompanyingCourse): Response
+    {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+
+        return $this->render('@ChillPerson/AccompanyingCourse/history.html.twig', [
+            'accompanyingCourse' => $accompanyingCourse,
+        ]);
+    }
+
+    /**
+     * Homepage of Accompanying Course section.
      *
      * @Route("/{_locale}/parcours/{accompanying_period_id}", name="chill_person_accompanying_course_index")
      * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
@@ -97,9 +156,9 @@ class AccompanyingCourseController extends Controller
         // compute some warnings
         // get persons without household
         $withoutHousehold = [];
-        foreach ($accompanyingCourse->getParticipations() as
-            $p) {
-            if (FALSE === $p->getPerson()->isSharingHousehold()) {
+
+        foreach ($accompanyingCourse->getParticipations() as $p) {
+            if (false === $p->getPerson()->isSharingHousehold()) {
                 $withoutHousehold[] = $p->getPerson();
             }
         }
@@ -120,42 +179,41 @@ class AccompanyingCourseController extends Controller
             'withoutHousehold' => $withoutHousehold,
             'participationsByHousehold' => $accompanyingCourse->actualParticipationsByHousehold(),
             'works' => $works,
-            'activities' => $activities
+            'activities' => $activities,
         ]);
     }
 
     /**
-     * Edit page of Accompanying Course section
-     *
-     * the page edit all blocks managed by vuejs component
-     *
-     * @Route("/{_locale}/parcours/{accompanying_period_id}/edit", name="chill_person_accompanying_course_edit")
-     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
+     * @Route("/{_locale}/person/parcours/new", name="chill_person_accompanying_course_new")
      */
-    public function editAction(AccompanyingPeriod $accompanyingCourse): Response
+    public function newAction(Request $request): Response
     {
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+        $period = new AccompanyingPeriod();
+        $em = $this->getDoctrine()->getManager();
 
-        return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
-            'accompanyingCourse' => $accompanyingCourse
+        if ($request->query->has('person_id')) {
+            $personIds = $request->query->get('person_id');
+
+            if (false === is_array($personIds)) {
+                throw new BadRequestException('person_id parameter should be an array');
+            }
+
+            foreach ($personIds as $personId) {
+                $person = $em->getRepository(Person::class)->find($personId);
+
+                if (null !== $person) {
+                    $period->addPerson($person);
+                }
+            }
+        }
+
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE, $period);
+
+        $em->persist($period);
+        $em->flush();
+
+        return $this->redirectToRoute('chill_person_accompanying_course_edit', [
+            'accompanying_period_id' => $period->getId(),
         ]);
     }
-
-    /**
-     * History page of Accompanying Course section
-     *
-     * the page show anti chronologic history with all actions, title of page is 'Accompanying Course History'
-     *
-     * @Route("/{_locale}/parcours/{accompanying_period_id}/history", name="chill_person_accompanying_course_history")
-     * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
-     */
-    public function historyAction(AccompanyingPeriod $accompanyingCourse): Response
-    {
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
-
-        return $this->render('@ChillPerson/AccompanyingCourse/history.html.twig', [
-            'accompanyingCourse' => $accompanyingCourse
-        ]);
-    }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index 6263736b0..95cbaf023 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
@@ -9,15 +18,14 @@ class AccompanyingCourseWorkApiController extends ApiController
 {
     protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
     {
-        switch($action) {
+        switch ($action) {
             case '_entity':
                 switch ($request->getMethod()) {
                     case Request::METHOD_PUT:
-                        return [ 'groups' => [ 'accompanying_period_work:edit' ] ];
+                        return ['groups' => ['accompanying_period_work:edit']];
                 }
         }
 
         return parent::getContextForSerialization($action, $request, $_format, $entity);
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
index 739b14e2b..1da7424bf 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
@@ -1,91 +1,159 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 
 class AccompanyingCourseWorkController extends AbstractController
 {
-    private TranslatorInterface $trans;
-    private SerializerInterface $serializer;
-    private AccompanyingPeriodWorkRepository $workRepository;
+    private LoggerInterface $chillLogger;
+
     private PaginatorFactory $paginator;
 
+    private SerializerInterface $serializer;
+
+    private TranslatorInterface $trans;
+
+    private AccompanyingPeriodWorkRepository $workRepository;
+
     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->chillLogger = $chillLogger;
     }
 
     /**
      * @Route(
-     *  "{_locale}/person/accompanying-period/{id}/work/new",
-     *  name="chill_person_accompanying_period_work_new",
-     *  methods={"GET"}
-     *  )
+     *     "{_locale}/person/accompanying-period/{id}/work/new",
+     *     name="chill_person_accompanying_period_work_new",
+     *     methods={"GET"}
+     * )
      */
     public function createWork(AccompanyingPeriod $period): Response
     {
         // TODO ACL
 
         if ($period->getSocialIssues()->count() === 0) {
-            $this->addFlash('error', $this->trans->trans(
-                "accompanying_work.You must add at least ".
-                "one social issue on accompanying period")
+            $this->addFlash(
+                'error',
+                $this->trans->trans(
+                    'accompanying_work.You must add at least ' .
+                'one social issue on accompanying period'
+                )
             );
 
             return $this->redirectToRoute('chill_person_accompanying_course_index', [
-                'accompanying_period_id' => $period->getId()
+                'accompanying_period_id' => $period->getId(),
             ]);
         }
 
-        $json = $this->serializer->normalize($period, 'json', [ "groups" => [ "read" ]]);
+        $json = $this->serializer->normalize($period, 'json', ['groups' => ['read']]);
 
         return $this->render('@ChillPerson/AccompanyingCourseWork/create.html.twig', [
             'accompanyingCourse' => $period,
-            'json' => $json
+            'json' => $json,
         ]);
     }
 
     /**
      * @Route(
-     *  "{_locale}/person/accompanying-period/work/{id}/edit",
-     *  name="chill_person_accompanying_period_work_edit",
-     *  methods={"GET"}
-     *  )
+     *     "{_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->chillLogger->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(),
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/person/accompanying-period/work/{id}/edit",
+     *     name="chill_person_accompanying_period_work_edit",
+     *     methods={"GET"}
+     * )
      */
     public function editWork(AccompanyingPeriodWork $work): Response
     {
         // TODO ACL
-        $json = $this->serializer->normalize($work, 'json', [ "groups" => [ "read" ] ]);
+        $json = $this->serializer->normalize($work, 'json', ['groups' => ['read']]);
+
         return $this->render('@ChillPerson/AccompanyingCourseWork/edit.html.twig', [
             'accompanyingCourse' => $work->getAccompanyingPeriod(),
             'work' => $work,
-            'json' => $json
+            'json' => $json,
         ]);
     }
 
     /**
      * @Route(
-     *  "{_locale}/person/accompanying-period/{id}/work",
-     *  name="chill_person_accompanying_period_work_list",
-     *  methods={"GET"}
-     *  )
+     *     "{_locale}/person/accompanying-period/{id}/work",
+     *     name="chill_person_accompanying_period_work_list",
+     *     methods={"GET"}
+     * )
      */
     public function listWorkByAccompanyingPeriod(AccompanyingPeriod $period): Response
     {
@@ -103,7 +171,19 @@ class AccompanyingCourseWorkController extends AbstractController
         return $this->render('@ChillPerson/AccompanyingCourseWork/index.html.twig', [
             'accompanyingCourse' => $period,
             'works' => $works,
-            'paginator' => $paginator
+            'paginator' => $paginator,
         ]);
     }
+
+    private function createDeleteForm(int $id): Form
+    {
+        $params = [];
+        $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();
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index 255c6d9ba..bfc85a5b3 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -1,51 +1,42 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\AccompanyingPeriodType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepositoryInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTime;
 use Doctrine\DBAL\Exception;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Form\AccompanyingPeriodType;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\Common\Collections\Criteria;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use function array_filter;
+use function count;
 
 /**
- * Class AccompanyingPeriodController
- *
- * @package Chill\PersonBundle\Controller
+ * Class AccompanyingPeriodController.
  */
 class AccompanyingPeriodController extends AbstractController
 {
+    protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
+
     /**
      * @var EventDispatcherInterface
      */
@@ -56,8 +47,6 @@ class AccompanyingPeriodController extends AbstractController
      */
     protected $validator;
 
-    protected AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository;
-
     public function __construct(
         AccompanyingPeriodACLAwareRepositoryInterface $accompanyingPeriodACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
@@ -68,218 +57,71 @@ class AccompanyingPeriodController extends AbstractController
         $this->validator = $validator;
     }
 
-    /**
-     * @ParamConverter("person", options={"id"="person_id"})
-     */
-    public function listAction(Person $person): Response
-    {
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $person);
-
-        $event = new PrivacyEvent($person, [
-            'element_class' => AccompanyingPeriod::class,
-            'action' => 'list'
-        ]);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-        $accompanyingPeriods = $this->accompanyingPeriodACLAwareRepository
-            ->findByPerson($person, AccompanyingPeriodVoter::SEE);
-
-        return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
-            'accompanying_periods' => $accompanyingPeriods,
-            'person' => $person
-        ]);
-    }
-
-    public function createAction(int $person_id, Request $request): Response
-    {
-        $person = $this->_getPerson($person_id);
-
-        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person,
-                'You are not allowed to update this person');
-
-        $accompanyingPeriod = new AccompanyingPeriod(new \DateTime('now'));
-        $accompanyingPeriod->setClosingDate(new \DateTime('now'));
-
-        $accompanyingPeriod->addPerson($person);
-        //or $person->addAccompanyingPeriod($accompanyingPeriod);
-
-        $form = $this->createForm(
-            AccompanyingPeriodType::class,
-            $accompanyingPeriod, [
-                'period_action' => 'create',
-                'center' => $person->getCenter()
-            ]);
-
-        if ($request->getMethod() === 'POST') {
-            $form->handleRequest($request);
-            $errors = $this->_validatePerson($person);
-            $flashBag = $this->get('session')->getFlashBag();
-
-            if ($form->isValid(['Default', 'closed'])
-                && count($errors) === 0) {
-
-                $em = $this->getDoctrine()->getManager();
-                $em->persist($accompanyingPeriod);
-                $em->flush();
-                $flashBag->add('success',
-                    $this->get('translator')->trans(
-                        'A period has been created.'));
-
-                return $this->redirect(
-                    $this->generateUrl('chill_person_accompanying_period_list', [
-                        'person_id' => $person->getId()
-                    ]));
-
-            } else {
-                $flashBag->add('error', $this->get('translator')
-                        ->trans('Error! Period not created!'));
-
-                foreach($errors as $error) {
-                    $flashBag->add('info', $error->getMessage());
-                }
-            }
-        }
-
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
-            'form' => $form->createView(),
-            'person' => $person,
-            'accompanying_period' => $accompanyingPeriod
-        ]);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function updateAction(int $person_id, int $period_id, Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        /** @var AccompanyingPeriod $accompanyingPeriod */
-        $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($period_id);
-
-        if ($accompanyingPeriod === null) {
-            throw $this->createNotFoundException("Period with id " . $period_id . " is not found");
-        }
-
-        /** @var Person $person */
-        $person = $this->_getPerson($person_id);
-
-        // CHECK
-        if (! $accompanyingPeriod->containsPerson($person)) {
-            throw new Exception("Accompanying period " . $period_id . " does not contain person " . $person_id);
-        }
-
-        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person,
-                'You are not allowed to update this person');
-
-        $form = $this->createForm(AccompanyingPeriodType::class,
-            $accompanyingPeriod, [
-                'period_action' => 'update',
-                'center' => $person->getCenter()
-        ]);
-
-        if ($request->getMethod() === 'POST') {
-            $form->handleRequest($request);
-            $errors = $this->_validatePerson($person);
-            $flashBag = $this->get('session')->getFlashBag();
-
-            if ($form->isValid(['Default', 'closed'])
-                    && count($errors) === 0) {
-
-                $em->flush();
-
-                $flashBag->add('success',
-                    $this->get('translator')->trans('An accompanying period has been updated.'));
-
-                return $this->redirect(
-                    $this->generateUrl('chill_person_accompanying_period_list', [
-                        'person_id' => $person->getId()
-                ]));
-
-            } else {
-
-                $flashBag->add('error', $this->get('translator')
-                        ->trans('Error when updating the period'));
-
-                foreach($errors as $error) {
-                    $flashBag->add('info', $error->getMessage());
-                }
-            }
-        }
-
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
-            'form' => $form->createView(),
-            'person' => $person,
-            'accompanying_period' => $accompanyingPeriod
-        ]);
-    }
-
     /**
      * @throws \Exception
      */
     public function closeAction(int $person_id, Request $request): Response
     {
-
         $person = $this->_getPerson($person_id);
 
         $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person, 'You are not allowed to update this person');
 
         if ($person->isOpen() === false) {
-
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
-                    ->trans('Beware period is closed', ['%name%' => $person->__toString()]
-            ));
+                ->trans(
+                    'Beware period is closed',
+                    ['%name%' => $person->__toString()]
+                ));
 
             return $this->redirect(
                 $this->generateUrl('chill_person_accompanying_period_list', [
-                    'person_id' => $person->getId()
-            ]));
+                    'person_id' => $person->getId(),
+                ])
+            );
         }
 
         $current = $person->getCurrentAccompanyingPeriod();
 
         $form = $this->createForm(AccompanyingPeriodType::class, $current, [
             'period_action' => 'close',
-            'center' => $person->getCenter()
+            'center' => $person->getCenter(),
         ]);
 
         if ($request->getMethod() === 'POST') {
             $form->handleRequest($request);
 
-            if ($form->isValid()){
+            if ($form->isValid()) {
                 $person->close($current);
                 $errors = $this->_validatePerson($person);
 
                 if (count($errors) === 0) {
                     $this->get('session')->getFlashBag()
                         ->add('success', $this->get('translator')
-                            ->trans('An accompanying period has been closed.', [
-                                '%name%' => $person->__toString()
-                            ]));
+                        ->trans('An accompanying period has been closed.', [
+                            '%name%' => $person->__toString(),
+                        ]));
 
                     $this->getDoctrine()->getManager()->flush();
 
                     return $this->redirect(
                         $this->generateUrl('chill_person_accompanying_period_list', [
-                            'person_id' => $person->getId()
+                            'person_id' => $person->getId(),
                         ])
                     );
-
-                } else {
-                    $this->get('session')->getFlashBag()
-                            ->add('error', $this->get('translator')
-                                    ->trans('Error! Period not closed!'));
-
-                    foreach ($errors as $error) {
-                        $this->get('session')->getFlashBag()
-                            ->add('info', $error->getMessage());
-                    }
                 }
+                $this->get('session')->getFlashBag()
+                    ->add('error', $this->get('translator')
+                    ->trans('Error! Period not closed!'));
 
+                foreach ($errors as $error) {
+                    $this->get('session')->getFlashBag()
+                        ->add('info', $error->getMessage());
+                }
             } else { //if form is not valid
                 $this->get('session')->getFlashBag()
-                    ->add('error',
+                    ->add(
+                        'error',
                         $this->get('translator')
                             ->trans('Pediod closing form is not valid')
                     );
@@ -294,57 +136,136 @@ class AccompanyingPeriodController extends AbstractController
         return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
-            'accompanying_period' => $current
+            'accompanying_period' => $current,
         ]);
     }
 
-    private function _validatePerson(Person $person): ConstraintViolationListInterface
+    public function createAction(int $person_id, Request $request): Response
     {
-        $errors = $this->validator->validate($person, null,
-            ['Default']);
+        $person = $this->_getPerson($person_id);
 
-        // Can be disabled with config
-        if (false === $this->container->getParameter('chill_person.allow_multiple_simultaneous_accompanying_periods')) {
+        $this->denyAccessUnlessGranted(
+            PersonVoter::UPDATE,
+            $person,
+            'You are not allowed to update this person'
+        );
 
-            $errors_accompanying_period = $this->validator->validate($person, null,
-                ['accompanying_period_consistent']);
+        $accompanyingPeriod = new AccompanyingPeriod(new DateTime('now'));
+        $accompanyingPeriod->setClosingDate(new DateTime('now'));
 
-            foreach($errors_accompanying_period as $error ) {
-                $errors->add($error);
+        $accompanyingPeriod->addPerson($person);
+        //or $person->addAccompanyingPeriod($accompanyingPeriod);
+
+        $form = $this->createForm(
+            AccompanyingPeriodType::class,
+            $accompanyingPeriod,
+            [
+                'period_action' => 'create',
+                'center' => $person->getCenter(),
+            ]
+        );
+
+        if ($request->getMethod() === 'POST') {
+            $form->handleRequest($request);
+            $errors = $this->_validatePerson($person);
+            $flashBag = $this->get('session')->getFlashBag();
+
+            if ($form->isValid(['Default', 'closed'])
+                && count($errors) === 0) {
+                $em = $this->getDoctrine()->getManager();
+                $em->persist($accompanyingPeriod);
+                $em->flush();
+                $flashBag->add(
+                    'success',
+                    $this->get('translator')->trans(
+                        'A period has been created.'
+                    )
+                );
+
+                return $this->redirect(
+                    $this->generateUrl('chill_person_accompanying_period_list', [
+                        'person_id' => $person->getId(),
+                    ])
+                );
+            }
+            $flashBag->add('error', $this->get('translator')
+                ->trans('Error! Period not created!'));
+
+            foreach ($errors as $error) {
+                $flashBag->add('info', $error->getMessage());
             }
         }
 
-        return $errors;
+        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+            'form' => $form->createView(),
+            'person' => $person,
+            'accompanying_period' => $accompanyingPeriod,
+        ]);
+    }
+
+    /**
+     * @ParamConverter("person", options={"id": "person_id"})
+     */
+    public function listAction(Person $person): Response
+    {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $person);
+
+        $event = new PrivacyEvent($person, [
+            'element_class' => AccompanyingPeriod::class,
+            'action' => 'list',
+        ]);
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        $accompanyingPeriodsRaw = $this->accompanyingPeriodACLAwareRepository
+            ->findByPerson($person, AccompanyingPeriodVoter::SEE);
+
+        // filter visible or not visible
+        $accompanyingPeriods = array_filter($accompanyingPeriodsRaw, function (AccompanyingPeriod $ap) {
+            return $this->isGranted(AccompanyingPeriodVoter::SEE, $ap);
+        });
+
+        return $this->render('@ChillPerson/AccompanyingPeriod/list.html.twig', [
+            'accompanying_periods' => $accompanyingPeriods,
+            'person' => $person,
+        ]);
     }
 
     public function openAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
 
-        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person,
-                'You are not allowed to update this person');
+        $this->denyAccessUnlessGranted(
+            PersonVoter::UPDATE,
+            $person,
+            'You are not allowed to update this person'
+        );
 
         //in case the person is already open
         if ($person->isOpen()) {
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
-                    ->trans('Error! Period %name% is not closed ; it can be open',
-                        ['%name%' => $person->__toString()]
-            ));
+                ->trans(
+                    'Error! Period %name% is not closed ; it can be open',
+                    ['%name%' => $person->__toString()]
+                ));
 
             return $this->redirect(
                 $this->generateUrl('chill_person_accompanying_period_list', [
-                    'person_id' => $person->getId()
-            ]));
+                    'person_id' => $person->getId(),
+                ])
+            );
         }
 
-        $accompanyingPeriod = new AccompanyingPeriod(new \DateTime());
+        $accompanyingPeriod = new AccompanyingPeriod(new DateTime());
 
-        $form = $this->createForm(AccompanyingPeriodType::class,
-            $accompanyingPeriod, [
+        $form = $this->createForm(
+            AccompanyingPeriodType::class,
+            $accompanyingPeriod,
+            [
                 'period_action' => 'open',
-                'center' => $person->getCenter()
-        ]);
+                'center' => $person->getCenter(),
+            ]
+        );
 
         if ($request->getMethod() === 'POST') {
             $form->handleRequest($request);
@@ -357,40 +278,41 @@ class AccompanyingPeriodController extends AbstractController
                 if (count($errors) <= 0) {
                     $this->get('session')->getFlashBag()
                         ->add('success', $this->get('translator')
-                            ->trans('An accompanying period has been opened.',
+                        ->trans(
+                            'An accompanying period has been opened.',
                             ['%name%' => $person->__toString()]
-                    ));
+                        ));
 
                     $this->getDoctrine()->getManager()->flush();
 
                     return $this->redirect(
                         $this->generateUrl('chill_person_accompanying_period_list', [
-                            'person_id' => $person->getId()
-                        ]));
-
-                } else {
-                    $this->get('session')->getFlashBag()
-                        ->add('error', $this->get('translator')
-                            ->trans('Period not opened'));
-
-                    foreach ($errors as $error) {
-                        $this->get('session')->getFlashBag()
-                            ->add('info', $error->getMessage());
-                    }
+                            'person_id' => $person->getId(),
+                        ])
+                    );
                 }
+                $this->get('session')->getFlashBag()
+                    ->add('error', $this->get('translator')
+                    ->trans('Period not opened'));
 
+                foreach ($errors as $error) {
+                    $this->get('session')->getFlashBag()
+                        ->add('info', $error->getMessage());
+                }
             } else { // if errors in forms
                 $this->get('session')->getFlashBag()
-                   ->add('error', $this->get('translator')
-                       ->trans('Period not opened : form is invalid')
-                   );
+                    ->add(
+                        'error',
+                        $this->get('translator')
+                            ->trans('Period not opened : form is invalid')
+                    );
             }
         }
 
         return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
-            'accompanying_period' => $accompanyingPeriod
+            'accompanying_period' => $accompanyingPeriod,
         ]);
     }
 
@@ -399,21 +321,21 @@ class AccompanyingPeriodController extends AbstractController
         /** @var Person $person */
         $person = $this->_getPerson($person_id);
 
-        /* @var $period AccompanyingPeriod */
-        $period = \array_filter(
+        /** @var AccompanyingPeriod $period */
+        $period = array_filter(
             $person->getAccompanyingPeriods(),
-            function (AccompanyingPeriod $p) use ($period_id) {
+            static function (AccompanyingPeriod $p) use ($period_id) {
                 return $p->getId() === ($period_id);
             }
-        )[0] ?? NULL;
+        )[0] ?? null;
 
-        if ($period === NULL) {
+        if (null === $period) {
             throw $this->createNotFoundException('period not found');
         }
 
         $confirm = $request->query->getBoolean('confirm', false);
 
-        if ($confirm === true && $period->canBeReOpened($person)) {
+        if (true === $confirm && $period->canBeReOpened($person)) {
             $period->reOpen();
 
             $this->_validatePerson($person);
@@ -421,40 +343,141 @@ class AccompanyingPeriodController extends AbstractController
             $this->getDoctrine()->getManager()->flush();
 
             $this->addFlash('success', $this->get('translator')->trans(
-                    'The period has been re-opened'));
+                'The period has been re-opened'
+            ));
 
             return $this->redirectToRoute('chill_person_accompanying_period_list', [
-                'person_id' => $person->getId()
+                'person_id' => $person->getId(),
             ]);
+        }
 
-        } elseif ($confirm === false && $period->canBeReOpened($person)) {
+        if (false === $confirm && $period->canBeReOpened($person)) {
             return $this->render('ChillPersonBundle:AccompanyingPeriod:re_open.html.twig', [
                 'period' => $period,
-                'person' => $person
+                'person' => $person,
             ]);
-
-        } else {
-            return (new Response())
-                ->setStatusCode(Response::HTTP_BAD_REQUEST)
-                ->setContent("You cannot re-open this period");
         }
+
+        return (new Response())
+            ->setStatusCode(Response::HTTP_BAD_REQUEST)
+            ->setContent('You cannot re-open this period');
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function updateAction(int $person_id, int $period_id, Request $request): Response
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        /** @var AccompanyingPeriod $accompanyingPeriod */
+        $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($period_id);
+
+        if (null === $accompanyingPeriod) {
+            throw $this->createNotFoundException('Period with id ' . $period_id . ' is not found');
+        }
+
+        /** @var Person $person */
+        $person = $this->_getPerson($person_id);
+
+        // CHECK
+        if (!$accompanyingPeriod->containsPerson($person)) {
+            throw new Exception('Accompanying period ' . $period_id . ' does not contain person ' . $person_id);
+        }
+
+        $this->denyAccessUnlessGranted(
+            PersonVoter::UPDATE,
+            $person,
+            'You are not allowed to update this person'
+        );
+
+        $form = $this->createForm(
+            AccompanyingPeriodType::class,
+            $accompanyingPeriod,
+            [
+                'period_action' => 'update',
+                'center' => $person->getCenter(),
+            ]
+        );
+
+        if ($request->getMethod() === 'POST') {
+            $form->handleRequest($request);
+            $errors = $this->_validatePerson($person);
+            $flashBag = $this->get('session')->getFlashBag();
+
+            if ($form->isValid(['Default', 'closed'])
+                    && count($errors) === 0) {
+                $em->flush();
+
+                $flashBag->add(
+                    'success',
+                    $this->get('translator')->trans('An accompanying period has been updated.')
+                );
+
+                return $this->redirect(
+                    $this->generateUrl('chill_person_accompanying_period_list', [
+                        'person_id' => $person->getId(),
+                    ])
+                );
+            }
+
+            $flashBag->add('error', $this->get('translator')
+                ->trans('Error when updating the period'));
+
+            foreach ($errors as $error) {
+                $flashBag->add('info', $error->getMessage());
+            }
+        }
+
+        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+            'form' => $form->createView(),
+            'person' => $person,
+            'accompanying_period' => $accompanyingPeriod,
+        ]);
     }
 
     /**
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
-    private function _getPerson(int $id) : Person
+    private function _getPerson(int $id): Person
     {
         $person = $this->getDoctrine()->getManager()
             ->getRepository('ChillPersonBundle:Person')->find($id);
 
-        if ($person === null) {
+        if (null === $person) {
             throw $this->createNotFoundException('Person not found');
         }
 
-        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person,
-                "You are not allowed to see this person");
+        $this->denyAccessUnlessGranted(
+            PersonVoter::SEE,
+            $person,
+            'You are not allowed to see this person'
+        );
 
         return $person;
     }
+
+    private function _validatePerson(Person $person): ConstraintViolationListInterface
+    {
+        $errors = $this->validator->validate(
+            $person,
+            null,
+            ['Default']
+        );
+
+        // Can be disabled with config
+        if (false === $this->container->getParameter('chill_person.allow_multiple_simultaneous_accompanying_periods')) {
+            $errors_accompanying_period = $this->validator->validate(
+                $person,
+                null,
+                ['accompanying_period_consistent']
+            );
+
+            foreach ($errors_accompanying_period as $error) {
+                $errors->add($error);
+            }
+        }
+
+        return $errors;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
new file mode 100644
index 000000000..ddd3445a4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use function count;
+use function in_array;
+
+class AccompanyingPeriodWorkEvaluationApiController
+{
+    private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private SerializerInterface $serializer;
+
+    public function __construct(
+        DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
+        SerializerInterface $serializer,
+        PaginatorFactory $paginatorFactory
+    ) {
+        $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
+        $this->serializer = $serializer;
+        $this->paginatorFactory = $paginatorFactory;
+    }
+
+    /**
+     * @Route("/api/1.0/person/docgen/template/by-evaluation/{id}.{_format}",
+     * requirements={"format": "json"})
+     */
+    public function listTemplateByEvaluation(Evaluation $evaluation, string $_format): JsonResponse
+    {
+        if ('json' !== $_format) {
+            throw new BadRequestHttpException('format not supported');
+        }
+
+        $evaluations =
+            array_filter(
+                $this->docGeneratorTemplateRepository
+                    ->findByEntity(AccompanyingPeriodWorkEvaluation::class),
+                static function (DocGeneratorTemplate $t) use ($evaluation) {
+                    $ids = $t->getOptions()['evaluations'] ?? [];
+
+                    return in_array($evaluation->getId(), $ids, true);
+                }
+            );
+
+        $paginator = $this->paginatorFactory->create(count($evaluations));
+        $paginator->setItemsPerPage(count($evaluations));
+
+        return new JsonResponse($this->serializer->serialize(
+            new Collection($evaluations, $paginator),
+            'json',
+            [
+                AbstractNormalizer::GROUPS => ['read'],
+            ]
+        ), JsonResponse::HTTP_OK, [], true);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php
index 483619be6..9eee2c4a0 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php
@@ -1,50 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class AdminClosingMotiveController
- * Controller for closing motives
- *
- * @package Chill\PersonBundle\Controller
+ * Controller for closing motives.
  */
 class AdminClosingMotiveController extends CRUDController
 {
-    
     /**
      * @param \Chill\MainBundle\CRUD\Controller\string|string $action
-     * @param Request $request
-     * @return object
      */
     protected function createEntity($action, Request $request): object
     {
         $entity = parent::createEntity($action, $request);
-        
+
         if ($request->query->has('parent_id')) {
             $parentId = $request->query->getInt('parent_id');
-            
+
             $parent = $this->getDoctrine()->getManager()
                 ->getRepository($this->getEntityClass())
                 ->find($parentId);
-            
-            if (NULL === $parent) {
+
+            if (null === $parent) {
                 throw $this->createNotFoundException('parent id not found');
             }
-            
+
             $entity->setParent($parent);
         }
+
         return $entity;
     }
-    
+
     /**
-     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index 751beb7a8..9d16bdc13 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -1,26 +1,33 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * Class AdminController
- *
- * @package Chill\PersonBundle\Controller
+ * Class AdminController.
  */
 class AdminController extends AbstractController
 {
     /**
      * @param $_locale
+     *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction($_locale)
     {
         return $this->render('ChillPersonBundle:Admin:layout.html.twig', []);
     }
-    
+
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php b/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php
index da46ac5c5..d27ebe2e8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php
@@ -1,15 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
 /**
- * Class AdminMaritalStatusController
- *
- * @package Chill\PersonBundle\Controller
+ * Class AdminMaritalStatusController.
  */
 class AdminMaritalStatusController extends CRUDController
 {
     // for minimal cases, nothing is required here !
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
index 11e41ba29..62f4fc68f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
@@ -1,27 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Serializer\Model\Collection;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\Household\HouseholdACLAwareRepositoryInterface;
 use Chill\PersonBundle\Repository\Household\HouseholdRepository;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use function array_filter;
+use function array_values;
 
 class HouseholdApiController extends ApiController
 {
-    private HouseholdRepository $householdRepository;
-
     private HouseholdACLAwareRepositoryInterface $householdACLAwareRepository;
 
+    private HouseholdRepository $householdRepository;
+
     public function __construct(
         HouseholdRepository $householdRepository,
         HouseholdACLAwareRepositoryInterface $householdACLAwareRepository
@@ -30,44 +41,44 @@ class HouseholdApiController extends ApiController
         $this->householdACLAwareRepository = $householdACLAwareRepository;
     }
 
-    public function householdAddressApi($id, Request $request, string $_format): Response
-    {
-        return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, [ 'groups' => [ 'read' ] ]);
-    }
-
     /**
-     * Find Household of people participating to the same AccompanyingPeriod
+     * @Route("/api/1.0/person/household/by-address-reference/{id}.json",
+     * name="chill_api_person_household_by_address_reference")
      *
-     * @ParamConverter("person", options={"id" = "person_id"})
+     * @return \Symfony\Component\HttpFoundation\JsonResponse
      */
-    public function suggestHouseholdByAccompanyingPeriodParticipationApi(Person $person, string $_format)
+    public function getHouseholdByAddressReference(AddressReference $addressReference): Response
     {
-        // TODO add acl
-
-        $count = $this->householdRepository->countByAccompanyingPeriodParticipation($person);
-        $paginator = $this->getPaginatorFactory()->create($count);
-
-        if ($count === 0) {
-            $households = [];
-        } else {
-            $households = $this->householdRepository->findByAccompanyingPeriodParticipation($person,
-                $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
-        }
+        // TODO ACL
+        $this->denyAccessUnlessGranted('ROLE_USER');
 
+        $total = $this->householdACLAwareRepository->countByAddressReference($addressReference);
+        $paginator = $this->getPaginatorFactory()->create($total);
+        $households = $this->householdACLAwareRepository->findByAddressReference(
+            $addressReference,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
         $collection = new Collection($households, $paginator);
 
-        return $this->json($collection, Response::HTTP_OK, [],
-            [ "groups" => ["read"]]);
+        return $this->json($collection, Response::HTTP_OK, [], [
+            AbstractNormalizer::GROUPS => ['read'],
+        ]);
+    }
+
+    public function householdAddressApi($id, Request $request, string $_format): Response
+    {
+        return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, ['groups' => ['read']]);
     }
 
     /**
      * @Route("/api/1.0/person/address/suggest/by-household/{household_id}.{_format}",
-     *  name="chill_person_address_suggest_by_household",
-     *  requirements={
-     *     "_format"="json"
+     *     name="chill_person_address_suggest_by_household",
+     *     requirements={
+     *         "_format": "json"
      *     }
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
      */
     public function suggestAddressByHousehold(Household $household, string $_format)
     {
@@ -81,9 +92,11 @@ class HouseholdApiController extends ApiController
                     $a = $participation->getAccompanyingPeriod()->getAddressLocation();
                     $addresses[$a->getId()] = $a;
                 }
+
                 if (null !== $personLocation = $participation
                     ->getAccompanyingPeriod()->getPersonLocation()) {
                     $a = $personLocation->getCurrentHouseholdAddress();
+
                     if (null !== $a) {
                         $addresses[$a->getId()] = $a;
                     }
@@ -93,34 +106,59 @@ class HouseholdApiController extends ApiController
 
         // remove the actual address
         $actual = $household->getCurrentAddress();
+
         if (null !== $actual) {
-            $addresses = \array_filter($addresses, fn($a) => $a !== $actual);
+            $addresses = array_filter($addresses, static fn ($a) => $a !== $actual);
         }
 
-        return $this->json(\array_values($addresses), Response::HTTP_OK, [],
-            [ 'groups' => [ 'read' ] ]);
+        return $this->json(
+            array_values($addresses),
+            Response::HTTP_OK,
+            [],
+            ['groups' => ['read']]
+        );
     }
 
     /**
+     * Find Household of people participating to the same AccompanyingPeriod.
      *
-     * @Route("/api/1.0/person/household/by-address-reference/{id}.json",
-     *     name="chill_api_person_household_by_address_reference")
-     * @param AddressReference $addressReference
-     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     * @ParamConverter("person", options={"id": "person_id"})
      */
-    public function getHouseholdByAddressReference(AddressReference $addressReference): Response
+    public function suggestHouseholdByAccompanyingPeriodParticipationApi(Person $person, string $_format)
     {
-        // TODO ACL
-        $this->denyAccessUnlessGranted('ROLE_USER');
+        // TODO add acl
 
-        $total = $this->householdACLAwareRepository->countByAddressReference($addressReference);
-        $paginator = $this->getPaginatorFactory()->create($total);
-        $households = $this->householdACLAwareRepository->findByAddressReference($addressReference,
-            $paginator->getCurrentPageFirstItemNumber(), $paginator->getItemsPerPage());
+        $count = $this->householdRepository->countByAccompanyingPeriodParticipation($person);
+        $paginator = $this->getPaginatorFactory()->create($count);
+
+        $households = [];
+
+        if (0 !== $count) {
+            $allHouseholds = $this->householdRepository->findByAccompanyingPeriodParticipation(
+                $person,
+                $paginator->getItemsPerPage(),
+                $paginator->getCurrentPageFirstItemNumber()
+            );
+            $currentHouseholdPerson = $person->getCurrentHousehold();
+
+            foreach ($allHouseholds as $h) {
+                if ($h !== $currentHouseholdPerson) {
+                    $households[] = $h;
+                }
+            }
+
+            if (null !== $currentHouseholdPerson) {
+                $count = $count - 1;
+                $paginator = $this->getPaginatorFactory()->create($count);
+            }
+        }
         $collection = new Collection($households, $paginator);
 
-        return $this->json($collection, Response::HTTP_OK, [], [
-            AbstractNormalizer::GROUPS => ['read']
-        ]);
+        return $this->json(
+            $collection,
+            Response::HTTP_OK,
+            [],
+            ['groups' => ['read']]
+        );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 1b9824184..6ce73d508 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -1,51 +1,256 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Entity\Address;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Form\HouseholdType;
+use Chill\PersonBundle\Repository\Household\PositionRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\Household\Position;
-use Chill\PersonBundle\Repository\Household\PositionRepository;
+use function array_key_exists;
+use function count;
 
 /**
  * @Route("/{_locale}/person/household")
  */
 class HouseholdController extends AbstractController
 {
-    private TranslatorInterface $translator;
-
     private PositionRepository $positionRepository;
 
-    public function __construct(TranslatorInterface $translator, PositionRepository $positionRepository)
+    private Security $security;
 
-    {
+    private SerializerInterface $serializer;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        PositionRepository $positionRepository,
+        SerializerInterface $serializer,
+        Security $security
+    ) {
         $this->translator = $translator;
         $this->positionRepository = $positionRepository;
+        $this->serializer = $serializer;
+        $this->security = $security;
     }
 
     /**
      * @Route(
-     *      "/{household_id}/summary",
-     *      name="chill_person_household_summary",
-     *      methods={"GET", "HEAD"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
+     *     "/{household_id}/accompanying-period",
+     *     name="chill_person_household_accompanying_period",
+     *     methods={"GET", "HEAD"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
+     */
+    public function accompanyingPeriod(Request $request, Household $household)
+    {
+        $currentMembers = $household->getCurrentPersons();
+        $accompanyingPeriods = [];
+
+        foreach ($currentMembers as $p) {
+            $accompanyingPeriodsMember = $p->getCurrentAccompanyingPeriods();
+
+            foreach ($accompanyingPeriodsMember as $accompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $accompanyingPeriod)) {
+                    continue;
+                }
+                $accompanyingPeriods[$accompanyingPeriod->getId()] = $accompanyingPeriod;
+            }
+        }
+
+        $oldMembers = $household->getNonCurrentMembers();
+        $accompanyingPeriodsOld = [];
+
+        foreach ($oldMembers as $m) {
+            $accompanyingPeriodsOldMember = $m->getPerson()->getAccompanyingPeriods();
+
+            foreach ($accompanyingPeriodsOldMember as $accompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $accompanyingPeriod)) {
+                    continue;
+                }
+                $id = $accompanyingPeriod->getId();
+
+                if (!array_key_exists($id, $accompanyingPeriodsOld) && !array_key_exists($id, $accompanyingPeriods)) {
+                    $accompanyingPeriodsOld[$id] = $accompanyingPeriod;
+                }
+            }
+        }
+
+        return $this->render(
+            '@ChillPerson/Household/accompanying_period.html.twig',
+            [
+                'household' => $household,
+                'accompanying_periods' => $accompanyingPeriods,
+                'accompanying_periods_old' => $accompanyingPeriodsOld,
+            ]
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/{household_id}/address/edit",
+     *     name="chill_person_household_address_edit",
+     *     methods={"GET", "HEAD", "POST"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
+     */
+    public function addressEdit(Request $request, Household $household)
+    {
+        // TODO ACL
+
+        $address_id = $request->query->get('address_id');
+        $address = $this->getDoctrine()->getManager()
+            ->getRepository(Address::class)
+            ->find($address_id);
+
+        return $this->render(
+            '@ChillPerson/Household/address_edit.html.twig',
+            [
+                'household' => $household,
+                'address' => $address,
+            ]
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/{household_id}/addresses",
+     *     name="chill_person_household_addresses",
+     *     methods={"GET", "HEAD"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
+     */
+    public function addresses(Request $request, Household $household)
+    {
+        // TODO ACL
+
+        //TODO put these lines into a validator constraint on household->getAddress
+        $addresses = $household->getAddresses();
+        $cond = true;
+
+        for ($i = 0; count($addresses) - 1 > $i; ++$i) {
+            if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) {
+                $cond = false;
+            }
+        }
+
+        return $this->render(
+            '@ChillPerson/Household/addresses.html.twig',
+            [
+                'household' => $household,
+            ]
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/{household_id}/address/move",
+     *     name="chill_person_household_address_move",
+     *     methods={"GET", "HEAD", "POST"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
+     */
+    public function addressMove(Request $request, Household $household)
+    {
+        // TODO ACL
+
+        return $this->render(
+            '@ChillPerson/Household/address_move.html.twig',
+            [
+                'household' => $household,
+            ]
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/{household_id}/members/metadata/edit",
+     *     name="chill_person_household_members_metadata_edit",
+     *     methods={"GET", "POST"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
+     */
+    public function editHouseholdMetadata(Request $request, Household $household)
+    {
+        // TODO ACL
+        $form = $this->createMetadataForm($household);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator->trans('household.data_saved'));
+
+            return $this->redirectToRoute('chill_person_household_summary', [
+                'household_id' => $household->getId(),
+            ]);
+        }
+
+        return $this->render('@ChillPerson/Household/edit_member_metadata.html.twig', [
+            'household' => $household,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "/{household_id}/relationship",
+     *     name="chill_person_household_relationship",
+     *     methods={"GET", "HEAD"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
+     */
+    public function showRelationship(Request $request, Household $household)
+    {
+        $jsonString = $this->serializer->serialize(
+            $household->getCurrentPersons(),
+            'json',
+            [AbstractNormalizer::GROUPS => ['read']]
+        );
+
+        return $this->render(
+            '@ChillPerson/Household/relationship.html.twig',
+            [
+                'household' => $household,
+                'persons' => $jsonString,
+            ]
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/{household_id}/summary",
+     *     name="chill_person_household_summary",
+     *     methods={"GET", "HEAD"}
+     * )
+     * @ParamConverter("household", options={"id": "household_id"})
      */
     public function summary(Request $request, Household $household)
     {
         // TODO ACL
 
         $positions = $this->positionRepository
-            ->findByActiveOrdered()
-            ;
+            ->findByActiveOrdered();
 
         // little performance improvement:
         // initialize members collection, which will avoid
@@ -58,179 +263,29 @@ class HouseholdController extends AbstractController
             $form = null;
         }
 
-        return $this->render('@ChillPerson/Household/summary.html.twig',
+        return $this->render(
+            '@ChillPerson/Household/summary.html.twig',
             [
                 'household' => $household,
                 'positions' => $positions,
-                'form' => NULL !== $form ? $form->createView() : null,
+                'form' => null !== $form ? $form->createView() : null,
             ]
         );
     }
 
-    /**
-     * @Route(
-     *      "/{household_id}/accompanying-period",
-     *      name="chill_person_household_accompanying_period",
-     *      methods={"GET", "HEAD"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function accompanyingPeriod(Request $request, Household $household)
-    {
-        // TODO ACL
-
-        $members = $household->getMembers();
-        foreach($members as $m) {
-            $accompanyingPeriods = $m->getPerson()->getAccompanyingPeriods();
-        }
-
-        return $this->render('@ChillPerson/Household/accompanying_period.html.twig',
-            [
-                'household' => $household,
-                'accompanying_periods' => $accompanyingPeriods
-            ]
-        );
-    }
-
-    /**
-     * @Route(
-     *      "/{household_id}/addresses",
-     *      name="chill_person_household_addresses",
-     *      methods={"GET", "HEAD"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function addresses(Request $request, Household $household)
-    {
-        // TODO ACL
-
-        //TODO put these lines into a validator constraint on household->getAddress
-        $addresses = $household->getAddresses();
-        $cond = True;
-        for ($i=0; $i < count($addresses) - 1; $i++) {
-            if ($addresses[$i]->getValidFrom() != $addresses[$i + 1]->getValidTo()) {
-                $cond = False;
-            }
-        }
-
-        return $this->render('@ChillPerson/Household/addresses.html.twig',
-            [
-                'household' => $household
-            ]
-        );
-    }
-
-
-    /**
-     * @Route(
-     *      "/{household_id}/address/move",
-     *      name="chill_person_household_address_move",
-     *      methods={"GET", "HEAD", "POST"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function addressMove(Request $request, Household $household)
-    {
-        // TODO ACL
-
-        return $this->render('@ChillPerson/Household/address_move.html.twig',
-            [
-                'household' => $household
-            ]
-        );
-    }
-
-    /**
-     * @Route(
-     *      "/{household_id}/address/edit",
-     *      name="chill_person_household_address_edit",
-     *      methods={"GET", "HEAD", "POST"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function addressEdit(Request $request, Household $household)
-    {
-
-        // TODO ACL
-
-        $address_id = $request->query->get('address_id');
-        $address = $this->getDoctrine()->getManager()
-            ->getRepository(Address::class)
-            ->find($address_id)
-            ;
-
-        return $this->render('@ChillPerson/Household/address_edit.html.twig',
-            [
-                'household' => $household,
-                'address' => $address,
-            ]
-        );
-    }
-
-    /**
-     * @Route(
-     *      "/{household_id}/relationship",
-     *      name="chill_person_household_relationship",
-     *      methods={"GET", "HEAD"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function showRelationship(Request $request, Household $household)
-    {
-        return $this->render('@ChillPerson/Household/relationship.html.twig',
-            [
-                'household' => $household
-            ]
-        );
-    }
-
-    /**
-     * @Route(
-     *      "/{household_id}/members/metadata/edit",
-     *      name="chill_person_household_members_metadata_edit",
-     *      methods={"GET", "POST"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function editHouseholdMetadata(Request $request, Household $household)
-    {
-        // TODO ACL
-        $form = $this->createMetadataForm($household);
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() and $form->isValid()) {
-            $this->getDoctrine()->getManager()->flush();
-
-            $this->addFlash('success', $this->translator->trans('household.data_saved'));
-
-            return $this->redirectToRoute('chill_person_household_summary', [
-                'household_id' => $household->getId()
-            ]);
-        }
-
-        return $this->render('@ChillPerson/Household/edit_member_metadata.html.twig', [
-            'household' => $household,
-            'form' => $form->createView()
-        ]);
-    }
-
     private function createMetadataForm(Household $household): FormInterface
     {
-        $form = $this->createForm(
+        return $this->createForm(
             HouseholdType::class,
             $household,
             [
                 'action' => $this->generateUrl(
                     'chill_person_household_members_metadata_edit',
                     [
-                        'household_id' => $household->getId()
+                        'household_id' => $household->getId(),
                     ]
-                )
+                ),
             ]
         );
-
-        return $form;
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index 2cfd12842..012d0fd68 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -1,56 +1,191 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\HouseholdMemberType;
+use Chill\PersonBundle\Household\MembersEditor;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Form\HouseholdMemberType;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
-use Symfony\Component\Routing\Annotation\Route;
-use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\Translation\TranslatorInterface;
-use Chill\PersonBundle\Household\MembersEditor;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use function count;
 
 class HouseholdMemberController extends ApiController
 {
     private UrlGeneratorInterface $generator;
 
-    private TranslatorInterface $translator;
-
     private AccompanyingPeriodRepository $periodRepository;
 
+    private TranslatorInterface $translator;
+
     public function __construct(
         UrlGeneratorInterface $generator,
         TranslatorInterface $translator,
         AccompanyingPeriodRepository $periodRepository
-    )
-    {
+    ) {
         $this->generator = $generator;
         $this->translator = $translator;
         $this->periodRepository = $periodRepository;
     }
-    
+
     /**
      * @Route(
-     *      "/api/1.0/person/household/members/move.{_format}",
-     *      name="chill_api_person_household_members_move"
-     *  )
+     *     "/{_locale}/person/household/member/{id}/edit",
+     *     name="chill_person_household_member_edit"
+     * )
+     */
+    public function editMembership(Request $request, HouseholdMember $member): Response
+    {
+        // TODO ACL
+
+        $form = $this->createForm(HouseholdMemberType::class, $member, [
+            'validation_groups' => ['household_memberships'],
+        ]);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->getDoctrine()->getManager()->flush();
+
+            $this->addFlash('success', $this->translator
+                ->trans('household.successfully saved member'));
+
+            return $this->redirect(
+                $request->get('returnPath', null) ??
+                $this->generator->generate('chill_person_household_summary', ['household_id' => $member->getHousehold()->getId()])
+            );
+        }
+
+        return $this->render('@ChillPerson/Household/Member/edit.html.twig', [
+            'household' => $member->getHousehold(),
+            'member' => $member,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Route for showing an editor to leave a household.
+     *
+     * Possibles arguments are:
+     *
+     * * persons[]: an id of the person to add to the form
+     * * household: the id of the destination household
+     * * allow_leave_without_household: if present, the editor will allow
+     *     to leave household without joining another
+     *
+     * @Route(
+     *     "/{_locale}/person/household/members/editor",
+     *     name="chill_person_household_members_editor"
+     * )
+     */
+    public function editor(Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        if ($request->query->has('persons')) {
+            $ids = $request->query->get('persons', []);
+
+            if (0 === count($ids)) {
+                throw new BadRequestException('parameters persons in query ' .
+                    'is not an array or empty');
+            }
+
+            $persons = $em->getRepository(Person::class)
+                ->findById($ids);
+
+            foreach ($persons as $person) {
+                $this->denyAccessUnlessGranted(
+                    PersonVoter::SEE,
+                    $person,
+                    "You are not allowed to see person with id {$person->getId()}"
+                );
+            }
+        }
+
+        if ($householdId = $request->query->get('household', false)) {
+            $household = $em->getRepository(Household::class)
+                ->find($householdId);
+            $allowHouseholdCreate = false;
+            $allowHouseholdSearch = false;
+            $allowLeaveWithoutHousehold = false;
+
+            if (null === $household) {
+                throw $this->createNotFoundException('household not found');
+            }
+            // TODO ACL on household
+        }
+
+        $positions = $this->getDoctrine()->getManager()
+            ->getRepository(Position::class)
+            ->findAll();
+
+        $data = [
+            'persons' => $persons ?? false ?
+                $this->getSerializer()->normalize($persons, 'json', ['groups' => ['read']]) : [],
+            'household' => $household ?? false ?
+                $this->getSerializer()->normalize($household, 'json', ['groups' => ['read']]) : null,
+            'positions' => $this->getSerializer()->normalize($positions, 'json', ['groups' => ['read']]),
+            'allowHouseholdCreate' => $allowHouseholdCreate ?? true,
+            'allowHouseholdSearch' => $allowHouseholdSearch ?? true,
+            'allowLeaveWithoutHousehold' => $allowLeaveWithoutHousehold ?? $request->query->has('allow_leave_without_household'),
+        ];
+
+        // context
+        if ($request->query->has('accompanying_period_id')) {
+            $period = $this->periodRepository->find(
+                $request->query->getInt('accompanying_period_id')
+            );
+
+            if (null === $period) {
+                throw $this->createNotFoundException('period not found');
+            }
+
+            // TODO add acl on accompanying Course
+        }
+
+        return $this->render('@ChillPerson/Household/members_editor.html.twig', [
+            'data' => $data,
+            'expandSuggestions' => (int) $request->query->getBoolean('expand_suggestions', false),
+            'accompanyingCourse' => $period ?? null,
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "/api/1.0/person/household/members/move.{_format}",
+     *     name="chill_api_person_household_members_move"
+     * )
+     *
+     * @param mixed $_format
      */
     public function move(Request $request, $_format): Response
     {
         try {
             $editor = $this->getSerializer()
-                ->deserialize($request->getContent(), MembersEditor::class,
-                    $_format, ['groups' => [ "read" ]]);
+                ->deserialize(
+                    $request->getContent(),
+                    MembersEditor::class,
+                    $_format,
+                    ['groups' => ['read']]
+                );
         } catch (Exception\InvalidArgumentException | Exception\UnexpectedValueException $e) {
             throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e);
         }
@@ -68,143 +203,16 @@ class HouseholdMemberController extends ApiController
         // if new household, persist it
         if (
             $editor->hasHousehold()
-            &&
-            FALSE === $em->contains($editor->getHousehold())
+            && false === $em->contains($editor->getHousehold())
         ) {
             $em->persist($editor->getHousehold());
         }
 
         foreach ($editor->getPersistable() as $el) {
-           $em->persist($el); 
+            $em->persist($el);
         }
         $em->flush();
 
-        return $this->json($editor->getHousehold(), Response::HTTP_OK, [], ["groups" => ["read"]]);
-    }
-
-    /**
-     * Route for showing an editor to leave a household.
-     *
-     * Possibles arguments are:
-     *
-     * * persons[]: an id of the person to add to the form
-     * * household: the id of the destination household
-     * * allow_leave_without_household: if present, the editor will allow 
-     *     to leave household without joining another 
-     *
-     * @Route(
-     *      "/{_locale}/person/household/members/editor",
-     *      name="chill_person_household_members_editor"
-     *  )
-     */
-    public function editor(Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if ($request->query->has('persons')) {
-            $ids = $request->query->get('persons', []);
-
-            if (0 === count($ids)) {
-                throw new BadRequestExceptions("parameters persons in query ".
-                    "is not an array or empty");
-            }
-
-            $persons = $em->getRepository(Person::class)
-                ->findById($ids)
-                ;
-
-            foreach ($persons as $person) {
-                $this->denyAccessUnlessGranted(PersonVoter::SEE, $person, 
-                    "You are not allowed to see person with id {$person->getId()}"
-                );
-            }
-        }
-
-        if ($householdId = $request->query->get('household', false)) {
-            $household = $em->getRepository(Household::class)
-                ->find($householdId)
-                ;
-            $allowHouseholdCreate = false;
-            $allowHouseholdSearch = false;
-            $allowLeaveWithoutHousehold = false;
-
-            if (NULL === $household) {
-                throw $this->createNotFoundException('household not found');
-            }
-            // TODO ACL on household
-        }
-
-        $positions = $this->getDoctrine()->getManager()
-            ->getRepository(Position::class)
-            ->findAll()
-            ;
-
-        $data = [
-            'persons' => $persons ?? false ? 
-                $this->getSerializer()->normalize($persons, 'json', [ 'groups' => [ 'read' ]]) : [],
-            'household' => $household ?? false ?
-                $this->getSerializer()->normalize($household, 'json', [ 'groups' => [ 'read' ]]) : null,
-            'positions' => 
-                $this->getSerializer()->normalize($positions, 'json', [ 'groups' => [ 'read' ]]),
-            'allowHouseholdCreate' => $allowHouseholdCreate ?? true,
-            'allowHouseholdSearch' => $allowHouseholdSearch ?? true,
-            'allowLeaveWithoutHousehold' => $allowLeaveWithoutHousehold ?? $request->query->has('allow_leave_without_household'),
-        ];
-
-        // context
-        if ($request->query->has('accompanying_period_id')) {
-            $period = $this->periodRepository->find(
-                $request->query->getInt('accompanying_period_id')
-            );
-
-            if ($period === null) {
-                throw $this->createNotFoundException('period not found');
-            }
-
-            // TODO add acl on accompanying Course
-        }
-
-        return $this->render('@ChillPerson/Household/members_editor.html.twig', [
-            'data' => $data,
-            'expandSuggestions' => (int) $request->query->getBoolean('expand_suggestions', false),
-            'accompanyingCourse' => $period ?? null,
-        ]);
-    }
-
-    /**
-     * @Route(
-     *      "/{_locale}/person/household/member/{id}/edit",
-     *      name="chill_person_household_member_edit"
-     *  )
-     */
-    public function editMembership(Request $request, HouseholdMember $member): Response
-    {
-        // TODO ACL
-
-        $form = $this->createForm(HouseholdMemberType::class, $member, [
-            'validation_groups' => [ 'household_memberships' ] 
-        ]);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->getDoctrine()->getManager()->flush();
-
-            $this->addFlash('success', $this->translator
-                ->trans('household.successfully saved member')) 
-                ;
-
-            return $this->redirect(
-                $request->get('returnPath', null) ??
-                $this->generator->generate('chill_person_household_summary', [ 'household_id' => 
-                    $member->getHousehold()->getId() ])
-                );
-        }
-
-        return $this->render('@ChillPerson/Household/Member/edit.html.twig', [
-            'household' => $member->getHousehold(),
-            'member' => $member,
-            'form' => $form->createView()
-        ]);
-
+        return $this->json($editor->getHousehold(), Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
index 3b44162c4..e62c0c123 100644
--- a/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php
@@ -1,10 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use DateTime;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class OpeningApiController extends ApiController
 {
@@ -12,6 +21,6 @@ class OpeningApiController extends ApiController
     {
         $qb->where($qb->expr()->gt('e.noActiveAfter', ':now'))
             ->orWhere($qb->expr()->isNull('e.noActiveAfter'));
-        $qb->setParameter('now', new \DateTime('now'));
-    }     
+        $qb->setParameter('now', new DateTime('now'));
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
index 4ec1b6218..d387ff737 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
@@ -1,43 +1,28 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2016, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Form\Type\AddressType;
+use Chill\PersonBundle\Entity\Person;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Form\Type\AddressType;
-use Chill\MainBundle\Entity\Address;
-use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use function count;
 
 /**
  * Class PersonAddressController
- * Controller for addresses associated with person
- *
- * @package Chill\PersonBundle\Controller
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Controller for addresses associated with person.
  */
 class PersonAddressController extends AbstractController
 {
@@ -48,78 +33,27 @@ class PersonAddressController extends AbstractController
 
     /**
      * PersonAddressController constructor.
-     *
-     * @param ValidatorInterface $validator
      */
     public function __construct(ValidatorInterface $validator)
     {
         $this->validator = $validator;
     }
 
-    public function listAction($person_id)
-    {
-        $person = $this->getDoctrine()->getManager()
-              ->getRepository('ChillPersonBundle:Person')
-              ->find($person_id);
-
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-                    . " found ");
-        }
-
-        $this->denyAccessUnlessGranted(
-            'CHILL_PERSON_SEE',
-            $person,
-            "You are not allowed to edit this person."
-        );
-
-        return $this->render('ChillPersonBundle:Address:list.html.twig', array(
-            'person' => $person
-        ));
-    }
-
-    public function newAction($person_id)
-    {
-        $person = $this->getDoctrine()->getManager()
-              ->getRepository('ChillPersonBundle:Person')
-              ->find($person_id);
-
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-                    . " found ");
-        }
-
-        $this->denyAccessUnlessGranted(
-            'CHILL_PERSON_UPDATE',
-            $person,
-            "You are not allowed to edit this person."
-        );
-
-        $address = new Address();
-
-        $form = $this->createCreateForm($person, $address);
-
-        return $this->render('ChillPersonBundle:Address:new.html.twig', array(
-            'person' => $person,
-            'form' => $form->createView()
-        ));
-    }
-
     public function createAction($person_id, Request $request)
     {
         $person = $this->getDoctrine()->getManager()
-              ->getRepository('ChillPersonBundle:Person')
-              ->find($person_id);
+            ->getRepository('ChillPersonBundle:Person')
+            ->find($person_id);
 
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-                    . " found ");
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+                    . ' found ');
         }
 
         $this->denyAccessUnlessGranted(
             'CHILL_PERSON_UPDATE',
             $person,
-            "You are not allowed to edit this person."
+            'You are not allowed to edit this person.'
         );
 
         $address = new Address();
@@ -137,7 +71,6 @@ class PersonAddressController extends AbstractController
                     $this->addFlash('error', $error->getMessage());
                 }
             } elseif ($form->isValid()) {
-
                 $em = $this->getDoctrine()->getManager();
                 $em->flush();
 
@@ -146,47 +79,96 @@ class PersonAddressController extends AbstractController
                     $this->get('translator')->trans('The new address was created successfully')
                 );
 
-                return $this->redirectToRoute('chill_person_address_list', array(
-                    'person_id' => $person->getId()
-                ));
+                return $this->redirectToRoute('chill_person_address_list', [
+                    'person_id' => $person->getId(),
+                ]);
             } else {
                 $this->addFlash('error', $this->get('translator')
-                        ->trans('Error! Address not created!'));
+                    ->trans('Error! Address not created!'));
             }
         }
 
-        return $this->render('ChillPersonBundle:Address:new.html.twig', array(
+        return $this->render('ChillPersonBundle:Address:new.html.twig', [
             'person' => $person,
-            'form' => $form->createView()
-        ));
+            'form' => $form->createView(),
+        ]);
     }
 
     public function editAction($person_id, $address_id)
     {
         $person = $this->getDoctrine()->getManager()
-              ->getRepository('ChillPersonBundle:Person')
-              ->find($person_id);
+            ->getRepository('ChillPersonBundle:Person')
+            ->find($person_id);
 
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-                    . " found ");
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+                    . ' found ');
         }
 
         $this->denyAccessUnlessGranted(
             'CHILL_PERSON_UPDATE',
             $person,
-            "You are not allowed to edit this person."
+            'You are not allowed to edit this person.'
         );
 
         $address = $this->findAddressById($person, $address_id);
 
         $form = $this->createEditForm($person, $address);
 
-        return $this->render('ChillPersonBundle:Address:edit.html.twig', array(
-           'person' => $person,
-           'address' => $address,
-           'form' => $form->createView()
-        ));
+        return $this->render('ChillPersonBundle:Address:edit.html.twig', [
+            'person' => $person,
+            'address' => $address,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    public function listAction($person_id)
+    {
+        $person = $this->getDoctrine()->getManager()
+            ->getRepository('ChillPersonBundle:Person')
+            ->find($person_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+                    . ' found ');
+        }
+
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_SEE',
+            $person,
+            'You are not allowed to edit this person.'
+        );
+
+        return $this->render('ChillPersonBundle:Address:list.html.twig', [
+            'person' => $person,
+        ]);
+    }
+
+    public function newAction($person_id)
+    {
+        $person = $this->getDoctrine()->getManager()
+            ->getRepository('ChillPersonBundle:Person')
+            ->find($person_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+                    . ' found ');
+        }
+
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_UPDATE',
+            $person,
+            'You are not allowed to edit this person.'
+        );
+
+        $address = new Address();
+
+        $form = $this->createCreateForm($person, $address);
+
+        return $this->render('ChillPersonBundle:Address:new.html.twig', [
+            'person' => $person,
+            'form' => $form->createView(),
+        ]);
     }
 
     public function updateAction($person_id, $address_id, Request $request)
@@ -195,15 +177,15 @@ class PersonAddressController extends AbstractController
             ->getRepository('ChillPersonBundle:Person')
             ->find($person_id);
 
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-                . " found ");
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+                . ' found ');
         }
 
         $this->denyAccessUnlessGranted(
             'CHILL_PERSON_UPDATE',
             $person,
-            "You are not allowed to edit this person."
+            'You are not allowed to edit this person.'
         );
 
         $address = $this->findAddressById($person, $address_id);
@@ -211,7 +193,7 @@ class PersonAddressController extends AbstractController
         $form = $this->createEditForm($person, $address);
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() and $form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $validatePersonErrors = $this->validatePerson($person);
 
             if (count($validatePersonErrors) !== 0) {
@@ -220,90 +202,84 @@ class PersonAddressController extends AbstractController
                 }
             } elseif ($form->isValid()) {
                 $this->getDoctrine()->getManager()
-                      ->flush();
+                    ->flush();
 
                 $this->addFlash('success', $this->get('translator')->trans(
-                    "The address has been successfully updated"
+                    'The address has been successfully updated'
                 ));
 
-                return $this->redirectToRoute('chill_person_address_list', array(
-                   'person_id' => $person->getId()
-                ));
+                return $this->redirectToRoute('chill_person_address_list', [
+                    'person_id' => $person->getId(),
+                ]);
             } else {
                 $this->addFlash('error', $this->get('translator')
                     ->trans('Error when updating the period'));
             }
         }
 
-        return $this->render('ChillPersonBundle:Address:edit.html.twig', array(
-           'person' => $person,
-           'address' => $address,
-           'form' => $form->createView()
-        ));
+        return $this->render('ChillPersonBundle:Address:edit.html.twig', [
+            'person' => $person,
+            'address' => $address,
+            'form' => $form->createView(),
+        ]);
     }
 
     /**
-     * @param Person $person
-     * @param Address $address
-     * @return \Symfony\Component\Form\Form
-     */
-    protected function createEditForm(Person $person, Address $address)
-    {
-        $form = $this->createForm(AddressType::class, $address, array(
-           'method' => 'POST',
-           'action' => $this->generateUrl('chill_person_address_update', array(
-              'person_id' => $person->getId(),
-              'address_id' => $address->getId()
-           )),
-           'has_no_address' => true
-        ));
-
-        $form->add('submit', SubmitType::class, array(
-           'label' => 'Submit'
-        ));
-
-        return $form;
-    }
-
-    /**
-     *
-     * @param Person $person
-     * @param Address $address
      * @return \Symfony\Component\Form\Form
      */
     protected function createCreateForm(Person $person, Address $address)
     {
-        $form = $this->createForm(AddressType::class, $address, array(
-           'method' => 'POST',
-           'action' => $this->generateUrl('chill_person_address_create', array(
-              'person_id' => $person->getId()
-           )),
-           'has_no_address' => true
-        ));
+        $form = $this->createForm(AddressType::class, $address, [
+            'method' => 'POST',
+            'action' => $this->generateUrl('chill_person_address_create', [
+                'person_id' => $person->getId(),
+            ]),
+            'has_no_address' => true,
+        ]);
 
-        $form->add('submit', SubmitType::class, array(
-           'label' => 'Submit'
-        ));
+        $form->add('submit', SubmitType::class, [
+            'label' => 'Submit',
+        ]);
+
+        return $form;
+    }
+
+    /**
+     * @return \Symfony\Component\Form\Form
+     */
+    protected function createEditForm(Person $person, Address $address)
+    {
+        $form = $this->createForm(AddressType::class, $address, [
+            'method' => 'POST',
+            'action' => $this->generateUrl('chill_person_address_update', [
+                'person_id' => $person->getId(),
+                'address_id' => $address->getId(),
+            ]),
+            'has_no_address' => true,
+        ]);
+
+        $form->add('submit', SubmitType::class, [
+            'label' => 'Submit',
+        ]);
 
         return $form;
     }
 
     /**
-     *
-     * @param Person $person
      * @param int $address_id
-     * @return Address
+     *
      * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the address id does not exists or is not associated with given person
+     *
+     * @return Address
      */
     protected function findAddressById(Person $person, $address_id)
     {
         $address = $this->getDoctrine()->getManager()
             ->getRepository(Address::class)
-            ->find($address_id)
-            ;
+            ->find($address_id);
 
         if (!$person->getAddresses()->contains($address)) {
-            throw $this->createAccessDeniedException("Not allowed to see this address");
+            throw $this->createAccessDeniedException('Not allowed to see this address');
         }
 
         return $address;
@@ -311,16 +287,17 @@ class PersonAddressController extends AbstractController
 
     /**
      * @param Chill\PersonBundle\Entity\Person $person
+     *
      * @return \Symfony\Component\Validator\ConstraintViolationListInterface
      */
     private function validatePerson(Person $person)
     {
         $errors = $this->validator
-            ->validate($person, null, array('Default'));
+            ->validate($person, null, ['Default']);
         $errors_addresses_consistent = $this->validator
-            ->validate($person, null, array('addresses_consistent'));
+            ->validate($person, null, ['addresses_consistent']);
 
-        foreach($errors_addresses_consistent as $error) {
+        foreach ($errors_addresses_consistent as $error) {
             $errors->add($error);
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
index ab39c13bb..23f6ec95d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php
@@ -1,70 +1,51 @@
 <?php
-/*
- * Copyright (C) 2015-2021 Champs-Libres Coopérative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Chill\MainBundle\Entity\Address;
 use Symfony\Component\Routing\Annotation\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Symfony\Component\Security\Core\Role\Role;
+use function array_filter;
+use function array_values;
 
 class PersonApiController extends ApiController
 {
     private AuthorizationHelper $authorizationHelper;
 
-    /**
-     * @param AuthorizationHelper $authorizationHelper
-     */
     public function __construct(AuthorizationHelper $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
 
-    protected function createEntity(string $action, Request $request): object
-    {
-        $person = parent::createEntity($action, $request);
-
-        // TODO temporary hack to allow creation of person with fake center
-        /* $centers = $this->authorizationHelper->getReachableCenters($this->getUser(),
-            new Role(PersonVoter::CREATE));
-        $person->setCenter($centers[0]); */
-
-        return $person;
-    }
-
     public function personAddressApi($id, Request $request, string $_format): Response
     {
-        return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, [ 'groups' => [ 'read' ] ]);
+        return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, ['groups' => ['read']]);
     }
 
     /**
      * @Route("/api/1.0/person/address/suggest/by-person/{person_id}.{_format}",
-     *  name="chill_person_address_suggest_by_person",
-     *  requirements={
-     *     "_format"="json"
+     *     name="chill_person_address_suggest_by_person",
+     *     requirements={
+     *         "_format": "json"
      *     }
-     *  )
-     *  @ParamConverter("person", options={"id" = "person_id"})
+     * )
+     * @ParamConverter("person", options={"id": "person_id"})
      */
     public function suggestAddress(Person $person, Request $request, string $_format): Response
     {
@@ -81,10 +62,20 @@ class PersonApiController extends ApiController
 
         // remove the actual address
         $actual = $person->getCurrentHouseholdAddress();
+
         if (null !== $actual) {
-            $addresses = \array_filter($addresses, fn($a) => $a !== $actual);
+            $addresses = array_filter($addresses, static fn ($a) => $a !== $actual);
         }
 
-        return $this->json(\array_values($addresses), Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]);
+        return $this->json(array_values($addresses), Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+
+    protected function createEntity(string $action, Request $request): object
+    {
+        return parent::createEntity($action, $request);
+        // TODO temporary hack to allow creation of person with fake center
+        /* $centers = $this->authorizationHelper->getReachableCenters($this->getUser(),
+            new Role(PersonVoter::CREATE));
+        $person->setCenter($centers[0]); */
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index f9190857c..1b79ba867 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -1,65 +1,49 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
-use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Psr\Log\LoggerInterface;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Form\CreationPersonType;
+use Chill\PersonBundle\Form\PersonType;
+use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Translation\TranslatorInterface;
-use Chill\MainBundle\Search\SearchProvider;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Routing\Annotation\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use function count;
+use function hash;
+use function implode;
+use function in_array;
+use function is_array;
 
 final class PersonController extends AbstractController
 {
     /**
-     * @var SimilarPersonMatcher
+     * @var ConfigPersonAltNamesHelper
      */
-    protected $similarPersonMatcher;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected $configPersonAltNameHelper;
 
     /**
      * @var EventDispatcherInterface
@@ -72,9 +56,14 @@ final class PersonController extends AbstractController
     protected $personRepository;
 
     /**
-     * @var ConfigPersonAltNamesHelper
+     * @var SimilarPersonMatcher
      */
-    protected $configPersonAltNameHelper;
+    protected $similarPersonMatcher;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     /**
      * @var EntityManagerInterface
@@ -111,113 +100,100 @@ final class PersonController extends AbstractController
         $this->validator = $validator;
         $this->em = $em;
         $this->security = $security;
-  }
+    }
+
+    public function editAction($person_id, Request $request)
+    {
+        $person = $this->_getPerson($person_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException();
+        }
+
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_UPDATE',
+            $person,
+            'You are not allowed to edit this person'
+        );
+
+        $form = $this->createForm(
+            PersonType::class,
+            $person,
+            [
+                'cFGroup' => $this->getCFGroup(),
+            ]
+        );
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && !$form->isValid()) {
+            $this->get('session')
+                ->getFlashBag()->add('error', $this->translator
+                ->trans('This form contains errors'));
+        } elseif ($form->isSubmitted() && $form->isValid()) {
+            $this->get('session')->getFlashBag()
+                ->add(
+                    'success',
+                    $this->get('translator')
+                        ->trans('The person data has been updated')
+                );
+
+            $this->em->flush();
+
+            return $this->redirectToRoute('chill_person_view', [
+                'person_id' => $person->getId(),
+            ]);
+        }
+
+        return $this->render(
+            'ChillPersonBundle:Person:edit.html.twig',
+            ['person' => $person, 'form' => $form->createView()]
+        );
+    }
 
     public function getCFGroup()
     {
         $cFGroup = null;
 
-        $cFDefaultGroup  = $this->em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup")
-            ->findOneByEntity("Chill\PersonBundle\Entity\Person");
+        $cFDefaultGroup = $this->em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup')
+            ->findOneByEntity('Chill\\PersonBundle\\Entity\\Person');
 
-        if($cFDefaultGroup) {
+        if ($cFDefaultGroup) {
             $cFGroup = $cFDefaultGroup->getCustomFieldsGroup();
         }
 
         return $cFGroup;
     }
 
-    public function viewAction($person_id)
+    /**
+     * @Route(
+     *     "/{_locale}/person/household/{person_id}/history",
+     *     name="chill_person_household_person_history",
+     *     methods={"GET", "POST"}
+     * )
+     * @ParamConverter("person", options={"id": "person_id"})
+     */
+    public function householdHistoryByPerson(Request $request, Person $person): Response
     {
-        $person = $this->_getPerson($person_id);
-
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-                    . " found on this server");
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person,
-                "You are not allowed to see this person.");
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_SEE',
+            $person,
+            'You are not allowed to see this person.'
+        );
 
         $event = new PrivacyEvent($person);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        return $this->render('ChillPersonBundle:Person:view.html.twig',
-            array(
-                "person" => $person,
-                "cFGroup" => $this->getCFGroup(),
-                "alt_names" => $this->configPersonAltNameHelper->getChoices(),
-            ));
-    }
-
-    public function editAction($person_id)
-    {
-        $person = $this->_getPerson($person_id);
-
-        if ($person === null) {
-            throw $this->createNotFoundException();
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_UPDATE', $person,
-                'You are not allowed to edit this person');
-
-        $form = $this->createForm(PersonType::class, $person,
-            array(
-                "action" => $this->generateUrl('chill_person_general_update',
-                    array("person_id" => $person_id)),
-                "cFGroup" => $this->getCFGroup()
-            )
+        return $this->render(
+            '@ChillPerson/Person/household_history.html.twig',
+            [
+                'person' => $person,
+            ]
         );
-
-        return $this->render('ChillPersonBundle:Person:edit.html.twig',
-            array('person' => $person, 'form' => $form->createView()));
-    }
-
-    public function updateAction($person_id, Request $request)
-    {
-        $person = $this->_getPerson($person_id);
-
-        if ($person === null) {
-            return $this->createNotFoundException();
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_UPDATE', $person,
-                'You are not allowed to edit this person');
-
-        $form = $this->createForm(PersonType::class, $person,
-            array("cFGroup" => $this->getCFGroup()));
-
-        if ($request->getMethod() === 'POST') {
-            $form->handleRequest($request);
-
-            if ( ! $form->isValid() ) {
-                $this->get('session')
-                        ->getFlashBag()->add('error', $this->translator
-                            ->trans('This form contains errors'));
-
-                return $this->render('ChillPersonBundle:Person:edit.html.twig',
-                        array('person' => $person,
-                            'form' => $form->createView()));
-            }
-
-            $this->get('session')->getFlashBag()
-                    ->add('success',
-                            $this->get('translator')
-                            ->trans('The person data has been updated')
-                            );
-
-            $this->em->flush();
-
-            $url = $this->generateUrl('chill_person_view', array(
-                'person_id' => $person->getId()
-            ));
-
-            return $this->redirect($url);
-        }
     }
 
     /**
-     * Method for creating a new person
+     * Method for creating a new person.
      *
      *The controller register data from a previous post on the form, and
      * register it in the session.
@@ -225,15 +201,14 @@ final class PersonController extends AbstractController
      * The next post compare the data with previous one and, if yes, show a
      * review page if there are "alternate persons".
      *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
+     * @return Response|\Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function newAction(Request $request)
     {
         $person = new Person();
 
         if (1 === count($this->security->getUser()
-                ->getGroupCenters())) {
+            ->getGroupCenters())) {
             $person->setCenter(
                 $this->security->getUser()
                     ->getGroupCenters()[0]
@@ -242,14 +217,12 @@ final class PersonController extends AbstractController
         }
 
         $form = $this->createForm(CreationPersonType::class, $person, [
-            'validation_groups' => ['create']
+            'validation_groups' => ['create'],
         ])->add('editPerson', SubmitType::class, [
-            'label' => 'Add the person'
+            'label' => 'Add the person',
         ])->add('createPeriod', SubmitType::class, [
-            'label' => 'Add the person and create an accompanying period'
-        ])->add('createHousehold', SubmitType::class, [
-            'label' => 'Add the person and create an household'
-        ]); // TODO createHousehold form action
+            'label' => 'Add the person and create an accompanying period',
+        ]);
 
         $form->handleRequest($request);
 
@@ -257,14 +230,12 @@ final class PersonController extends AbstractController
             $this->lastPostDataReset();
         } elseif ($request->getMethod() === Request::METHOD_POST
             && $form->isValid()) {
-
             $alternatePersons = $this->similarPersonMatcher
                 ->matchPerson($person);
 
             if (
-                FALSE === $this->isLastPostDataChanges($form, $request, true)
-                ||
-                count($alternatePersons) === 0
+                false === $this->isLastPostDataChanges($form, $request, true)
+                || count($alternatePersons) === 0
             ) {
                 $this->em->persist($person);
 
@@ -273,84 +244,75 @@ final class PersonController extends AbstractController
 
                 if ($form->get('createPeriod')->isClicked()) {
                     return $this->redirectToRoute('chill_person_accompanying_course_new', [
-                        'person_id' => [ $person->getId() ]
+                        'person_id' => [$person->getId()],
                     ]);
                 }
 
-                return $this->redirectToRoute('chill_person_general_edit',
-                    ['person_id' => $person->getId()]);
+                return $this->redirectToRoute(
+                    'chill_person_general_edit',
+                    ['person_id' => $person->getId()]
+                );
             }
         } elseif ($request->getMethod() === Request::METHOD_POST && !$form->isValid()) {
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
-        return $this->render('@ChillPerson/Person/create.html.twig',
+        return $this->render(
+            '@ChillPerson/Person/create.html.twig',
             [
                 'form' => $form->createView(),
-                'alternatePersons' => $alternatePersons ?? []
+                'alternatePersons' => $alternatePersons ?? [],
             ]
         );
     }
 
-    private function isLastPostDataChanges(Form $form, Request $request, bool $replace = false): bool
+    public function viewAction($person_id)
     {
-        /** @var SessionInterface $session */
-        $session = $this->get('session');
-        if (!$session->has('last_person_data')) {
-            return true;
+        $person = $this->_getPerson($person_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+                    . ' found on this server');
         }
 
-        $newPost = $this->lastPostDataBuildHash($form, $request);
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_SEE',
+            $person,
+            'You are not allowed to see this person.'
+        );
 
-        $isChanged = $newPost !== $session->get('last_person_data');
+        $event = new PrivacyEvent($person);
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        if ($replace) {
-            $session->set('last_person_data', $newPost);
-        }
-
-        return $isChanged ;
-    }
-
-    private function lastPostDataReset(): void
-    {
-        $this->get('session')->set('last_person_data', "");
+        return $this->render(
+            'ChillPersonBundle:Person:view.html.twig',
+            [
+                'person' => $person,
+                'cFGroup' => $this->getCFGroup(),
+                'alt_names' => $this->configPersonAltNameHelper->getChoices(),
+            ]
+        );
     }
 
     /**
-     * build the hash for posted data
+     * easy getting a person by his id.
      *
-     * For privacy reasons, the data are hashed using sha512
+     * @param mixed $id
      *
-     * @param Form $form
-     * @param Request $request
-     * @return string
+     * @return \Chill\PersonBundle\Entity\Person
      */
-    private function lastPostDataBuildHash(Form $form, Request $request): string
+    private function _getPerson($id)
     {
-        $fields = [];
-        $ignoredFields = ['form_status', '_token'];
-
-        foreach ($request->request->all()[$form->getName()] as $field => $value) {
-            if (\in_array($field, $ignoredFields)) {
-                continue;
-            }
-            $fields[$field] = \is_array($value) ?
-                \implode(",", $value) : $value;
-        }
-        ksort($fields);
-
-        return \hash('sha512', \implode("&", $fields));
+        return $this->personRepository->find($id);
     }
 
     /**
-     *
-     * @param \Chill\PersonBundle\Entity\Person $person
      * @return \Symfony\Component\Validator\ConstraintViolationListInterface
      */
     private function _validatePersonAndAccompanyingPeriod(Person $person)
     {
         $errors = $this->validator
-            ->validate($person, null, array('creation'));
+            ->validate($person, null, ['creation']);
 
         //validate accompanying periods
         $periods = $person->getAccompanyingPeriods();
@@ -360,7 +322,7 @@ final class PersonController extends AbstractController
                 ->validate($period);
 
             //group errors :
-            foreach($period_errors as $error) {
+            foreach ($period_errors as $error) {
                 $errors->add($error);
             }
         }
@@ -368,39 +330,50 @@ final class PersonController extends AbstractController
         return $errors;
     }
 
-    /**
-     * easy getting a person by his id
-     * @return \Chill\PersonBundle\Entity\Person
-     */
-    private function _getPerson($id)
+    private function isLastPostDataChanges(Form $form, Request $request, bool $replace = false): bool
     {
-        $person = $this->personRepository->find($id);
+        /** @var SessionInterface $session */
+        $session = $this->get('session');
 
-        return $person;
+        if (!$session->has('last_person_data')) {
+            return true;
+        }
+
+        $newPost = $this->lastPostDataBuildHash($form, $request);
+
+        $isChanged = $session->get('last_person_data') !== $newPost;
+
+        if ($replace) {
+            $session->set('last_person_data', $newPost);
+        }
+
+        return $isChanged;
     }
 
     /**
+     * build the hash for posted data.
      *
-     * @Route(
-     *      "/{_locale}/person/household/{person_id}/history",
-     *      name="chill_person_household_person_history",
-     *      methods={"GET", "POST"}
-     *  )
-     *  @ParamConverter("person", options={"id" = "person_id"})
+     * For privacy reasons, the data are hashed using sha512
      */
-    public function householdHistoryByPerson(Request $request, Person $person): Response
+    private function lastPostDataBuildHash(Form $form, Request $request): string
     {
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person,
-                "You are not allowed to see this person.");
+        $fields = [];
+        $ignoredFields = ['form_status', '_token'];
 
-        $event = new PrivacyEvent($person);
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        foreach ($request->request->all()[$form->getName()] as $field => $value) {
+            if (in_array($field, $ignoredFields, true)) {
+                continue;
+            }
+            $fields[$field] = is_array($value) ?
+                implode(',', $value) : $value;
+        }
+        ksort($fields);
 
-        return $this->render(
-            '@ChillPerson/Person/household_history.html.twig',
-            [
-                'person' => $person
-            ]
-        );
+        return hash('sha512', implode('&', $fields));
+    }
+
+    private function lastPostDataReset(): void
+    {
+        $this->get('session')->set('last_person_data', '');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index d30ddebae..0b3f36b1c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -1,29 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\DocStoreBundle\Entity\PersonDocument;
+use Chill\EventBundle\Entity\Participation;
 use Chill\PersonBundle\Actions\Remove\PersonMove;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonNotDuplicate;
 use Chill\PersonBundle\Form\PersonConfimDuplicateType;
 use Chill\PersonBundle\Form\PersonFindManuallyDuplicateType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use Chill\TaskBundle\Entity\SingleTask;
 use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Translation\TranslatorInterface;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\DocStoreBundle\Entity\PersonDocument;
-use Chill\EventBundle\Entity\Participation;
-use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
-use Chill\TaskBundle\Entity\SingleTask;
+use function count;
 
 class PersonDuplicateController extends Controller
 {
+    /**
+     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+     */
+    private $eventDispatcher;
+
+    /**
+     * @var \Chill\PersonBundle\Actions\Remove\PersonMove
+     */
+    private $personMove;
+
+    /**
+     * @var \Chill\PersonBundle\Repository\PersonRepository
+     */
+    private $personRepository;
+
     /**
      * @var \Chill\PersonBundle\Search\SimilarPersonMatcher
      */
@@ -34,27 +58,12 @@ class PersonDuplicateController extends Controller
      */
     private $translator;
 
-    /**
-     * @var \Chill\PersonBundle\Repository\PersonRepository
-     */
-    private $personRepository;
-
-    /**
-     * @var \Chill\PersonBundle\Actions\Remove\PersonMove
-     */
-    private $personMove;
-
-    /**
-     * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-     */
-    private $eventDispatcher;
-
     public function __construct(
-      SimilarPersonMatcher $similarPersonMatcher,
-      TranslatorInterface $translator,
-      PersonRepository $personRepository,
-      PersonMove $personMove,
-      EventDispatcherInterface $eventDispatcher
+        SimilarPersonMatcher $similarPersonMatcher,
+        TranslatorInterface $translator,
+        PersonRepository $personRepository,
+        PersonMove $personMove,
+        EventDispatcherInterface $eventDispatcher
     ) {
         $this->similarPersonMatcher = $similarPersonMatcher;
         $this->translator = $translator;
@@ -63,29 +72,6 @@ class PersonDuplicateController extends Controller
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function viewAction($person_id, PersonNotDuplicateRepository $personNotDuplicateRepository)
-    {
-        $person = $this->_getPerson($person_id);
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-              . " found on this server");
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DUPLICATE', $person,
-          "You are not allowed to see this person.");
-
-        $duplicatePersons = $this->similarPersonMatcher->
-            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
-
-        $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
-
-        return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
-            'person' => $person,
-            'duplicatePersons' => $duplicatePersons,
-            'notDuplicatePersons' => $notDuplicatePersons,
-        ]);
-    }
-
     public function confirmAction($person1_id, $person2_id, Request $request)
     {
         if ($person1_id === $person2_id) {
@@ -98,17 +84,20 @@ class PersonDuplicateController extends Controller
         $person1->counters = $this->_getCounters($person1_id);
         $person2->counters = $this->_getCounters($person2_id);
 
-        if ($person1 === null) {
-            throw $this->createNotFoundException("Person with id $person1_id not"
-                . " found on this server");
+        if (null === $person1) {
+            throw $this->createNotFoundException("Person with id {$person1_id} not"
+                . ' found on this server');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DUPLICATE', $person1,
-            "You are not allowed to see this person.");
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_DUPLICATE',
+            $person1,
+            'You are not allowed to see this person.'
+        );
 
-        if ($person2 === null) {
-            throw $this->createNotFoundException("Person with id $person2_id not"
-                . " found on this server");
+        if (null === $person2) {
+            throw $this->createNotFoundException("Person with id {$person2_id} not"
+                . ' found on this server');
         }
 
         $form = $this->createForm(PersonConfimDuplicateType::class);
@@ -116,10 +105,10 @@ class PersonDuplicateController extends Controller
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $event = new PrivacyEvent($person1, array(
+            $event = new PrivacyEvent($person1, [
                 'element_class' => Person::class,
-                'action' => 'move'
-            ));
+                'action' => 'move',
+            ]);
             $event->addPerson($person2);
             $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
@@ -128,7 +117,8 @@ class PersonDuplicateController extends Controller
             $connection = $this->getDoctrine()->getConnection();
 
             $connection->beginTransaction();
-            foreach($sqls as $sql) {
+
+            foreach ($sqls as $sql) {
                 $connection->executeQuery($sql);
             }
             $connection->commit();
@@ -143,15 +133,68 @@ class PersonDuplicateController extends Controller
         ]);
     }
 
+    public function findManuallyDuplicateAction($person_id, Request $request)
+    {
+        $person = $this->_getPerson($person_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+              . ' found on this server');
+        }
+
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_DUPLICATE',
+            $person,
+            'You are not allowed to see this person.'
+        );
+
+        $form = $this->createForm(PersonFindManuallyDuplicateType::class);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $person2 = $form->get('person')->getData();
+
+            if (null === $person2) {
+                throw $this->createNotFoundException("Person with id {$person2->getId}() not"
+                  . ' found on this server');
+            }
+
+            $direction = $form->get('direction')->getData();
+
+            if ('starting' === $direction) {
+                $params = [
+                    'person1_id' => $person->getId(),
+                    'person2_id' => $person2->getId(),
+                ];
+            } else {
+                $params = [
+                    'person1_id' => $person2->getId(),
+                    'person2_id' => $person->getId(),
+                ];
+            }
+
+            return $this->redirectToRoute('chill_person_duplicate_confirm', $params);
+        }
+
+        return $this->render('ChillPersonBundle:PersonDuplicate:find_manually.html.twig', [
+            'person' => $person,
+            'form' => $form->createView(),
+        ]);
+    }
+
     public function notDuplicateAction($person1_id, $person2_id)
     {
         [$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DUPLICATE', $person1,
-          "You are not allowed to see this person.");
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_DUPLICATE',
+            $person1,
+            'You are not allowed to see this person.'
+        );
 
         $personNotDuplicate = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
-          ->findOneBy(['person1' => $person1, 'person2' => $person2]);
+            ->findOneBy(['person1' => $person1, 'person2' => $person2]);
 
         if (!$personNotDuplicate instanceof PersonNotDuplicate) {
             $personNotDuplicate = new PersonNotDuplicate();
@@ -170,11 +213,14 @@ class PersonDuplicateController extends Controller
     {
         [$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DUPLICATE', $person1,
-          "You are not allowed to see this person.");
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_DUPLICATE',
+            $person1,
+            'You are not allowed to see this person.'
+        );
 
         $personNotDuplicate = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
-          ->findOneBy(['person1' => $person1, 'person2' => $person2]);
+            ->findOneBy(['person1' => $person1, 'person2' => $person2]);
 
         if ($personNotDuplicate instanceof PersonNotDuplicate) {
             $this->getDoctrine()->getManager()->remove($personNotDuplicate);
@@ -184,54 +230,56 @@ class PersonDuplicateController extends Controller
         return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
     }
 
-    public function findManuallyDuplicateAction($person_id, Request $request)
+    public function viewAction($person_id, PersonNotDuplicateRepository $personNotDuplicateRepository)
     {
         $person = $this->_getPerson($person_id);
-        if ($person === null) {
-            throw $this->createNotFoundException("Person with id $person_id not"
-              . " found on this server");
+
+        if (null === $person) {
+            throw $this->createNotFoundException("Person with id {$person_id} not"
+              . ' found on this server');
         }
 
-        $this->denyAccessUnlessGranted('CHILL_PERSON_DUPLICATE', $person,
-          "You are not allowed to see this person.");
+        $this->denyAccessUnlessGranted(
+            'CHILL_PERSON_DUPLICATE',
+            $person,
+            'You are not allowed to see this person.'
+        );
 
-        $form = $this->createForm(PersonFindManuallyDuplicateType::class);
+        $duplicatePersons = $this->similarPersonMatcher->
+            matchPerson($person, $personNotDuplicateRepository, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
 
-        $form->handleRequest($request);
+        $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            $person2 = $form->get('person')->getData();
-
-            if ($person2 === null) {
-                throw $this->createNotFoundException("Person with id $person2->getId() not"
-                  . " found on this server");
-            }
-
-            $direction =  $form->get('direction')->getData();
-
-            if ($direction === 'starting') {
-                $params =  [
-                    'person1_id' => $person->getId(),
-                    'person2_id' => $person2->getId(),
-                ];
-            } else {
-                $params =  [
-                    'person1_id' => $person2->getId(),
-                    'person2_id' => $person->getId(),
-                ];
-            }
-
-            return $this->redirectToRoute('chill_person_duplicate_confirm', $params);
-        }
-
-        return $this->render('ChillPersonBundle:PersonDuplicate:find_manually.html.twig', [
+        return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
             'person' => $person,
-            'form' => $form->createView(),
+            'duplicatePersons' => $duplicatePersons,
+            'notDuplicatePersons' => $notDuplicatePersons,
         ]);
     }
 
+    private function _getCounters($id): ?array
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $nb_activity = $em->getRepository(Activity::class)->findBy(['person' => $id]);
+        $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person' => $id]);
+        $nb_event = $em->getRepository(Participation::class)->findBy(['person' => $id]);
+        $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person' => $id]);
+        $person = $em->getRepository(Person::class)->findOneBy(['id' => $id]);
+
+        return [
+            'nb_activity' => count($nb_activity),
+            'nb_document' => count($nb_document),
+            'nb_event' => count($nb_event),
+            'nb_task' => $nb_task,
+            'nb_addresses' => count($person->getAddresses()),
+        ];
+    }
+
     /**
-     * easy getting a person by his id
+     * easy getting a person by his id.
+     *
+     * @param mixed $id
      */
     private function _getPerson($id): ?Person
     {
@@ -252,35 +300,16 @@ class PersonDuplicateController extends Controller
             $person2 = $this->_getPerson($person2_id);
         }
 
-        if ($person1 === null) {
-            throw $this->createNotFoundException("Person with id $person1_id not"
-              . " found on this server");
+        if (null === $person1) {
+            throw $this->createNotFoundException("Person with id {$person1_id} not"
+              . ' found on this server');
         }
 
-        if ($person2 === null) {
-            throw $this->createNotFoundException("Person with id $person2_id not"
-              . " found on this server");
+        if (null === $person2) {
+            throw $this->createNotFoundException("Person with id {$person2_id} not"
+              . ' found on this server');
         }
 
         return [$person1, $person2];
     }
-
-    private function _getCounters($id): ?array
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $nb_activity = $em->getRepository(Activity::class)->findBy(['person'=>$id]);
-        $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person'=>$id]);
-        $nb_event = $em->getRepository(Participation::class)->findBy(['person'=>$id]);
-        $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person'=>$id]);
-        $person = $em->getRepository(Person::class)->findOneBy(['id'=>$id]);
-
-        return [
-            'nb_activity' => count($nb_activity),
-            'nb_document' => count($nb_document),
-            'nb_event' => count($nb_event),
-            'nb_task' => $nb_task,
-            'nb_addresses' => count($person->getAddresses())
-        ];
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
new file mode 100644
index 000000000..271b0cff7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+class RelationshipApiController extends ApiController
+{
+    private RelationshipRepository $repository;
+
+    private ValidatorInterface $validator;
+
+    public function __construct(ValidatorInterface $validator, RelationshipRepository $repository)
+    {
+        $this->validator = $validator;
+        $this->repository = $repository;
+    }
+
+    /**
+     * @ParamConverter("person", options={"id": "person_id"})
+     */
+    public function getRelationshipsByPerson(Person $person)
+    {
+        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
+
+        $relationships = $this->repository->findByPerson($person);
+
+        return $this->json($relationships, Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
index c1d251efb..d154c8e2e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
@@ -36,7 +45,7 @@ class SocialIssueApiController extends ApiController
     protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
     {
         $query
-            ->orderBy("GET_JSON_FIELD_BY_KEY(e.title, :locale)", 'ASC')
+            ->orderBy('GET_JSON_FIELD_BY_KEY(e.title, :locale)', 'ASC')
             ->setParameter(':locale', $request->getLocale());
 
         return null;
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php
index 134cedc74..8105066e9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php
@@ -1,32 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
 /**
  * Class AdminSocialIssueController
- * Controller for social issues
- *
- * @package Chill\PersonBundle\Controller
+ * Controller for social issues.
  */
 class AdminEvaluationController extends CRUDController
 {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php
index 18e1c9f3b..149d3c372 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php
@@ -1,32 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
 /**
  * Class AdminSocialIssueController
- * Controller for social issues
- *
- * @package Chill\PersonBundle\Controller
+ * Controller for social issues.
  */
 class AdminGoalController extends CRUDController
 {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php
index 80d552282..98ea9592a 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php
@@ -1,32 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
 /**
  * Class AdminSocialIssueController
- * Controller for social issues
- *
- * @package Chill\PersonBundle\Controller
+ * Controller for social issues.
  */
 class AdminResultController extends CRUDController
 {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php
index 695ec75a1..c254f8178 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php
@@ -1,32 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
 /**
  * Class AdminSocialIssueController
- * Controller for social issues
- *
- * @package Chill\PersonBundle\Controller
+ * Controller for social issues.
  */
 class AdminSocialActionController extends CRUDController
 {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php
index 35b0df4a2..f783ab182 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php
@@ -1,32 +1,21 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
 /**
  * Class AdminSocialIssueController
- * Controller for social issues
- *
- * @package Chill\PersonBundle\Controller
+ * Controller for social issues.
  */
 class AdminSocialIssueController extends CRUDController
 {
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
index 24b919978..98b40311d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php
@@ -1,22 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 class SocialWorkEvaluationApiController extends AbstractController
 {
     private PaginatorFactory $paginatorFactory;
 
-    /**
-     * @param PaginatorFactory $paginatorFactory
-     */
     public function __construct(PaginatorFactory $paginatorFactory)
     {
         $this->paginatorFactory = $paginatorFactory;
@@ -26,21 +32,21 @@ class SocialWorkEvaluationApiController extends AbstractController
      * @Route("/api/1.0/person/social-work/evaluation/by-social-action/{action_id}.json",
      *     name="chill_person_evaluation_index_by_social_action",
      *     requirements={
-     *          "_format": "json"
+     *         "_format": "json"
      *     }
      * )
      * @ParamConverter("action", options={"id": "action_id"})
-     * @param SocialAction $action
-     * @return Response
      */
     public function listEvaluationBySocialAction(SocialAction $action): Response
     {
         $pagination = $this->paginatorFactory->create($action->getEvaluations()->count());
 
-        $evaluations = $action->getEvaluations()->slice($pagination->getCurrentPageFirstItemNumber(),
-            $pagination->getItemsPerPage());
+        $evaluations = $action->getEvaluations()->slice(
+            $pagination->getCurrentPageFirstItemNumber(),
+            $pagination->getItemsPerPage()
+        );
         $collection = new Collection($evaluations, $pagination);
 
-        return $this->json($collection, Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]);
+        return $this->json($collection, Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
index 2e678a0d0..a9d1238da 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
@@ -1,13 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
+use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
-use Chill\MainBundle\CRUD\Controller\ApiController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -17,7 +25,6 @@ class SocialWorkGoalApiController extends ApiController
 
     private PaginatorFactory $paginator;
 
-
     public function __construct(GoalRepository $goalRepository, PaginatorFactory $paginator)
     {
         $this->goalRepository = $goalRepository;
@@ -28,13 +35,16 @@ class SocialWorkGoalApiController extends ApiController
     {
         $totalItems = $this->goalRepository->countBySocialActionWithDescendants($action);
         $paginator = $this->getPaginatorFactory()->create($totalItems);
-        
-        $entities = $this->goalRepository->findBySocialActionWithDescendants($action, ["id" => "ASC"],
-            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
-        
+
+        $entities = $this->goalRepository->findBySocialActionWithDescendants(
+            $action,
+            ['id' => 'ASC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
         $model = new Collection($entities, $paginator);
 
-        return $this->json($model, Response::HTTP_OK, [], [ "groups" => [ "read" ]]);    
+        return $this->json($model, Response::HTTP_OK, [], ['groups' => ['read']]);
     }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
index 24902a163..3ce3848fd 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkResultApiController.php
@@ -1,12 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Serializer\Model\Collection;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\SocialWork\Goal;
-use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -19,29 +28,37 @@ class SocialWorkResultApiController extends ApiController
         $this->resultRepository = $resultRepository;
     }
 
+    public function listByGoal(Request $request, Goal $goal): Response
+    {
+        $totalItems = $this->resultRepository->countByGoal($goal);
+        $paginator = $this->getPaginatorFactory()->create($totalItems);
+
+        $entities = $this->resultRepository->findByGoal(
+            $goal,
+            ['id' => 'ASC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        $model = new Collection($entities, $paginator);
+
+        return $this->json($model, Response::HTTP_OK, [], ['groups' => ['read']]);
+    }
+
     public function listBySocialAction(Request $request, SocialAction $action): Response
     {
         $totalItems = $this->resultRepository->countBySocialActionWithDescendants($action);
         $paginator = $this->getPaginatorFactory()->create($totalItems);
-        
-        $entities = $this->resultRepository->findBySocialActionWithDescendants($action, ["id" => "ASC"],
-            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
-        
+
+        $entities = $this->resultRepository->findBySocialActionWithDescendants(
+            $action,
+            ['id' => 'ASC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
         $model = new Collection($entities, $paginator);
 
-        return $this->json($model, Response::HTTP_OK, [], [ "groups" => [ "read" ]]);    
-    }
-    
-    public function listByGoal(Request $request, Goal $goal): Response
-    {    
-        $totalItems = $this->resultRepository->countByGoal($goal);
-        $paginator = $this->getPaginatorFactory()->create($totalItems);
-        
-        $entities = $this->resultRepository->findByGoal($goal, ["id" => "ASC"],
-            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
-        
-        $model = new Collection($entities, $paginator);
-
-        return $this->json($model, Response::HTTP_OK, [], [ "groups" => [ "read" ]]);    
+        return $this->json($model, Response::HTTP_OK, [], ['groups' => ['read']]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
index de87b380a..24c1c6645 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
@@ -1,36 +1,43 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Serializer\Model\Collection;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use Symfony\Component\HttpFoundation\Request;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use function count;
 
 class SocialWorkSocialActionApiController extends ApiController
 {
-    private SocialIssueRepository $socialIssueRepository;
-
     private PaginatorFactory $paginator;
 
-    /**
-     * @param SocialIssueRepository $socialIssueRepository
-     */
+    private SocialIssueRepository $socialIssueRepository;
+
     public function __construct(SocialIssueRepository $socialIssueRepository, PaginatorFactory $paginator)
     {
         $this->socialIssueRepository = $socialIssueRepository;
         $this->paginator = $paginator;
     }
-    
+
     public function listBySocialIssueApi($id, Request $request)
     {
         $socialIssue = $this->socialIssueRepository
             ->find($id);
 
-        if (NULL === $socialIssue) {
-            throw $this->createNotFoundException("socialIssue not found");
+        if (null === $socialIssue) {
+            throw $this->createNotFoundException('socialIssue not found');
         }
 
         $socialActions = $socialIssue->getRecursiveSocialActions();
@@ -39,9 +46,7 @@ class SocialWorkSocialActionApiController extends ApiController
         $pagination->setItemsPerPage(count($socialActions));
 
         $collection = new Collection($socialActions, $pagination);
-        
-
-        return $this->json($collection, JsonResponse::HTTP_OK, [], [ "groups" => [ "read" ]]);
-    } 
 
+        return $this->json($collection, JsonResponse::HTTP_OK, [], ['groups' => ['read']]);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
index 4e3d67755..7402698d9 100644
--- a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
@@ -1,96 +1,78 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Controller;
 
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Timeline\TimelineBuilder;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
-use Chill\MainBundle\Timeline\TimelineBuilder;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
 
 class TimelinePersonController extends AbstractController
 {
-    
     protected EventDispatcherInterface $eventDispatcher;
-    
-    protected TimelineBuilder $timelineBuilder;
-    
+
     protected PaginatorFactory $paginatorFactory;
-    
-    /**
-     * TimelinePersonController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     */
+
+    protected TimelineBuilder $timelineBuilder;
+
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         TimelineBuilder $timelineBuilder,
-        PaginatorFactory $paginatorFactory,
-        AuthorizationHelper $authorizationHelper
+        PaginatorFactory $paginatorFactory
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->timelineBuilder = $timelineBuilder;
         $this->paginatorFactory = $paginatorFactory;
-        $this->authorizationHelper = $authorizationHelper;
     }
-    
-    
+
     public function personAction(Request $request, $person_id)
     {
         $person = $this->getDoctrine()
-                ->getRepository('ChillPersonBundle:Person')
-                ->find($person_id);
+            ->getRepository(Person::class)
+            ->find($person_id);
 
-        if ($person === NULL) {
+        if (null === $person) {
             throw $this->createNotFoundException();
         }
-        
+
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
-        
-        $nbItems = $this->timelineBuilder->countItems('person', 
-            [ 'person' => $person ]
-            );
-        
+
+        $nbItems = $this->timelineBuilder->countItems(
+            'person',
+            ['person' => $person]
+        );
+
         $paginator = $this->paginatorFactory->create($nbItems);
-        
-        $event = new PrivacyEvent($person, array('action' => 'timeline'));
+
+        $event = new PrivacyEvent($person, ['action' => 'timeline']);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
-        return $this->render('ChillPersonBundle:Timeline:index.html.twig', array
-            (
+
+        return $this->render(
+            'ChillPersonBundle:Timeline:index.html.twig',
+            [
                 'timeline' => $this->timelineBuilder->getTimelineHTML(
-                    'person', 
-                    array('person' => $person),
+                    'person',
+                    ['person' => $person],
                     $paginator->getCurrentPage()->getFirstItemNumber(),
                     $paginator->getItemsPerPage()
-                    ),
+                ),
                 'person' => $person,
                 'nb_items' => $nbItems,
-                'paginator' => $paginator
-            )
+                'paginator' => $paginator,
+            ]
         );
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
new file mode 100644
index 000000000..4f5a51fd4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/PersonRandomHelper.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\DataFixtures\Helper;
+
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use function array_pop;
+use function random_int;
+
+trait PersonRandomHelper
+{
+    private ?int $countPersons = null;
+
+    private array $randPersons = [];
+
+    protected function getRandomPerson(EntityManagerInterface $em): Person
+    {
+        $fetchBy = 5;
+
+        if (null === $this->countPersons) {
+            $qb = $em->createQueryBuilder();
+            $this->countPersons = $qb->select('count(p)')
+                ->from(Person::class, 'p')
+                ->getQuery()
+                ->getSingleScalarResult();
+        }
+
+        if ([] === $this->randPersons) {
+            $qb = $em->createQueryBuilder();
+            $this->randPersons = $qb
+                ->select('p')
+                ->from(Person::class, 'p')
+                ->getQuery()
+                ->setFirstResult(random_int(0, $this->countPersons - $fetchBy))
+                ->setMaxResults($fetchBy)
+                ->getResult();
+        }
+
+        return array_pop($this->randPersons);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
new file mode 100644
index 000000000..516914f5f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/Helper/RandomPersonHelperTrait.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\DataFixtures\Helper;
+
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use function random_int;
+
+trait RandomPersonHelperTrait
+{
+    private ?int $nbOfPersons = null;
+
+    protected function getRandomPerson(EntityManagerInterface $em): Person
+    {
+        $qb = $em->createQueryBuilder();
+        $qb
+            ->from(Person::class, 'p');
+
+        if (null === $this->nbOfPersons) {
+            $this->nbOfPersons = $qb
+                ->select('COUNT(p)')
+                ->getQuery()
+                ->getSingleScalarResult();
+        }
+
+        return $qb
+            ->select('p')
+            ->setMaxResults(1)
+            ->setFirstResult(random_int(0, $this->nbOfPersons))
+            ->getQuery()
+            ->getSingleResult();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
index fad0596a6..c1d045ac4 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php
@@ -1,89 +1,70 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 
 /**
- * Load closing motives into database
- *
- * @author Julien Fastré <julien arobase fastre point info>
+ * Load closing motives into database.
  */
-class LoadAccompanyingPeriodClosingMotive extends AbstractFixture 
-    implements OrderedFixtureInterface 
+class LoadAccompanyingPeriodClosingMotive extends AbstractFixture implements OrderedFixtureInterface
 {
-    
-    public function getOrder() {
+    public static $closingMotives = [
+        'nothing_to_do' => [
+            'name' => [
+                'fr' => 'Plus rien à faire',
+                'en' => 'Nothing to do',
+                'nl' => 'nieks meer te doen',
+            ],
+        ],
+        'did_not_come_back' => [
+            'name' => [
+                'fr' => "N'est plus revenu",
+                'en' => "Did'nt come back",
+                'nl' => 'Niet teruggekomen',
+            ],
+        ],
+        'no_more_money' => [
+            'active' => false,
+            'name' => [
+                'fr' => "Plus d'argent",
+                'en' => 'No more money',
+                'nl' => 'Geen geld',
+            ],
+        ],
+    ];
+
+    public static $references = [];
+
+    public function getOrder()
+    {
         return 9500;
     }
-    
-    public static $closingMotives = array(
-        'nothing_to_do' => array(
-           'name' => array(
-              'fr' => 'Plus rien à faire',
-              'en' => 'Nothing to do',
-              'nl' => 'nieks meer te doen'
-           )
-        ),
-        'did_not_come_back' => array(
-           'name' => array(
-              'fr' => "N'est plus revenu",
-              'en' => "Did'nt come back",
-              'nl' => "Niet teruggekomen"
-           )
-        ),
-       'no_more_money' => array(
-          'active' => false,
-          'name' => array(
-             'fr' => "Plus d'argent",
-             'en' => "No more money",
-             'nl' => "Geen geld"
-          )
-       )
-    );
-    
-    public static $references = array();
-    
-    public function load(ObjectManager $manager) 
+
+    public function load(ObjectManager $manager)
     {
         foreach (static::$closingMotives as $ref => $new) {
             $motive = new ClosingMotive();
             $motive->setName($new['name'])
-                  ->setActive((isset($new['active']) ? $new['active'] : true))
-                ;
-            
+                ->setActive(($new['active'] ?? true));
+
             $manager->persist($motive);
             $this->addReference($ref, $motive);
-            echo "Adding ClosingMotive $ref\n";
+            echo "Adding ClosingMotive {$ref}\n";
         }
-        
+
         $manager->flush();
     }
-        
-        
-
-
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
index e96bf44e6..1e392c9f2 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
@@ -1,14 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
 
 /**
- * Load notififications into database
+ * Load notififications into database.
  */
 class LoadAccompanyingPeriodNotifications extends AbstractFixture implements DependentFixtureInterface
 {
@@ -24,20 +33,20 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep
                 'center a_social',
                 'center a_administrative',
                 'center a_direction',
-                'multi_center'
+                'multi_center',
             ],
-        ]
+        ],
     ];
 
-    protected function getEntityRef()
-    {
-        return null;
-    }
-
     public function getDependencies()
     {
         return [
             LoadPeople::class,
         ];
     }
+
+    protected function getEntityRef()
+    {
+        return null;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
index cbec9c439..d4bfe9a2d 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodOrigin.php
@@ -1,56 +1,42 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+
 use Doctrine\Persistence\ObjectManager;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
-
 /**
- * Description of LoadAccompanyingPeriodOrigin
- *
- * @author Champs-Libres Coop
+ * Description of LoadAccompanyingPeriodOrigin.
  */
 class LoadAccompanyingPeriodOrigin extends AbstractFixture implements OrderedFixtureInterface
 {
-
     public const ACCOMPANYING_PERIOD_ORIGIN = 'accompanying_period_origin';
 
-    public function getOrder()
-    {
-        return 10005;
-    }
+    public static $references = [];
 
     private $phoneCall = ['en' => 'phone call', 'fr' => 'appel téléphonique'];
 
-    public static $references = array();
+    public function getOrder()
+    {
+        return 9000;
+    }
 
     public function load(ObjectManager $manager)
     {
         $o = new Origin();
-        $o->setLabel(json_encode($this->phoneCall));
+        $o->setLabel($this->phoneCall);
 
         $manager->persist($o);
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
index 82e232e8d..64c7d2701 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -8,24 +17,23 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use DateTimeImmutable;
 use Doctrine\Persistence\ObjectManager;
-use Chill\PersonBundle\DataFixtures\ORM\LoadPeople;
+use function array_pop;
+use function array_rand;
+use function count;
 
 class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Doctrine\Common\DataFixtures\DependentFixtureInterface
 {
-    private AccompanyingPeriodRepository $periodRepository;
-    private EvaluationRepository $evaluationRepository;
-
     /**
-     * @var Evaluation[]|array
+     * @var array|Evaluation[]
      */
     private array $cacheEvaluations = [];
 
-    /**
-     * @param AccompanyingPeriodRepository $periodRepository
-     */
+    private EvaluationRepository $evaluationRepository;
+
+    private AccompanyingPeriodRepository $periodRepository;
+
     public function __construct(
         AccompanyingPeriodRepository $periodRepository,
         EvaluationRepository $evaluationRepository
@@ -34,16 +42,83 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
         $this->evaluationRepository = $evaluationRepository;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function getDependencies()
     {
         return [
-            LoadPeople::class
+            LoadPeople::class,
         ];
     }
 
+    public function load(ObjectManager $manager)
+    {
+        // load all the period which are confirmed
+        $periods = $this->periodRepository
+            ->findBy(['step' => AccompanyingPeriod::STEP_CONFIRMED]);
+
+        $i = 0;
+
+        while (null !== $period = array_pop($periods)) {
+            /** @var AccompanyingPeriod $period */
+            ++$i;
+
+            if (0 === $i % 15) {
+                $manager->flush();
+            }
+
+            if (0 === $period->getSocialIssues()->count()) {
+                continue;
+            }
+            $work = new AccompanyingPeriod\AccompanyingPeriodWork();
+            $action = $this->getRandomAction($period->getSocialIssues()->first());
+
+            if (null !== $action) {
+                $work
+                    ->setAccompanyingPeriod($period)
+                    ->setSocialAction($action)
+                    ->setStartDate(new DateTimeImmutable('today'))
+                    ->addPerson($period->getPersons()->first())
+                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setCreatedBy($this->getReference('center a_social'))
+                    ->setUpdatedAt(new DateTimeImmutable())
+                    ->setUpdatedBy($this->getReference('center a_social'));
+                $manager->persist($work);
+
+                if ($action->getEvaluations()->count() > 0) {
+                    $ev = $action->getEvaluations()->first();
+                    $evaluation = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
+                    $evaluation->setAccompanyingPeriodWork($work)
+                        ->setEvaluation($ev);
+                    $manager->persist($evaluation);
+                }
+            }
+
+            // 1 of 10, force an evaluation
+            if (0 === $i % 10) {
+                $evaluation = $this->getRandomEvaluation();
+                $action = $evaluation->getSocialAction();
+                $issue = $action->getIssue();
+
+                $period->addSocialIssue($issue);
+                $work
+                    ->setAccompanyingPeriod($period)
+                    ->setSocialAction($action)
+                    ->setStartDate(new DateTimeImmutable('today'))
+                    ->addPerson($period->getPersons()->first())
+                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setCreatedBy($this->getReference('center a_social'))
+                    ->setUpdatedAt(new DateTimeImmutable())
+                    ->setUpdatedBy($this->getReference('center a_social'));
+                $manager->persist($work);
+                $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
+                $ev->setAccompanyingPeriodWork($work)
+                    ->setEvaluation($evaluation);
+                $manager->persist($ev);
+            }
+        }
+
+        $manager->flush();
+    }
+
     private function getRandomAction(SocialIssue $socialIssue): ?SocialAction
     {
         $actions = $socialIssue->getRecursiveSocialActions()->toArray();
@@ -52,89 +127,16 @@ class LoadAccompanyingPeriodWork extends \Doctrine\Bundle\FixturesBundle\Fixture
             return null;
         }
 
-        return $actions[\array_rand($actions)];
+        return $actions[array_rand($actions)];
     }
 
     private function getRandomEvaluation(): Evaluation
     {
-       if (0 === count($this->cacheEvaluations)) {
-           $this->cacheEvaluations = $this->evaluationRepository
-               ->findAll();
-       }
-
-       return $this->cacheEvaluations[\array_rand($this->cacheEvaluations)];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function load(ObjectManager $manager)
-    {
-        // load all the period which are confirmed
-        $periods = $this->periodRepository
-            ->findBy(['step' => AccompanyingPeriod::STEP_CONFIRMED])
-            ;
-
-        $i = 0;
-        while (null !== $period = \array_pop($periods)) {
-           /** @var AccompanyingPeriod $period */
-           $i++;
-           if (0 === $i % 15) {
-               $manager->flush();
-           }
-           if (0 === $period->getSocialIssues()->count()) {
-               continue;
-           }
-           $work = new AccompanyingPeriod\AccompanyingPeriodWork();
-           $action = $this->getRandomAction($period->getSocialIssues()->first());
-
-           if (null !== $action) {
-               $work
-                   ->setAccompanyingPeriod($period)
-                   ->setSocialAction($action)
-                   ->setStartDate(new \DateTimeImmutable('today'))
-                   ->addPerson($period->getPersons()->first())
-                   ->setCreatedAt(new \DateTimeImmutable())
-                   ->setCreatedBy($this->getReference('center a_social'))
-                   ->setUpdatedAt(new \DateTimeImmutable())
-                   ->setUpdatedBy($this->getReference('center a_social'));
-               $manager->persist($work);
-
-               if ($action->getEvaluations()->count() > 0) {
-                   $ev = $action->getEvaluations()->first();
-                   $evaluation = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
-                   $evaluation->setAccompanyingPeriodWork($work)
-                       ->setEvaluation($ev);
-                   $manager->persist($evaluation);
-               }
-           }
-
-           // 1 of 10, force an evaluation
-           if (0 === $i % 10) {
-               $evaluation = $this->getRandomEvaluation();
-               $action = $evaluation->getSocialAction();
-               $issue = $action->getIssue();
-
-               $period->addSocialIssue($issue);
-               $work
-                   ->setAccompanyingPeriod($period)
-                   ->setSocialAction($action)
-                   ->setStartDate(new \DateTimeImmutable('today'))
-                   ->addPerson($period->getPersons()->first())
-                   ->setCreatedAt(new \DateTimeImmutable())
-                   ->setCreatedBy($this->getReference('center a_social'))
-                   ->setUpdatedAt(new \DateTimeImmutable())
-                   ->setUpdatedBy($this->getReference('center a_social'))
-               ;
-               $manager->persist($work);
-               $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation();
-               $ev->setAccompanyingPeriodWork($work)
-                   ->setEvaluation($evaluation);
-               $manager->persist($ev);
-           }
-
+        if (0 === count($this->cacheEvaluations)) {
+            $this->cacheEvaluations = $this->evaluationRepository
+                ->findAll();
         }
 
-        $manager->flush();
+        return $this->cacheEvaluations[array_rand($this->cacheEvaluations)];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
index 235cadd95..9541aa76b 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -1,78 +1,63 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
+use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
+use Chill\CustomFieldsBundle\CustomFields\CustomFieldTitle;
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldTitle;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
-use Chill\PersonBundle\Entity\Person;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterface,
-  ContainerAwareInterface
+class LoadCustomFields extends AbstractFixture implements
+  ContainerAwareInterface,
+    OrderedFixtureInterface
 {
     /**
-     *
      * @var ContainerInterface
      */
     private $container;
-    
+
     /**
-     *
-     * @var CustomField
-     */
-    private $customFieldText;
-    
-    /**
-     *
      * @var CustomField
      */
     private $customFieldChoice;
-    
+
+    /**
+     * @var CustomField
+     */
+    private $customFieldText;
+
     /**
      * @var TranslatableStringHelper
      */
     private $translatableStringHelper;
-    
+
     /**
      * @var TranslatorInterface
      */
     private $translator;
-    
+
     /**
      * LoadCustomFields constructor.
-     *
-     * @param TranslatableStringHelper $translatableStringHelper
-     * @param TranslatorInterface $translator
      */
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
@@ -81,21 +66,12 @@ class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterfac
         $this->translatableStringHelper = $translatableStringHelper;
         $this->translator = $translator;
     }
-    
+
     //put your code here
     public function getOrder()
     {
         return 10003;
     }
-    
-    public function setContainer(ContainerInterface $container = null)
-    {
-        if ($container === null) {
-            throw new \RuntimeException("The given container should not be null");
-        }
-        
-        $this->container = $container;
-    }
 
     public function load(ObjectManager $manager)
     {
@@ -103,45 +79,16 @@ class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterfac
         $this->loadData($manager);
         $manager->flush();
     }
-    
-    private function loadData(ObjectManager $manager)
+
+    public function setContainer(?ContainerInterface $container = null)
     {
-        $personIds = $this->container->get('doctrine.orm.entity_manager')
-            ->createQuery("SELECT person.id FROM ChillPersonBundle:Person person")
-            ->getScalarResult();
-        
-        // get possible values for cfGroup
-        $choices = array_map(
-            function($a) { return $a["slug"]; }, 
-            $this->customFieldChoice->getOptions()["choices"]
-        );
-        // create faker
-        $faker = \Faker\Factory::create('fr_FR');
-        // select a set of people and add data
-        foreach ($personIds as $id) {
-            // add info on 1 person on 2
-            if (rand(0,1) === 1) {
-                /* @var $person Person */
-                $person = $manager->getRepository(Person::class)->find($id);
-                $person->setCFData(array(
-                    "remarques" => $this->createCustomFieldText()
-                        ->serialize($faker->text(rand(150, 250)), $this->customFieldText),
-                    "document-d-identite" => $this->createCustomFieldChoice()
-                        ->serialize(array($choices[array_rand($choices)]), $this->customFieldChoice)
-                ));
-            }
+        if (null === $container) {
+            throw new RuntimeException('The given container should not be null');
         }
+
+        $this->container = $container;
     }
-    
-    private function createCustomFieldText()
-    {
-        return new CustomFieldText(
-            $this->container->get('request_stack'),
-            $this->container->get('templating'),
-            $this->translatableStringHelper
-        );
-    }
-    
+
     private function createCustomFieldChoice()
     {
         return new CustomFieldChoice(
@@ -150,80 +97,113 @@ class LoadCustomFields extends AbstractFixture implements OrderedFixtureInterfac
             $this->translatableStringHelper
         );
     }
-    
+
+    private function createCustomFieldText()
+    {
+        return new CustomFieldText(
+            $this->container->get('request_stack'),
+            $this->container->get('templating'),
+            $this->translatableStringHelper
+        );
+    }
+
+    private function loadData(ObjectManager $manager)
+    {
+        $personIds = $this->container->get('doctrine.orm.entity_manager')
+            ->createQuery('SELECT person.id FROM ChillPersonBundle:Person person')
+            ->getScalarResult();
+
+        // get possible values for cfGroup
+        $choices = array_map(
+            static function ($a) { return $a['slug']; },
+            $this->customFieldChoice->getOptions()['choices']
+        );
+        // create faker
+        $faker = \Faker\Factory::create('fr_FR');
+        // select a set of people and add data
+        foreach ($personIds as $id) {
+            // add info on 1 person on 2
+            if (mt_rand(0, 1) === 1) {
+                /** @var Person $person */
+                $person = $manager->getRepository(Person::class)->find($id);
+                $person->setCFData([
+                    'remarques' => $this->createCustomFieldText()
+                        ->serialize($faker->text(mt_rand(150, 250)), $this->customFieldText),
+                    'document-d-identite' => $this->createCustomFieldChoice()
+                        ->serialize([$choices[array_rand($choices)]], $this->customFieldChoice),
+                ]);
+            }
+        }
+    }
+
     private function loadFields(ObjectManager $manager)
     {
         $cfGroup = (new CustomFieldsGroup())
             ->setEntity(Person::class)
-            ->setName(array("fr" => "Données"))
-            ;
+            ->setName(['fr' => 'Données']);
         $manager->persist($cfGroup);
-        
+
         // make this group default for Person::class
         $manager->persist(
             (new CustomFieldsDefaultGroup())
                 ->setCustomFieldsGroup($cfGroup)
                 ->setEntity(Person::class)
-            );
-        
+        );
+
         // create title field
         $customField0 = (new CustomField())
             ->setActive(true)
-            ->setName(array("fr" => "Données personnalisées"))
-            ->setSlug("personal-data")
+            ->setName(['fr' => 'Données personnalisées'])
+            ->setSlug('personal-data')
             ->setOrdering(10)
             ->setType('title')
-            ->setOptions(array(CustomFieldTitle::TYPE => CustomFieldTitle::TYPE_TITLE))
-            ->setCustomFieldsGroup($cfGroup)
-            ;
+            ->setOptions([CustomFieldTitle::TYPE => CustomFieldTitle::TYPE_TITLE])
+            ->setCustomFieldsGroup($cfGroup);
         $manager->persist($customField0);
-        
+
         // create text field
         $this->customFieldText = (new CustomField())
             ->setActive(true)
-            ->setName(array("fr" => "Remarques"))
-            ->setSlug("remarques")
+            ->setName(['fr' => 'Remarques'])
+            ->setSlug('remarques')
             ->setOrdering(20)
             ->setType('text')
-            ->setOptions(array('maxLength' => 5000))
-            ->setCustomFieldsGroup($cfGroup)
-            ;
+            ->setOptions(['maxLength' => 5000])
+            ->setCustomFieldsGroup($cfGroup);
         $manager->persist($this->customFieldText);
-        
+
         // create choice field
         $this->customFieldChoice = (new CustomField())
             ->setActive(true)
-            ->setName(array("fr" => "Document d'identité"))
-            ->setSlug("document-d-identite")
+            ->setName(['fr' => "Document d'identité"])
+            ->setSlug('document-d-identite')
             ->setOrdering(30)
             ->setType('choice')
             ->setCustomFieldsGroup($cfGroup)
-            ->setOptions(array(
-                "multiple" => true,
-                "other"    => false,
-                "expanded" => true,
-                "active"   => true,
-                "slug"     => "document-d-identite",
-                "choices"  => array(
-                    array(
-                        "name"   => array("fr" => "Carte d'identité"),
-                        "active" => true,
-                        "slug"   => "carte-d-identite"
-                    ),
-                    array(
-                        "name"   => array("fr" => "Passeport"),
-                        "active" => true,
-                        "slug"   => "passeport"
-                    ),
-                    array(
-                        "name"   => array("fr" => "Titre de séjour"),
-                        "active" => true,
-                        "slug"   => "passeport"
-                    )
-                )
-            ))
-            ;
+            ->setOptions([
+                'multiple' => true,
+                'other' => false,
+                'expanded' => true,
+                'active' => true,
+                'slug' => 'document-d-identite',
+                'choices' => [
+                    [
+                        'name' => ['fr' => "Carte d'identité"],
+                        'active' => true,
+                        'slug' => 'carte-d-identite',
+                    ],
+                    [
+                        'name' => ['fr' => 'Passeport'],
+                        'active' => true,
+                        'slug' => 'passeport',
+                    ],
+                    [
+                        'name' => ['fr' => 'Titre de séjour'],
+                        'active' => true,
+                        'slug' => 'passeport',
+                    ],
+                ],
+            ]);
         $manager->persist($this->customFieldChoice);
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
index 24a5bbb7f..6f9edd768 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php
@@ -1,28 +1,46 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\MainBundle\Entity\PostalCode;
+use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\PostalCode;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Household\MembersEditorFactory;
+use DateInterval;
+use DateTime;
+use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Nelmio\Alice\Loader\NativeLoader;
-use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
+use function array_pop;
+use function array_rand;
+use function random_int;
+use function shuffle;
 
 class LoadHousehold extends Fixture implements DependentFixtureInterface
 {
+    private const NUMBER_OF_HOUSEHOLD = 10;
+
     private MembersEditorFactory $editorFactory;
 
     private EntityManagerInterface $em;
 
     private NativeLoader $loader;
 
-    private CONST NUMBER_OF_HOUSEHOLD = 10;
+    private array $personIds;
 
     public function __construct(MembersEditorFactory $editorFactory, EntityManagerInterface $em)
     {
@@ -31,6 +49,14 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
         $this->loader = new NativeLoader();
     }
 
+    public function getDependencies()
+    {
+        return [
+            LoadPeople::class,
+            LoadHouseholdPosition::class,
+        ];
+    }
+
     public function load(ObjectManager $manager)
     {
         // generate two times the participation. This will lead to
@@ -41,87 +67,44 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
         $this->generateHousehold(
             $manager,
-            \DateTimeImmutable::createFromFormat('Y-m-d', '2010-01-01')
+            DateTimeImmutable::createFromFormat('Y-m-d', '2010-01-01')
         );
 
         $this->preparePersonIds();
 
         $this->generateHousehold(
             $manager,
-            \DateTimeImmutable::createFromFormat('Y-m-d', '2015-01-01')
+            DateTimeImmutable::createFromFormat('Y-m-d', '2015-01-01')
         );
 
         $manager->flush();
     }
 
-    private function generateHousehold(ObjectManager $manager, \DateTimeImmutable $startDate)
+    private function addAddressToHousehold(Household $household, DateTimeImmutable $date, ObjectManager $manager)
     {
-        for ($i=0; $i < self::NUMBER_OF_HOUSEHOLD; $i++) {
-            $household = new Household();
-            $manager->persist($household);
-
-            $this->addAddressToHousehold($household, clone $startDate, $manager);
-
-            $movement = $this->editorFactory->createEditor($household);
-
-            // load adults
-            $k = 0;
-            foreach ($this->getRandomPersons(1, 3) as $person) {
-                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
-                $position = $this->getReference(LoadHouseholdPosition::ADULT);
-
-                $movement->addMovement($date, $person, $position, $k === 0, "self generated");
-                $k++;
-            }
-
-            // load children
-            foreach ($this->getRandomPersons(0, 3) as $person) {
-                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
-                $position = $this->getReference(LoadHouseholdPosition::CHILD);
-
-                $movement->addMovement($date, $person, $position, $k === 0, "self generated");
-                $k++;
-            }
-
-            // load children out
-            foreach ($this->getRandomPersons(0, 2) as $person) {
-                $date = $startDate->add(new \DateInterval('P'.\random_int(1, 200).'W'));
-                $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT);
-
-                $movement->addMovement($date, $person, $position, $k === 0, "self generated");
-                $k++;
-            }
-
-            foreach ($movement->getPersistable() as $obj) {
-                $manager->persist($obj);
-            }
-        }
-    }
-
-    private function addAddressToHousehold(Household $household, \DateTimeImmutable $date, ObjectManager $manager)
-    {
-        if (\random_int(0, 10) > 8) {
+        if (random_int(0, 10) > 8) {
             //  20% of household without address
             return;
         }
 
-        $nb = \random_int(1, 6);
+        $nb = random_int(1, 6);
 
         $i = 0;
+
         while ($i < $nb) {
             $address = $this->createAddress();
-            $address->setValidFrom(\DateTime::createFromImmutable($date));
+            $address->setValidFrom(DateTime::createFromImmutable($date));
 
-            if (\random_int(0, 20) < 1) {
-                $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
-                $address->setValidTo(\DateTime::createFromImmutable($date));
+            if (random_int(0, 20) < 1) {
+                $date = $date->add(new DateInterval('P' . random_int(8, 52) . 'W'));
+                $address->setValidTo(DateTime::createFromImmutable($date));
             }
 
             $household->addAddress($address);
             $manager->persist($address);
 
-            $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W'));
-            $i++;
+            $date = $date->add(new DateInterval('P' . random_int(8, 52) . 'W'));
+            ++$i;
         }
     }
 
@@ -132,54 +115,92 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
                 'address1' => [
                     'street' => '<fr_FR:streetName()>',
                     'streetNumber' => '<fr_FR:buildingNumber()>',
-                    'postCode' => $this->getPostalCode()
-                ]
-            ]
+                    'postCode' => $this->getPostalCode(),
+                ],
+            ],
         ]);
 
         return $objectSet->getObjects()['address1'];
     }
 
+    private function generateHousehold(ObjectManager $manager, DateTimeImmutable $startDate)
+    {
+        for ($i = 0; self::NUMBER_OF_HOUSEHOLD > $i; ++$i) {
+            $household = new Household();
+            $manager->persist($household);
+
+            $this->addAddressToHousehold($household, clone $startDate, $manager);
+
+            $movement = $this->editorFactory->createEditor($household);
+
+            // load adults
+            $k = 0;
+
+            foreach ($this->getRandomPersons(1, 3) as $person) {
+                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $position = $this->getReference(LoadHouseholdPosition::ADULT);
+
+                $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
+                ++$k;
+            }
+
+            // load children
+            foreach ($this->getRandomPersons(0, 3) as $person) {
+                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $position = $this->getReference(LoadHouseholdPosition::CHILD);
+
+                $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
+                ++$k;
+            }
+
+            // load children out
+            foreach ($this->getRandomPersons(0, 2) as $person) {
+                $date = $startDate->add(new DateInterval('P' . random_int(1, 200) . 'W'));
+                $position = $this->getReference(LoadHouseholdPosition::CHILD_OUT);
+
+                $movement->addMovement($date, $person, $position, 0 === $k, 'self generated');
+                ++$k;
+            }
+
+            foreach ($movement->getPersistable() as $obj) {
+                $manager->persist($obj);
+            }
+        }
+    }
+
     private function getPostalCode(): PostalCode
     {
-        $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
+        $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
 
         return $this->getReference($ref);
     }
 
+    private function getRandomPersons(int $min, int $max): array
+    {
+        $persons = [];
+
+        $nb = random_int($min, $max);
+
+        for ($i = 0; $i < $nb; ++$i) {
+            $personId = array_pop($this->personIds)['id'];
+            $persons[] = $this->em->getRepository(Person::class)->find($personId);
+        }
+
+        return $persons;
+    }
+
     private function preparePersonIds()
     {
+        // @TODO: Remove this and make this service stateless
         $this->personIds = $this->em
-            ->createQuery('SELECT p.id FROM '.Person::class.' p '.
-                'JOIN p.center c '.
+            ->createQuery(
+                'SELECT p.id FROM ' . Person::class . ' p ' .
+                'JOIN p.center c ' .
                 'WHERE c.name = :center '
             )
             ->setParameter('center', 'Center A')
-            ->getScalarResult()
-            ;
+            ->getScalarResult();
 
-        \shuffle($this->personIds);
-    }
-
-    private function getRandomPersons(int $min, int $max)
-    {
-        $nb = \random_int($min, $max);
-
-        for ($i=0; $i < $nb; $i++) {
-            $personId = \array_pop($this->personIds)['id'];
-            $persons[] = $this->em->getRepository(Person::class)
-                ->find($personId)
-                ;
-        }
-
-        return $persons ?? [];
-    }
-
-    public function getDependencies()
-    {
-        return [
-            LoadPeople::class,
-            LoadHouseholdPosition::class
-        ];
+        shuffle($this->personIds);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
index cf0bf3de1..42d2b7dd8 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHouseholdPosition.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Entity\Household\Position;
@@ -8,26 +17,27 @@ use Doctrine\Persistence\ObjectManager;
 
 class LoadHouseholdPosition extends Fixture
 {
-    const POSITIONS_DATA = [
-        ["Adulte", true, true, 1.0, self::ADULT ],
-        ["Enfants", true, false, 2.0, self::CHILD ],
-        ["Enfants hors ménage", false, false, 3.0, self::CHILD_OUT ]
-    ];
+    public const ADULT = 'position_adulte';
 
-    const ADULT = "position_adulte";
-    const CHILD = "position_enfant";
-    const CHILD_OUT = "position_enfant_hors";
+    public const CHILD = 'position_enfant';
+
+    public const CHILD_OUT = 'position_enfant_hors';
+
+    public const POSITIONS_DATA = [
+        ['Adulte', true, true, 1.0, self::ADULT],
+        ['Enfant', true, false, 2.0, self::CHILD],
+        ['Enfant hors ménage', false, false, 3.0, self::CHILD_OUT],
+    ];
 
     public function load(ObjectManager $manager)
     {
-        foreach (self::POSITIONS_DATA as list($name, $share, $allowHolder, 
-            $ordering, $ref)) {
+        foreach (self::POSITIONS_DATA as [$name, $share, $allowHolder,
+            $ordering, $ref, ]) {
             $position = (new Position())
-                ->setLabel([ "fr" => $name ])
+                ->setLabel(['fr' => $name])
                 ->setAllowHolder($allowHolder)
                 ->setShareHousehold($share)
-                ->setOrdering($ordering)
-                ;
+                ->setOrdering($ordering);
 
             $manager->persist($position);
             $this->addReference($ref, $position);
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
index b0cf57637..45a9f6fd4 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadMaritalStatus.php
@@ -1,66 +1,54 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\PersonBundle\Entity\MaritalStatus;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\PersonBundle\Entity\MaritalStatus;
 
 /**
- * Load marital status into database
- *
- * @author Marc Ducobu <marc@champs-libres.coop>
+ * Load marital status into database.
  */
 class LoadMaritalStatus extends AbstractFixture implements OrderedFixtureInterface
 {
     private $maritalStatuses = [
-        ['id' => 'single', 'name' =>['en' => 'single', 'fr' => 'célibataire']],
-        ['id' => 'married', 'name' =>['en' => 'married', 'fr' => 'marié(e)']],
-        ['id' => 'widow', 'name' =>['en' => 'widow', 'fr' => 'veuf – veuve ']],
-        ['id' => 'separat', 'name' =>['en' => 'separated', 'fr' => 'séparé(e)']],
-        ['id' => 'divorce', 'name' =>['en' => 'divorced', 'fr' => 'divorcé(e)']],
-        ['id' => 'legalco', 'name' =>['en' => 'legal cohabitant', 'fr' => 'cohabitant(e) légal(e)']],
-        ['id' => 'unknown', 'name' =>['en' => 'unknown', 'fr' => 'indéterminé']]
+        ['id' => 'single', 'name' => ['en' => 'single', 'fr' => 'célibataire']],
+        ['id' => 'married', 'name' => ['en' => 'married', 'fr' => 'marié(e)']],
+        ['id' => 'widow', 'name' => ['en' => 'widow', 'fr' => 'veuf – veuve ']],
+        ['id' => 'separat', 'name' => ['en' => 'separated', 'fr' => 'séparé(e)']],
+        ['id' => 'divorce', 'name' => ['en' => 'divorced', 'fr' => 'divorcé(e)']],
+        ['id' => 'legalco', 'name' => ['en' => 'legal cohabitant', 'fr' => 'cohabitant(e) légal(e)']],
+        ['id' => 'unknown', 'name' => ['en' => 'unknown', 'fr' => 'indéterminé']],
     ];
 
     public function getOrder()
     {
         return 9999;
     }
-    
+
     public function load(ObjectManager $manager)
     {
         echo "loading maritalStatuses... \n";
 
         foreach ($this->maritalStatuses as $ms) {
-            echo $ms['name']['en'].' ';
+            echo $ms['name']['en'] . ' ';
             $new_ms = new MaritalStatus();
             $new_ms->setId($ms['id']);
             $new_ms->setName($ms['name']);
-            $this->addReference('ms_'.$ms['id'], $new_ms);
+            $this->addReference('ms_' . $ms['id'], $new_ms);
             $manager->persist($new_ms);
         }
-        
+
         $manager->flush();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index adc37d5b5..924155955 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -1,26 +1,19 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
+use Chill\MainBundle\Doctrine\Model\Point;
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\PostalCode;
@@ -32,380 +25,92 @@ use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use DateInterval;
+use DateTime;
+use DateTimeImmutable;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\PersonBundle\Entity\Person;
+use Exception;
 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;
-use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
-use Chill\MainBundle\Entity\Address;
-use Chill\MainBundle\Doctrine\Model\Point;
 use Symfony\Component\Workflow\Registry;
-use Symfony\Component\Workflow\Workflow;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use function count;
+use function random_int;
+use function ucfirst;
 
 /**
- * Load people into database
- *
+ * Load people into database.
  */
-class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+class LoadPeople extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    protected Generator $faker;
-
-    protected Registry $workflowRegistry;
-
-    protected SocialIssueRepository $socialIssueRepository;
-
-    protected CountryRepository $countryRepository;
-
-    protected NativeLoader $loader;
+    public const PERSON = 'person';
 
     /**
-     * @var array|SocialIssue[]
+     * @var array|Center[]
      */
-    protected array $cacheSocialIssues = [];
+    protected array $cacheCenters = [];
 
     /**
      * @var array|Country[]
      */
     protected array $cacheCountries = [];
 
-    /**
-     * @var array|Center[]
-     */
-    protected array $cacheCenters = [];
-
-    protected CenterRepository $centerRepository;
-
     /**
      * @var array|MaritalStatus[]
      */
     protected array $cacheMaritalStatuses = [];
 
-    protected MaritalStatusRepository $maritalStatusRepository;
-
     /**
      * @var array|Scope[]
      */
     protected array $cacheScopes = [];
 
+    /**
+     * @var array|SocialIssue[]
+     */
+    protected array $cacheSocialIssues = [];
+
+    /**
+     * @var array|User[]
+     */
+    protected array $cacheUsers = [];
+
+    protected CenterRepository $centerRepository;
+
+    protected CountryRepository $countryRepository;
+
+    protected Generator $faker;
+
+    protected NativeLoader $loader;
+
+    protected MaritalStatusRepository $maritalStatusRepository;
+
     protected ScopeRepository $scopeRepository;
 
-    /** @var array|User[] */
-    protected array $cacheUsers = [];
+    protected SocialIssueRepository $socialIssueRepository;
 
     protected UserRepository $userRepository;
 
-    public function __construct(
-        Registry $workflowRegistry,
-        SocialIssueRepository $socialIssueRepository,
-        CenterRepository $centerRepository,
-        CountryRepository $countryRepository,
-        MaritalStatusRepository $maritalStatusRepository,
-        ScopeRepository $scopeRepository,
-        UserRepository $userRepository
-    ) {
-        $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);
-        $this->scopeRepository = $scopeRepository;
-        $this->userRepository = $userRepository;
-    }
+    protected Registry $workflowRegistry;
 
-    public function getOrder()
-    {
-        return 10000;
-    }
+    private $genders = [Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER];
 
-    public function load(ObjectManager $manager)
-    {
-        $this->loadExpectedPeople($manager);
-        $this->loadRandPeople($manager);
-
-        $manager->flush();
-    }
-
-    public function loadExpectedPeople(ObjectManager $manager)
-    {
-        echo "loading expected people...\n";
-
-
-        foreach ($this->peoples as $personDef) {
-            $person = $this->createExpectedPerson($personDef);
-            $this->addAPerson($person, $manager);
-        }
-    }
-
-    protected function loadRandPeople(ObjectManager $manager)
-    {
-        echo "loading rand people...\n";
-        $persons = $this->createRandPerson()->getObjects();
-
-        foreach ($persons as $person) {
-            $this->addAPerson($person, $manager);
-        }
-    }
-
-    private function createRandPerson(): ObjectSet
-    {
-        return $this->loader->loadData([
-            Person::class => [
-                'persons{1..300}' => [
-                    'firstName' => '<firstname()>',
-                    'lastName' => '<lastname()>',
-                    'gender' => '<getRandomGender()>',
-                    'nationality' => '<getRandomCountry()>',
-                    'center' => '<getRandomCenter()>',
-                    'maritalStatus' => '<getRandomMaritalStatus()>',
-                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
-                    'placeOfBirth' => '<city()>',
-                    'email' => '<freeEmail()>',
-                    'countryOfBirth' => '<getRandomCountry(80)>',
-                ]
-            ]
-        ]);
-    }
-
-    private function createExpectedPerson($default): Person
-    {
-        $person = $this->loader->loadData([
-            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 $person;
-    }
-
-    /**
-     * create a new person from array data
-     *
-     * @throws \Exception
-     */
-    private function addAPerson(Person $person, ObjectManager $manager)
-    {
-        $accompanyingPeriod = new AccompanyingPeriod(
-            (new \DateTime())
-                ->sub(
-                    new \DateInterval('P' . \random_int(0, 180) . 'D')
-                )
-        );
-        $accompanyingPeriod->setCreatedBy($this->getRandomUser())
-            ->setCreatedAt(new \DateTimeImmutable('now'));
-        $person->addAccompanyingPeriod($accompanyingPeriod);
-        $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
-
-        if (\random_int(0, 10) > 3) {
-            // always add social scope:
-            $accompanyingPeriod->addScope($this->getReference('scope_social'));
-
-            $accompanyingPeriod->setAddressLocation($this->createAddress());
-            $manager->persist($accompanyingPeriod->getAddressLocation());
-            $workflow = $this->workflowRegistry->get($accompanyingPeriod);
-            $workflow->apply($accompanyingPeriod, 'confirm');
-        }
-
-        $manager->persist($person);
-        $manager->persist($accompanyingPeriod);
-        echo "add person'".$person->__toString()."'\n";
-    }
-
-    private function getRandomUser(): User
-    {
-        if (0 === count($this->cacheUsers)) {
-            $this->cacheUsers = $this->userRepository->findAll();
-        }
-
-        return $this->cacheUsers[\array_rand($this->cacheUsers)];
-    }
-
-    private function createAddress(): Address
-    {
-        $objectSet = $this->loader->loadData([
-            Address::class => [
-                'address' => [
-                    'street' => '<fr_FR:streetName()>',
-                    'streetNumber' => '<fr_FR:buildingNumber()>',
-                    'validFrom' => '<dateTimeBetween(\'-1 year\', \'now\')>',
-                    'postCode' => $this->getPostalCode()
-                ],
-            ],
-        ]);
-
-        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)];
-
-        return $this->getReference($ref);
-    }
-
-    /**
-     * Create a random point
-     *
-     * @return Point
-     */
-    private function getRandomPoint()
-    {
-        $lonBrussels = 4.35243;
-        $latBrussels = 50.84676;
-        $lon = $lonBrussels + 0.01 * rand(-5, 5);
-        $lat = $latBrussels + 0.01 * rand(-5, 5);
-        return Point::fromLonLat($lon, $lat);
-    }
-
-    /**
-     * Create a random address
-     *
-     * @return Address
-     */
-    private function getRandomAddress()
-    {
-        return (new Address())
-            ->setStreetAddress1($this->faker->streetAddress)
-            ->setStreetAddress2(
-                rand(0,9) > 5 ? $this->faker->streetAddress : ''
-            )
-            ->setPoint(
-                rand(0,9) > 5 ? $this->getRandomPoint() : NULL
-            )
-            ->setPostcode($this->getReference(
-                LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
-            ))
-            ->setValidFrom($this->faker->dateTimeBetween('-5 years'))
-        ;
-    }
-
-    /**
-     * @internal This method is public and called by faker as a custom generator
-     * @return Center
-     */
-    public function getRandomCenter(): Center
-    {
-        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->cacheCountries [\array_rand($this->cacheCountries)];
-    }
-
-    /**
-     * @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)];
-    }
-
-    /**
-     * @internal This method is public and called by faker as a custom generator
-     * @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();
-        }
-
-        if ($nullPercentage < \random_int(0, 100)) {
-            return NULL;
-        }
-
-        return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)];
-    }
-
-    private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER);
-
-    private $peoples = array(
-        array(
-            'lastName' => "Depardieu",
-            'firstName' => "Gérard",
-            'birthdate' => "1948-12-27",
-            'placeOfBirth' => "Châteauroux",
+    private $peoples = [
+        [
+            'lastName' => 'Depardieu',
+            'firstName' => 'Gérard',
+            'birthdate' => '1948-12-27',
+            'placeOfBirth' => 'Châteauroux',
             'nationality' => 'RU',
             'gender' => Person::MALE_GENDER,
             'center' => 'Center A',
@@ -414,73 +119,73 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
                     'from' => '2015-02-01',
                     'to' => '2015-10-30',
                     'remark' => 'oops',
-                ],[
+                ], [
                     'from' => '2017-06-01',
                     'to' => '2018-03-30',
                     'remark' => 'argg',
-                ],[
+                ], [
                     'from' => '2019-01-01',
                     'to' => '2019-12-31',
                     'remark' => 'blob',
-                ]
-            ]
-        ),
-        array(
+                ],
+            ],
+        ],
+        [
             //to have a person with same firstname as Gérard Depardieu
-            'lastName' => "Depardieu",
-            'firstName' => "Jean",
-            'birthdate' => "1960-10-12",
+            'lastName' => 'Depardieu',
+            'firstName' => 'Jean',
+            'birthdate' => '1960-10-12',
             'countryOfBirth' => 'FR',
             'nationality' => 'FR',
             'center' => 'Center A',
-            'maritalStatus' => 'ms_divorce'
-        ),
-        array(
+            'maritalStatus' => 'ms_divorce',
+        ],
+        [
             //to have a person with same birthdate of Gérard Depardieu
             'lastName' => 'Van Snick',
             'firstName' => 'Bart',
             'birthdate' => '1948-12-27',
             'center' => 'Center A',
-            'maritalStatus' => 'ms_legalco'
-        ),
-        array(
+            'maritalStatus' => 'ms_legalco',
+        ],
+        [
             //to have a woman with Depardieu as FirstName
             'lastName' => 'Depardieu',
             'firstName' => 'Charline',
             'gender' => Person::FEMALE_GENDER,
             'center' => 'Center A',
-            'maritalStatus' => 'ms_legalco'
-        ),
-        array(
+            'maritalStatus' => 'ms_legalco',
+        ],
+        [
             //to have a special character in lastName
             'lastName' => 'Manço',
             'firstName' => 'Étienne',
             'center' => 'Center A',
-            'maritalStatus' => 'ms_unknown'
-        ),
-        array(
+            'maritalStatus' => 'ms_unknown',
+        ],
+        [
             //to have true duplicate person
-            'lastName' => "Depardieu",
-            'firstName' => "Jean",
-            'birthdate' => "1960-10-12",
+            'lastName' => 'Depardieu',
+            'firstName' => 'Jean',
+            'birthdate' => '1960-10-12',
             'countryOfBirth' => 'FR',
             'nationality' => 'FR',
             'center' => 'Center A',
-            'maritalStatus' => 'ms_divorce'
-        ),
-        array(
+            'maritalStatus' => 'ms_divorce',
+        ],
+        [
             //to have false duplicate person
-            'lastName' => "Depardieu",
-            'firstName' => "Jeanne",
-            'birthdate' => "1966-11-13",
+            'lastName' => 'Depardieu',
+            'firstName' => 'Jeanne',
+            'birthdate' => '1966-11-13',
             'countryOfBirth' => 'FR',
             'nationality' => 'FR',
             'center' => 'Center A',
-            'maritalStatus' => 'ms_legalco'
-        ),
+            'maritalStatus' => 'ms_legalco',
+        ],
         [
             'lastName' => 'Diallo',
-            'firstName' => "Fatoumata Binta"
+            'firstName' => 'Fatoumata Binta',
         ],
         [
             'lastName' => 'Diallo',
@@ -504,7 +209,7 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
         ],
         [
             'lastName' => 'Bah',
-            'firstName' => "Fatoumata Binta"
+            'firstName' => 'Fatoumata Binta',
         ],
         [
             'lastName' => 'Bah',
@@ -534,24 +239,320 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
             'lastName' => 'Gaillot',
             'firstName' => 'Adèle',
         ],
-    );
+    ];
 
-/*
-    private function addAccompanyingPeriods(Person $person, array $periods, ObjectManager $manager)
+    public function __construct(
+        Registry $workflowRegistry,
+        SocialIssueRepository $socialIssueRepository,
+        CenterRepository $centerRepository,
+        CountryRepository $countryRepository,
+        MaritalStatusRepository $maritalStatusRepository,
+        ScopeRepository $scopeRepository,
+        UserRepository $userRepository
+    ) {
+        $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);
+        $this->scopeRepository = $scopeRepository;
+        $this->userRepository = $userRepository;
+    }
+
+    public function getOrder()
     {
-        foreach ($periods as $period) {
+        return 10000;
+    }
 
-            echo "adding new past Accompanying Period..\n";
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     */
+    public function getRandomCenter(): Center
+    {
+        if (0 === count($this->cacheCenters)) {
+            $this->cacheCenters = $this->centerRepository->findAll();
+        }
 
-            /** @var AccompanyingPeriod $accompanyingPeriod
-            $accompanyingPeriod = new AccompanyingPeriod(new \DateTime($period['from']));
-            $accompanyingPeriod
-                ->setClosingDate(new \DateTime($period['to']))
-                ->setRemark($period['remark'])
-            ;
+        return $this->cacheCenters[array_rand($this->cacheCenters)];
+    }
 
-            $person->addAccompanyingPeriod($accompanyingPeriod);
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     *
+     * @throws Exception
+     */
+    public function getRandomCountry(int $nullPercentage = 20): ?Country
+    {
+        if (0 === count($this->cacheCountries)) {
+            $this->cacheCountries = $this->countryRepository->findAll();
+        }
+
+        if (random_int(0, 100) > $nullPercentage) {
+            return null;
+        }
+
+        return $this->cacheCountries[array_rand($this->cacheCountries)];
+    }
+
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     */
+    public function getRandomGender(): string
+    {
+        return $this->genders[array_rand($this->genders)];
+    }
+
+    /**
+     * @internal This method is public and called by faker as a custom generator
+     *
+     * @throws Exception
+     */
+    public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus
+    {
+        if (0 === count($this->cacheMaritalStatuses)) {
+            $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll();
+        }
+
+        if (random_int(0, 100) > $nullPercentage) {
+            return null;
+        }
+
+        return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)];
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $this->loadExpectedPeople($manager);
+        $this->loadRandPeople($manager);
+
+        $manager->flush();
+    }
+
+    public function loadExpectedPeople(ObjectManager $manager)
+    {
+        echo "loading expected people...\n";
+
+        foreach ($this->peoples as $personDef) {
+            $person = $this->createExpectedPerson($personDef);
+            $this->addAPerson($person, $manager);
         }
     }
-    */
+
+    protected function loadRandPeople(ObjectManager $manager)
+    {
+        echo "loading rand people...\n";
+        $persons = $this->createRandPerson()->getObjects();
+
+        foreach ($persons as $person) {
+            $this->addAPerson($person, $manager);
+        }
+    }
+
+    /**
+     * create a new person from array data.
+     *
+     * @throws Exception
+     */
+    private function addAPerson(Person $person, ObjectManager $manager)
+    {
+        $accompanyingPeriod = new AccompanyingPeriod(
+            (new DateTime())
+                ->sub(
+                    new DateInterval('P' . random_int(0, 180) . 'D')
+                )
+        );
+        $accompanyingPeriod->setCreatedBy($this->getRandomUser())
+            ->setCreatedAt(new DateTimeImmutable('now'));
+        $person->addAccompanyingPeriod($accompanyingPeriod);
+        $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue());
+
+        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);
+            $workflow->apply($accompanyingPeriod, 'confirm');
+        }
+
+        $manager->persist($person);
+        $manager->persist($accompanyingPeriod);
+        echo "add person'" . $person->__toString() . "'\n";
+
+        $this->addReference(self::PERSON . $person->getId(), $person);
+    }
+
+    private function createAddress(): Address
+    {
+        $objectSet = $this->loader->loadData([
+            Address::class => [
+                'address' => [
+                    'street' => '<fr_FR:streetName()>',
+                    'streetNumber' => '<fr_FR:buildingNumber()>',
+                    'validFrom' => '<dateTimeBetween(\'-1 year\', \'now\')>',
+                    'postCode' => $this->getPostalCode(),
+                ],
+            ],
+        ]);
+
+        return $objectSet->getObjects()['address'];
+    }
+
+    private function createExpectedPerson($default): Person
+    {
+        $person = $this->loader->loadData([
+            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 $person;
+    }
+
+    private function createRandPerson(): ObjectSet
+    {
+        return $this->loader->loadData([
+            Person::class => [
+                'persons{1..300}' => [
+                    'firstName' => '<firstname()>',
+                    'lastName' => '<lastname()>',
+                    'gender' => '<getRandomGender()>',
+                    'nationality' => '<getRandomCountry()>',
+                    'center' => '<getRandomCenter()>',
+                    'maritalStatus' => '<getRandomMaritalStatus()>',
+                    'birthdate' => '<dateTimeBetween("-75 years", "-1 tears")>',
+                    'placeOfBirth' => '<city()>',
+                    'email' => '<freeEmail()>',
+                    'countryOfBirth' => '<getRandomCountry(80)>',
+                ],
+            ],
+        ]);
+    }
+
+    private function getPostalCode(): PostalCode
+    {
+        $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
+
+        return $this->getReference($ref);
+    }
+
+    /**
+     * Create a random address.
+     *
+     * @return Address
+     */
+    private function getRandomAddress()
+    {
+        return (new Address())
+            ->setStreetAddress1($this->faker->streetAddress)
+            ->setStreetAddress2(
+                mt_rand(0, 9) > 5 ? $this->faker->streetAddress : ''
+            )
+            ->setPoint(
+                mt_rand(0, 9) > 5 ? $this->getRandomPoint() : null
+            )
+            ->setPostcode($this->getReference(
+                LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)]
+            ))
+            ->setValidFrom($this->faker->dateTimeBetween('-5 years'));
+    }
+
+    /**
+     * Create a random point.
+     *
+     * @return Point
+     */
+    private function getRandomPoint()
+    {
+        $lonBrussels = 4.35243;
+        $latBrussels = 50.84676;
+        $lon = $lonBrussels + 0.01 * mt_rand(-5, 5);
+        $lat = $latBrussels + 0.01 * mt_rand(-5, 5);
+
+        return Point::fromLonLat($lon, $lat);
+    }
+
+    private function getRandomSocialIssue(): SocialIssue
+    {
+        if (0 === count($this->cacheSocialIssues)) {
+            $this->cacheSocialIssues = $this->socialIssueRepository->findAll();
+        }
+
+        return $this->cacheSocialIssues[array_rand($this->cacheSocialIssues)];
+    }
+
+    private function getRandomUser(): User
+    {
+        if (0 === count($this->cacheUsers)) {
+            $this->cacheUsers = $this->userRepository->findAll();
+        }
+
+        return $this->cacheUsers[array_rand($this->cacheUsers)];
+    }
+
+    /*
+        private function addAccompanyingPeriods(Person $person, array $periods, ObjectManager $manager)
+        {
+            foreach ($periods as $period) {
+
+                echo "adding new past Accompanying Period..\n";
+
+                /** @var AccompanyingPeriod $accompanyingPeriod
+                $accompanyingPeriod = new AccompanyingPeriod(new \DateTime($period['from']));
+                $accompanyingPeriod
+                    ->setClosingDate(new \DateTime($period['to']))
+                    ->setRemark($period['remark'])
+                ;
+
+                $person->addAccompanyingPeriod($accompanyingPeriod);
+            }
+        }
+     */
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index 18f8e5879..7b368bbe8 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -1,37 +1,27 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 
 /**
  * Add a role CHILL_PERSON_UPDATE & CHILL_PERSON_CREATE for all groups except administrative,
- * and a role CHILL_PERSON_SEE for administrative
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * and a role CHILL_PERSON_SEE for administrative.
  */
 class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -40,7 +30,6 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
         return 9600;
     }
 
-
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
@@ -60,13 +49,13 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     );
 
                     $roleScopeUpdate = (new RoleScope())
-                                ->setRole('CHILL_PERSON_UPDATE')
-                                ->setScope(null);
+                        ->setRole('CHILL_PERSON_UPDATE')
+                        ->setScope(null);
                     $permissionsGroup->addRoleScope($roleScopeUpdate);
 
                     $roleScopeCreate = (new RoleScope())
-                                ->setRole('CHILL_PERSON_CREATE')
-                                ->setScope(null);
+                        ->setRole('CHILL_PERSON_CREATE')
+                        ->setScope(null);
                     $permissionsGroup->addRoleScope($roleScopeCreate);
 
                     $roleScopeDuplicate = (new RoleScope())
@@ -75,13 +64,13 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     $permissionsGroup->addRoleScope($roleScopeDuplicate);
 
                     $roleScopeList = (new RoleScope())
-                                ->setRole(PersonVoter::LISTS)
-                                ->setScope(null);
+                        ->setRole(PersonVoter::LISTS)
+                        ->setScope(null);
                     $permissionsGroup->addRoleScope($roleScopeList);
 
                     $roleScopeStats = (new RoleScope())
-                                ->setRole(PersonVoter::STATS)
-                                ->setScope(null);
+                        ->setRole(PersonVoter::STATS)
+                        ->setScope(null);
                     $permissionsGroup->addRoleScope($roleScopeStats);
 
                     $manager->persist($roleScopeUpdate);
@@ -89,19 +78,19 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     $manager->persist($roleScopeDuplicate);
 
                     break;
+
                 case 'administrative':
                     printf("Adding CHILL_PERSON_SEE to %s permission group \n", $permissionsGroup->getName());
                     $roleScopeSee = (new RoleScope())
-                                ->setRole('CHILL_PERSON_SEE')
-                                ->setScope(null);
+                        ->setRole('CHILL_PERSON_SEE')
+                        ->setScope(null);
                     $permissionsGroup->addRoleScope($roleScopeSee);
                     $manager->persist($roleScopeSee);
+
                     break;
             }
-
         }
 
         $manager->flush();
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
new file mode 100644
index 000000000..e2bb469bc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadRelations extends Fixture implements FixtureGroupInterface
+{
+    public const RELATION_KEY = 'relations';
+
+    public const RELATIONS = [
+        ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fille']],
+        ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fils']],
+        ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fille']],
+        ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']],
+
+        ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Frère']],
+        ['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Soeur']],
+        ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Soeur']],
+
+        ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-frère']],
+        ['title' => ['fr' => 'Demi-soeur'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
+        ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
+
+        ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Neveu']],
+        ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Nièce']],
+        ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Neveu']],
+        ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']],
+    ];
+
+    public static function getGroups(): array
+    {
+        return ['person_relations'];
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        foreach (self::RELATIONS as $key => $value) {
+            echo 'Creating a new relation type: relation' . $value['title']['fr'] . 'reverse relation: ' . $value['reverseTitle']['fr'] . "\n";
+            $relation = new Relation();
+            $relation->setTitle($value['title'])
+                ->setReverseTitle($value['reverseTitle']);
+            $manager->persist($relation);
+
+            $this->addReference(self::RELATION_KEY . $key, $relation);
+        }
+
+        $manager->flush();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
new file mode 100644
index 000000000..80f3e711d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+use DateTimeImmutable;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectManager;
+use function count;
+
+class LoadRelationships extends Fixture implements DependentFixtureInterface
+{
+    use PersonRandomHelper;
+
+    private EntityManagerInterface $em;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->em = $em;
+    }
+
+    public function getDependencies()
+    {
+        return [
+            LoadPeople::class,
+            LoadRelations::class,
+        ];
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        for ($i = 0; 15 > $i; ++$i) {
+            $user = $this->getRandomUser();
+            $date = new DateTimeImmutable();
+            $relationship = (new Relationship())
+                ->setFromPerson($this->getRandomPerson($this->em))
+                ->setToPerson($this->getRandomPerson($this->em))
+                ->setRelation($this->getReference(LoadRelations::RELATION_KEY .
+                    random_int(0, count(LoadRelations::RELATIONS) - 1)))
+                ->setReverse((bool) random_int(0, 1))
+                ->setCreatedBy($user)
+                ->setUpdatedBy($user)
+                ->setCreatedAt($date)
+                ->setUpdatedAt($date);
+            $manager->persist($relationship);
+        }
+
+        $manager->flush();
+    }
+
+    private function getRandomUser(): User
+    {
+        $userRef = array_rand(LoadUsers::$refs);
+
+        return $this->getReference($userRef);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
index f96fb5fc2..4501ef51e 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
@@ -1,44 +1,48 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
 use Chill\PersonBundle\Service\Import\SocialWorkMetadata;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Exception;
 use League\Csv\Reader;
+use Throwable;
 
-class LoadSocialWorkMetadata extends \Doctrine\Bundle\FixturesBundle\Fixture implements \Doctrine\Common\DataFixtures\OrderedFixtureInterface
+class LoadSocialWorkMetadata extends Fixture implements OrderedFixtureInterface
 {
     private SocialWorkMetadata $importer;
 
-    /**
-     * @param SocialWorkMetadata $importer
-     */
     public function __construct(SocialWorkMetadata $importer)
     {
         $this->importer = $importer;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function load(ObjectManager $manager)
-    {
-        try {
-            $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv');
-        } catch (Throwable $e) {
-            throw new Exception('Error while loading CSV.',0, $e);
-        }
-
-        $csv->setDelimiter(";");
-
-        $this->importer->import($csv);
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function getOrder()
     {
         return 9500;
     }
+
+    public function load(ObjectManager $manager)
+    {
+        try {
+            $csv = Reader::createFromPath(__DIR__ . '/data/social_work_metadata.csv');
+        } catch (Throwable $e) {
+            throw new Exception('Error while loading CSV.', 0, $e);
+        }
+
+        $csv->setDelimiter(';');
+
+        $this->importer->import($csv);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index bc3b798fa..65a45c2e6 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -1,50 +1,40 @@
 <?php
-/*
- * Copyright (C) 2014-2016 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DependencyInjection;
 
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\MainBundle\DependencyInjection\MissingBundleException;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Exception;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use function array_key_exists;
 
 /**
  * Class ChillPersonExtension
- * Loads and manages your bundle configuration
+ * Loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
- * @package Chill\PersonBundle\DependencyInjection
  */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
-
     /**
-     * {@inheritDoc}
-     * @param array $configs
-     * @param ContainerBuilder $container
-     * @throws \Exception
+     * @throws Exception
      */
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -52,19 +42,23 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $config = $this->processConfiguration($configuration, $configs);
 
         // set configuration for validation
-        $container->setParameter('chill_person.validation.birtdate_not_before',
-                $config['validation']['birthdate_not_after']);
+        $container->setParameter(
+            'chill_person.validation.birtdate_not_before',
+            $config['validation']['birthdate_not_after']
+        );
 
         $this->handlePersonFieldsParameters($container, $config['person_fields']);
         $this->handleAccompanyingPeriodsFieldsParameters($container, $config['accompanying_periods_fields']);
 
-        $container->setParameter('chill_person.allow_multiple_simultaneous_accompanying_periods',
-                $config['allow_multiple_simultaneous_accompanying_periods']);
+        $container->setParameter(
+            'chill_person.allow_multiple_simultaneous_accompanying_periods',
+            $config['allow_multiple_simultaneous_accompanying_periods']
+        );
 
         // register all configuration in a unique parameter
         $container->setParameter('chill_person', $config);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
         $loader->load('services/exports.yaml');
@@ -85,13 +79,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader->load('services/serializer.yaml');
         $loader->load('services/security.yaml');
         $loader->load('services/doctrineEventListener.yaml');
-
-        // load service advanced search only if configure
-        if ($config['search']['search_by_phone'] != 'never') {
-            $loader->load('services/search_by_phone.yaml');
-            $container->setParameter('chill_person.search.search_by_phone',
-                $config['search']['search_by_phone']);
-        }
+        $loader->load('services/accompanyingPeriodConsistency.yaml');
 
         if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
             $loader->load('services/exports_accompanying_period.yaml');
@@ -99,70 +87,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
     }
 
     /**
-     * @param ContainerBuilder $container
-     * @param $config
-     */
-    private function handlePersonFieldsParameters(ContainerBuilder $container, $config)
-    {
-        if (array_key_exists('enabled', $config)) {
-            unset($config['enabled']);
-        }
-
-        $container->setParameter('chill_person.person_fields', $config);
-
-        foreach ($config as $key => $value) {
-            switch($key) {
-                case 'accompanying_period':
-                    $container->setParameter('chill_person.accompanying_period', $value);
-                    break;
-                default:
-                    $container->setParameter('chill_person.person_fields.'.$key, $value);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     * @param $config
-     */
-    private function handleAccompanyingPeriodsFieldsParameters(ContainerBuilder $container, $config)
-    {
-        $container->setParameter('chill_person.accompanying_period_fields', $config);
-
-        foreach ($config as $key => $value) {
-            switch($key) {
-                case 'enabled':
-                    break;
-                default:
-                    $container->setParameter('chill_person.accompanying_period_fields.'.$key, $value);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     * @throws MissingBundleException
-     */
-    private function declarePersonAsCustomizable (ContainerBuilder $container)
-    {
-        $bundles = $container->getParameter('kernel.bundles');
-        if (!isset($bundles['ChillCustomFieldsBundle'])) {
-            throw new MissingBundleException('ChillCustomFieldsBundle');
-        }
-
-        $container->prependExtensionConfig('chill_custom_fields',
-            array('customizables_entities' =>
-                array(
-                    array('class' => 'Chill\PersonBundle\Entity\Person', 'name' => 'PersonEntity')
-                )
-            )
-        );
-    }
-
-    /**
-     * @param ContainerBuilder $container
      * @throws MissingBundleException
      */
     public function prepend(ContainerBuilder $container)
@@ -176,147 +100,31 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         //add person_fields parameter as global
         $chillPersonConfig = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration(new Configuration(), $chillPersonConfig);
-        $twigConfig = array(
-            'globals' => array(
-                'chill_person' => array(
-                    'fields' => $config['person_fields']
-                ),
+        $twigConfig = [
+            'globals' => [
+                'chill_person' => [
+                    'fields' => $config['person_fields'],
+                ],
                 'chill_accompanying_periods' => [
-                    'fields' => $config['accompanying_periods_fields']
-                ]
-            ),
-            'form_themes' => array('ChillPersonBundle:Export:ListPersonFormFields.html.twig')
-        );
+                    'fields' => $config['accompanying_periods_fields'],
+                ],
+            ],
+            'form_themes' => ['ChillPersonBundle:Export:ListPersonFormFields.html.twig'],
+        ];
         $container->prependExtensionConfig('twig', $twigConfig);
 
-        $this-> declarePersonAsCustomizable($container);
+        $this->declarePersonAsCustomizable($container);
 
         //declare routes for person bundle
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillPersonBundle/config/routes.yaml'
-              )
-           )
-        ));
-    }
-
-    protected function prependWorkflows(ContainerBuilder $container)
-    {
-         $container->prependExtensionConfig('framework', [
-           'workflows' => [
-                'accompanying_period_lifecycle' => [
-                    'type' =>  'state_machine',
-                    'audit_trail' => [
-                        'enabled' =>  true
-                    ],
-                    'marking_store' => [
-                        'type' =>  'method',
-                        'property' =>  'step',
-                    ],
-                    'supports' => [
-                        'Chill\PersonBundle\Entity\AccompanyingPeriod'
-                    ],
-                    'initial_marking' =>  'DRAFT',
-                    'places' => [
-                        'DRAFT',
-                        'CONFIRMED',
-                    ],
-                    'transitions' => [
-                        'confirm' => [
-                            'from' =>  'DRAFT',
-                            'to' =>  'CONFIRMED'
-                        ],
-                    ],
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillPersonBundle/config/routes.yaml',
                 ],
-            ]
-        ]);
-
-    }
-
-    /**
-     * Add a widget "add a person" on the homepage, automatically
-     *
-     * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
-     */
-    protected function prependHomepageWidget(containerBuilder $container)
-    {
-        $container->prependExtensionConfig('chill_main', array(
-            'widgets' => array(
-                'homepage' => array(
-                    array(
-                        'widget_alias' => 'add_person',
-                        'order' => 2
-                    )
-                )
-            )
-        ));
-    }
-
-    /**
-     * Add role hierarchy.
-     *
-     * @param ContainerBuilder $container
-     */
-    protected function prependRoleHierarchy(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', [
-            'role_hierarchy' => [
-                PersonVoter::UPDATE => [PersonVoter::SEE],
-                PersonVoter::CREATE => [PersonVoter::SEE],
-                PersonVoter::LISTS => [ChillExportVoter::EXPORT],
-                PersonVoter::STATS => [ChillExportVoter::EXPORT],
-                // accompanying period
-                AccompanyingPeriodVoter::SEE_DETAILS => [AccompanyingPeriodVoter::SEE],
-                AccompanyingPeriodVoter::CREATE => [AccompanyingPeriodVoter::SEE_DETAILS],
-                AccompanyingPeriodVoter::DELETE => [AccompanyingPeriodVoter::SEE_DETAILS],
-                AccompanyingPeriodVoter::EDIT => [AccompanyingPeriodVoter::SEE_DETAILS],
-                // give all ACL for FULL
-                AccompanyingPeriodVoter::FULL => [
-                    AccompanyingPeriodVoter::SEE_DETAILS,
-                    AccompanyingPeriodVoter::CREATE,
-                    AccompanyingPeriodVoter::EDIT,
-                    AccompanyingPeriodVoter::DELETE
-                ]
-            ]
+            ],
         ]);
     }
 
-    /**
-     * Add DQL function linked with person
-     *
-     * @param ContainerBuilder $container
-     */
-    protected function prependDoctrineDQL(ContainerBuilder $container)
-    {
-        //add DQL function to ORM (default entity_manager)
-
-        $container->prependExtensionConfig('doctrine', array(
-           'orm' => array(
-              'dql' => array(
-                 'string_functions' => array(
-                    'GET_PERSON_ADDRESS_ADDRESS_ID' => AddressPart\AddressPartAddressId::class,
-                    'GET_PERSON_ADDRESS_STREET_ADDRESS_1' => AddressPart\AddressPartStreetAddress1::class,
-                    'GET_PERSON_ADDRESS_STREET_ADDRESS_2' => AddressPart\AddressPartStreetAddress2::class,
-                    'GET_PERSON_ADDRESS_VALID_FROM' => AddressPart\AddressPartValidFrom::class,
-                    'GET_PERSON_ADDRESS_POSTCODE_LABEL' => AddressPart\AddressPartPostCodeLabel::class,
-                    'GET_PERSON_ADDRESS_POSTCODE_CODE' => AddressPart\AddressPartPostCodeCode::class,
-                    'GET_PERSON_ADDRESS_POSTCODE_ID'   => AddressPart\AddressPartPostCodeId::class,
-                    'GET_PERSON_ADDRESS_COUNTRY_NAME'  => AddressPart\AddressPartCountryName::class,
-                    'GET_PERSON_ADDRESS_COUNTRY_CODE'  => AddressPart\AddressPartCountryCode::class,
-                    'GET_PERSON_ADDRESS_COUNTRY_ID'    => AddressPart\AddressPartCountryId::class,
-                 ),
-                  'numeric_functions' => [
-                    'GET_PERSON_ADDRESS_ISNOADDRESS'   => AddressPart\AddressPartIsNoAddress::class,
-                  ]
-              )
-           )
-        ));
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     */
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
@@ -330,17 +138,17 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'actions' => [
                         'index' => [
                             'template' => '@ChillPerson/ClosingMotive/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/ClosingMotive/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/ClosingMotive/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\MaritalStatus::class,
@@ -353,15 +161,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/MaritalStatus/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/MaritalStatus/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/MaritalStatus/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
@@ -374,15 +182,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/SocialIssue/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialAction::class,
@@ -395,15 +203,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/SocialAction/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\Goal::class,
@@ -416,15 +224,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/Goal/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\Result::class,
@@ -437,15 +245,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/Result/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\Evaluation::class,
@@ -458,15 +266,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/Evaluation/index.html.twig',
                         ],
-                        'new'   => [
+                        'new' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/new.html.twig',
                         ],
-                        'edit'  => [
+                        'edit' => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillPerson/SocialWork/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
             ],
             'apis' => [
@@ -486,7 +294,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_GET => true,
                                 Request::METHOD_PUT => true,
                                 Request::METHOD_PATCH => true,
-                            ]
+                            ],
                         ],
                         'participation' => [
                             'methods' => [
@@ -497,8 +305,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
-                            ]
+                                Request::METHOD_DELETE => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
                         ],
                         'resource' => [
                             'methods' => [
@@ -509,8 +317,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
-                            ]
+                                Request::METHOD_DELETE => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
                         ],
                         'comment' => [
                             'methods' => [
@@ -521,8 +329,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
-                            ]
+                                Request::METHOD_DELETE => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
                         ],
                         'requestor' => [
                             'methods' => [
@@ -533,8 +341,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
-                            ]
+                                Request::METHOD_DELETE => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
                         ],
                         'scope' => [
                             'methods' => [
@@ -545,8 +353,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
-                            ]
+                                Request::METHOD_DELETE => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
                         ],
                         'socialissue' => [
                             'methods' => [
@@ -558,8 +366,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'controller_action' => 'socialIssueApi',
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                                Request::METHOD_DELETE=> \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE
-                            ]
+                                Request::METHOD_DELETE => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
+                            ],
                         ],
                         'work' => [
                             'methods' => [
@@ -572,9 +380,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
                                 Request::METHOD_DELETE => 'ALWAYS_FAILS',
-                            ]
+                            ],
                         ],
-
                         'confirm' => [
                             'methods' => [
                                 Request::METHOD_POST => true,
@@ -583,9 +390,27 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             ],
                             'roles' => [
                                 Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::SEE,
-                            ]
+                            ],
                         ],
-                    ]
+                        'confidential' => [
+                            'methods' => [
+                                Request::METHOD_POST => true,
+                                Request::METHOD_GET => true,
+                            ],
+                            'controller_action' => 'toggleConfidentialApi',
+                            'roles' => [
+                                Request::METHOD_POST => \Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL,
+                            ],
+                        ],
+                        'findAccompanyingPeriodsByPerson' => [
+                            'path' => '/by-person/{person_id}.{_format}',
+                            'controller_action' => 'getAccompanyingPeriodsByPerson',
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Origin::class,
@@ -597,16 +422,16 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
-                            ]
+                                Request::METHOD_HEAD => true,
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
@@ -618,16 +443,16 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         '_index' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
+                                Request::METHOD_HEAD => true,
                             ],
                         ],
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true
-                            ]
+                                Request::METHOD_HEAD => true,
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\Person::class,
@@ -640,8 +465,8 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                                Request::METHOD_POST=> true,
-                                Request::METHOD_PATCH => true
+                                Request::METHOD_POST => true,
+                                Request::METHOD_PATCH => true,
                             ],
                             'roles' => [
                                 Request::METHOD_GET => \Chill\PersonBundle\Security\Authorization\PersonVoter::SEE,
@@ -657,9 +482,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_GET => false,
                                 Request::METHOD_HEAD => false,
                             ],
-                            'controller_action' => 'personAddressApi'
+                            'controller_action' => 'personAddressApi',
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\Household\Household::class,
@@ -678,7 +503,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                            ]
+                            ],
                         ],
                         'address' => [
                             'methods' => [
@@ -687,16 +512,16 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_GET => false,
                                 Request::METHOD_HEAD => false,
                             ],
-                            'controller_action' => 'householdAddressApi'
+                            'controller_action' => 'householdAddressApi',
                         ],
                         'suggestHouseholdByAccompanyingPeriodParticipation' => [
                             'path' => '/suggest/by-person/{person_id}/through-accompanying-period-participation.{_format}',
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
-                            ]
-                        ]
-                    ]
+                            ],
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialAction::class,
@@ -714,7 +539,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         '_index' => [
                             'methods' => [
@@ -724,7 +549,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         'listBySocialIssue' => [
                             'single-collection' => 'collection',
@@ -736,10 +561,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
-
-                        ]
-                    ]
+                            ],
+                        ],
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork::class,
@@ -761,9 +585,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                                 Request::METHOD_HEAD => 'ROLE_USER',
                                 Request::METHOD_PATCH => 'ROLE_USER',
                                 Request::METHOD_PUT => 'ROLE_USER',
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\Result::class,
@@ -780,7 +604,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         '_index' => [
                             'methods' => [
@@ -790,7 +614,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         'by-social-action' => [
                             'single-collection' => 'collection',
@@ -803,7 +627,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         'by-goal' => [
                             'single-collection' => 'collection',
@@ -816,9 +640,9 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\Goal::class,
@@ -835,7 +659,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         '_index' => [
                             'methods' => [
@@ -845,7 +669,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
                         'by-social-action' => [
                             'single-collection' => 'collection',
@@ -858,11 +682,243 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'roles' => [
                                 Request::METHOD_GET => 'ROLE_USER',
                                 Request::METHOD_HEAD => 'ROLE_USER',
-                            ]
+                            ],
                         ],
-                    ]
+                    ],
                 ],
-            ]
+                [
+                    'class' => \Chill\PersonBundle\Entity\Relationships\Relationship::class,
+                    'controller' => \Chill\PersonBundle\Controller\RelationshipApiController::class,
+                    'name' => 'relationship_by_person',
+                    'base_path' => '/api/1.0/relations/relationship',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_POST => true,
+                                Request::METHOD_PATCH => true,
+                                Request::METHOD_DELETE => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_POST => 'ROLE_USER',
+                                Request::METHOD_PATCH => 'ROLE_USER',
+                                Request::METHOD_DELETE => 'ROLE_USER',
+                            ],
+                        ],
+                        'relationship-by-person' => [
+                            'path' => '/by-person/{person_id}.json',
+                            'controller_action' => 'getRelationshipsByPerson',
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                            'roles' => [
+                                Request::METHOD_GET => 'ROLE_USER',
+                                Request::METHOD_HEAD => 'ROLE_USER',
+                            ],
+                        ],
+                    ],
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Relationships\Relation::class,
+                    'name' => 'relations',
+                    'base_path' => '/api/1.0/relations/relation',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
         ]);
     }
+
+    /**
+     * Add DQL function linked with person.
+     */
+    protected function prependDoctrineDQL(ContainerBuilder $container)
+    {
+        //add DQL function to ORM (default entity_manager)
+
+        $container->prependExtensionConfig('doctrine', [
+            'orm' => [
+                'dql' => [
+                    'string_functions' => [
+                        'GET_PERSON_ADDRESS_ADDRESS_ID' => AddressPart\AddressPartAddressId::class,
+                        'GET_PERSON_ADDRESS_STREET_ADDRESS_1' => AddressPart\AddressPartStreetAddress1::class,
+                        'GET_PERSON_ADDRESS_STREET_ADDRESS_2' => AddressPart\AddressPartStreetAddress2::class,
+                        'GET_PERSON_ADDRESS_VALID_FROM' => AddressPart\AddressPartValidFrom::class,
+                        'GET_PERSON_ADDRESS_POSTCODE_LABEL' => AddressPart\AddressPartPostCodeLabel::class,
+                        'GET_PERSON_ADDRESS_POSTCODE_CODE' => AddressPart\AddressPartPostCodeCode::class,
+                        'GET_PERSON_ADDRESS_POSTCODE_ID' => AddressPart\AddressPartPostCodeId::class,
+                        'GET_PERSON_ADDRESS_COUNTRY_NAME' => AddressPart\AddressPartCountryName::class,
+                        'GET_PERSON_ADDRESS_COUNTRY_CODE' => AddressPart\AddressPartCountryCode::class,
+                        'GET_PERSON_ADDRESS_COUNTRY_ID' => AddressPart\AddressPartCountryId::class,
+                    ],
+                    'numeric_functions' => [
+                        'GET_PERSON_ADDRESS_ISNOADDRESS' => AddressPart\AddressPartIsNoAddress::class,
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+    /**
+     * Add a widget "add a person" on the homepage, automatically.
+     *
+     * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
+     */
+    protected function prependHomepageWidget(containerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'widgets' => [
+                'homepage' => [
+                    [
+                        'widget_alias' => 'add_person',
+                        'order' => 2,
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+    /**
+     * Add role hierarchy.
+     */
+    protected function prependRoleHierarchy(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                PersonVoter::UPDATE => [PersonVoter::SEE],
+                PersonVoter::CREATE => [PersonVoter::SEE],
+                PersonVoter::LISTS => [ChillExportVoter::EXPORT],
+                PersonVoter::STATS => [ChillExportVoter::EXPORT],
+                // accompanying period
+                AccompanyingPeriodVoter::SEE_DETAILS => [AccompanyingPeriodVoter::SEE],
+                AccompanyingPeriodVoter::CREATE => [AccompanyingPeriodVoter::SEE_DETAILS],
+                AccompanyingPeriodVoter::DELETE => [AccompanyingPeriodVoter::SEE_DETAILS],
+                AccompanyingPeriodVoter::EDIT => [AccompanyingPeriodVoter::SEE_DETAILS],
+                // give all ACL for FULL
+                AccompanyingPeriodVoter::FULL => [
+                    AccompanyingPeriodVoter::SEE_DETAILS,
+                    AccompanyingPeriodVoter::CREATE,
+                    AccompanyingPeriodVoter::EDIT,
+                    AccompanyingPeriodVoter::DELETE,
+                ],
+            ],
+        ]);
+    }
+
+    protected function prependWorkflows(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('framework', [
+            'workflows' => [
+                'accompanying_period_lifecycle' => [
+                    'type' => 'state_machine',
+                    'audit_trail' => [
+                        'enabled' => true,
+                    ],
+                    'marking_store' => [
+                        'type' => 'method',
+                        'property' => 'step',
+                    ],
+                    'supports' => [
+                        'Chill\PersonBundle\Entity\AccompanyingPeriod',
+                    ],
+                    'initial_marking' => 'DRAFT',
+                    'places' => [
+                        'DRAFT',
+                        'CONFIRMED',
+                        'CLOSED',
+                    ],
+                    'transitions' => [
+                        'confirm' => [
+                            'from' => 'DRAFT',
+                            'to' => 'CONFIRMED',
+                        ],
+                        'close' => [
+                            'from' => 'CONFIRMED',
+                            'to' => 'CLOSED',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
+
+    /**
+     * @throws MissingBundleException
+     */
+    private function declarePersonAsCustomizable(ContainerBuilder $container)
+    {
+        $bundles = $container->getParameter('kernel.bundles');
+
+        if (!isset($bundles['ChillCustomFieldsBundle'])) {
+            throw new MissingBundleException('ChillCustomFieldsBundle');
+        }
+
+        $container->prependExtensionConfig(
+            'chill_custom_fields',
+            ['customizables_entities' => [
+                ['class' => 'Chill\PersonBundle\Entity\Person', 'name' => 'PersonEntity'],
+            ],
+            ]
+        );
+    }
+
+    /**
+     * @param $config
+     */
+    private function handleAccompanyingPeriodsFieldsParameters(ContainerBuilder $container, $config)
+    {
+        $container->setParameter('chill_person.accompanying_period_fields', $config);
+
+        foreach ($config as $key => $value) {
+            switch ($key) {
+                case 'enabled':
+                    break;
+
+                default:
+                    $container->setParameter('chill_person.accompanying_period_fields.' . $key, $value);
+
+                    break;
+            }
+        }
+    }
+
+    /**
+     * @param $config
+     */
+    private function handlePersonFieldsParameters(ContainerBuilder $container, $config)
+    {
+        if (array_key_exists('enabled', $config)) {
+            unset($config['enabled']);
+        }
+
+        $container->setParameter('chill_person.person_fields', $config);
+
+        foreach ($config as $key => $value) {
+            switch ($key) {
+                case 'accompanying_period':
+                    $container->setParameter('chill_person.accompanying_period', $value);
+
+                    break;
+
+                default:
+                    $container->setParameter('chill_person.person_fields.' . $key, $value);
+
+                    break;
+            }
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
index 1ee7782d3..c4f4dbdf3 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
@@ -1,29 +1,23 @@
 <?php
-/*
- * Copyright (C) 2018 Champs-Libres <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\DependencyInjection\CompilerPass;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * Remove services which add AccompanyingPeriod to timeline if 
- * accompanying_periods are set to `hidden` 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\DependencyInjection\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use function in_array;
+
+/**
+ * Remove services which add AccompanyingPeriod to timeline if
+ * accompanying_periods are set to `hidden`.
  */
 class AccompanyingPeriodTimelineCompilerPass implements CompilerPassInterface
 {
@@ -33,34 +27,33 @@ class AccompanyingPeriodTimelineCompilerPass implements CompilerPassInterface
         if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
             return;
         }
-        
+
         $definitions = [
             'chill.person.timeline.accompanying_period_opening',
-            'chill.person.timeline.accompanying_period_closing'
+            'chill.person.timeline.accompanying_period_closing',
         ];
-        
-        foreach($definitions as $definition) {
+
+        foreach ($definitions as $definition) {
             $container
-                ->removeDefinition($definition)
-                ;
+                ->removeDefinition($definition);
         }
-        
+
         $definition = $container->getDefinition('chill.main.timeline_builder');
-        
-        // we have to remove all methods call, and re-add them if not linked 
+
+        // we have to remove all methods call, and re-add them if not linked
         // to this service
         $calls = $definition->getMethodCalls();
-        
-        foreach($calls as list($method, $arguments)) {
-            if ($method !== 'addProvider') {
+
+        foreach ($calls as [$method, $arguments]) {
+            if ('addProvider' !== $method) {
                 continue;
             }
-            
+
             $definition->removeMethodCall('addProvider');
-            
-            if (FALSE === \in_array($arguments[1], $definitions)) {
+
+            if (false === in_array($arguments[1], $definitions, true)) {
                 $definition->addMethodCall($method, $arguments);
-            } 
+            }
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
index bf2d18922..8a0cab301 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
@@ -1,151 +1,152 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\DependencyInjection;
 
+use DateInterval;
+use Exception;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
+    private $validationBirthdateNotAfterInfos = 'The period before today during which'
+            . ' any birthdate is not allowed. The birthdate is expressed as ISO8601 : '
+            . 'https://en.wikipedia.org/wiki/ISO_8601#Durations';
 
-    private $validationBirthdateNotAfterInfos = "The period before today during which"
-            . " any birthdate is not allowed. The birthdate is expressed as ISO8601 : "
-            . "https://en.wikipedia.org/wiki/ISO_8601#Durations";
-    /**
-     * {@inheritDoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('cl_chill_person');
         $rootNode = $treeBuilder->getRootNode('cl_chill_person');
 
         $rootNode
-                ->canBeDisabled()
-                ->children()
-                    ->arrayNode('search')
-                        ->canBeDisabled()
-                        ->children()
-                            ->enumNode('search_by_phone')
-                            ->values(['always', 'on-domain', 'never'])
-                            ->defaultValue('on-domain')
-                            ->info('enable search by phone. \'always\' show the result '
-                                . 'on every result. \'on-domain\' will show the result '
-                                . 'only if the domain is given in the search box. '
-                                . '\'never\' disable this feature')
-                            ->end()
-                        ->end() //children for 'search', parent = array node 'search'
-                    ->end() // array 'search', parent = children of root
-                    ->arrayNode('validation')
-                        ->canBeDisabled()
-                        ->children()
-                            ->booleanNode('center_required')
-                                ->info('Enable a center for each person entity. If disabled, you must provide your own center provider')
-                                ->defaultValue(true)
-                            ->end()
-                            ->scalarNode('birthdate_not_after')
-                                ->info($this->validationBirthdateNotAfterInfos)
-                                    ->defaultValue('P1D')
-                                    ->validate()
-                                        ->ifTrue(function($period) {
-                                            try {
-                                                $interval = new \DateInterval($period);
-                                            } catch (\Exception $ex) {
-                                                return true;
-                                            }
-                                            return false;
-                                        })
-                                        ->thenInvalid('Invalid period for birthdate validation : "%s" '
+            ->canBeDisabled()
+            ->children()
+            ->arrayNode('validation')
+            ->canBeDisabled()
+            ->children()
+            ->booleanNode('center_required')
+            ->info('Enable a center for each person entity. If disabled, you must provide your own center provider')
+            ->defaultValue(true)
+            ->end()
+            ->scalarNode('birthdate_not_after')
+            ->info($this->validationBirthdateNotAfterInfos)
+            ->defaultValue('P1D')
+            ->validate()
+            ->ifTrue(static function ($period) {
+                try {
+                    $interval = new DateInterval($period);
+                } catch (Exception $ex) {
+                    return true;
+                }
+
+                return false;
+            })
+            ->thenInvalid('Invalid period for birthdate validation : "%s" '
                                                 . 'The parameter should match duration as defined by ISO8601 : '
                                                 . 'https://en.wikipedia.org/wiki/ISO_8601#Durations')
-                            ->end() // birthdate_not_after, parent = children of validation
-                        ->end() // children for 'validation', parent = validation
-                    ->end() //validation, parent = children of root
-                ->end() // children of root, parent = root
-                    ->arrayNode('person_fields')
-                        ->canBeDisabled()
-                        ->children()
-                                ->append($this->addFieldNode('place_of_birth'))
-                                ->append($this->addFieldNode('email'))
-                                ->append($this->addFieldNode('phonenumber'))
-                                ->append($this->addFieldNode('mobilenumber'))
-                                ->append($this->addFieldNode('contact_info'))
-                                ->append($this->addFieldNode('nationality'))
-                                ->append($this->addFieldNode('country_of_birth'))
-                                ->append($this->addFieldNode('marital_status'))
-                                ->append($this->addFieldNode('spoken_languages'))
-                                ->append($this->addFieldNode('address'))
-                                ->append($this->addFieldNode('accompanying_period'))
-                                ->append($this->addFieldNode('memo'))
-                                ->append($this->addFieldNode('number_of_children'))
-                                ->arrayNode('alt_names')
-                                    ->defaultValue([])
-                                    ->arrayPrototype()
-                                        ->children()
-                                            ->scalarNode('key')
-                                                ->isRequired()->cannotBeEmpty()
-                                            ->end()
-                                            ->arrayNode('labels')
-                                                ->children()
-                                                    ->scalarNode('lang')->isRequired()->cannotBeEmpty()
-                                                        ->example('fr')
-                                                    ->end()
-                                                    ->scalarNode('label')->isRequired()->cannotBeEmpty()
-                                                        ->example('Nom de jeune fille')
-                                                    ->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                ->end()
-                        ->end() //children for 'person_fields', parent = array 'person_fields'
-                    ->end() // person_fields, parent = children of root
-                    ->arrayNode('accompanying_periods_fields')
-                        ->canBeDisabled()
-                        ->children()
-                                ->append($this->addFieldNode('user'))
-                                ->append($this->addFieldNode('createdBy'))
-                                ->append($this->addFieldNode('step'))
-                                ->append($this->addFieldNode('origin'))
-                                ->append($this->addFieldNode('intensity'))
-                                ->append($this->addFieldNode('scopes'))
-                                ->append($this->addFieldNode('requestor'))
-                                ->append($this->addFieldNode('anonymous'))
-                                ->append($this->addFieldNode('emergency'))
-                                ->append($this->addFieldNode('confidential'))
-                        ->end() //children for 'accompanying_person_fields', parent = array 'person_fields'
-                    ->end() // paccompanying_person_fields, parent = children of root
-                    ->booleanNode('allow_multiple_simultaneous_accompanying_periods')
-                        ->info('Can we have more than one simultaneous accompanying period in the same time. Default false.')
-                        ->defaultValue(false)
-                    ->end()
-                ->end() // children of 'root', parent = root
-                ;
-
+            ->end() // birthdate_not_after, parent = children of validation
+            ->end() // children for 'validation', parent = validation
+            ->end() //validation, parent = children of root
+            ->end() // children of root, parent = root
+            ->arrayNode('person_fields')
+            ->canBeDisabled()
+            ->children()
+            ->append($this->addFieldNode('place_of_birth'))
+            ->append($this->addFieldNode('email'))
+            ->append($this->addFieldNode('phonenumber'))
+            ->append($this->addFieldNode('mobilenumber'))
+            ->append($this->addFieldNode('contact_info'))
+            ->append($this->addFieldNode('nationality'))
+            ->append($this->addFieldNode('country_of_birth'))
+            ->append($this->addFieldNode('marital_status'))
+            ->append($this->addFieldNode('civility'))
+            ->append($this->addFieldNode('spoken_languages'))
+            ->append($this->addFieldNode('address'))
+            ->append($this->addFieldNode('accompanying_period'))
+            ->append($this->addFieldNode('memo'))
+            ->append($this->addFieldNode('number_of_children'))
+            ->append($this->addFieldNode('acceptEmail'))
+            ->append($this->addFieldNode('deathdate'))
+            ->arrayNode('alt_names')
+            ->defaultValue([])
+            ->arrayPrototype()
+            ->children()
+            ->scalarNode('key')
+            ->isRequired()->cannotBeEmpty()
+            ->end()
+            ->arrayNode('labels')
+            ->children()
+            ->scalarNode('lang')->isRequired()->cannotBeEmpty()
+            ->example('fr')
+            ->end()
+            ->scalarNode('label')->isRequired()->cannotBeEmpty()
+            ->example('Nom de jeune fille')
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end()
+            ->end() //children for 'person_fields', parent = array 'person_fields'
+            ->end() // person_fields, parent = children of root
+            ->arrayNode('accompanying_periods_fields')
+            ->canBeDisabled()
+            ->children()
+            ->append($this->addFieldNode('user'))
+            ->append($this->addFieldNode('createdBy'))
+            ->append($this->addFieldNode('step'))
+            ->append($this->addFieldNode('origin'))
+            ->append($this->addFieldNode('intensity'))
+            ->append($this->addFieldNode('scopes'))
+            ->append($this->addFieldNode('requestor'))
+            ->append($this->addFieldNode('anonymous'))
+            ->append($this->addFieldNode('emergency'))
+            ->append($this->addFieldNode('confidential'))
+            ->end() //children for 'accompanying_person_fields', parent = array 'person_fields'
+            ->end() // paccompanying_person_fields, parent = children of root
+            ->booleanNode('allow_multiple_simultaneous_accompanying_periods')
+            ->info('Can we have more than one simultaneous accompanying period in the same time. Default false.')
+            ->defaultValue(false)
+            ->end()
+            ->end() // children of 'root', parent = root
+;
 
         return $treeBuilder;
     }
 
     private function addFieldNode($key)
     {
-        $tree = new TreeBuilder($key,'enum');
+        $tree = new TreeBuilder($key, 'enum');
         $node = $tree->getRootNode($key);
 
-        switch($key) {
+        switch ($key) {
             case 'accompanying_period':
-                $info = "If the accompanying periods are shown";
+                $info = 'If the accompanying periods are shown';
+
                 break;
+
             default:
-                $info = "If the field $key must be shown";
+                $info = "If the field {$key} must be shown";
+
                 break;
         }
 
         $node
-            ->values(array('hidden', 'visible'))
+            ->values(['hidden', 'visible'])
             ->defaultValue('visible')
             ->info($info)
             ->end();
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
index 98e362dfb..14c9fb694 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
@@ -1,20 +1,14 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
@@ -23,70 +17,64 @@ use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\SqlWalker;
 
 /**
- * 
  * USAGE GET_ADDRESS_<part>(person.id, :date, 'postcode') where part
  * should be replace by the part of the address.
- * 
+ *
  * This function return the current address part at the given date, for the
  * given person (identified by his id)
- * 
- * The aim of this function is to be used within reports
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * The aim of this function is to be used within reports
  */
 abstract class AddressPart extends FunctionNode
 {
-    public $fields = array(
-            'address_id', 
-            'streetaddress1', 
-            'streetaddress2',
-            'validfrom', 
-            'postcode_label', 
-            'postcode_code', 
-            'postcode_id', 
-            'country_name', 
-            'country_code', 
-            'country_id'
-        );
-    
+    public $fields = [
+        'address_id',
+        'streetaddress1',
+        'streetaddress2',
+        'validfrom',
+        'postcode_label',
+        'postcode_code',
+        'postcode_id',
+        'country_name',
+        'country_code',
+        'country_id',
+    ];
+
     /**
-     *
-     * @var \Doctrine\ORM\Query\AST\Node
-     */
-    private $pid;
-    
-    /**
-     *
      * @var \Doctrine\ORM\Query\AST\Node
      */
     private $date;
-    
+
     /**
-     *
      * @var \Doctrine\ORM\Query\AST\Node
      */
     private $part;
-    
+
     /**
-     * return the part of the address
-     * 
-     * Should be one value of the "public" amongst 
-     * 'address_id', 'streetaddress1', 
-     * 'streetaddress2', 'validfrom',  'postcode_label',  'postcode_code', 
+     * @var \Doctrine\ORM\Query\AST\Node
+     */
+    private $pid;
+
+    /**
+     * return the part of the address.
+     *
+     * Should be one value of the "public" amongst
+     * 'address_id', 'streetaddress1',
+     * 'streetaddress2', 'validfrom',  'postcode_label',  'postcode_code',
      * 'postcode_id', 'country_name', 'country_code',  'country_id', 'isnoaddress'
-     * 
+     *
      * @return string
      */
     abstract public function getPart();
-        
+
     public function getSql(SqlWalker $sqlWalker)
     {
         return sprintf(
-            'get_last_address_%s(%s, %s)', 
+            'get_last_address_%s(%s, %s)',
             $this->getPart(),
             $this->pid->dispatch($sqlWalker),
             $this->date->dispatch($sqlWalker)
-            );
+        );
     }
 
     public function parse(Parser $parser)
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php
index 2f40796cf..5b9e784f1 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartAddressId.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartAddressId extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php
index e997dbb91..ca130478c 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryCode.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartCountryCode extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php
index ab0ab0da2..3672c2a74 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryId.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartCountryId extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php
index c37902909..b6da85ee4 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartCountryName.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartCountryName extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php
index bd08bb4df..4390fb6a8 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartIsNoAddress.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartIsNoAddress extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php
index ce792cede..09804b241 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeCode.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartPostCodeCode extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php
index 5400a04a7..bd2536047 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeId.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartPostCodeId extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php
index ab36a8c46..5edb77e6f 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartPostCodeLabel.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartPostCodeLabel extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php
index c06cf2b07..344b7e3c2 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress1.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartStreetAddress1 extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php
index 739120e5e..2827016bc 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartStreetAddress2.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartStreetAddress2 extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php
index 4a366bf1a..89ef28606 100644
--- a/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php
+++ b/src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart/AddressPartValidFrom.php
@@ -1,29 +1,18 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
 use Chill\PersonBundle\Doctrine\DQL\AddressPart;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AddressPartValidFrom extends AddressPart
 {
     public function getPart()
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 7d05adcc6..5b4293226 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -1,85 +1,97 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity;
 
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ResourceDuplicateCheck;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Serializer\Annotation\Groups;
+use LogicException;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Validator\GroupSequenceProviderInterface;
+use UnexpectedValueException;
+use function count;
+use function in_array;
+use const SORT_REGULAR;
 
 /**
- * AccompanyingPeriod Class
+ * AccompanyingPeriod Class.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period")
  * @DiscriminatorMap(typeProperty="type", mapping={
- *  "accompanying_period"=AccompanyingPeriod::class
- *  })
+ *     "accompanying_period": AccompanyingPeriod::class
+ * })
+ * @Assert\GroupSequenceProvider
+ * @Assert\Expression(
+ *     "this.isConfidential and this.getUser === NULL",
+ *     message="If the accompanying course is confirmed and confidential, a referrer must remain assigned."
+ * )
+ *
+ * @AccompanyingPeriodValidity(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
  */
-class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface,
-    HasScopesInterface, HasCentersInterface
+class AccompanyingPeriod implements
+    GroupSequenceProviderInterface,
+    HasCentersInterface,
+    HasScopesInterface,
+    TrackCreationInterface,
+    TrackUpdateInterface
 {
+    public const INTENSITIES = [self::INTENSITY_OCCASIONAL, self::INTENSITY_REGULAR];
+
     /**
-     * Mark an accompanying period as "occasional"
+     * Mark an accompanying period as "occasional".
      *
      * used in INTENSITY
      */
     public const INTENSITY_OCCASIONAL = 'occasional';
 
     /**
-     * Mark an accompanying period as "regular"
+     * Mark an accompanying period as "regular".
      *
      * used in INTENSITY
      */
     public const INTENSITY_REGULAR = 'regular';
 
-    public const INTENSITIES = [self::INTENSITY_OCCASIONAL, self::INTENSITY_REGULAR];
-
     /**
-     * Mark an accompanying period as "draft".
+     * Mark an accompanying period as "closed".
      *
-     * This means that the accompanying period is not yet
-     * confirmed by the creator
+     * This means that the accompanying period **is**
+     * closed by the creator
      */
-    public const STEP_DRAFT = 'DRAFT';
+    public const STEP_CLOSED = 'CLOSED';
 
     /**
      * Mark an accompanying period as "confirmed".
@@ -90,173 +102,183 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
     public const STEP_CONFIRMED = 'CONFIRMED';
 
     /**
-     * @var integer
+     * Mark an accompanying period as "draft".
      *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read"})
+     * This means that the accompanying period is not yet
+     * confirmed by the creator
      */
-    private $id;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(type="date")
-     * @Groups({"read", "write"})
-     */
-    private $openingDate;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(type="date", nullable=true)
-     * @Groups({"read", "write"})
-     */
-    private $closingDate = null;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(type="text")
-     * @Groups({"read", "write"})
-     */
-    private $remark = '';
-
-    /**
-     * @var Collection
-     *
-     * @ORM\OneToMany(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Comment",
-     *       mappedBy="accompanyingPeriod",
-     *       cascade={"persist", "remove"},
-     *       orphanRemoval=true
-     *     )
-     */
-    private $comments;
+    public const STEP_DRAFT = 'DRAFT';
 
     /**
      * @ORM\ManyToOne(
-     *    targetEntity=Comment::class
+     *     targetEntity=Address::class
+     * )
+     */
+    private ?Address $addressLocation = null;
+
+    /**
+     * @var DateTime
+     *
+     * @ORM\Column(type="date", nullable=true)
+     * @Groups({"read", "write", "docgen:read"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CLOSED})
+     * @Assert\GreaterThan(propertyPath="openingDate", groups={AccompanyingPeriod::STEP_CLOSED})
+     */
+    private ?DateTime $closingDate = null;
+
+    /**
+     * @var AccompanyingPeriod\ClosingMotive
+     *
+     * @ORM\ManyToOne(
+     * targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive")
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CLOSED})
+     */
+    private ?ClosingMotive $closingMotive = null;
+
+    /**
+     * @ORM\OneToMany(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Comment",
+     *     mappedBy="accompanyingPeriod",
+     *     cascade={"persist", "remove"},
+     *     orphanRemoval=true
+     * )
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_DRAFT})
+     */
+    private Collection $comments;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private bool $confidential = false;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     * @Groups({"docgen:read"})
+     */
+    private ?DateTimeInterface $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?User $createdBy = null;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private bool $emergency = false;
+
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=Comment::class
      * )
      * @Groups({"read"})
      */
     private ?Comment $initialComment = null;
 
-    /**
-     * @var Collection
-     *
-     * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
-     *     mappedBy="accompanyingPeriod",
-     *     cascade={"persist", "refresh", "remove", "merge", "detach"})
-     * @Groups({"read"})
-     */
-    private $participations;
-
-    /**
-     * @var AccompanyingPeriod\ClosingMotive
-     *
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive")
-     * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read", "write"})
-     */
-    private $closingMotive = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read", "write"})
-     */
-    private $user;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
-     */
-    private $createdBy;
-
     /**
      * @var string
-     * @ORM\Column(type="string", length=32, nullable=true)
-     * @Groups({"read"})
+     * @ORM\Column(type="string", nullable=true)
+     * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private $step = self::STEP_DRAFT;
+    private $intensity = self::INTENSITY_OCCASIONAL;
+
+    /**
+     * @var DateTime
+     *
+     * @ORM\Column(type="date")
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private ?DateTime $openingDate = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Origin::class)
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
      */
-    private $origin;
+    private ?Origin $origin = null;
 
     /**
-     * @var string
-     * @ORM\Column(type="string", nullable=true)
+     * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
+     *     mappedBy="accompanyingPeriod", orphanRemoval=true,
+     * cascade={"persist", "refresh", "remove", "merge", "detach"})
+     * @Groups({"read", "docgen:read"})
+     * @ParticipationOverlap(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED})
+     */
+    private Collection $participations;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=Person::class,
+     *     inversedBy="periodLocatedOn"
+     * )
+     */
+    private ?Person $personLocation = null;
+
+    /**
+     * @ORM\Column(type="text")
      * @Groups({"read", "write"})
      */
-    private $intensity;
+    private string $remark = '';
 
     /**
-     * @var Collection
-     * @ORM\ManyToMany(
-     *     targetEntity=Scope::class,
-     *     cascade={}
-     *     )
-     * @ORM\JoinTable(
-     *     name="accompanying_periods_scopes",
-     *     joinColumns={@ORM\JoinColumn(name="accompanying_period_id", referencedColumnName="id")},
-     *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
-     * )
-     * @Groups({"read"})
+     * @ORM\Column(type="boolean", options={"default": false})
+     * @Groups({"read", "write", "docgen:read"})
      */
-    private $scopes;
+    private bool $requestorAnonymous = false;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodRequested")
      * @ORM\JoinColumn(nullable=true)
      */
-    private $requestorPerson;
+    private ?Person $requestorPerson = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
      * @ORM\JoinColumn(nullable=true)
      */
-    private $requestorThirdParty;
+    private ?ThirdParty $requestorThirdParty = null;
 
     /**
-     * @var bool
-     * @ORM\Column(type="boolean", options={"default": false} )
-     * @Groups({"read", "write"})
-     */
-    private $requestorAnonymous = false;
-
-    /**
-     * @var bool
-     * @ORM\Column(type="boolean", options={"default": false} )
-     * @Groups({"read", "write"})
-     */
-    private $emergency = false;
-
-    /**
-     * @var bool
-     * @ORM\Column(type="boolean", options={"default": false} )
-     * @Groups({"read", "write"})
-     */
-    private $confidential = false;
-
-    /**
-     * @var Collection
-     *
      * @ORM\OneToMany(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\Resource",
      *     mappedBy="accompanyingPeriod",
      *     cascade={"persist", "remove"},
      *     orphanRemoval=true
      * )
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
+     * @ResourceDuplicateCheck(groups={AccompanyingPeriod::STEP_DRAFT, AccompanyingPeriod::STEP_CONFIRMED, "Default", "default"})
      */
-    private $resources;
+    private Collection $resources;
+
+    /**
+     * @ORM\ManyToMany(
+     *     targetEntity=Scope::class,
+     *     cascade={}
+     * )
+     * @ORM\JoinTable(
+     *     name="accompanying_periods_scopes",
+     *     joinColumns={@ORM\JoinColumn(name="accompanying_period_id", referencedColumnName="id")},
+     *     inverseJoinColumns={@ORM\JoinColumn(name="scope_id", referencedColumnName="id")}
+     * )
+     * @Groups({"read", "docgen:read"})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must be associated to at least one scope")
+     */
+    private Collection $scopes;
 
     /**
      * @ORM\ManyToMany(
@@ -264,253 +286,62 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      * )
      * @ORM\JoinTable(
      *     name="chill_person_accompanying_period_social_issues"
-     *  )
-     * @Groups({"read"})
+     * )
+     * @Groups({"read", "docgen:read"})
+     * @Assert\Count(min=1, groups={AccompanyingPeriod::STEP_CONFIRMED}, minMessage="A course must contains at least one social issue")
      */
     private Collection $socialIssues;
 
+    /**
+     * @ORM\Column(type="string", length=32, nullable=true)
+     * @Groups({"read"})
+     */
+    private string $step = self::STEP_DRAFT;
+
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private \DateTimeInterface $createdAt;
+    private ?DateTimeInterface $updatedAt = null;
 
     /**
      * @ORM\ManyToOne(
-     *    targetEntity=User::class
+     *     targetEntity=User::class
      * )
      */
-    private User $updatedBy;
+    private ?User $updatedBy = null;
 
     /**
-     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read", "write", "docgen:read"})
      */
-    private \DateTimeInterface $updatedAt;
+    private ?User $user = null;
 
     /**
      * @ORM\OneToMany(
-     *  targetEntity=AccompanyingPeriodWork::class,
-     *  mappedBy="accompanyingPeriod"
+     *     targetEntity=AccompanyingPeriodWork::class,
+     *     mappedBy="accompanyingPeriod"
      * )
      * @Assert\Valid(traverse=true)
      */
     private Collection $works;
 
-    /**
-     * @ORM\ManyToOne(
-     *  targetEntity=Person::class,
-     *  inversedBy="periodLocatedOn"
-     * )
-     */
-    private ?Person $personLocation = null;
-
-
-    /**
-     * @ORM\ManyToOne(
-     *  targetEntity=Address::class
-     * )
-     */
-    private ?Address $addressLocation = null;
-
     /**
      * AccompanyingPeriod constructor.
      *
-     * @param \DateTime $dateOpening
+     * @param DateTime $dateOpening
+     *
      * @uses AccompanyingPeriod::setClosingDate()
      */
-    public function __construct(\DateTime $dateOpening = null) {
-        $this->setOpeningDate($dateOpening ?? new \DateTime('now'));
+    public function __construct(?DateTime $dateOpening = null)
+    {
+        $this->setOpeningDate($dateOpening ?? new DateTime('now'));
         $this->participations = new ArrayCollection();
         $this->scopes = new ArrayCollection();
         $this->socialIssues = new ArrayCollection();
         $this->comments = new ArrayCollection();
         $this->works = new ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set openingDate
-     *
-     * @param \DateTime $dateOpening
-     * @return AccompanyingPeriod
-     */
-    public function setOpeningDate($openingDate)
-    {
-        $this->openingDate = $openingDate;
-
-        return $this;
-    }
-
-    /**
-     * Get openingDate
-     *
-     * @return \DateTime
-     */
-    public function getOpeningDate()
-    {
-        return $this->openingDate;
-    }
-
-    /**
-     * Set closingDate
-     *
-     * For closing a Person file, you should use Person::setClosed instead.
-     *
-     * @param \DateTime $dateClosing
-     * @return AccompanyingPeriod
-     *
-     */
-    public function setClosingDate($closingDate)
-    {
-        $this->closingDate = $closingDate;
-
-        return $this;
-    }
-
-    /**
-     * Get closingDate
-     *
-     * @return \DateTime
-     */
-    public function getClosingDate(): ?\DateTime
-    {
-        return $this->closingDate;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isOpen(): bool
-    {
-        if ($this->getOpeningDate() > new \DateTimeImmutable('now')) {
-            return false;
-        }
-
-        if ($this->getClosingDate() === null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function setRemark(string $remark = null): self
-    {
-        $this->remark = (string) $remark;
-
-        return $this;
-    }
-
-    public function getRemark(): string
-    {
-        return $this->remark;
-    }
-
-    /**
-     * @Groups({"read"})
-     */
-    public function getComments(): Collection
-    {
-        return $this->comments->filter(function (Comment $c) {
-            return $c !== $this->initialComment;
-        });
-    }
-
-    public function addComment(Comment $comment): self
-    {
-        $this->comments[] = $comment;
-        $comment->setAccompanyingPeriod($this);
-
-        return $this;
-    }
-
-    public function removeComment(Comment $comment): void
-    {
-        $comment->setAccompanyingPeriod(null);
-        $this->comments->removeElement($comment);
-    }
-
-    /**
-     * @Groups({"write"})
-     */
-    public function setInitialComment(?Comment $comment = null): self
-    {
-        if (NULL !== $this->initialComment) {
-            $this->removeComment($this->initialComment);
-        }
-        if ($comment instanceof Comment) {
-            $this->addComment($comment);
-        }
-
-        $this->initialComment = $comment;
-
-        return $this;
-    }
-
-    /**
-     * @Groups({"read"})
-     */
-    public function getInitialComment(): ?Comment
-    {
-        return $this->initialComment;
-    }
-
-    /**
-     * Get Participations Collection
-     */
-    public function getParticipations(): Collection
-    {
-        return $this->participations;
-    }
-
-    /**
-     * Get the participation containing a person
-     */
-    public function getParticipationsContainsPerson(Person $person): Collection
-    {
-        return $this
-            ->getParticipations()
-            ->filter(
-                static function(AccompanyingPeriodParticipation $participation) use ($person): bool {
-                    return $person === $participation->getPerson();
-                }
-            );
-    }
-
-    /**
-     * Get the opened participation containing a person
-     *
-     * "Open" means that the closed date is NULL
-     */
-    public function getOpenParticipationContainsPerson(Person $person): ?AccompanyingPeriodParticipation
-    {
-        $collection = $this
-            ->getParticipationsContainsPerson($person)
-            ->filter(
-                static function(AccompanyingPeriodParticipation $participation): bool {
-                    return null === $participation->getEndDate();
-                }
-            );
-
-        return $collection->count() > 0 ? $collection->first() : NULL;
-    }
-
-    public function getOPenParticipations(): Collection
-    {
-        return $this
-            ->getParticipations()
-            ->filter(
-                static function(AccompanyingPeriodParticipation $participation): bool {
-                    return null === $participation->getEndDate();
-                }
-            );
+        $this->resources = new ArrayCollection();
     }
 
     /**
@@ -522,104 +353,84 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
      *        Participation y , Participation z, ...
      *      ]
      *   ],
-     * ]
-     *
+     * ].
      */
     public function actualParticipationsByHousehold(): array
     {
-        $participations = $this->getOPenParticipations()->toArray();
+        $participations = $this->getOpenParticipations()->toArray();
 
         $households = [];
+
         foreach ($participations as $p) {
             $households[] = $p->getPerson()->getCurrentHousehold();
         }
         $households = array_unique($households, SORT_REGULAR);
 
         $array = [];
+
         foreach ($households as $household) {
             $members = [];
+
             foreach ($participations as $p) {
-                if ($household === $p->getPerson()->getCurrentHousehold()) {
+                if ($p->getPerson()->getCurrentHousehold() === $household) {
                     $members[] = array_shift($participations);
                 } else {
                     $participations[] = array_shift($participations);
                 }
             }
-            $array[] = [ 'household' => $household, 'members' => $members ];
+            $array[] = ['household' => $household, 'members' => $members];
         }
 
         return $array;
     }
 
-    /**
-     * Return true if the accompanying period contains a person.
-     *
-     * **Note**: this participation can be opened or not.
-     */
-    public function containsPerson(Person $person): bool
+    public function addComment(Comment $comment): self
     {
-        return $this->getParticipationsContainsPerson($person)->count() > 0;
+        $this->comments[] = $comment;
+        $comment->setAccompanyingPeriod($this);
+
+        return $this;
     }
 
-    /**
-     * Open a new participation for a person
-     */
-    public function createParticipationFor(Person $person): AccompanyingPeriodParticipation
+    public function addPerson(?Person $person = null): self
     {
-        $participation = new AccompanyingPeriodParticipation($this, $person);
-        $this->participations[] = $participation;
-
-        return $participation;
-    }
-
-    public function addPerson(Person $person = null): self
-    {
-        if (NULL !== $person) {
+        if (null !== $person) {
             $this->createParticipationFor($person);
         }
 
         return $this;
     }
 
-    /**
-     * Close a participation for a person
-     *
-     * Search for the person's participation and set the end date at
-     * 'now'.
-     *
-     * @return void
-     */
-    public function closeParticipationFor($person): ?AccompanyingPeriodParticipation
+    public function addResource(Resource $resource): self
     {
-        $participation = $this->getOpenParticipationContainsPerson($person);
-
-        if ($participation instanceof AccompanyingPeriodParticipation) {
-            $participation->setEndDate(new \DateTimeImmutable('now'));
-        }
-
-        return $participation;
-    }
-
-
-    /**
-     * Remove Person
-     */
-    public function removePerson(Person $person): self
-    {
-        $this->closeParticipationFor($person);
+        $resource->setAccompanyingPeriod($this);
+        $this->resources[] = $resource;
 
         return $this;
     }
 
-
-    public function getClosingMotive(): ?ClosingMotive
+    public function addScope(Scope $scope): self
     {
-        return $this->closingMotive;
+        if (!$this->scopes->contains($scope)) {
+            $this->scopes[] = $scope;
+        }
+
+        return $this;
     }
 
-    public function setClosingMotive(ClosingMotive $closingMotive = null): self
+    public function addSocialIssue(SocialIssue $socialIssue): self
     {
-        $this->closingMotive = $closingMotive;
+        if (!$this->socialIssues->contains($socialIssue)) {
+            $this->socialIssues[] = $socialIssue;
+        }
+
+        return $this;
+    }
+
+    public function addWork(AccompanyingPeriodWork $work): self
+    {
+        $this->works[] = $work;
+        $work->setAccompanyingPeriod($this);
 
         return $this;
     }
@@ -638,8 +449,7 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 
         $participation = $this->getOpenParticipationContainsPerson($person);
 
-        if (null === $participation)
-        {
+        if (null === $participation) {
             return false;
         }
 
@@ -649,57 +459,232 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     */
-    public function reOpen(): void
-    {
-        $this->setClosingDate(null);
-        $this->setClosingMotive(null);
-    }
-
-    /**
-     * Validation function
-     */
-    public function isDateConsistent(ExecutionContextInterface $context)
-    {
-        if ($this->isOpen()) {
-            return;
-        }
-
-        if (! $this->isClosingAfterOpening()) {
-            $context->buildViolation('The date of closing is before the date of opening')
-                ->atPath('dateClosing')
-                ->addViolation();
-        }
-    }
-
-    /**
-     * Returns true if the closing date is after the opening date.
+     * Close a participation for a person.
      *
-     * @return boolean
+     * Search for the person's participation and set the end date at
+     * 'now'.
+     *
+     * @param mixed $person
+     *
+     * @return void
      */
-    public function isClosingAfterOpening(): bool
+    public function closeParticipationFor($person): ?AccompanyingPeriodParticipation
     {
-        if (null === $this->getClosingDate()) {
-            return false;
-        }
-        $diff = $this->getOpeningDate()->diff($this->getClosingDate());
+        $participation = $this->getOpenParticipationContainsPerson($person);
 
-        if ($diff->invert === 0) {
-            return true;
+        if ($participation instanceof AccompanyingPeriodParticipation) {
+            $participation->setEndDate(new DateTime('now'));
         }
-        return false;
+
+        return $participation;
     }
 
-    function getUser(): ?User
+    /**
+     * Return true if the accompanying period contains a person.
+     *
+     * **Note**: this participation can be opened or not.
+     */
+    public function containsPerson(Person $person): bool
     {
-        return $this->user;
+        return $this->getParticipationsContainsPerson($person)->count() > 0;
     }
 
-    function setUser(User $user): self
+    /**
+     * Open a new participation for a person.
+     */
+    public function createParticipationFor(Person $person): AccompanyingPeriodParticipation
     {
-        $this->user = $user;
+        $participation = new AccompanyingPeriodParticipation($this, $person);
+        $this->participations[] = $participation;
 
-        return $this;
+        return $participation;
+    }
+
+    public function getAddressLocation(): ?Address
+    {
+        return $this->addressLocation;
+    }
+
+    /**
+     * Get a list of person which have an adresse available for a valid location.
+     *
+     * @return Collection|Person[]
+     */
+    public function getAvailablePersonLocation(): Collection
+    {
+        return $this->getOpenParticipations()
+            ->filter(static function (AccompanyingPeriodParticipation $p) {
+                return $p->getPerson()->hasCurrentHouseholdAddress();
+            })
+            ->map(static function (AccompanyingPeriodParticipation $p) {
+                return $p->getPerson();
+            });
+    }
+
+    public function getCenter(): ?Center
+    {
+        if (count($this->getPersons()) === 0) {
+            return null;
+        }
+
+        return $this->getPersons()->first()->getCenter();
+    }
+
+    public function getCenters(): ?iterable
+    {
+        foreach ($this->getPersons() as $person) {
+            if (!in_array($person->getCenter(), $centers ?? [], true)
+                && null !== $person->getCenter()) {
+                $centers[] = $person->getCenter();
+            }
+        }
+
+        return $centers ?? null;
+    }
+
+    /**
+     * Get closingDate.
+     *
+     * @return DateTime
+     */
+    public function getClosingDate(): ?DateTime
+    {
+        return $this->closingDate;
+    }
+
+    public function getClosingMotive(): ?ClosingMotive
+    {
+        return $this->closingMotive;
+    }
+
+    /**
+     * @Groups({"read"})
+     */
+    public function getComments(): Collection
+    {
+        return $this->comments->filter(function (Comment $c) {
+            return $c !== $this->initialComment;
+        });
+    }
+
+    public function getCreatedAt(): ?DateTime
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    /**
+     * @Groups({"docgen:read"})
+     */
+    public function getCurrentParticipations(): Collection
+    {
+        return $this->getOpenParticipations();
+    }
+
+    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]];
+        }
+
+        throw new LogicException('no validation group permitted with this step');
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @Groups({"read"})
+     */
+    public function getInitialComment(): ?Comment
+    {
+        return $this->initialComment;
+    }
+
+    public function getIntensity(): ?string
+    {
+        return $this->intensity;
+    }
+
+    /**
+     * Get the location, taking precedence into account.
+     *
+     * @Groups({"read"})
+     */
+    public function getLocation(?DateTimeImmutable $at = null): ?Address
+    {
+        if ($this->getPersonLocation() instanceof Person) {
+            return $this->getPersonLocation()->getCurrentPersonAddress();
+        }
+
+        return $this->getAddressLocation();
+    }
+
+    /**
+     * Get where the location is.
+     *
+     * @Groups({"read"})
+     */
+    public function getLocationStatus(): string
+    {
+        if ($this->getPersonLocation() instanceof Person) {
+            return 'person';
+        }
+
+        if ($this->getAddressLocation() instanceof Address) {
+            return 'address';
+        }
+
+        return 'none';
+    }
+
+    /**
+     * Get openingDate.
+     *
+     * @return DateTime
+     */
+    public function getOpeningDate(): ?DateTime
+    {
+        return $this->openingDate;
+    }
+
+    /**
+     * Get the opened participation containing a person.
+     *
+     * "Open" means that the closed date is NULL
+     */
+    public function getOpenParticipationContainsPerson(Person $person): ?AccompanyingPeriodParticipation
+    {
+        $collection = $this
+            ->getParticipationsContainsPerson($person)
+            ->filter(
+                static function (AccompanyingPeriodParticipation $participation): bool {
+                    return null === $participation->getEndDate();
+                }
+            );
+
+        return $collection->count() > 0 ? $collection->first() : null;
+    }
+
+    public function getOpenParticipations(): Collection
+    {
+        return $this
+            ->getParticipations()
+            ->filter(
+                static function (AccompanyingPeriodParticipation $participation): bool {
+                    return null === $participation->getEndDate();
+                }
+            );
     }
 
     public function getOrigin(): ?Origin
@@ -707,35 +692,92 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this->origin;
     }
 
-    public function setOrigin(Origin $origin): self
+    /**
+     * Get Participations Collection.
+     */
+    public function getParticipations(): Collection
     {
-        $this->origin = $origin;
-
-        return $this;
+        return $this->participations;
     }
 
-    public function getRequestorPerson(): ?Person
+    /**
+     * Get the participation containing a person.
+     */
+    public function getParticipationsContainsPerson(Person $person): Collection
     {
-        return $this->requestorPerson;
+        return $this
+            ->getParticipations()
+            ->filter(
+                static function (AccompanyingPeriodParticipation $participation) use ($person): bool {
+                    return $participation->getPerson() === $person;
+                }
+            );
     }
 
-    private function setRequestorPerson(Person $requestorPerson = null): self
+    /**
+     * @Groups({"read"})
+     */
+    public function getPersonLocation(): ?Person
     {
-        $this->requestorPerson = $requestorPerson;
-
-        return $this;
+        return $this->personLocation;
     }
 
-    public function getRequestorThirdParty(): ?ThirdParty
+    /**
+     * Get a list of all persons which are participating to this course.
+     *
+     * @psalm-return Collection<int, Person>
+     */
+    public function getPersons(): Collection
     {
-        return $this->requestorThirdParty;
+        return $this
+            ->participations
+            ->map(
+                static function (AccompanyingPeriodParticipation $participation): Person {
+                    return $participation->getPerson();
+                }
+            );
     }
 
-    private function setRequestorThirdParty(ThirdParty $requestorThirdParty = null): self
+    /**
+     * @return Collection|SocialAction[] All the descendant social actions of all
+     * the descendants of the entity
+     */
+    public function getRecursiveSocialActions(): Collection
     {
-        $this->requestorThirdParty = $requestorThirdParty;
+        $recursiveSocialActions = new ArrayCollection();
 
-        return $this;
+        foreach ($this->socialIssues as $socialIssue) {
+            foreach ($socialIssue->getRecursiveSocialActions() as $descendant) {
+                if (!$recursiveSocialActions->contains($descendant)) {
+                    $recursiveSocialActions->add($descendant);
+                }
+            }
+        }
+
+        return $recursiveSocialActions;
+    }
+
+    /**
+     * @return Collection|SocialIssues[] All social issues and their descendants
+     */
+    public function getRecursiveSocialIssues(): Collection
+    {
+        $recursiveSocialIssues = new ArrayCollection();
+
+        foreach ($this->socialIssues as $socialIssue) {
+            foreach ($socialIssue->getDescendantsWithThis() as $descendant) {
+                if (!$recursiveSocialIssues->contains($descendant)) {
+                    $recursiveSocialIssues->add($descendant);
+                }
+            }
+        }
+
+        return $recursiveSocialIssues;
+    }
+
+    public function getRemark(): string
+    {
+        return $this->remark;
     }
 
     /**
@@ -747,131 +789,30 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this->requestorPerson ?? $this->requestorThirdParty;
     }
 
-
     /**
-     * Set a requestor
-     *
-     * The requestor is either an instance of ThirdParty, or an
-     * instance of Person
-     *
-     * @param $requestor Person|ThirdParty
-     * @return self
-     * @throw UnexpectedValueException if the requestor is not a Person or ThirdParty
-     * @Groups({"write"})
+     * @return string 'person' if requestor is an instanceof @see{Person::class}, 'thirdparty' if this is an instanceof @see{ThirdParty::class}, or 'none'
      */
-    public function setRequestor($requestor): self
+    public function getRequestorKind(): string
     {
-        if ($requestor instanceof Person) {
-            $this->setRequestorThirdParty(NULL);
-            $this->setRequestorPerson($requestor);
-        } elseif ($requestor instanceof ThirdParty) {
-            $this->setRequestorThirdParty($requestor);
-            $this->setRequestorPerson(NULL);
-        } elseif (NULL === $requestor) {
-            $this->setRequestorPerson(NULL);
-            $this->setRequestorThirdParty(NULL);
-        } else {
-            throw new \UnexpectedValueException("requestor is not an instance of Person or ThirdParty");
+        if ($this->getRequestor() instanceof ThirdParty) {
+            return 'thirdparty';
         }
 
-        return $this;
-    }
-
-
-    public function isRequestorAnonymous(): bool
-    {
-        return $this->requestorAnonymous;
-    }
-
-    public function setRequestorAnonymous(bool $requestorAnonymous): self
-    {
-        $this->requestorAnonymous = $requestorAnonymous;
-
-        return $this;
-    }
-
-    public function isEmergency(): bool
-    {
-        return $this->emergency;
-    }
-
-    public function setEmergency(bool $emergency): self
-    {
-        $this->emergency = $emergency;
-
-        return $this;
-    }
-
-    public function isConfidential(): bool
-    {
-        return $this->confidential;
-    }
-
-    public function setConfidential(bool $confidential): self
-    {
-        $this->confidential = $confidential;
-
-        return $this;
-    }
-
-    public function getCreatedBy(): ?User
-    {
-        return $this->createdBy;
-    }
-
-    public function setCreatedBy(User $createdBy): self
-    {
-        $this->createdBy = $createdBy;
-
-        return $this;
-    }
-
-    public function getStep(): ?string
-    {
-        return $this->step;
-    }
-
-    public function setStep(string $step): self
-    {
-        $this->step = $step;
-
-        return $this;
-    }
-
-    public function getIntensity(): ?string
-    {
-        return $this->intensity;
-    }
-
-    public function setIntensity(string $intensity): self
-    {
-        $this->intensity = $intensity;
-
-        return $this;
-    }
-
-    /**
-     * @return iterable|Collection
-     */
-    public function getScopes(): Collection
-    {
-        return $this->scopes;
-    }
-
-
-
-    public function addScope(Scope $scope): self
-    {
-        if (!$this->scopes->contains($scope)) {
-            $this->scopes[] = $scope;
+        if ($this->getRequestor() instanceof Person) {
+            return 'person';
         }
 
-        return $this;
+        return 'none';
     }
 
-    public function removeScope(Scope $scope): void
+    public function getRequestorPerson(): ?Person
     {
-        $this->scopes->removeElement($scope);
+        return $this->requestorPerson;
+    }
+
+    public function getRequestorThirdParty(): ?ThirdParty
+    {
+        return $this->requestorThirdParty;
     }
 
     public function getResources(): Collection
@@ -879,18 +820,12 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this->resources;
     }
 
-    public function addResource(Resource $resource): self
+    /**
+     * @return Collection|iterable
+     */
+    public function getScopes(): Collection
     {
-        $resource->setAccompanyingPeriod($this);
-        $this->resources[] = $resource;
-
-        return $this;
-    }
-
-    public function removeResource(Resource $resource): void
-    {
-        $resource->setAccompanyingPeriod(null);
-        $this->resources->removeElement($resource);
+        return $this->scopes;
     }
 
     public function getSocialIssues(): Collection
@@ -898,92 +833,14 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this->socialIssues;
     }
 
-    public function addSocialIssue(SocialIssue $socialIssue): self
+    public function getStep(): ?string
     {
-        if (!$this->socialIssues->contains($socialIssue)) {
-            $this->socialIssues[] = $socialIssue;
-        }
-
-        return $this;
+        return $this->step;
     }
 
-    public function removeSocialIssue(SocialIssue $socialIssue): void
+    public function getUser(): ?User
     {
-        $this->socialIssues->removeElement($socialIssue);
-    }
-
-    /**
-     * @return Collection|SocialIssues[] All social issues and their descendants
-     */
-    public function getRecursiveSocialIssues(): Collection
-    {
-        $recursiveSocialIssues = new ArrayCollection();
-
-        foreach( $this->socialIssues as $socialIssue) {
-            foreach ($socialIssue->getDescendantsWithThis() as $descendant) {
-                if(! $recursiveSocialIssues->contains($descendant)) {
-                    $recursiveSocialIssues->add($descendant);
-                }
-            }
-        }
-        return $recursiveSocialIssues;
-    }
-
-
-    /**
-     * @return Collection|SocialAction[] All the descendant social actions of all
-     * the descendants of the entity
-     */
-    public function getRecursiveSocialActions(): Collection
-    {
-        $recursiveSocialActions = new ArrayCollection();
-
-        foreach( $this->socialIssues as $socialIssue) {
-            foreach ($socialIssue->getRecursiveSocialActions() as $descendant) {
-                if(! $recursiveSocialActions->contains($descendant)) {
-                    $recursiveSocialActions->add($descendant);
-                }
-            }
-        }
-
-        return $recursiveSocialActions;
-    }
-
-    /**
-     * Get a list of all persons which are participating to this course
-     *
-     * @psalm-return Collection<int, Person>
-     */
-    public function getPersons(): Collection
-    {
-        return $this
-            ->participations
-            ->map(
-                static function(AccompanyingPeriodParticipation $participation): Person {
-                    return $participation->getPerson();
-                }
-            );
-    }
-
-    public function setCreatedAt(\DateTimeInterface $datetime): self
-    {
-        $this->createdAt = $datetime;
-
-        return $this;
-    }
-
-    public function setUpdatedBy(User $user): self
-    {
-        $this->updatedBy = $user;
-
-        return $this;
-    }
-
-    public function setUpdatedAt(\DateTimeInterface $datetime): self
-    {
-        $this->updatedAt = $datetime;
-
-        return $this;
+        return $this->user;
     }
 
     /**
@@ -994,14 +851,107 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this->works;
     }
 
-    public function addWork(AccompanyingPeriodWork $work): self
+    /**
+     * Returns true if the closing date is after the opening date.
+     */
+    public function isClosingAfterOpening(): bool
     {
-        $this->works[] = $work;
-        $work->setAccompanyingPeriod($this);
+        if (null === $this->getClosingDate()) {
+            return false;
+        }
+        $diff = $this->getOpeningDate()->diff($this->getClosingDate());
+
+        if (0 === $diff->invert) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function isConfidential(): bool
+    {
+        return $this->confidential;
+    }
+
+    /**
+     * Validation function.
+     */
+    public function isDateConsistent(ExecutionContextInterface $context)
+    {
+        if ($this->isOpen()) {
+            return;
+        }
+
+        if (!$this->isClosingAfterOpening()) {
+            $context->buildViolation('The date of closing is before the date of opening')
+                ->atPath('dateClosing')
+                ->addViolation();
+        }
+    }
+
+    public function isEmergency(): bool
+    {
+        return $this->emergency;
+    }
+
+    public function isOpen(): bool
+    {
+        if ($this->getOpeningDate() > new DateTimeImmutable('now')) {
+            return false;
+        }
+
+        if ($this->getClosingDate() === null) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function isRequestorAnonymous(): bool
+    {
+        return $this->requestorAnonymous;
+    }
+
+    public function removeComment(Comment $comment): void
+    {
+        $comment->setAccompanyingPeriod(null);
+        $this->comments->removeElement($comment);
+    }
+
+    /**
+     * Remove Participation.
+     */
+    public function removeParticipation(AccompanyingPeriodParticipation $participation)
+    {
+        $participation->setAccompanyingPeriod(null);
+    }
+
+    /**
+     * Remove Person.
+     */
+    public function removePerson(Person $person): self
+    {
+        $this->closeParticipationFor($person);
 
         return $this;
     }
 
+    public function removeResource(Resource $resource): void
+    {
+        $resource->setAccompanyingPeriod(null);
+        $this->resources->removeElement($resource);
+    }
+
+    public function removeScope(Scope $scope): void
+    {
+        $this->scopes->removeElement($scope);
+    }
+
+    public function removeSocialIssue(SocialIssue $socialIssue): void
+    {
+        $this->socialIssues->removeElement($socialIssue);
+    }
+
     public function removeWork(AccompanyingPeriodWork $work): self
     {
         $this->work->removeElement($work);
@@ -1010,9 +960,10 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function getAddressLocation(): ?Address
+    public function reOpen(): void
     {
-        return $this->addressLocation;
+        $this->setClosingDate(null);
+        $this->setClosingMotive(null);
     }
 
     /**
@@ -1026,27 +977,100 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
     }
 
     /**
-     * @Groups({"read"})
+     * Set closingDate.
+     *
+     * For closing a Person file, you should use Person::setClosed instead.
+     *
+     * @param mixed $closingDate
+     *
+     * @return AccompanyingPeriod
      */
-    public function getPersonLocation(): ?Person
+    public function setClosingDate($closingDate)
     {
-        return $this->personLocation;
+        $this->closingDate = $closingDate;
+
+        return $this;
+    }
+
+    public function setClosingMotive(?ClosingMotive $closingMotive = null): self
+    {
+        $this->closingMotive = $closingMotive;
+
+        return $this;
+    }
+
+    public function setConfidential(bool $confidential): self
+    {
+        $this->confidential = $confidential;
+
+        return $this;
+    }
+
+    public function setCreatedAt(DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
+    public function setCreatedBy(User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function setEmergency(bool $emergency): self
+    {
+        $this->emergency = $emergency;
+
+        return $this;
     }
 
     /**
-     * Get a list of person which have an adresse available for a valid location
-     *
-     * @return Collection|Person[]
+     * @Groups({"write"})
      */
-    public function getAvailablePersonLocation(): Collection
+    public function setInitialComment(?Comment $comment = null): self
     {
-        return $this->getOPenParticipations()
-            ->filter(function(AccompanyingPeriodParticipation $p) {
-                return $p->getPerson()->hasCurrentHouseholdAddress();
-            })
-            ->map(function(AccompanyingPeriodParticipation $p) {
-                return $p->getPerson();
-            });
+        if (null !== $this->initialComment) {
+            $this->removeComment($this->initialComment);
+        }
+
+        if ($comment instanceof Comment) {
+            $this->addComment($comment);
+        }
+
+        $this->initialComment = $comment;
+
+        return $this;
+    }
+
+    public function setIntensity(string $intensity): self
+    {
+        $this->intensity = $intensity;
+
+        return $this;
+    }
+
+    /**
+     * Set openingDate.
+     *
+     * @param mixed $openingDate
+     *
+     * @return AccompanyingPeriod
+     */
+    public function setOpeningDate($openingDate)
+    {
+        $this->openingDate = $openingDate;
+
+        return $this;
+    }
+
+    public function setOrigin(Origin $origin): self
+    {
+        $this->origin = $origin;
+
+        return $this;
     }
 
     /**
@@ -1059,45 +1083,87 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * Get the location, taking precedence into account
-     *
-     * @Groups({"read"})
-     */
-    public function getLocation(\DateTimeImmutable $at = null): ?Address
+    public function setRemark(?string $remark = null): self
     {
-        if ($this->getPersonLocation() instanceof Person) {
-           return $this->getPersonLocation()->getCurrentHouseholdAddress($at);
-        }
+        $this->remark = (string) $remark;
 
-        return $this->getAddressLocation();
+        return $this;
     }
 
     /**
-     * Get where the location is
+     * Set a requestor.
      *
-     * @Groups({"read"})
+     * The requestor is either an instance of ThirdParty, or an
+     * instance of Person
+     *
+     * @param $requestor Person|ThirdParty
+     * @throw UnexpectedValueException if the requestor is not a Person or ThirdParty
+     * @Groups({"write"})
      */
-    public function getLocationStatus(): string
+    public function setRequestor($requestor): self
     {
-        if ($this->getPersonLocation() instanceof Person) {
-            return 'person';
-        } elseif ($this->getAddressLocation() instanceof Address) {
-            return 'address';
+        if ($requestor instanceof Person) {
+            $this->setRequestorThirdParty(null);
+            $this->setRequestorPerson($requestor);
+        } elseif ($requestor instanceof ThirdParty) {
+            $this->setRequestorThirdParty($requestor);
+            $this->setRequestorPerson(null);
+        } elseif (null === $requestor) {
+            $this->setRequestorPerson(null);
+            $this->setRequestorThirdParty(null);
         } else {
-            return 'none';
+            throw new UnexpectedValueException('requestor is not an instance of Person or ThirdParty');
         }
+
+        return $this;
     }
 
-    public function getCenters(): ?iterable
+    public function setRequestorAnonymous(bool $requestorAnonymous): self
     {
-        foreach ($this->getPersons() as $person) {
-            if (!in_array($person->getCenter(), $centers ?? [])
-                && NULL !== $person->getCenter()) {
-                $centers[] = $person->getCenter();
-            }
-        }
+        $this->requestorAnonymous = $requestorAnonymous;
 
-        return $centers ?? null;
+        return $this;
+    }
+
+    public function setStep(string $step): self
+    {
+        $this->step = $step;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+
+    public function setUser(User $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    private function setRequestorPerson(?Person $requestorPerson = null): self
+    {
+        $this->requestorPerson = $requestorPerson;
+
+        return $this;
+    }
+
+    private function setRequestorThirdParty(?ThirdParty $requestorThirdParty = null): self
+    {
+        $this->requestorThirdParty = $requestorThirdParty;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 39aaf309b..df4a5f5de 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -1,50 +1,47 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_work")
  * @Serializer\DiscriminatorMap(
- *      typeProperty="type",
- *      mapping={
- *          "accompanying_period_work":AccompanyingPeriodWork::class
- *      }
- *  )
+ *     typeProperty="type",
+ *     mapping={
+ *         "accompanying_period_work": AccompanyingPeriodWork::class
+ *     }
+ * )
  */
- class AccompanyingPeriodWork implements TrackCreationInterface, TrackUpdateInterface
+class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, TrackCreationInterface, TrackUpdateInterface
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\Column(type="text")
-     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
-     */
-    private string $note = "";
-
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
      * @Serializer\Groups({"read"})
@@ -52,60 +49,69 @@ use Symfony\Component\Validator\Constraints as Assert;
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=SocialAction::class)
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"accompanying_period_work:create"})
+     * @ORM\OneToMany(
+     *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
+     *     mappedBy="accompanyingPeriodWork",
+     *     cascade={"remove", "persist"},
+     *     orphanRemoval=true
+     * )
+     * @Serializer\Groups({"read", "docgen:read"})
+     *
+     * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
      */
-    private ?SocialAction $socialAction = null;
+    private Collection $accompanyingPeriodWorkEvaluations;
 
     /**
      * @ORM\Column(type="datetime_immutable")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?\DateTimeImmutable $createdAt = null;
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private bool $createdAutomatically = false;
+
+    /**
+     * @ORM\Column(type="text")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private string $createdAutomaticallyReason = '';
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?User $createdBy = null;
 
     /**
-     * @ORM\Column(type="datetime_immutable")
-     * @Serializer\Groups({"read"})
-     */
-    private ?\DateTimeImmutable $updatedAt = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     * @Serializer\Groups({"read"})
-     */
-    private ?User $updatedBy = null;
-
-    /**
-     * @ORM\Column(type="date_immutable")
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"accompanying_period_work:create"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"read"})
-     */
-    private \DateTimeImmutable $startDate;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default":null})
-     * @Serializer\Groups({"accompanying_period_work:create"})
-     * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\GreaterThan(propertyPath="startDate",
-     *    message="accompanying_course_work.The endDate should be greater than the start date"
-     *  )
+     *     message="accompanying_course_work.The endDate should be greater than the start date"
+     * )
      */
-    private ?\DateTimeImmutable $endDate = null;
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=AccompanyingPeriodWorkGoal::class,
+     *     mappedBy="accompanyingPeriodWork",
+     *     cascade={"persist"},
+     *     orphanRemoval=true
+     * )
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     */
+    private Collection $goals;
 
     /**
      * @ORM\ManyToOne(targetEntity=ThirdParty::class)
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      *
      * In schema : traitant
@@ -113,67 +119,73 @@ use Symfony\Component\Validator\Constraints as Assert;
     private ?ThirdParty $handlingThierParty = null;
 
     /**
-     * @ORM\Column(type="boolean")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private bool $createdAutomatically = false;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
+     * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
      */
-    private string $createdAutomaticallyReason = "";
+    private string $note = '';
 
     /**
-     * @ORM\OneToMany(
-     *      targetEntity=AccompanyingPeriodWorkGoal::class,
-     *      mappedBy="accompanyingPeriodWork",
-     *      cascade={"persist"},
-     *      orphanRemoval=true
-     *  )
-     * @Serializer\Groups({"read"})
+     * @ORM\ManyToMany(targetEntity=Person::class)
+     * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
      */
-    private Collection $goals;
+    private Collection $persons;
 
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorks")
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_result")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
     private Collection $results;
 
+    /**
+     * @ORM\ManyToOne(targetEntity=SocialAction::class)
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"accompanying_period_work:create"})
+     */
+    private ?SocialAction $socialAction = null;
+
+    /**
+     * @ORM\Column(type="date_immutable")
+     * @Serializer\Groups({"accompanying_period_work:create"})
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?DateTimeImmutable $startDate = null;
+
     /**
      * @ORM\ManyToMany(targetEntity=ThirdParty::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_third_party")
      *
      * In schema : intervenants
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"accompanying_period_work:edit"})
-    */
+     */
     private Collection $thirdParties;
 
     /**
-     *
-     * @ORM\ManyToMany(targetEntity=Person::class)
-     * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"accompanying_period_work:create"})
+     * @ORM\Column(type="datetime_immutable")
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private Collection $persons;
+    private ?DateTimeImmutable $updatedAt = null;
 
-     /**
-      * @var Collection
-      * @ORM\OneToMany(
-      *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
-      *     mappedBy="accompanyingPeriodWork",
-      *     cascade={"persist"},
-      *     orphanRemoval=true
-      * )
-      * @Serializer\Groups({"read"})
-      * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
-      */
-    private Collection $accompanyingPeriodWorkEvaluations;
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?User $updatedBy = null;
 
     public function __construct()
     {
@@ -184,172 +196,16 @@ use Symfony\Component\Validator\Constraints as Assert;
         $this->accompanyingPeriodWorkEvaluations = new ArrayCollection();
     }
 
-    public function getId(): ?int
+    public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
     {
-        return $this->id;
-    }
-
-    public function getNote(): ?string
-    {
-        return $this->note;
-    }
-
-    public function setNote(string $note): self
-    {
-        $this->note = $note;
-
-        return $this;
-    }
-
-    public function getAccompanyingPeriod(): ?AccompanyingPeriod
-    {
-        return $this->accompanyingPeriod;
-    }
-
-    /**
-     * Internal: you should use `$accompanyingPeriod->removeWork($work);` or
-     * `$accompanyingPeriod->addWork($work);`
-     */
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
-    {
-        if ($this->accompanyingPeriod instanceof AccompanyingPeriod &&
-            $accompanyingPeriod !== $this->accompanyingPeriod) {
-            throw new \LogicException("A work cannot change accompanyingPeriod");
+        if (!$this->accompanyingPeriodWorkEvaluations->contains($evaluation)) {
+            $this->accompanyingPeriodWorkEvaluations[] = $evaluation;
+            $evaluation->setAccompanyingPeriodWork($this);
         }
 
-        $this->accompanyingPeriod = $accompanyingPeriod;
-
         return $this;
     }
 
-    public function getSocialAction(): ?SocialAction
-    {
-        return $this->socialAction;
-    }
-
-    public function setSocialAction(?SocialAction $socialAction): self
-    {
-        $this->socialAction = $socialAction;
-
-        return $this;
-    }
-
-    public function getCreatedAt(): ?\DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
-    public function setCreatedAt(\DateTimeInterface $createdAt): self
-    {
-        $this->createdAt = $createdAt;
-
-        return $this;
-    }
-
-    public function getCreatedBy(): ?User
-    {
-        return $this->createdBy;
-    }
-
-    public function setCreatedBy(?User $createdBy): self
-    {
-        $this->createdBy = $createdBy;
-
-        return $this;
-    }
-
-    public function setUpdatedBy(User $user): TrackUpdateInterface
-    {
-        $this->updatedBy = $user;
-
-        return $this;
-    }
-
-    public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
-    {
-        $this->updatedAt = $datetime;
-
-        return $this;
-    }
-
-    public function getUpdatedAt(): ?\DateTimeImmutable
-    {
-        return $this->updatedAt;
-    }
-
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
-    public function getStartDate(): ?\DateTimeInterface
-    {
-        return $this->startDate;
-    }
-
-    public function setStartDate(\DateTimeInterface $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-
-    public function getEndDate(): ?\DateTimeInterface
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(?\DateTimeInterface $endDate = null): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
-
-    public function getHandlingThierParty(): ?ThirdParty
-    {
-        return $this->handlingThierParty;
-    }
-
-    public function setHandlingThierParty(?ThirdParty $handlingThierParty): self
-    {
-        $this->handlingThierParty = $handlingThierParty;
-
-        return $this;
-    }
-
-    public function getCreatedAutomatically(): ?bool
-    {
-        return $this->createdAutomatically;
-    }
-
-    public function setCreatedAutomatically(bool $createdAutomatically): self
-    {
-        $this->createdAutomatically = $createdAutomatically;
-
-        return $this;
-    }
-
-    public function getCreatedAutomaticallyReason(): ?string
-    {
-        return $this->createdAutomaticallyReason;
-    }
-
-    public function setCreatedAutomaticallyReason(string $createdAutomaticallyReason): self
-    {
-        $this->createdAutomaticallyReason = $createdAutomaticallyReason;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|AccompanyingPeriodWorkGoal[]
-     */
-    public function getGoals(): Collection
-    {
-        return $this->goals;
-    }
-
     public function addGoal(AccompanyingPeriodWorkGoal $goal): self
     {
         if (!$this->goals->contains($goal)) {
@@ -360,26 +216,15 @@ use Symfony\Component\Validator\Constraints as Assert;
         return $this;
     }
 
-    public function removeGoal(AccompanyingPeriodWorkGoal $goal): self
+    public function addPerson(Person $person): self
     {
-       if ($this->goals->removeElement($goal)) {
-            // set the owning side to null (unless already changed)
-            if ($goal->getAccompanyingPeriodWork() === $this) {
-                $goal->setAccompanyingPeriodWork(null);
-            }
+        if (!$this->persons->contains($person)) {
+            $this->persons[] = $person;
         }
 
         return $this;
     }
 
-    /**
-     * @return Collection|Result[]
-     */
-    public function getResults(): Collection
-    {
-        return $this->results;
-    }
-
     public function addResult(Result $result): self
     {
         if (!$this->results->contains($result)) {
@@ -389,13 +234,104 @@ use Symfony\Component\Validator\Constraints as Assert;
         return $this;
     }
 
-    public function removeResult(Result $result): self
+    public function addThirdParty(ThirdParty $thirdParty): self
     {
-        $this->results->removeElement($result);
+        if (!$this->thirdParties->contains($thirdParty)) {
+            $this->thirdParties[] = $thirdParty;
+        }
 
         return $this;
     }
 
+    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        return $this->accompanyingPeriod;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getAccompanyingPeriodWorkEvaluations()
+    {
+        return $this->accompanyingPeriodWorkEvaluations;
+    }
+
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedAutomatically(): ?bool
+    {
+        return $this->createdAutomatically;
+    }
+
+    public function getCreatedAutomaticallyReason(): ?string
+    {
+        return $this->createdAutomaticallyReason;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function getEndDate(): ?DateTimeInterface
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * @return AccompanyingPeriodWorkGoal[]|Collection
+     */
+    public function getGoals(): Collection
+    {
+        return $this->goals;
+    }
+
+    public function getHandlingThierParty(): ?ThirdParty
+    {
+        return $this->handlingThierParty;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getNote(): ?string
+    {
+        return $this->note;
+    }
+
+    public function getPersons(): Collection
+    {
+        return $this->persons;
+    }
+
+    /**
+     * @return Collection|Result[]
+     */
+    public function getResults(): Collection
+    {
+        return $this->results;
+    }
+
+    public function getSocialAction(): ?SocialAction
+    {
+        return $this->socialAction;
+    }
+
+    public function getSocialIssues(): Collection
+    {
+        return new ArrayCollection([$this->getSocialAction()->getIssue()]);
+    }
+
+    public function getStartDate(): ?DateTimeInterface
+    {
+        return $this->startDate;
+    }
+
     /**
      * @return Collection|ThirdParty[]
      */
@@ -409,31 +345,32 @@ use Symfony\Component\Validator\Constraints as Assert;
         return $this->getThirdParties();
     }
 
-    public function addThirdParty(ThirdParty $thirdParty): self
+    public function getUpdatedAt(): ?DateTimeImmutable
     {
-        if (!$this->thirdParties->contains($thirdParty)) {
-            $this->thirdParties[] = $thirdParty;
-        }
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function removeAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
+    {
+        $this->accompanyingPeriodWorkEvaluations
+            ->removeElement($evaluation);
+        $evaluation->setAccompanyingPeriodWork(null);
 
         return $this;
     }
 
-    public function removeThirdParty(ThirdParty $thirdParty): self
+    public function removeGoal(AccompanyingPeriodWorkGoal $goal): self
     {
-        $this->thirdParties->removeElement($thirdParty);
-
-        return $this;
-    }
-
-    public function getPersons(): Collection
-    {
-        return $this->persons;
-    }
-
-    public function addPerson(Person $person): self
-    {
-        if (!$this->persons->contains($person)) {
-            $this->persons[] = $person;
+        if ($this->goals->removeElement($goal)) {
+            // set the owning side to null (unless already changed)
+            if ($goal->getAccompanyingPeriodWork() === $this) {
+                $goal->setAccompanyingPeriodWork(null);
+            }
         }
 
         return $this;
@@ -446,30 +383,117 @@ use Symfony\Component\Validator\Constraints as Assert;
         return $this;
     }
 
-     /**
-      * @return Collection
-      */
-     public function getAccompanyingPeriodWorkEvaluations()
-     {
-         return $this->accompanyingPeriodWorkEvaluations;
-     }
+    public function removeResult(Result $result): self
+    {
+        $this->results->removeElement($result);
 
-     public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
-     {
-         if (!$this->accompanyingPeriodWorkEvaluations->contains($evaluation)) {
-             $this->accompanyingPeriodWorkEvaluations[] = $evaluation;
-             $evaluation->setAccompanyingPeriodWork($this);
-         }
+        return $this;
+    }
 
-         return $this;
-     }
+    public function removeSocialIssue(SocialIssue $issue): AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
+    {
+        $this->getSocialIssues()->removeElement($issue);
 
-     public function removeAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self
-     {
-         $this->accompanyingPeriodWorkEvaluations
-             ->removeElement($evaluation);
-         $evaluation->setAccompanyingPeriodWork(null);
+        return $this;
+    }
 
-         return $this;
-     }
- }
+    public function removeThirdParty(ThirdParty $thirdParty): self
+    {
+        $this->thirdParties->removeElement($thirdParty);
+
+        return $this;
+    }
+
+    /**
+     * Internal: you should use `$accompanyingPeriod->removeWork($work);` or
+     * `$accompanyingPeriod->addWork($work);`.
+     */
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    {
+        if ($this->accompanyingPeriod instanceof AccompanyingPeriod
+        && $accompanyingPeriod !== $this->accompanyingPeriod) {
+            throw new LogicException('A work cannot change accompanyingPeriod');
+        }
+
+        $this->accompanyingPeriod = $accompanyingPeriod;
+
+        return $this;
+    }
+
+    public function setCreatedAt(DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function setCreatedAutomatically(bool $createdAutomatically): self
+    {
+        $this->createdAutomatically = $createdAutomatically;
+
+        return $this;
+    }
+
+    public function setCreatedAutomaticallyReason(string $createdAutomaticallyReason): self
+    {
+        $this->createdAutomaticallyReason = $createdAutomaticallyReason;
+
+        return $this;
+    }
+
+    public function setCreatedBy(?User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function setEndDate(?DateTimeInterface $endDate = null): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setHandlingThierParty(?ThirdParty $handlingThierParty): self
+    {
+        $this->handlingThierParty = $handlingThierParty;
+
+        return $this;
+    }
+
+    public function setNote(string $note): self
+    {
+        $this->note = $note;
+
+        return $this;
+    }
+
+    public function setSocialAction(?SocialAction $socialAction): self
+    {
+        $this->socialAction = $socialAction;
+
+        return $this;
+    }
+
+    public function setStartDate(DateTimeInterface $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): TrackUpdateInterface
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
index 996007e96..479bbfb87 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
@@ -1,36 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
 use DateInterval;
 use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use LogicException;
+use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table("chill_person_accompanying_period_work_evaluation")
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *        "accompanying_period_work_evaluation"=AccompanyingPeriodWorkEvaluation::class,
- *     })
+ *     "accompanying_period_work_evaluation": AccompanyingPeriodWorkEvaluation::class,
+ * })
  */
-class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCreationInterface
+class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackUpdateInterface
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
-     */
-    private ?int $id = null;
-
     /**
      * @ORM\ManyToOne(
      *     targetEntity=AccompanyingPeriodWork::class,
@@ -40,65 +43,16 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
     private ?AccompanyingPeriodWork $accompanyingPeriodWork = null;
 
     /**
-     * @ORM\ManyToOne(
-     *     targetEntity=Evaluation::class
-     * )
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     */
-    private ?Evaluation $evaluation = null;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"write"})
-     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     */
-    private ?DateTimeImmutable $startDate = null;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"write"})
-     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     */
-    private ?DateTimeImmutable $endDate = null;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     */
-    private ?DateTimeImmutable $maxDate = null;
-
-    /**
-     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     * @Serializer\Groups({"write"})
-     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
-     */
-    private ?DateInterval $warningInterval = null;
-
-    /**
-     * @var string
      * @ORM\Column(type="text", nullable=false, options={"default": ""})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\Groups({"write"})
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      */
     private string $comment = '';
 
-   /**
-     * @ORM\ManyToOne(
-     *     targetEntity=User::class
-     * )
-    * @Serializer\Groups({"read"})
-    */
-    private ?User $createdBy = null;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?DateTimeImmutable $createdAt = null;
 
@@ -106,27 +60,45 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
      * @ORM\ManyToOne(
      *     targetEntity=User::class
      * )
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?User $updatedBy = null;
+    private ?User $createdBy = null;
 
     /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     */
-    private ?DateTimeImmutable $updatedAt = null;
-
-    /**
-     * @var Collection
      * @ORM\OneToMany(
      *     targetEntity=AccompanyingPeriodWorkEvaluationDocument::class,
      *     mappedBy="accompanyingPeriodWorkEvaluation",
      *     cascade={"remove"}
-     *     )
+     * )
      * @Serializer\Groups({"read"})
      */
     private Collection $documents;
 
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=Evaluation::class
+     * )
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?Evaluation $evaluation = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
     /**
      * This is a workaround for client, to allow them to assign arbitrary data
      * dedicated to their job.
@@ -139,251 +111,51 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
      * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
      *
      * @var mixed
-     *
      */
-    private $key = null;
+    private $key;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateTimeImmutable $maxDate = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=User::class
+     * )
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?User $updatedBy = null;
+
+    /**
+     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"write"})
+     * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
+     */
+    private ?DateInterval $warningInterval = null;
 
     public function __construct()
     {
         $this->documents = new ArrayCollection();
     }
 
-    /**
-     * @return int|null
-     */
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return AccompanyingPeriodWork|null
-     */
-    public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork
-    {
-        return $this->accompanyingPeriodWork;
-    }
-
-    /**
-     * @param AccompanyingPeriodWork|null $accompanyingPeriodWork
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): AccompanyingPeriodWorkEvaluation
-    {
-        if (
-            $accompanyingPeriodWork instanceof AccompanyingPeriodWork
-            && $this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
-            && $this->accompanyingPeriodWork->getId() !== $accompanyingPeriodWork->getId()) {
-            throw new \RuntimeException("Changing the ".
-            "accompanyingPeriodWork is not allowed");
-        }
-
-        $this->accompanyingPeriodWork = $accompanyingPeriodWork;
-        return $this;
-    }
-
-    /**
-     * @return Evaluation|null
-     */
-    public function getEvaluation(): ?Evaluation
-    {
-        return $this->evaluation;
-    }
-
-    /**
-     * @param Evaluation|null $evaluation
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setEvaluation(?Evaluation $evaluation): AccompanyingPeriodWorkEvaluation
-    {
-        if (
-            ($evaluation instanceof Evaluation
-                && $this->evaluation instanceof Evaluation
-                && $evaluation->getId() !== $this->evaluation->getId())
-            ||
-            ($this->evaluation instanceof Evaluation
-                && null === $evaluation)
-        ) {
-            $cl = AccompanyingPeriodWorkEvaluation::class;
-            throw new \LogicException("once set, an $cl  cannot
-                change or remove the linked Evaluation::class");
-        }
-
-        $this->evaluation = $evaluation;
-
-        return $this;
-    }
-
-    /**
-     * @return DateTimeImmutable|null
-     */
-    public function getStartDate(): ?DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    /**
-     * @param DateTimeImmutable|null $startDate
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
-    {
-        $this->startDate = $startDate;
-        return $this;
-    }
-
-    /**
-     * @return DateTimeImmutable|null
-     */
-    public function getEndDate(): ?DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    /**
-     * @param DateTimeImmutable|null $endDate
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
-    {
-        $this->endDate = $endDate;
-        return $this;
-    }
-
-    /**
-     * @return DateTimeImmutable|null
-     */
-    public function getMaxDate(): ?DateTimeImmutable
-    {
-        return $this->maxDate;
-    }
-
-    /**
-     * @param DateTimeImmutable|null $maxDate
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setMaxDate(?DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
-    {
-        $this->maxDate = $maxDate;
-        return $this;
-    }
-
-    /**
-     * @return DateInterval|null
-     */
-    public function getWarningInterval(): ?DateInterval
-    {
-        return $this->warningInterval;
-    }
-
-    /**
-     * @param DateInterval|null $warningInterval
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setWarningInterval(?DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
-    {
-        $this->warningInterval = $warningInterval;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getComment(): string
-    {
-        return $this->comment;
-    }
-
-    /**
-     * @param string $comment
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setComment(string $comment): AccompanyingPeriodWorkEvaluation
-    {
-        $this->comment = $comment;
-        return $this;
-    }
-
-    /**
-     * @return User|null
-     */
-    public function getCreatedBy(): ?User
-    {
-        return $this->createdBy;
-    }
-
-    /**
-     * @param User|null $createdBy
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setCreatedBy(?User $createdBy): AccompanyingPeriodWorkEvaluation
-    {
-        $this->createdBy = $createdBy;
-        return $this;
-    }
-
-    /**
-     * @return DateTimeImmutable|null
-     */
-    public function getCreatedAt(): ?DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
-    /**
-     * @param DateTimeImmutable|null $createdAt
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setCreatedAt(\DateTimeInterface $createdAt): self
-    {
-        $this->createdAt = $createdAt;
-        return $this;
-    }
-
-    /**
-     * @return User|null
-     */
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
-    /**
-     * @param User|null $updatedBy
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setUpdatedBy(?User $updatedBy): AccompanyingPeriodWorkEvaluation
-    {
-        $this->updatedBy = $updatedBy;
-        return $this;
-    }
-
-    /**
-     * @return DateTimeImmutable|null
-     */
-    public function getUpdatedAt(): ?DateTimeImmutable
-    {
-        return $this->updatedAt;
-    }
-
-    /**
-     * @param DateTimeImmutable|null $updatedAt
-     * @return AccompanyingPeriodWorkEvaluation
-     */
-    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
-    {
-        $this->updatedAt = $updatedAt;
-        return $this;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getDocuments()
-    {
-        return $this->documents;
-    }
-
     public function addDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
     {
         if (!$this->documents->contains($document)) {
@@ -394,14 +166,51 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
         return $this;
     }
 
-    public function removeDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
+    public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork
     {
-        $this->documents->removeElement($document);
-        return $this;
+        return $this->accompanyingPeriodWork;
+    }
+
+    public function getComment(): string
+    {
+        return $this->comment;
+    }
+
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
     }
 
     /**
-     * Arbitrary data, used for client
+     * @return Collection
+     */
+    public function getDocuments()
+    {
+        return $this->documents;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getEvaluation(): ?Evaluation
+    {
+        return $this->evaluation;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Arbitrary data, used for client.
      *
      * @return mixed
      */
@@ -410,10 +219,123 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
         return $this->key;
     }
 
+    public function getMaxDate(): ?DateTimeImmutable
+    {
+        return $this->maxDate;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
     /**
-     * Arbitrary data, used for client
+     * @Serializer\Groups({"docgen:read"})
+     */
+    public function getWarningDate(): ?DateTimeImmutable
+    {
+        if (null === $this->getEndDate() || null === $this->getWarningInterval()) {
+            return null;
+        }
+
+        return $this->getEndDate()->sub($this->getWarningInterval());
+    }
+
+    public function getWarningInterval(): ?DateInterval
+    {
+        return $this->warningInterval;
+    }
+
+    public function removeDocument(AccompanyingPeriodWorkEvaluationDocument $document): self
+    {
+        $this->documents->removeElement($document);
+
+        return $this;
+    }
+
+    public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): AccompanyingPeriodWorkEvaluation
+    {
+        if (
+            $accompanyingPeriodWork instanceof AccompanyingPeriodWork
+            && $this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
+            && $this->accompanyingPeriodWork->getId() !== $accompanyingPeriodWork->getId()) {
+            throw new RuntimeException('Changing the ' .
+            'accompanyingPeriodWork is not allowed');
+        }
+
+        $this->accompanyingPeriodWork = $accompanyingPeriodWork;
+
+        return $this;
+    }
+
+    public function setComment(string $comment): AccompanyingPeriodWorkEvaluation
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $createdAt
+     *
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setCreatedAt(DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function setCreatedBy(?User $createdBy): AccompanyingPeriodWorkEvaluation
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setEvaluation(?Evaluation $evaluation): AccompanyingPeriodWorkEvaluation
+    {
+        if (
+            ($evaluation instanceof Evaluation
+                && $this->evaluation instanceof Evaluation
+                && $evaluation->getId() !== $this->evaluation->getId())
+            || ($this->evaluation instanceof Evaluation
+                && null === $evaluation)
+        ) {
+            $cl = AccompanyingPeriodWorkEvaluation::class;
+
+            throw new LogicException("once set, an {$cl}  cannot
+                change or remove the linked Evaluation::class");
+        }
+
+        $this->evaluation = $evaluation;
+
+        return $this;
+    }
+
+    /**
+     * Arbitrary data, used for client.
      *
      * @param mixed $key
+     *
      * @return AccompanyingPeriodWorkEvaluation
      */
     public function setKey($key): self
@@ -422,4 +344,44 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
 
         return $this;
     }
+
+    public function setMaxDate(?DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation
+    {
+        $this->maxDate = $maxDate;
+
+        return $this;
+    }
+
+    public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    /**
+     * @param DateTimeImmutable|null $updatedAt
+     *
+     * @return AccompanyingPeriodWorkEvaluation
+     */
+    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(?User $updatedBy): AccompanyingPeriodWorkEvaluation
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
+
+    public function setWarningInterval(?DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation
+    {
+        $this->warningInterval = $warningInterval;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
index eb07cd4d8..538cffc36 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
@@ -7,32 +16,21 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\User;
+use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
+use RuntimeException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table("chill_person_accompanying_period_work_evaluation_document")
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *     "accompanying_period_work_evaluation_document"=AccompanyingPeriodWorkEvaluationDocument::class
- *     })
+ *     "accompanying_period_work_evaluation_document": AccompanyingPeriodWorkEvaluationDocument::class
+ * })
  */
 class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doctrine\Model\TrackCreationInterface, \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
 {
     /**
-     * @var int|null
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     *
-     * @internal the default name exceeds 64 characters, we must set manually:
-     * @ORM\SequenceGenerator(sequenceName="chill_person_social_work_eval_doc_id_seq", allocationSize=1, initialValue=1000)
-     * @Serializer\Groups({"read"})
-     */
-    private ?int $id;
-
-    /**
-     * @var AccompanyingPeriodWorkEvaluation|null
      * @ORM\ManyToOne(
      *     targetEntity=AccompanyingPeriodWorkEvaluation::class,
      *     inversedBy="documents"
@@ -40,14 +38,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      */
     private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation = null;
 
-    /**
-     * @ORM\ManyToOne(
-     *     targetEntity=User::class
-     * )
-     * @Serializer\Groups({"read"})
-     */
-    private ?User $createdBy = null;
-
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
@@ -60,20 +50,26 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
      * )
      * @Serializer\Groups({"read"})
      */
-    private ?User $updatedBy = null;
+    private ?User $createdBy = null;
 
     /**
-     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     *
+     * @internal the default name exceeds 64 characters, we must set manually:
+     * @ORM\SequenceGenerator(sequenceName="chill_person_social_work_eval_doc_id_seq", allocationSize=1, initialValue=1000)
      * @Serializer\Groups({"read"})
      */
-    private ?\DateTimeImmutable $updatedAt = null;
+    private ?int $id;
 
     /**
-    * @ORM\ManyToOne(
-    *     targetEntity=StoredObject::class
-    * )
+     * @ORM\ManyToOne(
+     *     targetEntity=StoredObject::class,
+     *     cascade={"remove"},
+     * )
      * @Serializer\Groups({"read"})
-    */
+     */
     private ?StoredObject $storedObject = null;
 
     /**
@@ -85,17 +81,65 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
     private ?DocGeneratorTemplate $template = null;
 
     /**
-     * @return AccompanyingPeriodWorkEvaluation|null
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
      */
+    private ?\DateTimeImmutable $updatedAt = null;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity=User::class
+     * )
+     * @Serializer\Groups({"read"})
+     */
+    private ?User $updatedBy = null;
+
     public function getAccompanyingPeriodWorkEvaluation(): ?AccompanyingPeriodWorkEvaluation
     {
         return $this->accompanyingPeriodWorkEvaluation;
     }
 
     /**
-     * @param AccompanyingPeriodWorkEvaluation|null $accompanyingPeriodWorkEvaluation
-     * @return AccompanyingPeriodWorkEvaluationDocument
+     * @return \DateTimeImmutable|null
      */
+    public function getCreatedAt(): ?DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getStoredObject(): ?StoredObject
+    {
+        return $this->storedObject;
+    }
+
+    public function getTemplate(): ?DocGeneratorTemplate
+    {
+        return $this->template;
+    }
+
+    /**
+     * @return DateTimeImmutable|null
+     */
+    public function getUpdatedAt(): ?DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
     public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument
     {
         // if an evaluation is already associated, we cannot change the association (removing the association,
@@ -103,111 +147,53 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
         if ($this->accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation
             && $accompanyingPeriodWorkEvaluation instanceof AccompanyingPeriodWorkEvaluation) {
             if ($this->accompanyingPeriodWorkEvaluation !== $accompanyingPeriodWorkEvaluation) {
-                throw new \RuntimeException("It is not allowed to change the evaluation for a document");
+                throw new RuntimeException('It is not allowed to change the evaluation for a document');
             }
         }
         $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation;
+
         return $this;
     }
 
-    /**
-     * @return StoredObject|null
-     */
-    public function getStoredObject(): ?StoredObject
+    public function setCreatedAt(DateTimeInterface $datetime): TrackCreationInterface
     {
-        return $this->storedObject;
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
+    public function setCreatedBy(User $user): TrackCreationInterface
+    {
+        $this->createdBy = $user;
+
+        return $this;
     }
 
-    /**
-     * @param StoredObject|null $storedObject
-     * @return AccompanyingPeriodWorkEvaluationDocument
-     */
     public function setStoredObject(?StoredObject $storedObject): AccompanyingPeriodWorkEvaluationDocument
     {
         $this->storedObject = $storedObject;
+
         return $this;
     }
 
-    public function setCreatedBy(User $user): \Chill\MainBundle\Doctrine\Model\TrackCreationInterface
-    {
-        $this->createdBy = $user;
-        return $this;
-    }
-
-    public function setCreatedAt(\DateTimeInterface $datetime): \Chill\MainBundle\Doctrine\Model\TrackCreationInterface
-    {
-        $this->createdAt = $datetime;
-        return $this;
-    }
-
-    public function setUpdatedBy(User $user): \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
-    {
-        $this->updatedBy = $user;
-        return $this;
-    }
-
-    public function setUpdatedAt(\DateTimeInterface $datetime): \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface
-    {
-        $this->updatedAt = $datetime;
-        return $this;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return User|null
-     */
-    public function getCreatedBy(): ?User
-    {
-        return $this->createdBy;
-    }
-
-    /**
-     * @return \DateTimeImmutable|null
-     */
-    public function getCreatedAt(): ?\DateTimeInterface
-    {
-        return $this->createdAt;
-    }
-
-    /**
-     * @return User|null
-     */
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
-    /**
-     * @return DateTimeImmutable|null
-     */
-    public function getUpdatedAt(): ?\DateTimeInterface
-    {
-        return $this->updatedAt;
-    }
-
-    /**
-     * @return DocGeneratorTemplate|null
-     */
-    public function getTemplate(): ?DocGeneratorTemplate
-    {
-        return $this->template;
-    }
-
-    /**
-     * @param DocGeneratorTemplate|null $template
-     * @return AccompanyingPeriodWorkEvaluationDocument
-     */
     public function setTemplate(?DocGeneratorTemplate $template): AccompanyingPeriodWorkEvaluationDocument
     {
         $this->template = $template;
+
         return $this;
     }
 
+    public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): TrackUpdateInterface
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
index d8cfb4875..c31dfaa83 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
@@ -7,20 +16,33 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_work_goal")
  * @Serializer\DiscriminatorMap(
- *      typeProperty="type",
- *      mapping={
- *          "accompanying_period_work_goal":AccompanyingPeriodWorkGoal::class
- *      }
- *  )
+ *     typeProperty="type",
+ *     mapping={
+ *         "accompanying_period_work_goal": AccompanyingPeriodWorkGoal::class
+ *     }
+ * )
  */
 class AccompanyingPeriodWorkGoal
 {
+    /**
+     * @ORM\ManyToOne(targetEntity=AccompanyingPeriodWork::class, inversedBy="goals")
+     */
+    private $accompanyingPeriodWork;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Goal::class)
+     * @Serializer\Groups({"accompanying_period_work:edit"})
+     * @Serializer\Groups({"read"})
+     */
+    private $goal;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -36,18 +58,6 @@ class AccompanyingPeriodWorkGoal
      */
     private $note;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=AccompanyingPeriodWork::class, inversedBy="goals")
-     */
-    private $accompanyingPeriodWork;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=Goal::class)
-     * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"read"})
-     */
-    private $goal;
-
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorkGoals")
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_goal_result")
@@ -61,6 +71,25 @@ class AccompanyingPeriodWorkGoal
         $this->results = new ArrayCollection();
     }
 
+    public function addResult(Result $result): self
+    {
+        if (!$this->results->contains($result)) {
+            $this->results[] = $result;
+        }
+
+        return $this;
+    }
+
+    public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork
+    {
+        return $this->accompanyingPeriodWork;
+    }
+
+    public function getGoal(): ?Goal
+    {
+        return $this->goal;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -71,25 +100,28 @@ class AccompanyingPeriodWorkGoal
         return $this->note;
     }
 
-    public function setNote(string $note): self
+    /**
+     * @return Collection|Result[]
+     */
+    public function getResults(): Collection
     {
-        $this->note = $note;
-
-        return $this;
+        return $this->results;
     }
 
-    public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork
+    public function removeResult(Result $result): self
     {
-        return $this->accompanyingPeriodWork;
+        $this->results->removeElement($result);
+
+        return $this;
     }
 
     public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): self
     {
         if ($this->accompanyingPeriodWork instanceof AccompanyingPeriodWork
             && $accompanyingPeriodWork !== $this->accompanyingPeriodWork
-            && $accompanyingPeriodWork !== null
+            && null !== $accompanyingPeriodWork
         ) {
-            throw new \LogicException("Change accompanying period work is not allowed");
+            throw new LogicException('Change accompanying period work is not allowed');
         }
 
         $this->accompanyingPeriodWork = $accompanyingPeriodWork;
@@ -97,11 +129,6 @@ class AccompanyingPeriodWorkGoal
         return $this;
     }
 
-    public function getGoal(): ?Goal
-    {
-        return $this->goal;
-    }
-
     public function setGoal(?Goal $goal): self
     {
         $this->goal = $goal;
@@ -109,26 +136,9 @@ class AccompanyingPeriodWorkGoal
         return $this;
     }
 
-    /**
-     * @return Collection|Result[]
-     */
-    public function getResults(): Collection
+    public function setNote(string $note): self
     {
-        return $this->results;
-    }
-
-    public function addResult(Result $result): self
-    {
-        if (!$this->results->contains($result)) {
-            $this->results[] = $result;
-        }
-
-        return $this;
-    }
-
-    public function removeResult(Result $result): self
-    {
-        $this->results->removeElement($result);
+        $this->note = $note;
 
         return $this;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
index 29b2a44aa..aa12f0416 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php
@@ -1,33 +1,23 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
- * ClosingMotive give an explanation why we closed the Accompanying period
+ * ClosingMotive give an explanation why we closed the Accompanying period.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_closingmotive")
@@ -35,55 +25,50 @@ use Doctrine\Common\Collections\ArrayCollection;
 class ClosingMotive
 {
     /**
-     * @var integer
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
+    /**
+     * Child Accompanying periods.
+     *
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
+     * mappedBy="parent")
+     */
+    private Collection $children;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
-     * @var array
-     *
      * @ORM\Column(type="json")
+     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
-    private $name;
-    
+    private array $name = [];
+
     /**
-     * @var boolean
-     *
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="float")
      */
-    private $active = true;
-    
+    private float $ordering = 0.0;
+
     /**
      * @var self
      *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
-     *     inversedBy="children")
+     * inversedBy="children")
      */
-    private $parent = null;
-    
-    /**
-     * Child Accompanying periods
-     * @var Collection
-     *
-     * @ORM\OneToMany(
-     *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive",
-     *     mappedBy="parent")
-     */
-    private $children;
-    
-    /**
-     * @var float
-     *
-     * @ORM\Column(type="float")
-     */
-    private $ordering = 0.0;
-    
-    
+    private ?ClosingMotive $parent = null;
+
     /**
      * ClosingMotive constructor.
      */
@@ -91,11 +76,28 @@ class ClosingMotive
     {
         $this->children = new ArrayCollection();
     }
-    
+
+    public function addChildren(ClosingMotive $child): ClosingMotive
+    {
+        if ($this->children->contains($child)) {
+            return $this;
+        }
+
+        $this->children->add($child);
+        $child->setParent($this);
+
+        return $this;
+    }
+
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
     /**
-     * Get id
+     * Get id.
      *
-     * @return integer
+     * @return int
      */
     public function getId()
     {
@@ -103,7 +105,87 @@ class ClosingMotive
     }
 
     /**
-     * Set name
+     * Get name.
+     *
+     * @return array
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
+    /**
+     * @return ClosingMotive
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    public function hasParent(): bool
+    {
+        return null !== $this->parent;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function isChild(): bool
+    {
+        return null !== $this->parent;
+    }
+
+    public function isLeaf(): bool
+    {
+        return $this->children->count() === 0;
+    }
+
+    public function isParent(): bool
+    {
+        return $this->children->count() > 0;
+    }
+
+    public function removeChildren(ClosingMotive $child): ClosingMotive
+    {
+        if ($this->children->removeElement($child)) {
+            $child->setParent(null);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setActive(bool $active)
+    {
+        $this->active = $active;
+
+        if (false === $this->active) {
+            foreach ($this->getChildren() as $child) {
+                $child->setActive(false);
+            }
+        }
+
+        return $this;
+    }
+
+    public function setChildren(Collection $children): ClosingMotive
+    {
+        $this->children = $children;
+
+        return $this;
+    }
+
+    /**
+     * Set name.
      *
      * @param array $name
      *
@@ -117,161 +199,23 @@ class ClosingMotive
     }
 
     /**
-     * Get name
-     *
-     * @return array
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    
-    /**
-     * @return bool
-     */
-    public function isActive(): bool
-    {
-        return $this->active;
-    }
-    
-    /**
-     * @param bool $active
-     * @return $this
-     */
-    public function setActive(bool $active)
-    {
-        $this->active = $active;
-        
-        if ($this->active === FALSE) {
-            foreach ($this->getChildren() as $child) {
-                $child->setActive(FALSE);
-            }
-        }
-        
-        return $this;
-    }
-    
-    /**
-     * @return ClosingMotive
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-    
-    /**
-     * @return Collection
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children;
-    }
-    
-    /**
-     * @param ClosingMotive|null $parent
-     * @return ClosingMotive
-     */
-    public function setParent(?ClosingMotive $parent): ClosingMotive
-    {
-        $this->parent = $parent;
-        
-        if (NULL !== $parent) {
-            //$parent->addChildren($this);
-        }
-        
-        return $this;
-    }
-    
-    /**
-     * @param Collection $children
-     * @return ClosingMotive
-     */
-    public function setChildren(Collection $children): ClosingMotive
-    {
-        $this->children = $children;
-        
-        return $this;
-    }
-    
-    /**
-     * @param ClosingMotive $child
-     * @return ClosingMotive
-     */
-    public function addChildren(ClosingMotive $child): ClosingMotive
-    {
-        if ($this->children->contains($child)) {
-            return $this;
-        }
-        
-        $this->children->add($child);
-        $child->setParent($this);
-        
-        return $this;
-    }
-    
-    /**
-     * @param ClosingMotive $child
-     * @return ClosingMotive
-     */
-    public function removeChildren(ClosingMotive $child): ClosingMotive
-    {
-        if ($this->children->removeElement($child)) {
-            $child->setParent(null);
-        }
-        
-        return $this;
-    }
-    
-    /**
-     * @return float
-     */
-    public function getOrdering(): float
-    {
-        return $this->ordering;
-    }
-    
-    /**
-     * @param float $ordering
      * @return $this
      */
     public function setOrdering(float $ordering)
     {
         $this->ordering = $ordering;
-        
+
         return $this;
     }
-    
-    /**
-     * @return bool
-     */
-    public function isChild(): bool
-    {
-        return $this->parent !== null;
-    }
-    
-    /**
-     * @return bool
-     */
-    public function isParent(): bool
-    {
-        return $this->children->count() > 0;
-    }
-    
-    /**
-     * @return bool
-     */
-    public function isLeaf(): bool
-    {
-        return $this->children->count() === 0;
-    }
-    
-    /**
-     * @return bool
-     */
-    public function hasParent(): bool
-    {
-        return $this->parent !== null;
-    }
 
+    public function setParent(?ClosingMotive $parent): ClosingMotive
+    {
+        $this->parent = $parent;
+
+        if (null !== $parent) {
+            //$parent->addChildren($this);
+        }
+
+        return $this;
+    }
 }
-
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
index 18b5bd38d..75d1b2857 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -1,60 +1,54 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_comment")
  * @DiscriminatorMap(typeProperty="type", mapping={
- *    "accompanying_period_comment"=Comment::class
+ *     "accompanying_period_comment": Comment::class
  * })
  */
 class Comment implements TrackCreationInterface, TrackUpdateInterface
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Groups({"read"})
-     */
-    private $id;
-
     /**
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
-     *     inversedBy="comments")
+     * inversedBy="comments")
      * @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
      */
     private $accompanyingPeriod;
 
+    /**
+     * @ORM\Column(type="text")
+     * @Groups({"read", "write"})
+     */
+    private $content;
+
+    /**
+     * @ORM\Column(type="datetime")
+     * @Groups({"read"})
+     */
+    private $createdAt;
+
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
@@ -63,10 +57,12 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     private $creator;
 
     /**
-     * @ORM\Column(type="datetime")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
      * @Groups({"read"})
      */
-    private $createdAt;
+    private $id;
 
     /**
      * @ORM\Column(type="datetime")
@@ -81,20 +77,39 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
      */
     private $updatedBy;
 
-    /**
-     * @ORM\Column(type="text")
-     * @Groups({"read", "write"})
-     */
-    private $content;
+    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        return $this->accompanyingPeriod;
+    }
+
+    public function getContent(): ?string
+    {
+        return $this->content;
+    }
+
+    public function getCreatedAt(): ?DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreator(): ?User
+    {
+        return $this->creator;
+    }
 
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    public function getUpdatedAt(): ?DateTimeInterface
     {
-        return $this->accompanyingPeriod;
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
     }
 
     public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
@@ -104,14 +119,16 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function getCreator(): ?User
+    public function setContent(string $content): self
     {
-        return $this->creator;
+        $this->content = $content;
+
+        return $this;
     }
 
-    public function setCreator(?User $creator): self
+    public function setCreatedAt(DateTimeInterface $createdAt): self
     {
-        $this->creator = $creator;
+        $this->createdAt = $createdAt;
 
         return $this;
     }
@@ -121,51 +138,24 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
         return $this->setCreator($user);
     }
 
-    public function getCreatedAt(): ?\DateTimeInterface
+    public function setCreator(?User $creator): self
     {
-        return $this->createdAt;
-    }
-
-    public function setCreatedAt(\DateTimeInterface $createdAt): self
-    {
-        $this->createdAt = $createdAt;
+        $this->creator = $creator;
 
         return $this;
     }
 
-    public function getUpdatedAt(): ?\DateTimeInterface
-    {
-        return $this->updatedAt;
-    }
-
-    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
+    public function setUpdatedAt(DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
 
         return $this;
     }
 
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
     public function setUpdatedBy(User $updatedBy): self
     {
         $this->updatedBy = $updatedBy;
 
         return $this;
     }
-
-    public function getContent(): ?string
-    {
-        return $this->content;
-    }
-
-    public function setContent(string $content): self
-    {
-        $this->content = $content;
-
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
index aaf2bec94..7a1114b3e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php
@@ -1,40 +1,29 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation as Serializer;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_origin")
  * @Serializer\DiscriminatorMap(
- *   typeProperty="type", 
- *   mapping={
- *     "origin"=Origin::class
- * })
+ *     typeProperty="type",
+ *     mapping={
+ *         "origin": Origin::class
+ *     })
  */
 class Origin
 {
@@ -42,45 +31,46 @@ class Origin
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
-    private $label;
+    private array $label = [];
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true)
      * @Groups({"read"})
      */
-    private $noActiveAfter;
+    private ?DateTimeImmutable $noActiveAfter = null;
 
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getLabel()
+    public function getLabel(): array
     {
         return $this->label;
     }
 
-    public function setLabel(string $label): self
+    public function getNoActiveAfter(): ?DateTimeImmutable
+    {
+        return $this->noActiveAfter;
+    }
+
+    public function setLabel(array $label): self
     {
         $this->label = $label;
 
         return $this;
     }
 
-    public function getNoActiveAfter(): ?\DateTimeImmutable
-    {
-        return $this->noActiveAfter;
-    }
-
-    public function setNoActiveAfter(?\DateTimeImmutable $noActiveAfter): self
+    public function setNoActiveAfter(?DateTimeImmutable $noActiveAfter): self
     {
         $this->noActiveAfter = $noActiveAfter;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
index a50e28621..a11dc9b3d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php
@@ -1,53 +1,39 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
+use UnexpectedValueException;
 
 /**
  * @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
- *  })
+ *     "accompanying_period_resource": Resource::class
+ * })
  */
 class Resource
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Groups({"read"})
-     */
-    private $id;
-
     /**
      * @ORM\ManyToOne(
      *     targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod",
@@ -55,53 +41,48 @@ class Resource
      * )
      * @ORM\JoinColumn(nullable=false)
      */
-    private $accompanyingPeriod;
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
-     * @ORM\JoinColumn(nullable=true)
+     * @ORM\ManyToOne(targetEntity=Comment::class)
      */
-    private $thirdParty;
+    private $comment;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
-    private $person;
+    private ?Person $person = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=Comment::class)
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
      * @ORM\JoinColumn(nullable=true)
+     * @Groups({"docgen:read"})
      */
-    private $comment;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
+    private ?ThirdParty $thirdParty = null;
 
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
         return $this->accompanyingPeriod;
     }
 
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    public function getComment(): ?Comment
     {
-        $this->accompanyingPeriod = $accompanyingPeriod;
-
-        return $this;
+        return $this->comment;
     }
 
-    public function getThirdParty(): ?ThirdParty
+    public function getId(): ?int
     {
-        return $this->thirdParty;
-    }
-
-    private function setThirdParty(?ThirdParty $thirdParty): self
-    {
-        $this->thirdParty = $thirdParty;
-
-        return $this;
+        return $this->id;
     }
 
     public function getPerson(): ?Person
@@ -109,16 +90,25 @@ class Resource
         return $this->person;
     }
 
-    private function setPerson(?Person $person): self
+    /**
+     * @return Person|ThirdParty
+     * @Groups({"read", "write"})
+     */
+    public function getResource()
     {
-        $this->person = $person;
-
-        return $this;
+        return $this->person ?? $this->thirdParty;
     }
 
-    public function getComment(): ?Comment
+    public function getThirdParty(): ?ThirdParty
     {
-        return $this->comment;
+        return $this->thirdParty;
+    }
+
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    {
+        $this->accompanyingPeriod = $accompanyingPeriod;
+
+        return $this;
     }
 
     public function setComment(?Comment $comment): self
@@ -129,36 +119,42 @@ class Resource
     }
 
     /**
-     *
      * @param $resource Person|ThirdParty
      */
     public function setResource($resource): self
     {
         if ($resource instanceof ThirdParty) {
             $this->setThirdParty($resource);
-            $this->setPerson(NULL);
+            $this->setPerson(null);
         } elseif ($resource instanceof Person) {
             $this->setPerson($resource);
-            $this->setThirdParty(NULL);
-        } elseif (NULL === $resource) {
-            $this->setPerson(NULL);
-            $this->setThirdParty(NULL);
+            $this->setThirdParty(null);
+        } elseif (null === $resource) {
+            $this->setPerson(null);
+            $this->setThirdParty(null);
         } else {
-            throw new \UnexpectedValueException(sprintf("the resource ".
-                "should be an instance of %s or %s", Person::class,
-                ThirdParty::class));
+            throw new UnexpectedValueException(sprintf(
+                'the resource ' .
+                'should be an instance of %s or %s',
+                Person::class,
+                ThirdParty::class
+            ));
         }
 
         return $this;
     }
-    
-    
-    /**
-     * @return ThirdParty|Person
-     * @Groups({"read", "write"})
-     */
-    public function getResource()
+
+    private function setPerson(?Person $person): self
     {
-        return $this->person ?? $this->thirdParty;
+        $this->person = $person;
+
+        return $this;
+    }
+
+    private function setThirdParty(?ThirdParty $thirdParty): self
+    {
+        $this->thirdParty = $thirdParty;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
index c873e527a..42e57185e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
@@ -1,85 +1,83 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * AccompanyingPeriodParticipation Class
+ * AccompanyingPeriodParticipation Class.
  *
- * @package Chill\PersonBundle\Entity
  * @ORM\Entity
  * @ORM\Table(name="chill_person_accompanying_period_participation")
  * @DiscriminatorMap(typeProperty="type", mapping={
- *  "accompanying_period_participation"=AccompanyingPeriodParticipation::class
- *  })
+ *     "accompanying_period_participation": AccompanyingPeriodParticipation::class
+ * })
  */
 class AccompanyingPeriodParticipation
 {
+    /**
+     * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
+     * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
+     */
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
+
+    /**
+     * @ORM\Column(type="date", nullable=true)
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?DateTime $endDate = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $person;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
-     * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
-     */
-    private $accompanyingPeriod;
+    private ?Person $person = null;
 
     /**
      * @ORM\Column(type="date", nullable=false)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $startDate;
-
-    /**
-     * @ORM\Column(type="date", nullable=true)
-     * @Groups({"read"})
-     */
-    private $endDate = null;
+    private ?DateTime $startDate = null;
 
     public function __construct(AccompanyingPeriod $accompanyingPeriod, Person $person)
     {
-        $this->startDate = new \DateTimeImmutable('now');
+        $this->startDate = new DateTime('now');
         $this->accompanyingPeriod = $accompanyingPeriod;
         $this->person = $person;
     }
 
+    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        return $this->accompanyingPeriod;
+    }
+
+    public function getEndDate(): ?DateTimeInterface
+    {
+        return $this->endDate;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -90,16 +88,14 @@ class AccompanyingPeriodParticipation
         return $this->person;
     }
 
-    public function setPerson(?Person $person): self
+    public function getStartDate(): ?DateTimeInterface
     {
-        $this->person = $person;
-
-        return $this;
+        return $this->startDate;
     }
 
-    public function getAccompanyingPeriod(): ?AccompanyingPeriod
+    public function isOpen(): bool
     {
-        return $this->accompanyingPeriod;
+        return null === $this->endDate;
     }
 
     public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
@@ -109,29 +105,24 @@ class AccompanyingPeriodParticipation
         return $this;
     }
 
-    public function getStartDate(): ?\DateTimeInterface
-    {
-        return $this->startDate;
-    }
-
-    /*
-     * public function setStartDate(\DateTimeInterface $startDate): self { $this->startDate = $startDate; return $this; }
-     */
-
-    public function getEndDate(): ?\DateTimeInterface
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(?\DateTimeInterface $endDate): self
+    public function setEndDate(?DateTime $endDate): self
     {
         $this->endDate = $endDate;
 
         return $this;
     }
 
-    public function isOpen(): bool
+    public function setPerson(?Person $person): self
     {
-        return $this->endDate === null;
+        $this->person = $person;
+
+        return $this;
+    }
+
+    private function checkSameStartEnd()
+    {
+        if ($this->endDate === $this->startDate) {
+            $this->accompanyingPeriod->removeParticipation($this);
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
index e200182bc..1bee7127c 100644
--- a/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
+++ b/src/Bundle/ChillPersonBundle/Entity/HasPerson.php
@@ -1,34 +1,22 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2019, 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\Entity;
-
-use Chill\PersonBundle\Entity\Person;
 
 /**
- * Interface which applies to entities which are associated to a single person
- * 
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Entity;
+
+/**
+ * Interface which applies to entities which are associated to a single person.
  */
 interface HasPerson
 {
-    public function setPerson(Person $person = null): HasPerson;
-    
     public function getPerson(): ?Person;
+
+    public function setPerson(?Person $person = null): HasPerson;
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 46ae02ce0..95aa83872 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -1,74 +1,88 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Household;
 
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Entity\Address;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
-use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use function count;
 
 /**
  * @ORM\Entity
  * @ORM\Table(
- *      name="chill_person_household"
- *  )
+ *     name="chill_person_household"
+ * )
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *    "household"=Household::class
+ *     "household": Household::class
  * })
  * @MaxHolder(groups={"household_memberships"})
  */
 class Household
 {
     /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
-     */
-    private ?int $id = null;
-
-    /**
-     * Addresses
+     * Addresses.
      *
      * @ORM\ManyToMany(
      *     targetEntity="Chill\MainBundle\Entity\Address",
-     *     cascade={"persist", "remove", "merge", "detach"})
+     * cascade={"persist", "remove", "merge", "detach"})
      * @ORM\JoinTable(name="chill_person_household_to_addresses")
-     * @ORM\OrderBy({"validFrom" = "DESC"})
+     * @ORM\OrderBy({"validFrom": "DESC", "id": "DESC"})
      * @Serializer\Groups({"write"})
      */
     private Collection $addresses;
 
-    /**
-     * @ORM\OneToMany(
-     *      targetEntity=HouseholdMember::class,
-     *      mappedBy="household"
-     *  )
-     * @Serializer\Groups({"read"})
-     */
-    private Collection $members;
-
     /**
      * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_members_")
      */
     private CommentEmbeddable $commentMembers;
 
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=HouseholdMember::class,
+     *     mappedBy="household"
+     * )
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private Collection $members;
+
     /**
      * @ORM\Column(type="boolean", name="waiting_for_birth", options={"default": false})
+     * @Serializer\Groups({"docgen:read"})
      */
     private bool $waitingForBirth = false;
 
     /**
      * @ORM\Column(type="date_immutable", name="waiting_for_birth_date", nullable=true, options={"default": null})
+     * @Serializer\Groups({"docgen:read"})
      */
-    private ?\DateTimeImmutable $waitingForBirthDate = null;
+    private ?DateTimeImmutable $waitingForBirthDate = null;
 
     public function __construct()
     {
@@ -77,19 +91,13 @@ class Household
         $this->commentMembers = new CommentEmbeddable();
     }
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
     /**
-     * @param Address $address
      * @return $this
      */
     public function addAddress(Address $address)
     {
         foreach ($this->getAddresses() as $a) {
-            if ($a->getValidFrom() < $address->getValidFrom() && $a->getValidTo() === NULL) {
+            if ($a->getValidFrom() <= $address->getValidFrom() && $a->getValidTo() === null) {
                 $a->setValidTo($address->getValidFrom());
             }
         }
@@ -99,35 +107,22 @@ class Household
         return $this;
     }
 
-    /**
-     * Force an address starting at the current day
-     * on the Household.
-     *
-     * This will force the startDate's address on today.
-     *
-     * Used on household creation.
-     *
-     * @Serializer\Groups({"create"})
-     */
-    public function setForceAddress(Address $address)
+    public function addMember(HouseholdMember $member): self
     {
-       $address->setValidFrom(new \DateTime('today'));
-       $this->addAddress($address);
-    }
+        if (!$this->members->contains($member)) {
+            $this->members[] = $member;
+            $member->setHousehold($this);
+        }
 
-    /**
-     * @param Address $address
-     */
-    public function removeAddress(Address $address)
-    {
-        $this->addresses->removeElement($address);
+        return $this;
     }
 
     /**
      * By default, the addresses are ordered by date, descending (the most
-     * recent first)
+     * recent first).
      *
      * @Assert\Callback(methods={"validate"})
+     *
      * @return \Chill\MainBundle\Entity\Address[]
      */
     public function getAddresses()
@@ -135,25 +130,136 @@ class Household
         return $this->addresses;
     }
 
+    public function getCommentMembers(): CommentEmbeddable
+    {
+        return $this->commentMembers;
+    }
+
     /**
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Serializer\SerializedName("current_address")
      */
-    public function getCurrentAddress(\DateTime $at = null): ?Address
+    public function getCurrentAddress(?DateTime $at = null): ?Address
     {
-        $at = $at === null ? new \DateTime('today') : $at;
+        $at = null === $at ? new DateTime('today') : $at;
 
-        $addrs = $this->getAddresses()->filter(function (Address $a) use ($at) {
+        $addrs = $this->getAddresses()->filter(static function (Address $a) use ($at) {
             return $a->getValidFrom() <= $at && (
-                NULL === $a->getValidTo() || $at < $a->getValidTo()
+                null === $a->getValidTo() || $a->getValidTo() > $at
             );
         });
 
         if ($addrs->count() > 0) {
             return $addrs->first();
-        } else {
-            return null;
         }
+
+        return null;
+    }
+
+    /**
+     * @Serializer\Groups({"docgen:read"})
+     */
+    public function getCurrentMembers(?DateTimeImmutable $now = null): Collection
+    {
+        return $this->getMembers()->matching($this->buildCriteriaCurrentMembers($now));
+    }
+
+    public function getCurrentMembersByPosition(Position $position, ?DateTimeInterface $now = null)
+    {
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+
+        $criteria->where($expr->eq('position', $position));
+
+        return $this->getCurrentMembers($now)->matching($criteria);
+    }
+
+    /**
+     * get current members ids.
+     *
+     * Used in serialization
+     *
+     * @Serializer\Groups({"read"})
+     * @Serializer\SerializedName("current_members_id")
+     */
+    public function getCurrentMembersIds(?DateTimeImmutable $now = null): Collection
+    {
+        return $this->getCurrentMembers($now)->map(
+            static fn (HouseholdMember $m) => $m->getId()
+        );
+    }
+
+    /**
+     * @return HouseholdMember[]
+     */
+    public function getCurrentMembersOrdered(?DateTimeImmutable $now = null): Collection
+    {
+        $members = $this->getCurrentMembers($now);
+
+        $members->getIterator()
+            ->uasort(
+                static function (HouseholdMember $a, HouseholdMember $b) {
+                    if ($a->getPosition() === null) {
+                        if ($b->getPosition() === null) {
+                            return 0;
+                        }
+
+                        return -1;
+                    }
+
+                    if ($b->getPosition() === null) {
+                        return 1;
+                    }
+
+                    if ($a->getPosition()->getOrdering() < $b->getPosition()->getOrdering()) {
+                        return -1;
+                    }
+
+                    if ($a->getPosition()->getOrdering() > $b->getPosition()->getOrdering()) {
+                        return 1;
+                    }
+
+                    if ($a->isHolder() && !$b->isHolder()) {
+                        return 1;
+                    }
+
+                    if (!$a->isHolder() && $b->isHolder()) {
+                        return -1;
+                    }
+
+                    return 0;
+                }
+            );
+
+        return $members;
+    }
+
+    public function getCurrentMembersWithoutPosition(?DateTimeInterface $now = null)
+    {
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+
+        $criteria->where($expr->isNull('position'));
+
+        return $this->getCurrentMembers($now)->matching($criteria);
+    }
+
+    /**
+     * Get the persons currently associated to the household.
+     *
+     * Return a list of Person, instead of a list of HouseholdMembers
+     *
+     * @return Person[]
+     */
+    public function getCurrentPersons(?DateTimeImmutable $now = null): Collection
+    {
+        return $this->getCurrentMembers($now)
+            ->map(static function (HouseholdMember $m) { return $m->getPerson(); });
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
     }
 
     /**
@@ -164,36 +270,13 @@ class Household
         return $this->members;
     }
 
-    public function getMembersOnRange(\DateTimeImmutable $from, ?\DateTimeImmutable $to): Collection
-    {
-        $criteria = new Criteria();
-        $expr = Criteria::expr();
-
-        $criteria->where(
-            $expr->gte('startDate', $from)
-        );
-
-        if (NULL !== $to) {
-            $criteria->andWhere(
-                $expr->orX(
-                    $expr->lte('endDate', $to),
-                    $expr->eq('endDate', NULL)
-                ),
-            );
-        }
-
-        return $this->getMembers()
-            ->matching($criteria)
-            ;
-    }
-
     public function getMembersDuringMembership(HouseholdMember $membership)
     {
         return $this->getMembersOnRange(
             $membership->getStartDate(),
             $membership->getEndDate()
         )->filter(
-            function(HouseholdMember $m) use ($membership) {
+            static function (HouseholdMember $m) use ($membership) {
                 return $m !== $membership;
             }
         );
@@ -211,94 +294,33 @@ class Household
         return $this->getMembers()->matching($criteria);
     }
 
-    public function getCurrentMembers(?\DateTimeImmutable $now = null): Collection
-    {
-        return $this->getMembers()->matching($this->buildCriteriaCurrentMembers($now));
-    }
-
-    private function buildCriteriaCurrentMembers(?\DateTimeImmutable $now = null): Criteria
+    public function getMembersOnRange(DateTimeImmutable $from, ?DateTimeImmutable $to): Collection
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = $now === null ? (new \DateTimeImmutable('today')) : $now;
 
-        $criteria
-            ->where($expr->orX(
-                $expr->isNull('startDate'),
-                $expr->lte('startDate', $date)
-            ))
-            ->andWhere($expr->orX(
-                $expr->isNull('endDate'),
-                $expr->gt('endDate', $date)
-            ));
-
-        return $criteria;
-    }
-
-    /**
-     * @return HouseholdMember[]
-     */
-    public function getCurrentMembersOrdered(?\DateTimeImmutable $now = null): Collection
-    {
-        $members = $this->getCurrentMembers($now);
-
-        $members->getIterator()
-            ->uasort(
-                function (HouseholdMember $a, HouseholdMember $b) {
-                    if ($a->getPosition()->getOrdering() < $b->getPosition()->getOrdering()) {
-                        return -1;
-                    }
-                    if ($a->getPosition()->getOrdering() > $b->getPosition()->getOrdering()) {
-                        return 1;
-                    }
-                    if ($a->isHolder() && !$b->isHolder()) {
-                        return 1;
-                    }
-                    if (!$a->isHolder() && $b->isHolder()) {
-                        return -1;
-                    }
-
-                    return 0;
-                }
+        $criteria->where(
+            $expr->gte('startDate', $from)
         );
 
-        return $members;
+        if (null !== $to) {
+            $criteria->andWhere(
+                $expr->orX(
+                    $expr->lte('endDate', $to),
+                    $expr->eq('endDate', null)
+                ),
+            );
+        }
+
+        return $this->getMembers()
+            ->matching($criteria);
     }
 
-    /**
-     * get current members ids
-     *
-     * Used in serialization
-     *
-     * @Serializer\Groups({"read"})
-     * @Serializer\SerializedName("current_members_id")
-     *
-     */
-    public function getCurrentMembersIds(?\DateTimeImmutable $now = null): Collection
-    {
-        return $this->getCurrentMembers($now)->map(
-            fn (HouseholdMember $m) => $m->getId()
-        );
-    }
-
-    /**
-     * Get the persons currently associated to the household.
-     *
-     * Return a list of Person, instead of a list of HouseholdMembers
-     *
-     * @return Person[]
-     */
-    public function getCurrentPersons(?\DateTimeImmutable $now = null): Collection
-    {
-        return $this->getCurrentMembers($now)
-            ->map(function(HouseholdMember $m) { return $m->getPerson(); });
-    }
-
-    public function getNonCurrentMembers(\DateTimeImmutable $now = null): Collection
+    public function getNonCurrentMembers(?DateTimeImmutable $now = null): Collection
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = $now === null ? (new \DateTimeImmutable('today')) : $now;
+        $date = null === $now ? (new DateTimeImmutable('today')) : $now;
 
         $criteria
             ->where(
@@ -314,17 +336,7 @@ class Household
         return $this->getMembers()->matching($criteria);
     }
 
-    public function getCurrentMembersByPosition(Position $position, \DateTimeInterface $now = null)
-    {
-        $criteria = new Criteria();
-        $expr = Criteria::expr();
-
-        $criteria->where($expr->eq('position', $position));
-
-        return $this->getCurrentMembers($now)->matching($criteria);
-    }
-
-    public function getNonCurrentMembersByPosition(Position $position, \DateTimeInterface $now = null)
+    public function getNonCurrentMembersByPosition(Position $position, ?DateTimeInterface $now = null)
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -334,14 +346,29 @@ class Household
         return $this->getNonCurrentMembers($now)->matching($criteria);
     }
 
-    public function addMember(HouseholdMember $member): self
+    public function getNonCurrentMembersWithoutPosition(?DateTimeInterface $now = null)
     {
-        if (!$this->members->contains($member)) {
-            $this->members[] = $member;
-            $member->setHousehold($this);
-        }
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
 
-        return $this;
+        $criteria->where($expr->isNull('position'));
+
+        return $this->getNonCurrentMembers($now)->matching($criteria);
+    }
+
+    public function getWaitingForBirth(): bool
+    {
+        return $this->waitingForBirth;
+    }
+
+    public function getWaitingForBirthDate(): ?DateTimeImmutable
+    {
+        return $this->waitingForBirthDate;
+    }
+
+    public function removeAddress(Address $address)
+    {
+        $this->addresses->removeElement($address);
     }
 
     public function removeMember(HouseholdMember $member): self
@@ -356,11 +383,6 @@ class Household
         return $this;
     }
 
-    public function getCommentMembers(): CommentEmbeddable
-    {
-        return $this->commentMembers;
-    }
-
     public function setCommentMembers(CommentEmbeddable $commentMembers): self
     {
         $this->commentMembers = $commentMembers;
@@ -368,9 +390,20 @@ class Household
         return $this;
     }
 
-    public function getWaitingForBirth(): bool
+    /**
+     * Force an address starting at the current day
+     * on the Household.
+     *
+     * This will force the startDate's address on today.
+     *
+     * Used on household creation.
+     *
+     * @Serializer\Groups({"create"})
+     */
+    public function setForceAddress(Address $address)
     {
-        return $this->waitingForBirth;
+        $address->setValidFrom(new DateTime('today'));
+        $this->addAddress($address);
     }
 
     public function setWaitingForBirth(bool $waitingForBirth): self
@@ -380,12 +413,7 @@ class Household
         return $this;
     }
 
-    public function getWaitingForBirthDate(): ?\DateTimeImmutable
-    {
-        return $this->waitingForBirthDate;
-    }
-
-    public function setWaitingForBirthDate(?\DateTimeImmutable $waitingForBirthDate): self
+    public function setWaitingForBirthDate(?DateTimeImmutable $waitingForBirthDate): self
     {
         $this->waitingForBirthDate = $waitingForBirthDate;
 
@@ -395,15 +423,34 @@ class Household
     public function validate(ExecutionContextInterface $context, $payload)
     {
         $addresses = $this->getAddresses();
-        $cond = True;
-        for ($i=0; $i < count($addresses) - 1; $i++) {
-            if ($addresses[$i]->getValidFrom() != $addresses[$i + 1]->getValidTo()) {
-                $cond = False;
+        $cond = true;
+
+        for ($i = 0; count($addresses) - 1 > $i; ++$i) {
+            if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) {
+                $cond = false;
                 $context->buildViolation('The address are not sequentials. The validFrom date of one address should be equal to the validTo date of the previous address.')
                     ->atPath('addresses')
                     ->addViolation();
             }
         }
-        dump($cond);
+    }
+
+    private function buildCriteriaCurrentMembers(?DateTimeImmutable $now = null): Criteria
+    {
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+        $date = null === $now ? (new DateTimeImmutable('today')) : $now;
+
+        $criteria
+            ->where($expr->orX(
+                $expr->isNull('startDate'),
+                $expr->lte('startDate', $date)
+            ))
+            ->andWhere($expr->orX(
+                $expr->isNull('endDate'),
+                $expr->gt('endDate', $date)
+            ));
+
+        return $criteria;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 985084623..22c33f85f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -1,61 +1,90 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Household;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\Household\Position;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+use LogicException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
 
-
 /**
  * @ORM\Entity
  * @ORM\Table(
- *      name="chill_person_household_members"
- *  )
+ *     name="chill_person_household_members"
+ * )
  */
 class HouseholdMember
 {
     /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @ORM\Column(type="string", length=255, nullable=true)
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=Position::class)
-     * @Serializer\Groups({"read"})
-     * @Assert\NotNull(groups={"household_memberships"})
-     */
-    private ?Position $position = null;
+    private ?string $comment = null;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     * @Assert\NotNull(groups={"household_memberships"})
-     */
-    private ?\DateTimeImmutable $startDate = null;
-
-    /**
-     * @ORM\Column(type="date_immutable", nullable= true, options={"default": null})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\GreaterThan(
-     *      propertyPath="startDate",
-     *      message="household_membership.The end date must be after start date",
-     *      groups={"household_memberships"}
+     *     propertyPath="startDate",
+     *     message="household_membership.The end date must be after start date",
+     *     groups={"household_memberships"}
      * )
      */
-    private ?\DateTimeImmutable $endDate = null;
+    private ?DateTimeImmutable $endDate = null;
 
     /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     * @Serializer\Groups({"read"})
+     * @ORM\Column(type="boolean", options={"default": false})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private ?string $comment = NULL;
+    private bool $holder = false;
+
+    /**
+     * @var Household
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Household\Household"
+     * )
+     * @Assert\Valid(groups={"household_memberships"})
+     * @Assert\NotNull(groups={"household_memberships"})
+     */
+    private ?Household $household = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @var Person
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Person"
+     * )
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"docgen:person:with-household": false})
+     * @Assert\Valid(groups={"household_memberships"})
+     * @Assert\NotNull(groups={"household_memberships"})
+     */
+    private ?Person $person = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Position::class)
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Assert\NotNull(groups={"household_memberships_created"})
+     */
+    private ?Position $position = null;
 
     /**
      * @ORM\Column(type="boolean", name="sharedhousehold")
@@ -63,92 +92,40 @@ class HouseholdMember
     private bool $shareHousehold = false;
 
     /**
-     * @ORM\Column(type="boolean", options={"default": false})
-     * @Serializer\Groups({"read"})
-     */
-    private bool $holder = false;
-
-    /**
-     *
-     * @var Person
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Person"
-     * )
-     * @Serializer\Groups({"read"})
-     * @Assert\Valid(groups={"household_memberships"})
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read", "docgen:read"})
      * @Assert\NotNull(groups={"household_memberships"})
      */
-    private ?Person $person = null;
-
-    /**
-     *
-     * @var Household
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Household\Household"
-     * )
-     * @Assert\Valid(groups={"household_memberships"})
-     * @Assert\NotNull(groups={"household_memberships"})
-     */
-    private ?Household $household = null;
-
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getPosition(): ?Position
-    {
-        return $this->position;
-    }
-
-    public function setPosition(Position $position): self
-    {
-        if ($this->position instanceof Position) {
-            throw new \LogicException("The position is already set. You cannot change ".
-                "a position of a membership");
-        }
-
-        $this->position = $position;
-        $this->shareHousehold = $position->getShareHousehold();
-
-        return $this;
-    }
-
-    public function getStartDate(): ?\DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    public function setStartDate(\DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(?\DateTimeImmutable $endDate = null): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
+    private ?DateTimeImmutable $startDate = null;
 
     public function getComment(): ?string
     {
         return $this->comment;
     }
 
-    public function setComment(?string $comment): self
+    public function getEndDate(): ?DateTimeImmutable
     {
-        $this->comment = $comment;
+        return $this->endDate;
+    }
 
-        return $this;
+    public function getHousehold(): ?Household
+    {
+        return $this->household;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getPosition(): ?Position
+    {
+        return $this->position;
     }
 
     /**
@@ -159,38 +136,35 @@ class HouseholdMember
         return $this->shareHousehold;
     }
 
-
-    public function getPerson(): ?Person
+    public function getStartDate(): ?DateTimeImmutable
     {
-        return $this->person;
+        return $this->startDate;
     }
 
-    public function setPerson(?Person $person): self
+    public function isCurrent(?DateTimeImmutable $at = null): bool
     {
-        if ($this->person instanceof Person) {
-            throw new \LogicException("You cannot change person ".
-                "on a membership");
-        }
+        $at = null === $at ? new DateTimeImmutable('now') : $at;
 
-        $this->person = $person;
-        $this->person->addHouseholdParticipation($this);
+        return $this->getStartDate() < $at && (
+            null === $this->getEndDate() || $this->getEndDate() > $at
+        );
+    }
+
+    public function isHolder(): bool
+    {
+        return $this->holder;
+    }
+
+    public function setComment(?string $comment): self
+    {
+        $this->comment = $comment;
 
         return $this;
     }
 
-    public function getHousehold(): ?Household
+    public function setEndDate(?DateTimeImmutable $endDate = null): self
     {
-        return $this->household;
-    }
-
-    public function setHousehold(?Household $household): self
-    {
-        if ($this->household instanceof Household) {
-            throw new \LogicException("You cannot change household ".
-                "on a membership");
-        }
-
-        $this->household = $household;
+        $this->endDate = $endDate;
 
         return $this;
     }
@@ -202,17 +176,55 @@ class HouseholdMember
         return $this;
     }
 
-    public function isHolder(): bool
+    public function setHousehold(?Household $household): self
     {
-        return $this->holder;
+        if ($this->household instanceof Household) {
+            throw new LogicException('You cannot change household ' .
+                'on a membership');
+        }
+
+        $this->household = $household;
+
+        return $this;
     }
 
-    public function isCurrent(\DateTimeImmutable $at = null): bool
+    public function setPerson(?Person $person): self
     {
-        $at = NULL === $at ? new \DateTimeImmutable('now'): $at;
+        if ($this->person instanceof Person) {
+            throw new LogicException('You cannot change person ' .
+                'on a membership');
+        }
 
-        return $this->getStartDate() < $at && (
-            NULL === $this->getEndDate() || $at < $this->getEndDate()
-        );
+        $this->person = $person;
+        $this->person->addHouseholdParticipation($this);
+
+        return $this;
+    }
+
+    public function setPosition(Position $position): self
+    {
+        if ($this->position instanceof Position) {
+            throw new LogicException('The position is already set. You cannot change ' .
+                'a position of a membership');
+        }
+
+        $this->position = $position;
+        $this->shareHousehold = $position->getShareHousehold();
+
+        return $this;
+    }
+
+    public function setShareHousehold(bool $shareHousehold): self
+    {
+        $this->shareHousehold = $shareHousehold;
+
+        return $this;
+    }
+
+    public function setStartDate(DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
index 28235b521..3bb204c6f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
@@ -1,10 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Household;
 
 use Chill\MainBundle\Entity\Address;
-use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -36,6 +46,26 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class PersonHouseholdAddress
 {
+    /**
+     * @ORM\Id
+     * @ORM\ManyToOne(targetEntity=Address::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private $address;
+
+    /**
+     * @ORM\Id
+     * @ORM\ManyToOne(targetEntity=Household::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private $household;
+
+    /**
+     * @ORM\Id
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private $person;
 
     /**
      * @ORM\Column(type="date_immutable")
@@ -47,52 +77,9 @@ class PersonHouseholdAddress
      */
     private $validTo;
 
-    /**
-     * @ORM\Id
-     * @ORM\ManyToOne(targetEntity=Person::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $person;
-
-    /**
-     * @ORM\Id
-     * @ORM\ManyToOne(targetEntity=Household::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $household;
-
-    /**
-     * @ORM\Id
-     * @ORM\ManyToOne(targetEntity=Address::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $address;
-
-    /**
-     * The start date of the intersection address/household
-     *
-     * (this is not the startdate of the household, not
-     * the startdate of the address)
-     */
-    public function getValidFrom(): ?\DateTimeInterface
+    public function getAddress(): ?Address
     {
-        return $this->validFrom;
-    }
-
-    /**
-     * The end date of the intersection address/household
-     *
-     * (this is not the enddate of the household, not
-     * the enddate of the address)
-     */
-    public function getValidTo(): ?\DateTimeImmutable
-    {
-        return $this->validTo;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
+        return $this->address;
     }
 
     public function getHousehold(): ?Household
@@ -100,8 +87,30 @@ class PersonHouseholdAddress
         return $this->relation;
     }
 
-    public function getAddress(): ?Address
+    public function getPerson(): ?Person
     {
-        return $this->address;
+        return $this->person;
+    }
+
+    /**
+     * The start date of the intersection address/household.
+     *
+     * (this is not the startdate of the household, not
+     * the startdate of the address)
+     */
+    public function getValidFrom(): ?DateTimeInterface
+    {
+        return $this->validFrom;
+    }
+
+    /**
+     * The end date of the intersection address/household.
+     *
+     * (this is not the enddate of the household, not
+     * the enddate of the address)
+     */
+    public function getValidTo(): ?DateTimeImmutable
+    {
+        return $this->validTo;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
index b1bfef173..378bc0d9f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php
@@ -1,8 +1,16 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Household;
 
-use Chill\PersonBundle\Repository\Household\PositionRepository;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -10,43 +18,49 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Entity
  * @ORM\Table(name="chill_person_household_position")
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *   "household_position"=Position::class
- *   })
+ *     "household_position": Position::class
+ * })
  */
 class Position
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({ "read" })
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\Column(type="json")
-     * @Serializer\Groups({ "read" })
-     */
-    private array $label = [];
-
-    /**
-     * @ORM\Column(type="boolean")
-     * @Serializer\Groups({ "read" })
-     */
-    private bool $shareHouseHold = true;
-
     /**
      * @ORM\Column(type="boolean")
      * @Serializer\Groups({ "read" })
      */
     private bool $allowHolder = false;
 
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $label = [];
+
     /**
      * @ORM\Column(type="float")
-     * @Serializer\Groups({ "read" })
+     * @Serializer\Groups({"read"})
      */
     private float $ordering = 0.00;
 
+    /**
+     * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read"})
+     */
+    private bool $shareHouseHold = true;
+
+    public function getAllowHolder(): bool
+    {
+        return $this->allowHolder;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -57,11 +71,9 @@ class Position
         return $this->label;
     }
 
-    public function setLabel(array $label): self
+    public function getOrdering(): float
     {
-        $this->label = $label;
-
-        return $this;
+        return $this->ordering;
     }
 
     public function getShareHousehold(): bool
@@ -69,18 +81,6 @@ class Position
         return $this->shareHouseHold;
     }
 
-    public function setShareHousehold(bool $shareHouseHold): self
-    {
-        $this->shareHouseHold = $shareHouseHold;
-
-        return $this;
-    }
-
-    public function getAllowHolder(): bool
-    {
-        return $this->allowHolder;
-    }
-
     public function isAllowHolder(): bool
     {
         return $this->getAllowHolder();
@@ -93,9 +93,11 @@ class Position
         return $this;
     }
 
-    public function getOrdering(): float
+    public function setLabel(array $label): self
     {
-        return $this->ordering;
+        $this->label = $label;
+
+        return $this;
     }
 
     public function setOrdering(float $ordering): self
@@ -104,4 +106,11 @@ class Position
 
         return $this;
     }
+
+    public function setShareHousehold(bool $shareHouseHold): self
+    {
+        $this->shareHouseHold = $shareHouseHold;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
index 43ae1b09f..56c9368dc 100644
--- a/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
+++ b/src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
@@ -1,92 +1,82 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * MaritalStatus
+ * MaritalStatus.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_marital_status")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class MaritalStatus
 {
     /**
      * @var string
      *
-     * @ORM\Id()
+     * @ORM\Id
      * @ORM\Column(type="string", length=7)
      */
-    private $id;
+    private ?string $id;
 
     /**
      * @var string array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
-    private $name;
+    private array $name;
 
     /**
-     * Get id
-     *
-     * @return string 
+     * Get id.
      */
-    public function getId()
+    public function getId(): string
     {
         return $this->id;
     }
 
     /**
-     * Set id
-     * 
-     * @param string $id
-     * @return MaritalStatus
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-        return $this;
-    }
-
-    /**
-     * Set name
+     * Get name.
      *
-     * @param string array $name
-     * @return MaritalStatus
+     * @return string array
      */
-    public function setName($name)
-    {
-        $this->name = $name;
-    
-        return $this;
-    }
-
-    /**
-     * Get name
-     *
-     * @return string array 
-     */
-    public function getName()
+    public function getName(): array
     {
         return $this->name;
-    } 
+    }
+
+    /**
+     * Set id.
+     *
+     * @return MaritalStatus
+     */
+    public function setId(string $id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Set name.
+     *
+     * @param string array $name
+     *
+     * @return MaritalStatus
+     */
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index 9aaad8c04..a3524d306 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -1,89 +1,270 @@
 <?php
 
-namespace Chill\PersonBundle\Entity;
-
-/*
+/**
  * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Entity;
+
 use ArrayIterator;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\Country;
-use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\MaritalStatus;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
-use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
-use DateTime;
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Criteria;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
-use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
-use Symfony\Component\Validator\Constraints as Assert;
-use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
-use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
+use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\Mapping as ORM;
+use Exception;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function count;
+use function in_array;
 
 /**
- * Person Class
+ * Person Class.
  *
  * @ORM\Entity
  * @ORM\Table(name="chill_person_person",
- *     indexes={@ORM\Index(
- *          name="person_names",
- *          columns={"firstName", "lastName"}
- * )})
- * @ORM\HasLifecycleCallbacks()
- * @DiscriminatorMap(typeProperty="type", mapping={
- *   "person"=Person::class
- * })
- * @PersonHasCenter(
- *     groups={"general", "creation"}
- * )
- * @HouseholdMembershipSequential(
- *     groups={"household_memberships"}
- * )
+ *     indexes={
+ *         @ORM\Index(
+ *             name="person_names",
+ *             columns={"firstName", "lastName"}
+ *         ),
+ *         @ORM\Index(
+ *             name="person_birthdate",
+ *             columns={"birthdate"}
+ *         )
+ *     })
+ *     @ORM\HasLifecycleCallbacks
+ *     @DiscriminatorMap(typeProperty="type", mapping={
+ *         "person": Person::class
+ *     })
+ *     @PersonHasCenter(
+ *         groups={"general", "creation"}
+ *     )
+ *     @HouseholdMembershipSequential(
+ *         groups={"household_memberships"}
+ *     )
  */
 class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateInterface
 {
-    /**
-     * The person's id
-     * @var integer
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
+    public const BOTH_GENDER = 'both';
+
+    // have days in commun
+    public const ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD = 2; // where there exist
+
+    public const ERROR_PERIODS_ARE_COLLAPSING = 1; // when two different periods
+
+    public const FEMALE_GENDER = 'woman';
+
+    public const MALE_GENDER = 'man';
+
+    public const NO_INFORMATION = 'unknown';
 
     /**
-     * The person's first name
+     * Accept receiving email.
+     *
+     * @var bool
+     *
+     * @ORM\Column(type="boolean", options={"default": false})
+     */
+    private ?bool $acceptEmail = false;
+
+    /**
+     * Accept short text message (aka SMS).
+     *
+     * @var bool
+     *
+     * @ORM\Column(type="boolean", options={"default": false})
+     */
+    private ?bool $acceptSMS = false;
+
+    /**
+     * The person's accompanying periods (when the person was accompanied by the center).
+     *
+     * @var Collection
+     *
+     * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
+     *     mappedBy="person",
+     * cascade={"persist", "remove", "merge", "detach"})
+     */
+    private $accompanyingPeriodParticipations;
+
+    /**
+     * The accompanying period requested by the Person.
+     *
+     * @ORM\OneToMany(targetEntity=AccompanyingPeriod::class,
+     * mappedBy="requestorPerson")
+     *
+     * @var AccompanyingPeriod[]|Collection
+     */
+    private Collection $accompanyingPeriodRequested;
+
+    /**
+     * Addresses.
+     *
+     * @var Collection
+     *
+     * @ORM\ManyToMany(
+     *     targetEntity="Chill\MainBundle\Entity\Address",
+     * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\JoinTable(name="chill_person_persons_to_addresses")
+     * @ORM\OrderBy({"validFrom": "DESC"})
+     */
+    private $addresses;
+
+    /**
+     * @var Collection
+     *
+     * @ORM\OneToMany(
+     *     targetEntity="Chill\PersonBundle\Entity\PersonAltName",
+     *     mappedBy="person",
+     *     cascade={"persist", "remove", "merge", "detach"},
+     * orphanRemoval=true)
+     */
+    private $altNames;
+
+    /**
+     * The person's birthdate.
+     *
+     * @var DateTime
+     *
+     * @ORM\Column(type="date", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
+     * @Birthdate(
+     *     groups={"general", "creation"}
+     * )
+     */
+    private $birthdate;
+
+    /**
+     * The person's center.
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
+     */
+    private ?Center $center = null;
+
+    /**
+     * Array where customfield's data are stored.
+     *
+     * @var array
+     *
+     * @ORM\Column(type="json")
+     */
+    private $cFData;
+
+    /**
+     * The marital status of the person.
+     *
+     * @var Civility
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Civility")
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private $civility;
+
+    /**
+     * Contact information for contacting the person.
+     *
+     * @var string
+     *
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $contactInfo = '';
+
+    /**
+     * The person's country of birth.
+     *
+     * @var Country
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
+     *
+     *     sf4 check: option inversedBy="birthsIn" return error mapping !!
+     *
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private $countryOfBirth;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     */
+    private $createdAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private $createdBy;
+
+    /**
+     * Cache the computation of household.
+     */
+    private array $currentHouseholdAt = [];
+
+    /**
+     * The current person address.
+     *
+     * This is computed through database and is optimized on database side.
+     *
+     * @ORM\OneToOne(targetEntity=PersonCurrentAddress::class, mappedBy="person")
+     */
+    private ?PersonCurrentAddress $currentPersonAddress = null;
+
+    /**
+     * The person's deathdate.
+     *
+     * @var DateTimeImmutable
+     *
+     * @ORM\Column(type="date_immutable", nullable=true)
+     * @Assert\Date(
+     *     groups={"general", "creation"}
+     * )
+     * @Assert\GreaterThan(propertyPath="birthDate")
+     * @Assert\LessThanOrEqual("today")
+     */
+    private ?DateTimeImmutable $deathdate = null;
+
+    /**
+     * The person's email.
+     *
+     * @var string
+     *
+     * @ORM\Column(type="text", nullable=true)
+     * @Assert\Email(
+     *     checkMX=true,
+     *     groups={"general", "creation"}
+     * )
+     */
+    private $email = '';
+
+    /**
+     * The person's first name.
+     *
      * @var string
      *
      * @ORM\Column(type="string", length=255)
@@ -98,7 +279,64 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $firstName;
 
     /**
-     * The person's last name
+     * fullname canonical. Read-only field, which is calculated by
+     * the database.
+     *
+     * @var string
+     *
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $fullnameCanonical;
+
+    /**
+     * The person's gender.
+     *
+     * @var string
+     *
+     * @ORM\Column(type="string", length=9, nullable=true)
+     * @Assert\NotNull(
+     *     groups={"general", "creation"}
+     * )
+     */
+    private $gender;
+
+    /**
+     * Comment on gender.
+     *
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="genderComment_")
+     */
+    private CommentEmbeddable $genderComment;
+
+    /**
+     * Read-only field, computed by the database.
+     *
+     * @ORM\OneToMany(
+     *     targetEntity=PersonHouseholdAddress::class,
+     *     mappedBy="person"
+     * )
+     */
+    private Collection $householdAddresses;
+
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=HouseholdMember::class,
+     *     mappedBy="person"
+     * )
+     */
+    private Collection $householdParticipations;
+
+    /**
+     * The person's id.
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private ?int $id = null;
+
+    /**
+     * The person's last name.
+     *
      * @var string
      *
      * @ORM\Column(type="string", length=255)
@@ -113,63 +351,61 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $lastName;
 
     /**
-     * @var Collection
+     * The marital status of the person.
      *
-     * @ORM\OneToMany(
-     *     targetEntity="Chill\PersonBundle\Entity\PersonAltName",
-     *     mappedBy="person",
-     *     cascade={"persist", "remove", "merge", "detach"},
-     *     orphanRemoval=true)
+     * @var MaritalStatus
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
+     * @ORM\JoinColumn(nullable=true)
      */
-    private $altNames;
+    private $maritalStatus;
 
     /**
-     * The person's birthdate
-     * @var \DateTime
+     * Comment on marital status.
+     *
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="maritalStatusComment_")
+     */
+    private CommentEmbeddable $maritalStatusComment;
+
+    /**
+     * The date of the last marital status change of the person.
+     *
+     * @var DateTime
      *
      * @ORM\Column(type="date", nullable=true)
      * @Assert\Date(
      *     groups={"general", "creation"}
      * )
-     * @Birthdate(
-     *     groups={"general", "creation"}
-     * )
      */
-    private $birthdate;
+    private ?DateTime $maritalStatusDate = null;
 
     /**
-     * The person's deathdate
-     * @var \DateTimeImmutable
+     * A remark over the person.
      *
-     * @ORM\Column(type="date_immutable", nullable=true)
-     * @Assert\Date(
-     *     groups={"general", "creation"}
-     * )
-     */
-    private ?\DateTimeImmutable $deathdate = null;
-
-    /**
-     * The person's place of birth
      * @var string
      *
-     * @ORM\Column(type="string", length=255, name="place_of_birth")
+     * @ORM\Column(type="text")
      */
-    private $placeOfBirth = '';
+    private $memo = ''; // TO-CHANGE in remark
 
     /**
-     * The person's country of birth
-     * @var Country
+     * The person's mobile phone number.
      *
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
-     *
-     *     sf4 check: option inversedBy="birthsIn" return error mapping !!
-     *
-     * @ORM\JoinColumn(nullable=true)
+     * @ORM\Column(type="text")
+     * @Assert\Regex(
+     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     groups={"general", "creation"}
+     * )
+     * @PhonenumberConstraint(
+     *     type="mobile",
+     *     groups={"general", "creation"}
+     * )
      */
-    private $countryOfBirth;
+    private string $mobilenumber = '';
 
     /**
-     * The person's nationality
+     * The person's nationality.
+     *
      * @var Country
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
@@ -181,106 +417,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $nationality;
 
     /**
-     * The person's gender
-     * @var string
+     * Number of children.
      *
-     * @ORM\Column(type="string", length=9, nullable=true)
-     * @Assert\NotNull(
-     *     groups={"general", "creation"}
-     * )
-     */
-    private $gender;
-
-    const MALE_GENDER = 'man';
-    const FEMALE_GENDER = 'woman';
-    const BOTH_GENDER = 'both';
-    const NO_INFORMATION = 'unknown';
-
-    /**
-     * Comment on gender
-     * @var CommentEmbeddable
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="genderComment_")
-     */
-    private CommentEmbeddable $genderComment;
-
-    /**
-     * The marital status of the person
-     * @var MaritalStatus
+     * @var int
      *
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\MaritalStatus")
-     * @ORM\JoinColumn(nullable=true)
+     * @ORM\Column(type="integer", nullable=true)
      */
-    private $maritalStatus;
-
-    /**
-     * The date of the last marital status change of the person
-     * @var \DateTime
-     *
-     * @ORM\Column(type="date", nullable=true)
-     * @Assert\Date(
-     *     groups={"general", "creation"}
-     * )
-     */
-    private ?\DateTime $maritalStatusDate;
-
-    /**
-     * Comment on marital status
-     * @var CommentEmbeddable
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="maritalStatusComment_")
-     */
-    private CommentEmbeddable $maritalStatusComment;
-
-    /**
-     * Contact information for contacting the person
-     * @var string
-     *
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $contactInfo = '';
-
-    /**
-     * The person's email
-     * @var string
-     *
-     * @ORM\Column(type="text", nullable=true)
-     * @Assert\Email(
-     *     checkMX=true,
-     *     groups={"general", "creation"}
-     * )
-     */
-    private $email = '';
-
-    /**
-     * The person's phonenumber
-     * @var string
-     *
-     * @ORM\Column(type="text", length=40, nullable=true)
-     * @Assert\Regex(
-     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
-     *     groups={"general", "creation"}
-     * )
-     * @PhonenumberConstraint(
-     *     type="landline",
-     *     groups={"general", "creation"}
-     * )
-     */
-    private $phonenumber = '';
-
-    /**
-     * The person's mobile phone number
-     * @var string
-     *
-     * @ORM\Column(type="text", length=40, nullable=true)
-     * @Assert\Regex(
-     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
-     *     groups={"general", "creation"}
-     * )
-     * @PhonenumberConstraint(
-     *     type="mobile",
-     *     groups={"general", "creation"}
-     * )
-     */
-    private $mobilenumber = '';
+    private ?int $numberOfChildren = null;
 
     /**
      * @var Collection
@@ -299,7 +442,49 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private $otherPhoneNumbers;
 
     /**
-     * The person's spoken languages
+     * @ORM\OneToMany(
+     *     targetEntity=AccompanyingPeriod::class,
+     *     mappedBy="personLocation"
+     * )
+     */
+    private Collection $periodLocatedOn;
+
+    /**
+     * The person's phonenumber.
+     *
+     * @ORM\Column(type="text")
+     * @Assert\Regex(
+     *     pattern="/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     groups={"general", "creation"}
+     * )
+     * @PhonenumberConstraint(
+     *     type="landline",
+     *     groups={"general", "creation"}
+     * )
+     */
+    private string $phonenumber = '';
+
+    /**
+     * The person's place of birth.
+     *
+     * @var string
+     *
+     * @ORM\Column(type="string", length=255, name="place_of_birth")
+     */
+    private $placeOfBirth = '';
+
+    /**
+     * @var bool
+     *
+     * @deprecated
+     *
+     * @ORM\Column(type="boolean")
+     */
+    private $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
+
+    /**
+     * The person's spoken languages.
+     *
      * @var ArrayCollection
      *
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\Language")
@@ -311,166 +496,17 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private $spokenLanguages;
 
-    /**
-     * The person's center
-     * @var Center
-     *
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
-     */
-    private $center;
-
-    /**
-     * The person's accompanying periods (when the person was accompanied by the center)
-     * @var Collection
-     *
-     * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
-     *     mappedBy="person",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     */
-    private $accompanyingPeriodParticipations;
-
-    /**
-     * The accompanying period requested by the Person
-     *
-     * @ORM\OneToMany(targetEntity=AccompanyingPeriod::class,
-     *     mappedBy="requestorPerson")
-     * @var Collection|AccompanyingPeriod[]
-     */
-    private Collection $accompanyingPeriodRequested;
-
-    /**
-     * A remark over the person
-     * @var string
-     *
-     * @ORM\Column(type="text")
-     */
-    private $memo = ''; // TO-CHANGE in remark
-
-
-    /**
-     * Accept short text message (aka SMS)
-     * @var boolean
-     *
-     * @ORM\Column(type="boolean", options={"default" : false})
-     */
-    private ?bool $acceptSMS = false;
-
-    /**
-     * Accept receiving email
-     * @var boolean
-     *
-     * @ORM\Column(type="boolean", options={"default" : false})
-     */
-    private ?bool $acceptEmail = false;
-
-    /**
-     * Number of children
-     * @var int
-     *
-     * @ORM\Column(type="integer", nullable=true)
-     */
-    private ?int $numberOfChildren = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $createdBy;
-
     /**
      * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
      */
-    private \DateTimeInterface $createdAt;
+    private $updatedAt;
 
     /**
      * @ORM\ManyToOne(
-     *    targetEntity=User::class
+     *     targetEntity=User::class
      * )
      */
-    private User $updatedBy;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
-     */
-    private \DateTimeInterface $updatedAt;
-
-    /**
-     * @var boolean
-     * @deprecated
-     *
-     * @ORM\Column(type="boolean")
-     */
-    private $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
-
-    /**
-     * Array where customfield's data are stored
-     * @var array
-     *
-     * @ORM\Column(type="json_array")
-     */
-    private $cFData;
-
-    /**
-     * Addresses
-     * @var Collection
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\MainBundle\Entity\Address",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_person_persons_to_addresses")
-     * @ORM\OrderBy({"validFrom" = "DESC"})
-     */
-    private $addresses;
-
-    /**
-     * The current person address.
-     *
-     * This is computed through database and is optimized on database side.
-     *
-     * @var PersonCurrentAddress|null
-     * @ORM\OneToOne(targetEntity=PersonCurrentAddress::class, mappedBy="person")
-     */
-    private ?PersonCurrentAddress $currentPersonAddress = null;
-
-    /**
-     * fullname canonical. Read-only field, which is calculated by
-     * the database.
-     * @var string
-     *
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $fullnameCanonical;
-
-    /**
-     * @ORM\OneToMany(
-     *  targetEntity=HouseholdMember::class,
-     *  mappedBy="person"
-     * )
-     */
-    private Collection $householdParticipations;
-
-    /**
-     * Cache the computation of household
-     */
-    private array $currentHouseholdAt = [];
-
-    /**
-     * Read-only field, computed by the database
-     *
-     * @ORM\OneToMany(
-     *  targetEntity=PersonHouseholdAddress::class,
-     *  mappedBy="person"
-     * )
-     */
-    private Collection $householdAddresses;
-
-    /**
-     * @ORM\OneToMany(
-     *  targetEntity=AccompanyingPeriod::class,
-     *  mappedBy="personLocation"
-     * )
-     */
-    private Collection $periodLocatedOn;
+    private $updatedBy;
 
     /**
      * Person constructor.
@@ -491,30 +527,15 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * This private function scan accompanyingPeriodParticipations Collection,
-     * searching for a given AccompanyingPeriod
+     * @return string
      */
-    private function participationsContainAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): ?AccompanyingPeriodParticipation
+    public function __toString()
     {
-        foreach ($this->accompanyingPeriodParticipations as $participation) {
-            /** @var AccompanyingPeriodParticipation $participation */
-            if ($accompanyingPeriod === $participation->getAccompanyingPeriod()) {
-                return $participation;
-        }}
-
-        return null;
+        return $this->getLabel();
     }
 
     /**
-     * This public function is the same but return only true or false
-     */
-    public function containsAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
-    {
-        return ($this->participationsContainAccompanyingPeriod($accompanyingPeriod)) ? false : true;
-    }
-
-    /**
-     * Add AccompanyingPeriodParticipation
+     * Add AccompanyingPeriodParticipation.
      *
      * @uses AccompanyingPeriod::addPerson
      */
@@ -527,262 +548,21 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * Remove AccompanyingPeriod
-     */
-    public function removeAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod) : void
-    {
-        $participation = $this->participationsContainAccompanyingPeriod($accompanyingPeriod);
-
-        if (! null === $participation) {
-            $participation->setEndDate(\DateTimeImmutable::class);
-            $this->accompanyingPeriodParticipations->removeElement($participation);
-        }
-    }
-
-    /**
-     * set the Person file as open at the given date.
-     *
-     * For updating a opening's date, you should update AccompanyingPeriod instance
-     * directly.
-     *
-     * For closing a file, @see this::close
-     *
-     * To check if the Person and its accompanying period is consistent, use validation.
-     */
-    public function open(AccompanyingPeriod $accompanyingPeriod) : void
-    {
-        $this->proxyAccompanyingPeriodOpenState = true;
-        $this->addAccompanyingPeriod($accompanyingPeriod);
-    }
-
-    /**
-     * Set the Person file as closed at the given date.
-     *
-     * For update a closing date, you should update AccompanyingPeriod instance
-     * directly.
-     *
-     * To check if the Person and its accompanying period are consistent, use validation.
-     *
-     * @throws \Exception if two lines of the accompanying period are open.
-     */
-    public function close(AccompanyingPeriod $accompanyingPeriod = null) : void
-    {
-        $this->proxyAccompanyingPeriodOpenState = false;
-    }
-
-    /**
-     * Return the opened accompanying period.
-     */
-    public function getOpenedAccompanyingPeriod() : ?AccompanyingPeriod
-    {
-        if ($this->isOpen() === false) {
-            return null;
-        }
-
-        foreach ($this->accompanyingPeriodParticipations as $participation) {
-            /** @var AccompanyingPeriodParticipation $participation */
-            if ($participation->getAccompanyingPeriod()->isOpen()) {
-                return $participation->getAccompanyingPeriod();
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the opened accompanying period.
-     *
-     * @deprecated since 1.1 use `getOpenedAccompanyingPeriod instead
-     */
-    public function getCurrentAccompanyingPeriod() : ?AccompanyingPeriod
-    {
-        return $this->getOpenedAccompanyingPeriod();
-    }
-
-    /**
-     * Get AccompanyingPeriods array
-     */
-    public function getAccompanyingPeriods(): array
-    {
-        $accompanyingPeriods = [];
-        foreach ($this->accompanyingPeriodParticipations as $participation)
-        {
-            /** @var AccompanyingPeriodParticipation $participation */
-            $accompanyingPeriods[] = $participation->getAccompanyingPeriod();
-        }
-        return $accompanyingPeriods;
-    }
-
-    /**
-     * Get AccompanyingPeriodParticipations Collection
-     *
-     * @return AccompanyingPeriodParticipation[]|Collection
-     */
-    public function getAccompanyingPeriodParticipations(): Collection
-    {
-        return $this->accompanyingPeriodParticipations;
-    }
-
-    /**
-     * Return a collection of participation, where the participation
-     * is still opened, not a draft, and the period is still opened
-     *
-     * @return AccompanyingPeriodParticipation[]|Collection
-     */
-    public function getOpenedParticipations(): Collection
-    {
-        // create a criteria for filtering easily
-        $criteria = Criteria::create();
-        $criteria
-            ->andWhere(Criteria::expr()->eq('endDate', NULL))
-            ->orWhere(Criteria::expr()->gt('endDate', new \DateTime('now')))
-            ;
-
-        return $this->getAccompanyingPeriodParticipations()
-            ->matching($criteria)
-            ->filter(function (AccompanyingPeriodParticipation $app) {
-                $period = $app->getAccompanyingPeriod();
-                return (
-                        NULL === $period->getClosingDate()
-                            || new \DateTime('now') < $period->getClosingDate()
-                    )
-                    && AccompanyingPeriod::STEP_DRAFT !== $period->getStep();
-            });
-    }
-
-    /**
-     * Get the accompanying periods of a give person with the chronological order.
-     */
-    public function getAccompanyingPeriodsOrdered(): array
-    {
-        $periods = $this->getAccompanyingPeriods();
-
-        //order by date :
-        usort($periods, function($a, $b) {
-            $dateA = $a->getOpeningDate();
-            $dateB = $b->getOpeningDate();
-
-            if ($dateA == $dateB) {
-                $dateEA = $a->getClosingDate();
-                $dateEB = $b->getClosingDate();
-
-                if ($dateEA == $dateEB) {
-                    return 0;
-                }
-
-                if ($dateEA < $dateEB) {
-                    return -1;
-                } else {
-                    return +1;
-                }
-            }
-
-            if ($dateA < $dateB) {
-                return -1 ;
-            } else {
-                return 1;
-            }
-        });
-
-        return $periods;
-    }
-
-    /**
-     * Check if the person is opened
-     */
-    public function isOpen() : bool
-    {
-        foreach ($this->getAccompanyingPeriods() as $period) {
-            if ($period->isOpen()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set firstName
-     *
-     * @param string $firstName
-     * @return Person
-     */
-    public function setFirstName($firstName)
-    {
-        $this->firstName = $firstName;
-
-        return $this;
-    }
-
-    /**
-     * Get firstName
-     *
-     * @return string
-     */
-    public function getFirstName()
-    {
-        return $this->firstName;
-    }
-
-    /**
-     * Set lastName
-     *
-     * @param string $lastName
-     * @return Person
-     */
-    public function setLastName($lastName)
-    {
-        $this->lastName = $lastName;
-
-        return $this;
-    }
-
-    /**
-     * Get lastName
-     *
-     * @return string
-     */
-    public function getLastName()
-    {
-        return $this->lastName;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getAltNames(): Collection
-    {
-        return $this->altNames;
-    }
-
-    /**
-     * @param Collection $altNames
      * @return $this
      */
-    public function setAltNames(Collection $altNames)
+    public function addAddress(Address $address)
     {
-        $this->altNames = $altNames;
+        $this->addresses[] = $address;
 
         return $this;
     }
 
     /**
-     * @param PersonAltName $altName
      * @return $this
      */
     public function addAltName(PersonAltName $altName)
     {
-        if (FALSE === $this->altNames->contains($altName)) {
+        if (false === $this->altNames->contains($altName)) {
             $this->altNames->add($altName);
             $altName->setPerson($this);
         }
@@ -790,401 +570,14 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @param PersonAltName $altName
-     * @return $this
-     */
-    public function removeAltName(PersonAltName $altName)
+    public function addHouseholdParticipation(HouseholdMember $member): self
     {
-        if ($this->altNames->contains($altName)) {
-            $altName->setPerson(null);
-            $this->altNames->removeElement($altName);
-        }
+        $this->householdParticipations[] = $member;
 
         return $this;
     }
 
     /**
-     * Set birthdate
-     *
-     * @param \DateTime $birthdate
-     * @return Person
-     */
-    public function setBirthdate($birthdate)
-    {
-        $this->birthdate = $birthdate;
-
-        return $this;
-    }
-
-    /**
-     * Get birthdate
-     *
-     * @return \DateTime
-     */
-    public function getBirthdate()
-    {
-        return $this->birthdate;
-    }
-
-    /**
-     * Return the age of a person, calculated at the date 'now'.
-     *
-     * If the person has a deathdate, calculate the age at the deathdate.
-     *
-     * @param string $at a valid string to create a DateTime
-     * @return int|null
-     */
-    public function getAge($at = 'now'): ?int
-    {
-        if ($this->birthdate instanceof \DateTimeInterface) {
-            if ($this->deathdate instanceof \DateTimeInterface) {
-                return date_diff($this->birthdate, $this->deathdate)->format("%y");
-            }
-            return date_diff($this->birthdate, date_create($at))->format("%y");
-        }
-
-        return null;
-    }
-
-    /**
-     * Set placeOfBirth
-     *
-     * @param string $placeOfBirth
-     * @return Person
-     */
-    public function setPlaceOfBirth($placeOfBirth)
-    {
-        if ($placeOfBirth === null) {
-            $placeOfBirth = '';
-        }
-
-        $this->placeOfBirth = $placeOfBirth;
-
-        return $this;
-    }
-
-    /**
-     * Get placeOfBirth
-     *
-     * @return string
-     */
-    public function getPlaceOfBirth()
-    {
-        return $this->placeOfBirth;
-    }
-
-    /**
-     * Set gender
-     *
-     * @param string $gender
-     * @return Person
-     */
-    public function setGender($gender)
-    {
-        $this->gender = $gender;
-
-        return $this;
-    }
-
-    /**
-     * Get gender
-     *
-     * @return string
-     */
-    public function getGender()
-    {
-        return $this->gender;
-    }
-
-    /**
-     * return gender as a Numeric form.
-     * This is used for translations
-     * @return int
-     */
-    public function getGenderNumeric()
-    {
-        if ($this->getGender() == self::FEMALE_GENDER) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Set memo
-     *
-     * @param string $memo
-     * @return Person
-     */
-    public function setMemo($memo)
-    {
-        if ($memo === null) {
-            $memo = '';
-        }
-
-        if ($this->memo !== $memo) {
-            $this->memo = $memo;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get memo
-     *
-     * @return string
-     */
-    public function getMemo()
-    {
-        return $this->memo;
-    }
-
-    /**
-     * Set maritalStatus
-     *
-     * @param MaritalStatus $maritalStatus
-     * @return Person
-     */
-    public function setMaritalStatus(MaritalStatus $maritalStatus = null)
-    {
-        $this->maritalStatus = $maritalStatus;
-        return $this;
-    }
-
-    /**
-     * Get maritalStatus
-     *
-     * @return MaritalStatus
-     */
-    public function getMaritalStatus()
-    {
-        return $this->maritalStatus;
-    }
-
-    /**
-      * Set contactInfo
-      *
-      * @param string $contactInfo
-      * @return Person
-      */
-     public function setcontactInfo($contactInfo)
-     {
-         if ($contactInfo === null) {
-             $contactInfo = '';
-         }
-
-         $this->contactInfo = $contactInfo;
-
-         return $this;
-     }
-
-     /**
-      * Get contactInfo
-      *
-      * @return string
-      */
-     public function getcontactInfo()
-     {
-         return $this->contactInfo;
-     }
-
-    /**
-     * Set email
-     *
-     * @param string $email
-     * @return Person
-     */
-    public function setEmail($email)
-    {
-        if ($email === null) {
-            $email = '';
-        }
-
-        $this->email = $email;
-
-        return $this;
-    }
-
-    /**
-     * Get email
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * Set countryOfBirth
-     *
-     * @param Chill\MainBundle\Entity\Country $countryOfBirth
-     * @return Person
-     */
-    public function setCountryOfBirth(Country $countryOfBirth = null)
-    {
-        $this->countryOfBirth = $countryOfBirth;
-        return $this;
-    }
-
-    /**
-     * Get countryOfBirth
-     *
-     * @return Chill\MainBundle\Entity\Country
-     */
-    public function getCountryOfBirth()
-    {
-        return $this->countryOfBirth;
-    }
-
-    /**
-     * Set nationality
-     *
-     * @param Chill\MainBundle\Entity\Country $nationality
-     * @return Person
-     */
-    public function setNationality(Country $nationality = null)
-    {
-        $this->nationality = $nationality;
-
-        return $this;
-    }
-
-    /**
-     * Get nationality
-     *
-     * @return Chill\MainBundle\Entity\Country
-     */
-    public function getNationality()
-    {
-        return $this->nationality;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->getFirstName()." ".$this->getLastName();
-    }
-
-    /**
-     * Get center
-     *
-     * @return Center
-     */
-    public function getCenter()
-    {
-        return $this->center;
-    }
-
-    /**
-     * Set the center
-     *
-     * @param Center $center
-     * @return \Chill\PersonBundle\Entity\Person
-     */
-    public function setCenter(Center $center)
-    {
-        $this->center = $center;
-        return $this;
-    }
-
-    /**
-     * Set cFData
-     *
-     * @param array $cFData
-     *
-     * @return Report
-     */
-    public function setCFData($cFData)
-    {
-        $this->cFData = $cFData;
-
-        return $this;
-    }
-
-    /**
-     * Get cFData
-     *
-     * @return array
-     */
-    public function getCFData()
-    {
-        if ($this->cFData === null) {
-            $this->cFData = [];
-        }
-        return $this->cFData;
-    }
-
-    /**
-     * Set phonenumber
-     *
-     * @param string $phonenumber
-     * @return Person
-     */
-    public function setPhonenumber($phonenumber = '')
-    {
-        $this->phonenumber = $phonenumber;
-
-        return $this;
-    }
-
-    /**
-     * Get phonenumber
-     *
-     * @return string
-     */
-    public function getPhonenumber()
-    {
-        return $this->phonenumber;
-    }
-
-    /**
-     * Set mobilenumber
-     *
-     * @param string $mobilenumber
-     * @return Person
-     */
-    public function setMobilenumber($mobilenumber = '')
-    {
-        $this->mobilenumber = $mobilenumber;
-
-        return $this;
-    }
-
-    /**
-     * Get mobilenumber
-     *
-     * @return string
-     */
-    public function getMobilenumber()
-    {
-        return $this->mobilenumber;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getOtherPhoneNumbers(): Collection
-    {
-        return $this->otherPhoneNumbers;
-    }
-
-    /**
-     * @param Collection $otherPhoneNumbers
-     * @return $this
-     */
-    public function setOtherPhoneNumbers(Collection $otherPhoneNumbers)
-    {
-        $this->otherPhoneNumbers = $otherPhoneNumbers;
-
-        return $this;
-    }
-
-    /**
-     * @param PersonPhone $otherPhoneNumber
      * @return $this
      */
     public function addOtherPhoneNumber(PersonPhone $otherPhoneNumber)
@@ -1197,189 +590,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    /**
-     * @param PersonPhone $otherPhoneNumber
-     * @return $this
-     */
-    public function removeOtherPhoneNumber(PersonPhone $otherPhoneNumber)
-    {
-        if ($this->otherPhoneNumbers->contains($otherPhoneNumber)) {
-            $this->otherPhoneNumbers->removeElement($otherPhoneNumber);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getLabel();
-    }
-
-    /**
-     * Set spokenLanguages
-     *
-     * @param type $spokenLanguages
-     * @return Person
-     */
-    public function setSpokenLanguages($spokenLanguages)
-    {
-        $this->spokenLanguages = $spokenLanguages;
-
-        return $this;
-    }
-
-    /**
-     * Get spokenLanguages
-     *
-     * @return ArrayCollection
-     */
-    public function getSpokenLanguages()
-    {
-        return $this->spokenLanguages;
-    }
-
-    /**
-     * @param Address $address
-     * @return $this
-     */
-    public function addAddress(Address $address)
-    {
-        $this->addresses[] = $address;
-
-        return $this;
-    }
-
-    /**
-     * @param Address $address
-     */
-    public function removeAddress(Address $address)
-    {
-        $this->addresses->removeElement($address);
-    }
-
-    /**
-     * By default, the addresses are ordered by date, descending (the most
-     * recent first)
-     */
-    public function getAddresses(): Collection
-    {
-        return $this->addresses;
-    }
-
-    /**
-     * @deprecated Use `getCurrentPersonAddress` instead
-     * @param DateTime|null $from
-     * @return false|mixed|null
-     * @throws \Exception
-     */
-    public function getLastAddress(DateTime $from = null)
-    {
-        return $this->getCurrentPersonAddress($from);
-    }
-
-    /**
-     * get the address associated with the person at the given date
-     *
-     * @param DateTime|null $at
-     * @return Address|null
-     * @throws \Exception
-     */
-    public function getCurrentPersonAddress(?\DateTime $at = null): ?Address
-    {
-        $at ??= new DateTime('now');
-
-        /** @var ArrayIterator $addressesIterator */
-        $addressesIterator = $this->getAddresses()
-            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
-            ->getIterator();
-
-        $addressesIterator->uasort(
-            static fn (Address $left, Address $right): int => $right->getValidFrom() <=> $left->getValidFrom()
-        );
-
-        return [] === ($addresses = iterator_to_array($addressesIterator)) ?
-            null :
-            current($addresses);
-    }
-
-    /**
-     * Validation callback that checks if the accompanying periods are valid
-     *
-     * This method add violation errors.
-     *
-     * @Assert\Callback(
-     *      groups={"accompanying_period_consistent"}
-     * )
-     */
-    public function isAccompanyingPeriodValid(ExecutionContextInterface $context)
-    {
-        $r = $this->checkAccompanyingPeriodsAreNotCollapsing();
-
-        if ($r !== true) {
-            if ($r['result'] === self::ERROR_PERIODS_ARE_COLLAPSING) {
-                $context->buildViolation('Two accompanying periods have days in commun')
-                    ->atPath('accompanyingPeriods')
-                    ->addViolation();
-            }
-
-            if ($r['result'] === self::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD) {
-                $context->buildViolation('A period is opened and a period is added after it')
-                    ->atPath('accompanyingPeriods')
-                    ->addViolation();
-            }
-        }
-    }
-
-    /**
-     * Return true if the person has two addresses with the
-     * same validFrom date (in format 'Y-m-d')
-     */
-    public function hasTwoAdressWithSameValidFromDate()
-    {
-        $validYMDDates = array();
-
-        foreach ($this->addresses as $ad) {
-            $validDate = $ad->getValidFrom()->format('Y-m-d');
-
-            if (in_array($validDate, $validYMDDates)) {
-                return true;
-            }
-            $validYMDDates[] = $validDate;
-        }
-
-        return false;
-    }
-
-    /**
-     * Validation callback that checks if the addresses are valid (do not have
-     * two addresses with the same validFrom date)
-     *
-     * This method add violation errors.
-     *
-     * @Assert\Callback(
-     *     groups={"addresses_consistent"}
-     * )
-     */
-    public function isAddressesValid(ExecutionContextInterface $context)
-    {
-        if ($this->hasTwoAdressWithSameValidFromDate()) {
-            $context
-                ->buildViolation('Two addresses has the same validFrom date')
-                ->atPath('addresses')
-                ->addViolation()
-                ;
-        }
-    }
-
-
-    const ERROR_PERIODS_ARE_COLLAPSING = 1; // when two different periods
-    // have days in commun
-    const ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD = 2; // where there exist
-    // a period opened and another one after it
-
     /**
      * Function used for validation that check if the accompanying periods of
      * the person are not collapsing (i.e. have not shared days) or having
@@ -1391,325 +601,58 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     public function checkAccompanyingPeriodsAreNotCollapsing()
     {
         $periods = $this->getAccompanyingPeriodsOrdered();
-        $periodsNbr = sizeof($periods);
+        $periodsNbr = count($periods);
         $i = 0;
 
-        while($i < $periodsNbr - 1) {
+        while ($periodsNbr - 1 > $i) {
             $periodI = $periods[$i];
             $periodAfterI = $periods[$i + 1];
 
-            if($periodI->isOpen()) {
-                return array(
+            if ($periodI->isOpen()) {
+                return [
                     'result' => self::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD,
                     'dateOpening' => $periodAfterI->getOpeningDate(),
                     'dateClosing' => $periodAfterI->getClosingDate(),
-                    'date' => $periodI->getOpeningDate()
-                );
-            } elseif ($periodI->getClosingDate() >= $periodAfterI->getOpeningDate()) {
-                return array(
+                    'date' => $periodI->getOpeningDate(),
+                ];
+            }
+
+            if ($periodI->getClosingDate() >= $periodAfterI->getOpeningDate()) {
+                return [
                     'result' => self::ERROR_PERIODS_ARE_COLLAPSING,
                     'dateOpening' => $periodI->getOpeningDate(),
 
                     'dateClosing' => $periodI->getClosingDate(),
-                    'date' => $periodAfterI->getOpeningDate()
-                );
+                    'date' => $periodAfterI->getOpeningDate(),
+                ];
             }
-            $i++;
+            ++$i;
         }
 
         return true;
     }
 
-    public function getFullnameCanonical() : string
+    /**
+     * Set the Person file as closed at the given date.
+     *
+     * For update a closing date, you should update AccompanyingPeriod instance
+     * directly.
+     *
+     * To check if the Person and its accompanying period are consistent, use validation.
+     *
+     * @throws Exception if two lines of the accompanying period are open.
+     */
+    public function close(?AccompanyingPeriod $accompanyingPeriod = null): void
     {
-        return $this->fullnameCanonical;
-    }
-
-    public function setFullnameCanonical($fullnameCanonical) : Person
-    {
-        $this->fullnameCanonical = $fullnameCanonical;
-        return $this;
-    }
-
-    public function addHouseholdParticipation(HouseholdMember $member): self
-    {
-        $this->householdParticipations[] = $member;
-
-        return $this;
-    }
-
-    public function getHouseholdParticipations(): Collection
-    {
-        return $this->householdParticipations;
+        $this->proxyAccompanyingPeriodOpenState = false;
     }
 
     /**
-     * Get participation where the person does share the household.
-     *
-     * Order by startDate, desc
+     * This public function is the same but return only true or false.
      */
-    public function getHouseholdParticipationsShareHousehold(): Collection
+    public function containsAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): bool
     {
-        $criteria = new Criteria();
-        $expr = Criteria::expr();
-
-        $criteria
-            ->where(
-                $expr->eq('shareHousehold', true)
-            )
-            ->orderBy(['startDate' => Criteria::DESC])
-            ;
-
-        return $this->getHouseholdParticipations()
-            ->matching($criteria)
-            ;
-    }
-
-    /**
-     * Get participation where the person does not share the household.
-     *
-     * Order by startDate, desc
-     */
-    public function getHouseholdParticipationsNotShareHousehold(): Collection
-    {
-        $criteria = new Criteria();
-        $expr = Criteria::expr();
-
-        $criteria
-            ->where(
-                $expr->eq('shareHousehold', false)
-            )
-            ->orderBy(['startDate' => Criteria::DESC])
-            ;
-
-        return $this->getHouseholdParticipations()
-            ->matching($criteria)
-            ;
-    }
-
-    public function getCurrentHousehold(?\DateTimeImmutable $at = null): ?Household
-    {
-        $participation = $this->getCurrentHouseholdParticipationShareHousehold($at);
-
-        return $participation instanceof HouseholdMember ?
-            $participation->getHousehold()
-            : null;
-    }
-
-    public function getCurrentHouseholdParticipationShareHousehold(?\DateTimeImmutable $at = null): ?HouseholdMember
-    {
-        $criteria = new Criteria();
-        $expr = Criteria::expr();
-        $date = NULL === $at ? new \DateTimeImmutable('today') : $at;
-        $datef = $date->format('Y-m-d');
-
-        if (
-            NULL !== ($this->currentHouseholdParticipationAt[$datef] ?? NULL)) {
-            return $this->currentHouseholdParticipationAt[$datef];
-        }
-
-        $criteria
-            ->where(
-                $expr->andX(
-                    $expr->lte('startDate', $date),
-                    $expr->orX(
-                        $expr->isNull('endDate'),
-                        $expr->gt('endDate', $date)
-                    ),
-                    $expr->eq('shareHousehold', true)
-                )
-            );
-
-        $participations = $this->getHouseholdParticipations()
-            ->matching($criteria)
-            ;
-
-        return $participations->count() > 0 ?
-            $this->currentHouseholdParticipationAt[$datef] = $participations->first()
-            : null;
-    }
-
-    public function isSharingHousehold(?\DateTimeImmutable $at = null): bool
-    {
-        return NULL !== $this->getCurrentHousehold($at);
-    }
-
-    public function getHouseholdAddresses(): Collection
-    {
-        return $this->householdAddresses;
-    }
-
-    public function getCurrentHouseholdAddress(?\DateTimeImmutable $at = null): ?Address
-    {
-        if (
-            NULL === $at
-            ||
-            $at->format('Ymd') === (new \DateTime('today'))->format('Ymd')
-        ) {
-            return $this->currentPersonAddress instanceof PersonCurrentAddress
-                ? $this->currentPersonAddress->getAddress() : NULL;
-        }
-
-        // if not now, compute the date from history
-        $criteria = new Criteria();
-        $expr = Criteria::expr();
-
-        $criteria->where(
-                $expr->lte('validFrom', $at)
-            )
-            ->andWhere(
-                $expr->orX(
-                    $expr->isNull('validTo'),
-                    $expr->gte('validTo', $at)
-                )
-            );
-
-        $addrs = $this->getHouseholdAddresses()
-            ->matching($criteria)
-            ;
-
-        if ($addrs->count() > 0) {
-            return $addrs->first()->getAddress();
-        } else {
-            return null;
-        }
-    }
-
-    public function hasCurrentHouseholdAddress(?\DateTimeImmutable $at = null): bool
-    {
-        return null !== $this->getCurrentHouseholdAddress($at);
-    }
-
-    public function getGenderComment(): CommentEmbeddable
-    {
-        return $this->genderComment;
-    }
-
-    public function setGenderComment(CommentEmbeddable $genderComment): self
-    {
-        $this->genderComment = $genderComment;
-
-        return $this;
-    }
-
-    public function getMaritalStatusComment(): CommentEmbeddable
-    {
-        return $this->maritalStatusComment;
-    }
-
-    public function setMaritalStatusComment(CommentEmbeddable $maritalStatusComment): self
-    {
-        $this->maritalStatusComment = $maritalStatusComment;
-
-        return $this;
-    }
-
-    public function getDeathdate(): ?\DateTimeInterface
-    {
-        return $this->deathdate;
-    }
-
-    public function setDeathdate(?\DateTimeInterface $deathdate): self
-    {
-        $this->deathdate = $deathdate;
-
-        return $this;
-    }
-
-    public function getMaritalStatusDate(): ?\DateTimeInterface
-    {
-        return $this->maritalStatusDate;
-    }
-
-    public function setMaritalStatusDate(?\DateTimeInterface $maritalStatusDate): self
-    {
-        $this->maritalStatusDate = $maritalStatusDate;
-
-        return $this;
-    }
-
-    public function getAcceptSMS(): ?bool
-    {
-        return $this->acceptSMS;
-    }
-
-    public function setAcceptSMS(bool $acceptSMS): self
-    {
-        $this->acceptSMS = $acceptSMS;
-
-        return $this;
-    }
-
-    public function getAcceptEmail(): ?bool
-    {
-        return $this->acceptEmail;
-    }
-
-    public function setAcceptEmail(bool $acceptEmail): self
-    {
-        $this->acceptEmail = $acceptEmail;
-
-        return $this;
-    }
-
-    public function getNumberOfChildren(): ?int
-    {
-        return $this->numberOfChildren;
-    }
-
-    public function setNumberOfChildren(int $numberOfChildren): self
-    {
-        $this->numberOfChildren = $numberOfChildren;
-
-        return $this;
-    }
-
-    /**
-     * @return AccompanyingPeriod[]|Collection
-     */
-    public function getAccompanyingPeriodRequested(): Collection
-    {
-        return $this->accompanyingPeriodRequested;
-    }
-
-    /**
-     * Return a list of all accompanying period where the person is involved:
-     *
-     * * as requestor;
-     * * as participant, only for opened participation;
-     *
-     * @param bool $asParticipantOpen add participation which are still opened
-     * @param bool $asRequestor add accompanying period where the person is requestor
-     * @return AccompanyingPeriod[]|Collection
-     */
-    public function getAccompanyingPeriodInvolved(
-        bool $asParticipantOpen = true,
-        bool $asRequestor = true
-    ): Collection
-    {
-       $result = new ArrayCollection();
-
-       if ($asParticipantOpen) {
-           foreach ($this->getOpenedParticipations()
-                        ->map(fn (AccompanyingPeriodParticipation $app) =>
-                            $app->getAccompanyingPeriod())
-               as $period
-           ) {
-               if (!$result->contains($period)) {
-                   $result->add($period);
-               }
-           }
-       }
-
-       if ($asRequestor) {
-           foreach ($this->accompanyingPeriodRequested as $period) {
-               if (!$result->contains($period)) {
-                   $result->add($period);
-               }
-           }
-       }
-
-       return $result;
+        return ($this->participationsContainAccompanyingPeriod($accompanyingPeriod)) ? false : true;
     }
 
     /**
@@ -1719,7 +662,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Used in template, to find the participation when iterating on a list
      * of period.
      *
-     * @param \Chill\PersonBundle\Entity\AccompanyingPeriod $period
      * @return AccompanyingPeriodParticipation
      */
     public function findParticipationForPeriod(AccompanyingPeriod $period): ?AccompanyingPeriodParticipation
@@ -1742,11 +684,934 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return null;
     }
 
+    public function getAcceptEmail(): ?bool
+    {
+        return $this->acceptEmail;
+    }
+
+    public function getAcceptSMS(): ?bool
+    {
+        return $this->acceptSMS;
+    }
+
+    /**
+     * Return a list of all accompanying period where the person is involved:.
+     *
+     * * as requestor;
+     * * as participant, only for opened participation;
+     *
+     * @param bool $asParticipantOpen add participation which are still opened
+     * @param bool $asRequestor add accompanying period where the person is requestor
+     *
+     * @return AccompanyingPeriod[]|Collection
+     */
+    public function getAccompanyingPeriodInvolved(
+        bool $asParticipantOpen = true,
+        bool $asRequestor = true
+    ): Collection {
+        $result = new ArrayCollection();
+
+        if ($asParticipantOpen) {
+            foreach ($this->getOpenedParticipations()
+                ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod())
+               as $period
+           ) {
+                if (!$result->contains($period)) {
+                    $result->add($period);
+                }
+            }
+        }
+
+        if ($asRequestor) {
+            foreach ($this->accompanyingPeriodRequested as $period) {
+                if (!$result->contains($period)) {
+                    $result->add($period);
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get AccompanyingPeriodParticipations Collection.
+     *
+     * @return AccompanyingPeriodParticipation[]|Collection
+     */
+    public function getAccompanyingPeriodParticipations(): Collection
+    {
+        return $this->accompanyingPeriodParticipations;
+    }
+
+    /**
+     * @return AccompanyingPeriod[]|Collection
+     */
+    public function getAccompanyingPeriodRequested(): Collection
+    {
+        return $this->accompanyingPeriodRequested;
+    }
+
+    /**
+     * Get AccompanyingPeriods array.
+     */
+    public function getAccompanyingPeriods(): array
+    {
+        $accompanyingPeriods = [];
+
+        foreach ($this->accompanyingPeriodParticipations as $participation) {
+            /** @var AccompanyingPeriodParticipation $participation */
+            $accompanyingPeriods[] = $participation->getAccompanyingPeriod();
+        }
+
+        return $accompanyingPeriods;
+    }
+
+    /**
+     * Get the accompanying periods of a give person with the chronological order.
+     */
+    public function getAccompanyingPeriodsOrdered(): array
+    {
+        $periods = $this->getAccompanyingPeriods();
+
+        //order by date :
+        usort($periods, static function ($a, $b) {
+            $dateA = $a->getOpeningDate();
+            $dateB = $b->getOpeningDate();
+
+            if ($dateA === $dateB) {
+                $dateEA = $a->getClosingDate();
+                $dateEB = $b->getClosingDate();
+
+                if ($dateEA === $dateEB) {
+                    return 0;
+                }
+
+                if ($dateEA < $dateEB) {
+                    return -1;
+                }
+
+                return +1;
+            }
+
+            if ($dateA < $dateB) {
+                return -1;
+            }
+
+            return 1;
+        });
+
+        return $periods;
+    }
+
+    /**
+     * get the address associated with the person at the given date.
+     *
+     * If the `$at` parameter is now, use the method `getCurrentPersonAddress`, which is optimized
+     * on database side.
+     *
+     * @throws Exception
+     */
+    public function getAddressAt(?DateTime $at = null): ?Address
+    {
+        $at ??= new DateTime('now');
+
+        /** @var ArrayIterator $addressesIterator */
+        $addressesIterator = $this->getAddresses()
+            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $at)
+            ->getIterator();
+
+        $addressesIterator->uasort(
+            static fn (Address $left, Address $right): int => $right->getValidFrom() <=> $left->getValidFrom()
+        );
+
+        return [] === ($addresses = iterator_to_array($addressesIterator)) ?
+            null :
+            current($addresses);
+    }
+
+    /**
+     * By default, the addresses are ordered by date, descending (the most
+     * recent first).
+     */
+    public function getAddresses(): Collection
+    {
+        return $this->addresses;
+    }
+
+    /**
+     * Return the age of a person, calculated at the date 'now'.
+     *
+     * If the person has a deathdate, calculate the age at the deathdate.
+     *
+     * @param string $at A valid string to create a DateTime.
+     */
+    public function getAge(string $at = 'now'): ?int
+    {
+        if ($this->birthdate instanceof DateTimeInterface) {
+            if ($this->deathdate instanceof DateTimeInterface) {
+                return (int) date_diff($this->birthdate, $this->deathdate)->format('%y');
+            }
+
+            return (int) date_diff($this->birthdate, date_create($at))->format('%y');
+        }
+
+        return null;
+    }
+
+    public function getAltNames(): Collection
+    {
+        return $this->altNames;
+    }
+
+    /**
+     * Get birthdate.
+     *
+     * @return DateTime
+     */
+    public function getBirthdate()
+    {
+        return $this->birthdate;
+    }
+
+    /**
+     * Get center.
+     *
+     * @return Center
+     */
+    public function getCenter()
+    {
+        return $this->center;
+    }
+
+    /**
+     * Get cFData.
+     *
+     * @return array
+     */
+    public function getCFData()
+    {
+        if (null === $this->cFData) {
+            $this->cFData = [];
+        }
+
+        return $this->cFData;
+    }
+
+    /**
+     * Get civility.
+     *
+     * @return Civility
+     */
+    public function getCivility()
+    {
+        return $this->civility;
+    }
+
+    /**
+     * Get contactInfo.
+     *
+     * @return string
+     */
+    public function getcontactInfo()
+    {
+        return $this->contactInfo;
+    }
+
+    /**
+     * Get countryOfBirth.
+     *
+     * @return Chill\MainBundle\Entity\Country
+     */
+    public function getCountryOfBirth()
+    {
+        return $this->countryOfBirth;
+    }
+
+    public function getCreatedAt(): ?DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
     public function getCreatedBy(): ?User
     {
         return $this->createdBy;
     }
 
+    /**
+     * Returns the opened accompanying period.
+     *
+     * @deprecated since 1.1 use `getOpenedAccompanyingPeriod instead
+     */
+    public function getCurrentAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        return $this->getOpenedAccompanyingPeriod();
+    }
+
+    /**
+     * Get current accompanyingPeriods array.
+     */
+    public function getCurrentAccompanyingPeriods(): array
+    {
+        $currentAccompanyingPeriods = [];
+        $currentDate = new DateTime();
+
+        foreach ($this->accompanyingPeriodParticipations as $participation) {
+            $endDate = $participation->getEndDate();
+
+            if (null === $endDate || $endDate > $currentDate) {
+                $currentAccompanyingPeriods[] = $participation->getAccompanyingPeriod();
+            }
+        }
+
+        return $currentAccompanyingPeriods;
+    }
+
+    public function getCurrentHousehold(?DateTimeImmutable $at = null): ?Household
+    {
+        $participation = $this->getCurrentHouseholdParticipationShareHousehold($at);
+
+        return $participation instanceof HouseholdMember ?
+            $participation->getHousehold()
+            : null;
+    }
+
+    public function getCurrentHouseholdAddress(?DateTimeImmutable $at = null): ?Address
+    {
+        if (
+            null === $at
+            || $at->format('Ymd') === (new DateTime('today'))->format('Ymd')
+        ) {
+            return $this->currentPersonAddress instanceof PersonCurrentAddress
+                ? $this->currentPersonAddress->getAddress() : null;
+        }
+
+        // if not now, compute the date from history
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+
+        $criteria->where(
+            $expr->lte('validFrom', $at)
+        )
+            ->andWhere(
+                $expr->orX(
+                    $expr->isNull('validTo'),
+                    $expr->gte('validTo', $at)
+                )
+            );
+
+        $addrs = $this->getHouseholdAddresses()
+            ->matching($criteria);
+
+        if ($addrs->count() > 0) {
+            return $addrs->first()->getAddress();
+        }
+
+        return null;
+    }
+
+    public function getCurrentHouseholdParticipationShareHousehold(?DateTimeImmutable $at = null): ?HouseholdMember
+    {
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+        $date = null === $at ? new DateTimeImmutable('today') : $at;
+        $datef = $date->format('Y-m-d');
+
+        if (
+            null !== ($this->currentHouseholdParticipationAt[$datef] ?? null)) {
+            return $this->currentHouseholdParticipationAt[$datef];
+        }
+
+        $criteria
+            ->where(
+                $expr->andX(
+                    $expr->lte('startDate', $date),
+                    $expr->orX(
+                        $expr->isNull('endDate'),
+                        $expr->gt('endDate', $date)
+                    ),
+                    $expr->eq('shareHousehold', true)
+                )
+            );
+
+        $participations = $this->getHouseholdParticipations()
+            ->matching($criteria);
+
+        return $participations->count() > 0 ?
+            $this->currentHouseholdParticipationAt[$datef] = $participations->first()
+            : null;
+    }
+
+    /**
+     * Get the current person address.
+     */
+    public function getCurrentPersonAddress(): ?Address
+    {
+        if (null === $this->currentPersonAddress) {
+            return null;
+        }
+
+        return $this->currentPersonAddress->getAddress();
+    }
+
+    public function getDeathdate(): ?DateTimeInterface
+    {
+        return $this->deathdate;
+    }
+
+    /**
+     * Get email.
+     *
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+     * Get firstName.
+     *
+     * @return string
+     */
+    public function getFirstName()
+    {
+        return $this->firstName;
+    }
+
+    public function getFullnameCanonical(): string
+    {
+        return $this->fullnameCanonical;
+    }
+
+    /**
+     * Get gender.
+     *
+     * @return string
+     */
+    public function getGender()
+    {
+        return $this->gender;
+    }
+
+    public function getGenderComment(): CommentEmbeddable
+    {
+        return $this->genderComment;
+    }
+
+    /**
+     * return gender as a Numeric form.
+     * This is used for translations.
+     *
+     * @return int
+     *
+     * @deprecated Keep for legacy. Used in Chill 1.5 for feminize before icu translations
+     */
+    public function getGenderNumeric()
+    {
+        switch ($this->getGender()) {
+            case self::FEMALE_GENDER:
+                return 1;
+
+            case self::MALE_GENDER:
+                return 0;
+
+            case self::BOTH_GENDER:
+                return 2;
+
+            default:
+                return -1;
+        }
+    }
+
+    public function getHouseholdAddresses(): Collection
+    {
+        return $this->householdAddresses;
+    }
+
+    public function getHouseholdParticipations(): Collection
+    {
+        return $this->householdParticipations;
+    }
+
+    /**
+     * Get participation where the person does not share the household.
+     *
+     * Order by startDate, desc
+     */
+    public function getHouseholdParticipationsNotShareHousehold(): Collection
+    {
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+
+        $criteria
+            ->where(
+                $expr->eq('shareHousehold', false)
+            )
+            ->orderBy(['startDate' => Criteria::DESC]);
+
+        return $this->getHouseholdParticipations()
+            ->matching($criteria);
+    }
+
+    /**
+     * Get participation where the person does share the household.
+     *
+     * Order by startDate, desc
+     */
+    public function getHouseholdParticipationsShareHousehold(): Collection
+    {
+        $criteria = new Criteria();
+        $expr = Criteria::expr();
+
+        $criteria
+            ->where(
+                $expr->eq('shareHousehold', true)
+            )
+            ->orderBy(['startDate' => Criteria::DESC]);
+
+        return $this->getHouseholdParticipations()
+            ->matching($criteria);
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLabel()
+    {
+        return $this->getFirstName() . ' ' . $this->getLastName();
+    }
+
+    /**
+     * @deprecated Use `getCurrentPersonAddress` instead
+     *
+     * @throws Exception
+     *
+     * @return false|mixed|null
+     */
+    public function getLastAddress(?DateTime $from = null)
+    {
+        return $this->getCurrentPersonAddress();
+    }
+
+    /**
+     * Get lastName.
+     *
+     * @return string
+     */
+    public function getLastName()
+    {
+        return $this->lastName;
+    }
+
+    /**
+     * Get maritalStatus.
+     *
+     * @return MaritalStatus
+     */
+    public function getMaritalStatus()
+    {
+        return $this->maritalStatus;
+    }
+
+    public function getMaritalStatusComment(): CommentEmbeddable
+    {
+        return $this->maritalStatusComment;
+    }
+
+    public function getMaritalStatusDate(): ?DateTimeInterface
+    {
+        return $this->maritalStatusDate;
+    }
+
+    /**
+     * Get memo.
+     *
+     * @return string
+     */
+    public function getMemo()
+    {
+        return $this->memo;
+    }
+
+    /**
+     * Get mobilenumber.
+     */
+    public function getMobilenumber(): string
+    {
+        return $this->mobilenumber;
+    }
+
+    /**
+     * Get nationality.
+     *
+     * @return Country
+     */
+    public function getNationality(): ?Country
+    {
+        return $this->nationality;
+    }
+
+    public function getNumberOfChildren(): ?int
+    {
+        return $this->numberOfChildren;
+    }
+
+    /**
+     * Return the opened accompanying period.
+     */
+    public function getOpenedAccompanyingPeriod(): ?AccompanyingPeriod
+    {
+        if ($this->isOpen() === false) {
+            return null;
+        }
+
+        foreach ($this->accompanyingPeriodParticipations as $participation) {
+            /** @var AccompanyingPeriodParticipation $participation */
+            if ($participation->getAccompanyingPeriod()->isOpen()) {
+                return $participation->getAccompanyingPeriod();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Return a collection of participation, where the participation
+     * is still opened or in draft state.
+     *
+     * @return AccompanyingPeriodParticipation[]|Collection
+     */
+    public function getOpenedParticipations(): Collection
+    {
+        // create a criteria for filtering easily
+        $criteria = Criteria::create();
+        $criteria
+            ->andWhere(Criteria::expr()->eq('endDate', null))
+            ->orWhere(Criteria::expr()->gt('endDate', new DateTime('now')));
+
+        return $this->getAccompanyingPeriodParticipations()
+            ->matching($criteria)
+            ->filter(static function (AccompanyingPeriodParticipation $app) {
+                return AccompanyingPeriod::STEP_CLOSED !== $app->getAccompanyingPeriod()->getStep();
+            });
+    }
+
+    public function getOtherPhoneNumbers(): Collection
+    {
+        return $this->otherPhoneNumbers;
+    }
+
+    /**
+     * Get phonenumber.
+     */
+    public function getPhonenumber(): string
+    {
+        return $this->phonenumber;
+    }
+
+    /**
+     * Get placeOfBirth.
+     *
+     * @return string
+     */
+    public function getPlaceOfBirth()
+    {
+        return $this->placeOfBirth;
+    }
+
+    /**
+     * Get spokenLanguages.
+     *
+     * @return ArrayCollection
+     */
+    public function getSpokenLanguages()
+    {
+        return $this->spokenLanguages;
+    }
+
+    public function getUpdatedAt(): ?DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function hasCurrentHouseholdAddress(?DateTimeImmutable $at = null): bool
+    {
+        return null !== $this->getCurrentHouseholdAddress($at);
+    }
+
+    /**
+     * Return true if the person has two addresses with the
+     * same validFrom date (in format 'Y-m-d').
+     */
+    public function hasTwoAdressWithSameValidFromDate()
+    {
+        $validYMDDates = [];
+
+        foreach ($this->addresses as $ad) {
+            $validDate = $ad->getValidFrom()->format('Y-m-d');
+
+            if (in_array($validDate, $validYMDDates, true)) {
+                return true;
+            }
+            $validYMDDates[] = $validDate;
+        }
+
+        return false;
+    }
+
+    /**
+     * Validation callback that checks if the accompanying periods are valid.
+     *
+     * This method add violation errors.
+     *
+     * @Assert\Callback(
+     *     groups={"accompanying_period_consistent"}
+     * )
+     */
+    public function isAccompanyingPeriodValid(ExecutionContextInterface $context)
+    {
+        $r = $this->checkAccompanyingPeriodsAreNotCollapsing();
+
+        if (true !== $r) {
+            if (self::ERROR_PERIODS_ARE_COLLAPSING === $r['result']) {
+                $context->buildViolation('Two accompanying periods have days in commun')
+                    ->atPath('accompanyingPeriods')
+                    ->addViolation();
+            }
+
+            if (self::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD === $r['result']) {
+                $context->buildViolation('A period is opened and a period is added after it')
+                    ->atPath('accompanyingPeriods')
+                    ->addViolation();
+            }
+        }
+    }
+
+    /**
+     * Validation callback that checks if the addresses are valid (do not have
+     * two addresses with the same validFrom date).
+     *
+     * This method add violation errors.
+     *
+     * @Assert\Callback(
+     *     groups={"addresses_consistent"}
+     * )
+     */
+    public function isAddressesValid(ExecutionContextInterface $context)
+    {
+        if ($this->hasTwoAdressWithSameValidFromDate()) {
+            $context
+                ->buildViolation('Two addresses has the same validFrom date')
+                ->atPath('addresses')
+                ->addViolation();
+        }
+    }
+
+    /**
+     * Check if the person is opened.
+     */
+    public function isOpen(): bool
+    {
+        foreach ($this->getAccompanyingPeriods() as $period) {
+            if ($period->isOpen()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function isSharingHousehold(?DateTimeImmutable $at = null): bool
+    {
+        return null !== $this->getCurrentHousehold($at);
+    }
+
+    /**
+     * set the Person file as open at the given date.
+     *
+     * For updating a opening's date, you should update AccompanyingPeriod instance
+     * directly.
+     *
+     * For closing a file, @see this::close
+     *
+     * To check if the Person and its accompanying period is consistent, use validation.
+     */
+    public function open(AccompanyingPeriod $accompanyingPeriod): void
+    {
+        $this->proxyAccompanyingPeriodOpenState = true;
+        $this->addAccompanyingPeriod($accompanyingPeriod);
+    }
+
+    /**
+     * Remove AccompanyingPeriod.
+     */
+    public function removeAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): void
+    {
+        $participation = $this->participationsContainAccompanyingPeriod($accompanyingPeriod);
+
+        if (!null === $participation) {
+            $participation->setEndDate(DateTimeImmutable::class);
+            $this->accompanyingPeriodParticipations->removeElement($participation);
+        }
+    }
+
+    public function removeAddress(Address $address)
+    {
+        $this->addresses->removeElement($address);
+    }
+
+    /**
+     * @return $this
+     */
+    public function removeAltName(PersonAltName $altName)
+    {
+        if ($this->altNames->contains($altName)) {
+            $altName->setPerson(null);
+            $this->altNames->removeElement($altName);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function removeOtherPhoneNumber(PersonPhone $otherPhoneNumber)
+    {
+        if ($this->otherPhoneNumbers->contains($otherPhoneNumber)) {
+            $this->otherPhoneNumbers->removeElement($otherPhoneNumber);
+        }
+
+        return $this;
+    }
+
+    public function setAcceptEmail(bool $acceptEmail): self
+    {
+        $this->acceptEmail = $acceptEmail;
+
+        return $this;
+    }
+
+    public function setAcceptSMS(bool $acceptSMS): self
+    {
+        $this->acceptSMS = $acceptSMS;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setAltNames(Collection $altNames)
+    {
+        $this->altNames = $altNames;
+
+        return $this;
+    }
+
+    /**
+     * Set birthdate.
+     *
+     * @param DateTime $birthdate
+     *
+     * @return Person
+     */
+    public function setBirthdate($birthdate)
+    {
+        $this->birthdate = $birthdate;
+
+        return $this;
+    }
+
+    /**
+     * Set the center.
+     *
+     * @return \Chill\PersonBundle\Entity\Person
+     */
+    public function setCenter(Center $center)
+    {
+        $this->center = $center;
+
+        return $this;
+    }
+
+    /**
+     * Set cFData.
+     *
+     * @param array $cFData
+     *
+     * @return Report
+     */
+    public function setCFData($cFData)
+    {
+        $this->cFData = $cFData;
+
+        return $this;
+    }
+
+    /**
+     * Set civility.
+     *
+     * @param Civility $civility
+     *
+     * @return Person
+     */
+    public function setCivility(?Civility $civility = null)
+    {
+        $this->civility = $civility;
+
+        return $this;
+    }
+
+    /**
+     * Set contactInfo.
+     *
+     * @param string $contactInfo
+     *
+     * @return Person
+     */
+    public function setcontactInfo($contactInfo)
+    {
+        if (null === $contactInfo) {
+            $contactInfo = '';
+        }
+
+        $this->contactInfo = $contactInfo;
+
+        return $this;
+    }
+
+    /**
+     * Set countryOfBirth.
+     *
+     * @param Chill\MainBundle\Entity\Country $countryOfBirth
+     *
+     * @return Person
+     */
+    public function setCountryOfBirth(?Country $countryOfBirth = null)
+    {
+        $this->countryOfBirth = $countryOfBirth;
+
+        return $this;
+    }
+
+    public function setCreatedAt(DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
     public function setCreatedBy(User $createdBy): self
     {
         $this->createdBy = $createdBy;
@@ -1754,9 +1619,229 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setCreatedAt(\DateTimeInterface $datetime): self
+    public function setDeathdate(?DateTimeInterface $deathdate): self
     {
-        $this->createdAt = $datetime;
+        $this->deathdate = $deathdate;
+
+        return $this;
+    }
+
+    /**
+     * Set email.
+     *
+     * @param string $email
+     *
+     * @return Person
+     */
+    public function setEmail($email)
+    {
+        if (null === $email) {
+            $email = '';
+        }
+
+        $this->email = $email;
+
+        return $this;
+    }
+
+    /**
+     * Set firstName.
+     *
+     * @param string $firstName
+     *
+     * @return Person
+     */
+    public function setFirstName($firstName)
+    {
+        $this->firstName = $firstName;
+
+        return $this;
+    }
+
+    public function setFullnameCanonical($fullnameCanonical): Person
+    {
+        $this->fullnameCanonical = $fullnameCanonical;
+
+        return $this;
+    }
+
+    /**
+     * Set gender.
+     *
+     * @param string $gender
+     *
+     * @return Person
+     */
+    public function setGender($gender)
+    {
+        $this->gender = $gender;
+
+        return $this;
+    }
+
+    public function setGenderComment(CommentEmbeddable $genderComment): self
+    {
+        $this->genderComment = $genderComment;
+
+        return $this;
+    }
+
+    /**
+     * Set lastName.
+     *
+     * @param string $lastName
+     *
+     * @return Person
+     */
+    public function setLastName($lastName)
+    {
+        $this->lastName = $lastName;
+
+        return $this;
+    }
+
+    /**
+     * Set maritalStatus.
+     *
+     * @param MaritalStatus $maritalStatus
+     *
+     * @return Person
+     */
+    public function setMaritalStatus(?MaritalStatus $maritalStatus = null)
+    {
+        $this->maritalStatus = $maritalStatus;
+
+        return $this;
+    }
+
+    public function setMaritalStatusComment(CommentEmbeddable $maritalStatusComment): self
+    {
+        $this->maritalStatusComment = $maritalStatusComment;
+
+        return $this;
+    }
+
+    public function setMaritalStatusDate(?DateTimeInterface $maritalStatusDate): self
+    {
+        $this->maritalStatusDate = $maritalStatusDate;
+
+        return $this;
+    }
+
+    /**
+     * Set memo.
+     *
+     * @param string $memo
+     *
+     * @return Person
+     */
+    public function setMemo($memo)
+    {
+        if (null === $memo) {
+            $memo = '';
+        }
+
+        if ($this->memo !== $memo) {
+            $this->memo = $memo;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set mobilenumber.
+     *
+     * @param string $mobilenumber
+     *
+     * @return Person
+     */
+    public function setMobilenumber(?string $mobilenumber = '')
+    {
+        $this->mobilenumber = (string) $mobilenumber;
+
+        return $this;
+    }
+
+    /**
+     * Set nationality.
+     *
+     * @param Chill\MainBundle\Entity\Country $nationality
+     *
+     * @return Person
+     */
+    public function setNationality(?Country $nationality = null)
+    {
+        $this->nationality = $nationality;
+
+        return $this;
+    }
+
+    public function setNumberOfChildren(?int $numberOfChildren): self
+    {
+        $this->numberOfChildren = $numberOfChildren;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setOtherPhoneNumbers(Collection $otherPhoneNumbers)
+    {
+        $this->otherPhoneNumbers = $otherPhoneNumbers;
+
+        return $this;
+    }
+
+    /**
+     * Set phonenumber.
+     *
+     * @param string $phonenumber
+     *
+     * @return Person
+     */
+    public function setPhonenumber(?string $phonenumber = '')
+    {
+        $this->phonenumber = (string) $phonenumber;
+
+        return $this;
+    }
+
+    /**
+     * Set placeOfBirth.
+     *
+     * @param string $placeOfBirth
+     *
+     * @return Person
+     */
+    public function setPlaceOfBirth($placeOfBirth)
+    {
+        if (null === $placeOfBirth) {
+            $placeOfBirth = '';
+        }
+
+        $this->placeOfBirth = $placeOfBirth;
+
+        return $this;
+    }
+
+    /**
+     * Set spokenLanguages.
+     *
+     * @param type $spokenLanguages
+     *
+     * @return Person
+     */
+    public function setSpokenLanguages($spokenLanguages)
+    {
+        $this->spokenLanguages = $spokenLanguages;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime;
 
         return $this;
     }
@@ -1768,11 +1853,19 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
-    public function setUpdatedAt(\DateTimeInterface $datetime): self
+    /**
+     * This private function scan accompanyingPeriodParticipations Collection,
+     * searching for a given AccompanyingPeriod.
+     */
+    private function participationsContainAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod): ?AccompanyingPeriodParticipation
     {
-        $this->updatedAt = $datetime;
+        foreach ($this->accompanyingPeriodParticipations as $participation) {
+            /** @var AccompanyingPeriodParticipation $participation */
+            if ($participation->getAccompanyingPeriod() === $accompanyingPeriod) {
+                return $participation;
+            }
+        }
 
-        return $this;
+        return null;
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
index e982f8b97..0c9e416c2 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonCurrentAddress.php
@@ -1,9 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\Person;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -13,13 +23,18 @@ use Doctrine\ORM\Mapping as ORM;
  * The computation is optimized on database side.
  *
  * The validFrom and validTo properties are the intersection of
- * household membership and address validity. See @link{PersonHouseholdAddress}
+ * household membership and address validity. See @see{PersonHouseholdAddress}
  *
  * @ORM\Entity(readOnly=true)
  * @ORM\Table("view_chill_person_current_address")
  */
 class PersonCurrentAddress
 {
+    /**
+     * @ORM\OneToOne(targetEntity=Address::class)
+     */
+    protected Address $address;
+
     /**
      * @ORM\Id
      * @ORM\OneToOne(targetEntity=Person::class, inversedBy="currentPersonAddress")
@@ -27,55 +42,40 @@ class PersonCurrentAddress
      */
     protected Person $person;
 
-    /**
-     * @ORM\OneToOne(targetEntity=Address::class)
-     */
-    protected Address $address;
-
     /**
      * @ORM\Column(name="valid_from", type="date_immutable")
      */
-    protected \DateTimeImmutable $validFrom;
+    protected DateTimeImmutable $validFrom;
 
     /**
      * @ORM\Column(name="valid_to", type="date_immutable")
      */
-    protected ?\DateTimeImmutable $validTo;
+    protected ?DateTimeImmutable $validTo;
+
+    public function getAddress(): Address
+    {
+        return $this->address;
+    }
 
-    /**
-     * @return Person
-     */
     public function getPerson(): Person
     {
         return $this->person;
     }
 
-    /**
-     * @return Address
-     */
-    public function getAddress(): Address
-    {
-        return $this->address;
-    }
-
     /**
      * This date is the intersection of household membership
-     * and address validity
-     *
-     * @return \DateTimeImmutable
+     * and address validity.
      */
-    public function getValidFrom(): \DateTimeImmutable
+    public function getValidFrom(): DateTimeImmutable
     {
         return $this->validFrom;
     }
 
     /**
      * This date is the intersection of household membership
-     * and address validity
-     *
-     * @return \DateTimeImmutable|null
+     * and address validity.
      */
-    public function getValidTo(): ?\DateTimeImmutable
+    public function getValidTo(): ?DateTimeImmutable
     {
         return $this->validTo;
     }
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
index 95603d4ef..d233082c4 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
@@ -1,11 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * PersonAltName
+ * PersonAltName.
  *
  * @ORM\Table(name="chill_person_alt_name")
  * @ORM\Entity
@@ -13,7 +22,7 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonAltName
 {
     /**
-     * @var integer
+     * @var int
      *
      * @ORM\Column(name="id", type="integer")
      * @ORM\Id
@@ -34,18 +43,17 @@ class PersonAltName
      * @ORM\Column(name="label", type="text")
      */
     private $label;
-    
+
     /**
      * @var Person
      *
      * @ORM\ManyToOne(
-     *  targetEntity="Chill\PersonBundle\Entity\Person",
-     *  inversedBy="altNames"
+     *     targetEntity="Chill\PersonBundle\Entity\Person",
+     *     inversedBy="altNames"
      * )
      */
     private $person;
 
-    
     /**
      * Get id.
      *
@@ -56,6 +64,31 @@ class PersonAltName
         return $this->id;
     }
 
+    /**
+     * Get key.
+     *
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * Get label.
+     *
+     * @return string
+     */
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
+    public function getPerson(): Person
+    {
+        return $this->person;
+    }
+
     /**
      * Set key.
      *
@@ -70,16 +103,6 @@ class PersonAltName
         return $this;
     }
 
-    /**
-     * Get key.
-     *
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
     /**
      * Set label.
      *
@@ -95,31 +118,12 @@ class PersonAltName
     }
 
     /**
-     * Get label.
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-    
-    /**
-     * @return Person
-     */
-    public function getPerson(): Person
-    {
-        return $this->person;
-    }
-    
-    /**
-     * @param Person|null $person
      * @return $this
      */
     public function setPerson(?Person $person = null)
     {
         $this->person = $person;
-        
+
         return $this;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
index 9f116c501..c00eb91fa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php
@@ -1,12 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\User;
+use DateTime;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * PersonNotDuplicate
+ * PersonNotDuplicate.
  *
  * @ORM\Table(name="chill_person_not_duplicate")
  * @ORM\Entity
@@ -14,8 +24,15 @@ use Chill\MainBundle\Entity\User;
 class PersonNotDuplicate
 {
     /**
-     * The person's id
-     * @var integer
+     * @var DateTime
+     * @ORM\Column(type="datetime")
+     */
+    private $date;
+
+    /**
+     * The person's id.
+     *
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -37,12 +54,6 @@ class PersonNotDuplicate
      */
     private $person2;
 
-    /**
-     * @var \DateTime
-     * @ORM\Column(type="datetime")
-     */
-    private $date;
-
     /**
      * @var User
      *
@@ -52,37 +63,7 @@ class PersonNotDuplicate
 
     public function __construct()
     {
-        $this->date = new \DateTime();
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    public function getPerson1()
-    {
-        return $this->person1;
-    }
-
-    public function setPerson1(Person $person1)
-    {
-        $this->person1 = $person1;
-    }
-
-    public function getPerson2()
-    {
-        return $this->person2;
-    }
-
-    public function setPerson2(Person $person2)
-    {
-        $this->person2 = $person2;
+        $this->date = new DateTime();
     }
 
     public function getDate()
@@ -90,9 +71,19 @@ class PersonNotDuplicate
         return $this->date;
     }
 
-    public function setDate(\DateTime $date)
+    public function getId()
     {
-        $this->date = $date;
+        return $this->id;
+    }
+
+    public function getPerson1()
+    {
+        return $this->person1;
+    }
+
+    public function getPerson2()
+    {
+        return $this->person2;
     }
 
     public function getUser()
@@ -100,6 +91,26 @@ class PersonNotDuplicate
         return $this->user;
     }
 
+    public function setDate(DateTime $date)
+    {
+        $this->date = $date;
+    }
+
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    public function setPerson1(Person $person1)
+    {
+        $this->person1 = $person1;
+    }
+
+    public function setPerson2(Person $person2)
+    {
+        $this->person2 = $person2;
+    }
+
     public function setUser(User $user)
     {
         $this->user = $user;
diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
index 222495e17..400e39c88 100644
--- a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
@@ -1,18 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity;
 
-use Chill\PersonBundle\Entity\Person;
+use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Person Phones
+ * Person Phones.
  *
  * @ORM\Entity
- * @ORM\Table(name="chill_person_phone")
+ * @ORM\Table(name="chill_person_phone",
+ *     indexes={
+ *         @ORM\Index(name="phonenumber", columns={"phonenumber"})
+ *     })
  */
 class PersonPhone
 {
+    /**
+     * @ORM\Column(type="datetime", nullable=false)
+     */
+    private DateTime $date;
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private ?string $description = null;
+
     /**
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -22,35 +44,35 @@ class PersonPhone
 
     /**
      * @ORM\ManyToOne(
-     *  targetEntity="Chill\PersonBundle\Entity\Person",
-     *  inversedBy="otherPhoneNumbers"
+     *     targetEntity="Chill\PersonBundle\Entity\Person",
+     *     inversedBy="otherPhoneNumbers"
      * )
      */
     private Person $person;
 
-    /**
-     * @ORM\Column(type="text", length=40, nullable=true)
-     */
-    private ?string $type;
-
     /**
      * @ORM\Column(type="text", length=40, nullable=false)
      */
     private string $phonenumber = '';
 
     /**
-     * @ORM\Column(type="text", nullable=true)
+     * @ORM\Column(type="text", length=40, nullable=true)
      */
-    private ?string $description = null;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=false)
-     */
-    private \DateTime $date;
+    private ?string $type;
 
     public function __construct()
     {
-        $this->date = new \DateTime();
+        $this->date = new DateTime();
+    }
+
+    public function getDate(): DateTime
+    {
+        return $this->date;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->description;
     }
 
     public function getId(): int
@@ -63,9 +85,9 @@ class PersonPhone
         return $this->person;
     }
 
-    public function setPerson(Person $person): void
+    public function getPhonenumber(): string
     {
-        $this->person = $person;
+        return $this->phonenumber;
     }
 
     public function getType(): string
@@ -73,24 +95,14 @@ class PersonPhone
         return $this->type;
     }
 
-    public function setType(string $type): void
+    public function isEmpty(): bool
     {
-        $this->type = $type;
+        return empty($this->getDescription()) && empty($this->getPhonenumber());
     }
 
-    public function getPhonenumber(): string
+    public function setDate(DateTime $date): void
     {
-        return $this->phonenumber;
-    }
-
-    public function setPhonenumber(string $phonenumber): void
-    {
-        $this->phonenumber = $phonenumber;
-    }
-
-    public function getDescription(): ?string
-    {
-        return $this->description;
+        $this->date = $date;
     }
 
     public function setDescription(?string $description): void
@@ -98,18 +110,18 @@ class PersonPhone
         $this->description = $description;
     }
 
-    public function getDate(): \DateTime
+    public function setPerson(Person $person): void
     {
-        return $this->date;
+        $this->person = $person;
     }
 
-    public function setDate(\DateTime $date): void
+    public function setPhonenumber(string $phonenumber): void
     {
-        $this->date = $date;
+        $this->phonenumber = $phonenumber;
     }
-    
-    public function isEmpty(): bool
+
+    public function setType(string $type): void
     {
-        return empty($this->getDescription()) && empty($this->getPhonenumber());
+        $this->type = $type;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
new file mode 100644
index 000000000..c78e5df33
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Entity\Relationships;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="chill_person_relations")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *     "relation": Relation::class
+ * })
+ */
+class Relation
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     * @Serializer\Groups({"read"})
+     */
+    private bool $isActive = true;
+
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     * @Serializer\Groups({"read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $reverseTitle = [];
+
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     * @Serializer\Groups({"read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $title = [];
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getIsActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    public function getReverseTitle(): ?array
+    {
+        return $this->reverseTitle;
+    }
+
+    public function getTitle(): ?array
+    {
+        return $this->title;
+    }
+
+    public function setIsActive(?bool $isActive): self
+    {
+        $this->isActive = $isActive;
+
+        return $this;
+    }
+
+    public function setReverseTitle(?array $reverseTitle): self
+    {
+        $this->reverseTitle = $reverseTitle;
+
+        return $this;
+    }
+
+    public function setTitle(?array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
new file mode 100644
index 000000000..d51881bb2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
@@ -0,0 +1,221 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Entity\Relationships;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\ORM\Mapping\DiscriminatorColumn;
+use RuntimeException;
+use Symfony\Component\Serializer\Annotation as Serializer;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="chill_person_relationships")
+ * @DiscriminatorColumn(name="relation_id", type="integer")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *     "relationship": Relationship::class
+ * })
+ */
+class Relationship implements TrackCreationInterface, TrackUpdateInterface
+{
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private ?User $createdBy = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Assert\NotNull
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Person $fromPerson = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Relation::class)
+     * @ORM\JoinColumn(nullable=false, name="relation_id", referencedColumnName="id")
+     * @Assert\NotNull
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Relation $relation = null;
+
+    /**
+     * @ORM\Column(type="boolean")
+     * @Assert\Type(
+     *     type="bool",
+     *     message="This must be of type boolean"
+     * )
+     * @Serializer\Groups({"read", "write"})
+     */
+    private bool $reverse;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Assert\NotNull
+     * @Serializer\Groups({"read", "write"})
+     */
+    private ?Person $toPerson = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private ?User $updatedBy = null;
+
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function getFromPerson(): ?Person
+    {
+        return $this->fromPerson;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Return the opposite person of the @see{counterpart} person.
+     *
+     * this is the from person if the given is associated to the To,
+     * or the To person otherwise.
+     *
+     * @throw RuntimeException if the counterpart is neither in the from or to person
+     */
+    public function getOpposite(Person $counterpart): Person
+    {
+        if ($this->fromPerson !== $counterpart && $this->toPerson !== $counterpart) {
+            throw new RuntimeException('the counterpart is neither the from nor to person for this relationship');
+        }
+
+        if ($this->fromPerson === $counterpart) {
+            return $this->toPerson;
+        }
+
+        return $this->fromPerson;
+    }
+
+    public function getRelation(): ?Relation
+    {
+        return $this->relation;
+    }
+
+    public function getReverse(): ?bool
+    {
+        return $this->reverse;
+    }
+
+    public function getToPerson(): ?Person
+    {
+        return $this->toPerson;
+    }
+
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function setCreatedAt(DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function setCreatedBy(?User $user): self
+    {
+        $this->createdBy = $user;
+
+        return $this;
+    }
+
+    public function setFromPerson(?Person $fromPerson): self
+    {
+        $this->fromPerson = $fromPerson;
+
+        return $this;
+    }
+
+    public function setRelation(?Relation $relation): self
+    {
+        $this->relation = $relation;
+
+        return $this;
+    }
+
+    public function setReverse(bool $reverse): self
+    {
+        $this->reverse = $reverse;
+
+        return $this;
+    }
+
+    public function setToPerson(?Person $toPerson): self
+    {
+        $this->toPerson = $toPerson;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(?DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(?User $updatedBy): self
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index f01b2a4c1..aeb8d0a8d 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -1,7 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use DateInterval;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -9,36 +19,30 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_evaluation")
  * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *     "social_work_evaluation"=Evaluation::class
- *     })
+ *     "social_work_evaluation": Evaluation::class
+ * })
  */
 class Evaluation
 {
+    /**
+     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
+     * @Serializer\Groups({"read"})
+     */
+    private ?DateInterval $delay = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private $id;
-
-    /**
-     * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
-     */
-    private $title = [];
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
      * @Serializer\Groups({"read"})
      */
-    private $delay;
-
-    /**
-     * @ORM\Column(type="dateinterval", nullable=true, options={"default": null})
-     * @Serializer\Groups({"read"})
-     */
-    private $notificationDelay;
+    private ?DateInterval $notificationDelay = null;
 
     /**
      * @ORM\ManyToOne(
@@ -46,58 +50,65 @@ class Evaluation
      *     inversedBy="evaluations"
      * )
      */
-    private $socialAction;
+    private ?SocialAction $socialAction = null;
+
+    /**
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $title = [];
+
+    public function getDelay(): ?DateInterval
+    {
+        return $this->delay;
+    }
 
     public function getId(): ?int
     {
         return $this->id;
     }
 
+    public function getNotificationDelay(): ?DateInterval
+    {
+        return $this->notificationDelay;
+    }
+
+    public function getSocialAction(): ?SocialAction
+    {
+        return $this->socialAction;
+    }
+
     public function getTitle(): array
     {
         return $this->title;
     }
 
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function getDelay(): ?\DateInterval
-    {
-        return $this->delay;
-    }
-
-    public function setDelay(\DateInterval $delay): self
+    public function setDelay(DateInterval $delay): self
     {
         $this->delay = $delay;
 
         return $this;
     }
 
-    public function getNotificationDelay(): ?\DateInterval
-    {
-        return $this->notificationDelay;
-    }
-
-    public function setNotificationDelay(\DateInterval $notificationDelay): self
+    public function setNotificationDelay(DateInterval $notificationDelay): self
     {
         $this->notificationDelay = $notificationDelay;
 
         return $this;
     }
 
-    public function getSocialAction(): ?SocialAction
-    {
-        return $this->socialAction;
-    }
-
     public function setSocialAction(?SocialAction $socialAction): self
     {
         $this->socialAction = $socialAction;
 
         return $this;
     }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
index 7ad301875..30abaa3ef 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php
@@ -1,7 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -11,43 +21,44 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_goal")
  * @Serializer\DiscriminatorMap(
- *      typeProperty="type",
- *      mapping={
- *          "social_work_goal":Goal::class
- *      }
- *  )
+ *     typeProperty="type",
+ *     mapping={
+ *         "social_work_goal": Goal::class
+ *     }
+ * )
  */
 class Goal
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
-     */
-    private $title = [];
-
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
     private $desactivationDate;
 
     /**
-     * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="goals")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private $socialActions;
+    private ?int $id = null;
 
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="goals")
      * @ORM\JoinTable(name="chill_person_social_work_goal_result")
      */
-    private $results;
+    private Collection $results;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="goals")
+     */
+    private Collection $socialActions;
+
+    /**
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $title = [];
 
     public function __construct()
     {
@@ -55,67 +66,6 @@ class Goal
         $this->results = new ArrayCollection();
     }
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getTitle(): array
-    {
-        return $this->title;
-    }
-
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function getDesactivationDate(): ?\DateTimeInterface
-    {
-        return $this->desactivationDate;
-    }
-
-    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
-    {
-        $this->desactivationDate = $desactivationDate;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|SocialAction[]
-     */
-    public function getSocialActions(): Collection
-    {
-        return $this->socialActions;
-    }
-
-    public function addSocialAction(SocialAction $socialAction): self
-    {
-        if (!$this->socialActions->contains($socialAction)) {
-            $this->socialActions[] = $socialAction;
-        }
-
-        return $this;
-    }
-
-    public function removeSocialAction(SocialAction $socialAction): self
-    {
-        $this->socialActions->removeElement($socialAction);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|Result[]
-     */
-    public function getResults(): Collection
-    {
-        return $this->results;
-    }
-
     public function addResult(Result $result): self
     {
         if (!$this->results->contains($result)) {
@@ -125,10 +75,71 @@ class Goal
         return $this;
     }
 
+    public function addSocialAction(SocialAction $socialAction): self
+    {
+        if (!$this->socialActions->contains($socialAction)) {
+            $this->socialActions[] = $socialAction;
+        }
+
+        return $this;
+    }
+
+    public function getDesactivationDate(): ?DateTimeInterface
+    {
+        return $this->desactivationDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Collection|Result[]
+     */
+    public function getResults(): Collection
+    {
+        return $this->results;
+    }
+
+    /**
+     * @return Collection|SocialAction[]
+     */
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
+    public function getTitle(): array
+    {
+        return $this->title;
+    }
+
     public function removeResult(Result $result): self
     {
         $this->results->removeElement($result);
 
         return $this;
     }
+
+    public function removeSocialAction(SocialAction $socialAction): self
+    {
+        $this->socialActions->removeElement($socialAction);
+
+        return $this;
+    }
+
+    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    {
+        $this->desactivationDate = $desactivationDate;
+
+        return $this;
+    }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index 42a4c0929..b4a9b6aa2 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -1,9 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\SocialWork;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use DateTime;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -13,52 +24,53 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_work_result")
  * @Serializer\DiscriminatorMap(
- *      typeProperty="type",
- *      mapping={
- *          "social_work_result":Result::class
- *      }
- *  )
+ *     typeProperty="type",
+ *     mapping={
+ *         "social_work_result": Result::class
+ *     }
+ * )
  */
 class Result
 {
     /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="results")
      */
-    private $id;
-
-    /**
-     * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
-     */
-    private $title = [];
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $desactivationDate;
-
-    /**
-     * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="results")
-     */
-    private $socialActions;
-
-    /**
-     * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")
-     */
-    private $goals;
+    private Collection $accompanyingPeriodWorkGoals;
 
     /**
      * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWork::class, mappedBy="results")
      */
-    private $accompanyingPeriodWorks;
+    private Collection $accompanyingPeriodWorks;
 
     /**
-     * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="results")
+     * @ORM\Column(type="datetime", nullable=true)
      */
-    private $accompanyingPeriodWorkGoals;
+    private DateTime $desactivationDate;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")
+     */
+    private Collection $goals;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     * @Serializer\Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=SocialAction::class, mappedBy="results")
+     */
+    private Collection $socialActions;
+
+    /**
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $title = [];
 
     public function __construct()
     {
@@ -68,91 +80,6 @@ class Result
         $this->accompanyingPeriodWorkGoals = new ArrayCollection();
     }
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getTitle(): array
-    {
-        return $this->title;
-    }
-
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function getDesactivationDate(): ?\DateTimeInterface
-    {
-        return $this->desactivationDate;
-    }
-
-    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
-    {
-        $this->desactivationDate = $desactivationDate;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|SocialAction[]
-     */
-    public function getSocialActions(): Collection
-    {
-        return $this->socialActions;
-    }
-
-    public function addSocialAction(SocialAction $socialAction): self
-    {
-        if (!$this->socialActions->contains($socialAction)) {
-            $this->socialActions[] = $socialAction;
-        }
-
-        return $this;
-    }
-
-    public function removeSocialAction(SocialAction $socialAction): self
-    {
-        $this->socialActions->removeElement($socialAction);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|Goal[]
-     */
-    public function getGoals(): Collection
-    {
-        return $this->goals;
-    }
-
-    public function addGoal(Goal $goal): self
-    {
-        if (!$this->goals->contains($goal)) {
-            $this->goals[] = $goal;
-        }
-
-        return $this;
-    }
-
-    public function removeGoal(Goal $goal): self
-    {
-        $this->goals->removeElement($goal);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|AccompanyingPeriodWork[]
-     */
-    public function getAccompanyingPeriodWorks(): Collection
-    {
-        return $this->accompanyingPeriodWorks;
-    }
-
     public function addAccompanyingPeriodWork(AccompanyingPeriodWork $accompanyingPeriod): self
     {
         if (!$this->accompanyingPeriodWorks->contains($accompanyingPeriod)) {
@@ -162,26 +89,83 @@ class Result
         return $this;
     }
 
-    public function removeAccompanyingPeriodWork(AccompanyingPeriodWork $accompanyingPeriod): self
+    public function addAccompanyingPeriodWorkGoal(AccompanyingPeriodWorkGoal $accompanyingPeriodWorkGoal): self
     {
-        $this->accompanyingPeriodWorks->removeElement($accompanyingPeriod);
+        if (!$this->accompanyingPeriodWorkGoals->contains($accompanyingPeriodWorkGoal)) {
+            $this->accompanyingPeriodWorkGoals[] = $accompanyingPeriodWorkGoal;
+        }
+
+        return $this;
+    }
+
+    public function addGoal(Goal $goal): self
+    {
+        if (!$this->goals->contains($goal)) {
+            $this->goals[] = $goal;
+        }
+
+        return $this;
+    }
+
+    public function addSocialAction(SocialAction $socialAction): self
+    {
+        if (!$this->socialActions->contains($socialAction)) {
+            $this->socialActions[] = $socialAction;
+        }
 
         return $this;
     }
 
     /**
-     * @return Collection|AccompanyingPeriodWorkGoal[]
+     * @return AccompanyingPeriodWorkGoal[]|Collection
      */
     public function getAccompanyingPeriodWorkGoals(): Collection
     {
         return $this->accompanyingPeriodWorkGoals;
     }
 
-    public function addAccompanyingPeriodWorkGoal(AccompanyingPeriodWorkGoal $accompanyingPeriodWorkGoal): self
+    /**
+     * @return AccompanyingPeriodWork[]|Collection
+     */
+    public function getAccompanyingPeriodWorks(): Collection
     {
-        if (!$this->accompanyingPeriodWorkGoals->contains($accompanyingPeriodWorkGoal)) {
-            $this->accompanyingPeriodWorkGoals[] = $accompanyingPeriodWorkGoal;
-        }
+        return $this->accompanyingPeriodWorks;
+    }
+
+    public function getDesactivationDate(): ?DateTimeInterface
+    {
+        return $this->desactivationDate;
+    }
+
+    /**
+     * @return Collection|Goal[]
+     */
+    public function getGoals(): Collection
+    {
+        return $this->goals;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Collection|SocialAction[]
+     */
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
+    public function getTitle(): array
+    {
+        return $this->title;
+    }
+
+    public function removeAccompanyingPeriodWork(AccompanyingPeriodWork $accompanyingPeriod): self
+    {
+        $this->accompanyingPeriodWorks->removeElement($accompanyingPeriod);
 
         return $this;
     }
@@ -192,4 +176,32 @@ class Result
 
         return $this;
     }
+
+    public function removeGoal(Goal $goal): self
+    {
+        $this->goals->removeElement($goal);
+
+        return $this;
+    }
+
+    public function removeSocialAction(SocialAction $socialAction): self
+    {
+        $this->socialActions->removeElement($socialAction);
+
+        return $this;
+    }
+
+    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    {
+        $this->desactivationDate = $desactivationDate;
+
+        return $this;
+    }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
index bb05c900e..c5ca7d18a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
@@ -1,7 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use DateInterval;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -11,14 +22,43 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_action")
  * @Serializer\DiscriminatorMap(
- *      typeProperty="type",
- *      mapping={
- *          "social_work_social_action":SocialAction::class
- *      }
- *  )
+ *     typeProperty="type",
+ *     mapping={
+ *         "social_work_social_action": SocialAction::class
+ *     }
+ * )
  */
 class SocialAction
 {
+    /**
+     * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="parent")
+     */
+    private $children;
+
+    /**
+     * @ORM\Column(type="dateinterval", nullable=true)
+     */
+    private $defaultNotificationDelay;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private $desactivationDate;
+
+    /**
+     * @ORM\OneToMany(
+     *     targetEntity=Evaluation::class,
+     *     mappedBy="socialAction"
+     * )
+     */
+    private Collection $evaluations;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=Goal::class, inversedBy="socialActions")
+     * @ORM\JoinTable(name="chill_person_social_action_goal")
+     */
+    private $goals;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -26,11 +66,6 @@ class SocialAction
      */
     private $id;
 
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $desactivationDate;
-
     /**
      * @ORM\ManyToOne(targetEntity=SocialIssue::class, inversedBy="socialActions")
      */
@@ -41,27 +76,6 @@ class SocialAction
      */
     private $parent;
 
-    /**
-     * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="parent")
-     */
-    private $children;
-
-    /**
-     * @ORM\Column(type="dateinterval", nullable=true)
-     */
-    private $defaultNotificationDelay;
-
-    /**
-     * @ORM\Column(type="json")
-     */
-    private $title = [];
-
-    /**
-     * @ORM\ManyToMany(targetEntity=Goal::class, inversedBy="socialActions")
-     * @ORM\JoinTable(name="chill_person_social_action_goal")
-     */
-    private $goals;
-
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="socialActions")
      * @ORM\JoinTable(name="chill_person_social_action_result")
@@ -69,13 +83,9 @@ class SocialAction
     private $results;
 
     /**
-     * @var Collection
-     * @ORM\OneToMany(
-     *     targetEntity=Evaluation::class,
-     *     mappedBy="socialAction"
-     * )
+     * @ORM\Column(type="json")
      */
-    private Collection $evaluations;
+    private $title = [];
 
     public function __construct()
     {
@@ -84,60 +94,6 @@ class SocialAction
         $this->results = new ArrayCollection();
     }
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getDesactivationDate(): ?\DateTimeInterface
-    {
-        return $this->desactivationDate;
-    }
-
-    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
-    {
-        $this->desactivationDate = $desactivationDate;
-
-        return $this;
-    }
-
-    public function getIssue(): ?SocialIssue
-    {
-        return $this->issue;
-    }
-
-    public function setIssue(?SocialIssue $issue): self
-    {
-        $this->issue = $issue;
-
-        return $this;
-    }
-
-    public function getParent(): ?self
-    {
-        return $this->parent;
-    }
-
-    public function hasParent(): bool
-    {
-        return $this->getParent() instanceof self;
-    }
-
-    public function setParent(?self $parent): self
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|self[]
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children;
-    }
-
     public function addChild(self $child): self
     {
         if (!$this->children->contains($child)) {
@@ -148,18 +104,42 @@ class SocialAction
         return $this;
     }
 
-    public function removeChild(self $child): self
+    public function addGoal(Goal $goal): self
     {
-        if ($this->children->removeElement($child)) {
-            // set the owning side to null (unless already changed)
-            if ($child->getParent() === $this) {
-                $child->setParent(null);
-            }
+        if (!$this->goals->contains($goal)) {
+            $this->goals[] = $goal;
         }
 
         return $this;
     }
 
+    public function addResult(Result $result): self
+    {
+        if (!$this->results->contains($result)) {
+            $this->results[] = $result;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return Collection|self[]
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
+    public function getDefaultNotificationDelay(): ?DateInterval
+    {
+        return $this->defaultNotificationDelay;
+    }
+
+    public function getDesactivationDate(): ?DateTimeInterface
+    {
+        return $this->desactivationDate;
+    }
+
     /**
      * @return Collection|self[] All the descendants (children, children of children, ...)
      */
@@ -168,10 +148,11 @@ class SocialAction
         $descendants = new ArrayCollection();
 
         foreach ($this->getChildren() as $child) {
-            if(! $descendants->contains($child)) {
+            if (!$descendants->contains($child)) {
                 $descendants->add($child);
-                foreach($child->getDescendants() as $descendantsOfChild) {
-                    if(! $descendants->contains($descendantsOfChild)) {
+
+                foreach ($child->getDescendants() as $descendantsOfChild) {
+                    if (!$descendants->contains($descendantsOfChild)) {
                         $descendants->add($descendantsOfChild);
                     }
                 }
@@ -188,35 +169,16 @@ class SocialAction
     {
         $descendants = $this->getDescendants();
 
-        if(! $descendants->contains($this)) {
+        if (!$descendants->contains($this)) {
             $descendants->add($this);
         }
 
         return $descendants;
     }
 
-    public function getDefaultNotificationDelay(): ?\DateInterval
+    public function getEvaluations(): Collection
     {
-        return $this->defaultNotificationDelay;
-    }
-
-    public function setDefaultNotificationDelay(\DateInterval $defaultNotificationDelay): self
-    {
-        $this->defaultNotificationDelay = $defaultNotificationDelay;
-
-        return $this;
-    }
-
-    public function getTitle(): array
-    {
-        return $this->title;
-    }
-
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
+        return $this->evaluations;
     }
 
     /**
@@ -227,10 +189,46 @@ class SocialAction
         return $this->goals;
     }
 
-    public function addGoal(Goal $goal): self
+    public function getId(): ?int
     {
-        if (!$this->goals->contains($goal)) {
-            $this->goals[] = $goal;
+        return $this->id;
+    }
+
+    public function getIssue(): ?SocialIssue
+    {
+        return $this->issue;
+    }
+
+    public function getParent(): ?self
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @return Collection|Result[]
+     */
+    public function getResults(): Collection
+    {
+        return $this->results;
+    }
+
+    public function getTitle(): array
+    {
+        return $this->title;
+    }
+
+    public function hasParent(): bool
+    {
+        return $this->getParent() instanceof self;
+    }
+
+    public function removeChild(self $child): self
+    {
+        if ($this->children->removeElement($child)) {
+            // set the owning side to null (unless already changed)
+            if ($child->getParent() === $this) {
+                $child->setParent(null);
+            }
         }
 
         return $this;
@@ -243,23 +241,6 @@ class SocialAction
         return $this;
     }
 
-    /**
-     * @return Collection|Result[]
-     */
-    public function getResults(): Collection
-    {
-        return $this->results;
-    }
-
-    public function addResult(Result $result): self
-    {
-        if (!$this->results->contains($result)) {
-            $this->results[] = $result;
-        }
-
-        return $this;
-    }
-
     public function removeResult(Result $result): self
     {
         $this->results->removeElement($result);
@@ -267,11 +248,38 @@ class SocialAction
         return $this;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getEvaluations(): Collection
+    public function setDefaultNotificationDelay(DateInterval $defaultNotificationDelay): self
     {
-        return $this->evaluations;
+        $this->defaultNotificationDelay = $defaultNotificationDelay;
+
+        return $this;
+    }
+
+    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
+    {
+        $this->desactivationDate = $desactivationDate;
+
+        return $this;
+    }
+
+    public function setIssue(?SocialIssue $issue): self
+    {
+        $this->issue = $issue;
+
+        return $this;
+    }
+
+    public function setParent(?self $parent): self
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index f9956e57f..80b106b4e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -1,21 +1,42 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_person_social_issue")
  * @DiscriminatorMap(typeProperty="type", mapping={
- *   "social_issue"=SocialIssue::class
+ *     "social_issue": SocialIssue::class
  * })
  */
 class SocialIssue
 {
+    /**
+     * @ORM\OneToMany(targetEntity=SocialIssue::class, mappedBy="parent")
+     */
+    private $children;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private $desactivationDate;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -29,14 +50,9 @@ class SocialIssue
     private $parent;
 
     /**
-     * @ORM\OneToMany(targetEntity=SocialIssue::class, mappedBy="parent")
+     * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="issue")
      */
-    private $children;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $desactivationDate;
+    private $socialActions;
 
     /**
      * @ORM\Column(type="json")
@@ -44,47 +60,12 @@ class SocialIssue
      */
     private $title = [];
 
-    /**
-     * @ORM\OneToMany(targetEntity=SocialAction::class, mappedBy="issue")
-     */
-    private $socialActions;
-
     public function __construct()
     {
         $this->children = new ArrayCollection();
         $this->socialActions = new ArrayCollection();
     }
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getParent(): ?self
-    {
-        return $this->parent;
-    }
-
-    public function hasParent(): bool
-    {
-        return $this->parent !== null;
-    }
-
-    public function setParent(?self $parent): self
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|self[]
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children;
-    }
-
     public function addChild(self $child): self
     {
         if (!$this->children->contains($child)) {
@@ -95,18 +76,86 @@ class SocialIssue
         return $this;
     }
 
-    public function removeChild(self $child): self
+    public function addSocialAction(SocialAction $socialAction): self
     {
-        if ($this->children->removeElement($child)) {
-            // set the owning side to null (unless already changed)
-            if ($child->getParent() === $this) {
-                $child->setParent(null);
-            }
+        if (!$this->socialActions->contains($socialAction)) {
+            $this->socialActions[] = $socialAction;
+            $socialAction->setSocialIssue($this);
         }
 
         return $this;
     }
 
+    /**
+     * In a SocialIssues's collection, find the elements which are an ancestor of
+     * other elements.
+     *
+     * Removing those elements of the Collection (which is not done by this method)
+     * will ensure that only the most descendent elements are present in the collection,
+     * (any ancestor of another element are present).
+     *
+     * @param Collection|SocialIssue[] $socialIssues
+     *
+     * @return Collection|SocialIssue[]
+     */
+    public static function findAncestorSocialIssues(Collection $socialIssues): Collection
+    {
+        $ancestors = new ArrayCollection();
+
+        foreach ($socialIssues as $candidateChild) {
+            if ($ancestors->contains($candidateChild)) {
+                continue;
+            }
+
+            foreach ($socialIssues as $candidateParent) {
+                if ($ancestors->contains($candidateParent)) {
+                    continue;
+                }
+
+                if ($candidateChild->isDescendantOf($candidateParent)) {
+                    $ancestors->add($candidateParent);
+                }
+            }
+        }
+
+        return $ancestors;
+    }
+
+    /**
+     * get all the ancestors of the social issue.
+     *
+     * @param bool $includeThis if the array in the result must include the present SocialIssue
+     */
+    public function getAncestors(bool $includeThis = true): array
+    {
+        $ancestors = [];
+
+        if ($includeThis) {
+            $ancestors[] = $this;
+        }
+
+        $current = $this;
+
+        while ($current->hasParent()) {
+            $ancestors[] = $current = $current->getParent();
+        }
+
+        return $ancestors;
+    }
+
+    /**
+     * @return Collection|self[]
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
+    public function getDesactivationDate(): ?DateTimeInterface
+    {
+        return $this->desactivationDate;
+    }
+
     /**
      * @return Collection|self[] All the descendants (children, children of children, ...)
      */
@@ -115,10 +164,11 @@ class SocialIssue
         $descendants = new ArrayCollection();
 
         foreach ($this->getChildren() as $child) {
-            if(! $descendants->contains($child)) {
+            if (!$descendants->contains($child)) {
                 $descendants->add($child);
-                foreach($child->getDescendants() as $descendantsOfChild) {
-                    if(! $descendants->contains($descendantsOfChild)) {
+
+                foreach ($child->getDescendants() as $descendantsOfChild) {
+                    if (!$descendants->contains($descendantsOfChild)) {
                         $descendants->add($descendantsOfChild);
                     }
                 }
@@ -128,6 +178,24 @@ class SocialIssue
         return $descendants;
     }
 
+    /**
+     * @return Collection|SocialAction[] All the descendant social actions of the entity
+     */
+    public function getDescendantsSocialActions(): Collection
+    {
+        $descendantsSocialActions = new ArrayCollection();
+
+        foreach ($this->getSocialActions() as $socialAction) {
+            foreach ($socialAction->getDescendantsWithThis() as $descendant) {
+                if (!$descendantsSocialActions->contains($descendant)) {
+                    $descendantsSocialActions->add($descendant);
+                }
+            }
+        }
+
+        return $descendantsSocialActions;
+    }
+
     /**
      * @return Collection|self[] All the descendants with the current entity (this)
      */
@@ -135,36 +203,40 @@ class SocialIssue
     {
         $descendants = $this->getDescendants();
 
-        if(! $descendants->contains($this)) {
+        if (!$descendants->contains($this)) {
             $descendants->add($this);
         }
 
         return $descendants;
     }
 
-
-    public function getDesactivationDate(): ?\DateTimeInterface
+    public function getId(): ?int
     {
-        return $this->desactivationDate;
+        return $this->id;
     }
 
-    public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self
+    public function getParent(): ?self
     {
-        $this->desactivationDate = $desactivationDate;
-
-        return $this;
+        return $this->parent;
     }
 
-    public function getTitle(): array
+    /**
+     * @return Collection|SocialAction[] All the descendant social actions of all
+     * the descendants of the entity
+     */
+    public function getRecursiveSocialActions(): Collection
     {
-        return $this->title;
-    }
+        $recursiveSocialActions = new ArrayCollection();
 
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
+        foreach ($this->getDescendantsWithThis() as $socialIssue) {
+            foreach ($socialIssue->getDescendantsSocialActions() as $descendant) {
+                if (!$recursiveSocialActions->contains($descendant)) {
+                    $recursiveSocialActions->add($descendant);
+                }
+            }
+        }
 
-        return $this;
+        return $recursiveSocialActions;
     }
 
     /**
@@ -175,11 +247,40 @@ class SocialIssue
         return $this->socialActions;
     }
 
-    public function addSocialAction(SocialAction $socialAction): self
+    public function getTitle(): array
     {
-        if (!$this->socialActions->contains($socialAction)) {
-            $this->socialActions[] = $socialAction;
-            $socialAction->setSocialIssue($this);
+        return $this->title;
+    }
+
+    public function hasParent(): bool
+    {
+        return null !== $this->parent;
+    }
+
+    /**
+     * Recursive method which return true if the current $issue is a descendant
+     * of the $issue given in parameter.
+     */
+    public function isDescendantOf(SocialIssue $issue): bool
+    {
+        if (!$this->hasParent()) {
+            return false;
+        }
+
+        if ($this->getParent() === $issue) {
+            return true;
+        }
+
+        return $this->getParent()->isDescendantOf($issue);
+    }
+
+    public function removeChild(self $child): self
+    {
+        if ($this->children->removeElement($child)) {
+            // set the owning side to null (unless already changed)
+            if ($child->getParent() === $this) {
+                $child->setParent(null);
+            }
         }
 
         return $this;
@@ -197,93 +298,24 @@ class SocialIssue
         return $this;
     }
 
-    /**
-     * @return Collection|SocialAction[] All the descendant social actions of the entity
-     */
-    public function getDescendantsSocialActions(): Collection
+    public function setDesactivationDate(?DateTimeInterface $desactivationDate): self
     {
-        $descendantsSocialActions = new ArrayCollection();
+        $this->desactivationDate = $desactivationDate;
 
-        foreach ($this->getSocialActions() as $socialAction) {
-            foreach ($socialAction->getDescendantsWithThis() as $descendant) {
-                if(! $descendantsSocialActions->contains($descendant)) {
-                    $descendantsSocialActions->add($descendant);
-                }
-            }
-        }
-
-        return $descendantsSocialActions;
+        return $this;
     }
 
-    /**
-     * @return Collection|SocialAction[] All the descendant social actions of all
-     * the descendants of the entity
-     */
-    public function getRecursiveSocialActions(): Collection
+    public function setParent(?self $parent): self
     {
-        $recursiveSocialActions = new ArrayCollection();
+        $this->parent = $parent;
 
-        foreach ($this->getDescendantsWithThis() as $socialIssue) {
-            foreach ($socialIssue->getDescendantsSocialActions() as $descendant) {
-                if(! $recursiveSocialActions->contains($descendant)) {
-                    $recursiveSocialActions->add($descendant);
-                }
-            }
-        }
-
-        return $recursiveSocialActions;
+        return $this;
     }
 
-    /**
-     * Recursive method which return true if the current $issue is a descendant
-     * of the $issue given in parameter.
-     *
-     * @param SocialIssue $issue
-     * @return bool
-     */
-    public function isDescendantOf(SocialIssue $issue): bool
+    public function setTitle(array $title): self
     {
-        if (!$this->hasParent()) {
-            return false;
-        }
+        $this->title = $title;
 
-        if ($this->getParent() === $issue) {
-            return true;
-        }
-
-        return $this->getParent()->isDescendantOf($issue);
-    }
-
-    /**
-     * In a SocialIssues's collection, find the elements which are an ancestor of
-     * other elements.
-     *
-     * Removing those elements of the Collection (which is not done by this method)
-     * will ensure that only the most descendent elements are present in the collection,
-     * (any ancestor of another element are present).
-     *
-     * @param Collection|SocialIssue[] $socialIssues
-     * @return Collection|SocialIssue[]
-     */
-    public static function findAncestorSocialIssues(Collection $socialIssues): Collection
-    {
-        $ancestors = new ArrayCollection();
-
-        foreach ($socialIssues as $candidateChild) {
-            if ($ancestors->contains($candidateChild)) {
-                continue;
-            }
-            foreach ($socialIssues as $candidateParent) {
-                if ($ancestors->contains($candidateParent)) {
-                    continue;
-                }
-
-                if ($candidateChild->isDescendantOf($candidateParent)) {
-                    $ancestors->add($candidateParent);
-                }
-            }
-        }
-
-        return $ancestors;
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
index 20855a166..d3b4beb47 100644
--- a/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
+++ b/src/Bundle/ChillPersonBundle/EventListener/PersonEventListener.php
@@ -1,17 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\PersonBundle\EventListener;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
-use Doctrine\Persistence\Event\LifecycleEventArgs;
-use LogicException;
-use Symfony\Component\Validator\Exception\LogicException as ExceptionLogicException;
+use const MB_CASE_TITLE;
 
 class PersonEventListener
 {
+    public function prePersistAltName(PersonAltName $altname)
+    {
+        $altnameCaps = mb_strtoupper($altname->getLabel(), 'UTF-8');
+        $altname->setLabel($altnameCaps);
+    }
+
     public function prePersistPerson(Person $person): void
     {
         $firstnameCaps = mb_convert_case(mb_strtolower($person->getFirstName()), MB_CASE_TITLE, 'UTF-8');
@@ -21,10 +32,4 @@ class PersonEventListener
         $lastnameCaps = mb_strtoupper($person->getLastName(), 'UTF-8');
         $person->setLastName($lastnameCaps);
     }
-
-    public function prePersistAltName(PersonAltName $altname)
-    {
-        $altnameCaps = mb_strtoupper($altname->getLabel(), 'UTF-8');
-        $altname->setLabel($altnameCaps);
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
index c21d5733a..b570c83de 100644
--- a/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
+++ b/src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
@@ -1,59 +1,46 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export;
 
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use function in_array;
 
-/**
- * 
- *
- */
 class AbstractAccompanyingPeriodExportElement
 {
+    /**
+     * Add the accompanying period alias to the query.
+     *
+     * @throws LogicException if the "person" alias is not present and attaching accompanying period is not possible
+     */
+    protected function addJoinAccompanyingPeriod(QueryBuilder $query): void
+    {
+        if (false === $this->havingAccompanyingPeriodInJoin($query)) {
+            if (false === in_array('person', $query->getAllAliases(), true)) {
+                throw new LogicException("the alias 'person' does not exists in "
+                    . 'query builder');
+            }
+
+            $query->join('person.accompanyingPeriods', 'accompanying_period');
+        }
+    }
+
     /**
      * Return true if "accompanying_period" alias is present in the query alises.
-     * 
-     * @param QueryBuilder $query
-     * @return bool
      */
     protected function havingAccompanyingPeriodInJoin(QueryBuilder $query): bool
     {
         $joins = $query->getDQLPart('join') ?? [];
-        
-        return (\in_array('accompanying_period', $query->getAllAliases()));
-    }
-    
-    /**
-     * Add the accompanying period alias to the query
-     * 
-     * @param QueryBuilder $query
-     * @return void
-     * @throws \LogicException if the "person" alias is not present and attaching accompanying period is not possible
-     */
-    protected function addJoinAccompanyingPeriod(QueryBuilder $query): void
-    {
-        if (FALSE === $this->havingAccompanyingPeriodInJoin($query)) {
-            if (FALSE === \in_array('person', $query->getAllAliases())) {
-                throw new \LogicException("the alias 'person' does not exists in "
-                    . "query builder");
-            }
-            
-            $query->join('person.accompanyingPeriods', 'accompanying_period');
-        }
+
+        return in_array('accompanying_period', $query->getAllAliases(), true);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
index bd07d3a48..04edade32 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php
@@ -1,28 +1,21 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator;
 
 use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use DateTime;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -54,48 +47,47 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_age_calculation', DateType::class, array(
-            'label' => "Calculate age in relation to this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
-            'format' => 'dd-MM-yyyy'
-        ));
-    }
-    
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['date_age_calculation'] === null) {
-            $context->buildViolation("The date should not be empty")
-                ->addViolation();
-        }
+        $builder->add('date_age_calculation', DateType::class, [
+            'label' => 'Calculate age in relation to this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ]);
     }
 
     public function getLabels($key, array $values, $data)
     {
-        return function($value) {
-            if ($value === '_header') {
-                return "Age";
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Age';
             }
-            
-            if ($value === NULL) {
-                return $this->translator->trans("without data");
+
+            if (null === $value) {
+                return $this->translator->trans('without data');
             }
-            
+
             return $value;
         };
     }
 
     public function getQueryKeys($data)
     {
-        return array(
-            'person_age'
-        );
+        return [
+            'person_age',
+        ];
     }
 
     public function getTitle()
     {
-        return "Aggregate by age";
+        return 'Aggregate by age';
     }
 
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['date_age_calculation']) {
+            $context->buildViolation('The date should not be empty')
+                ->addViolation();
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
index 1deefe993..9126542ad 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
@@ -1,37 +1,27 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator;
 
 use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\MainBundle\Util\CountriesInfo;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Repository\CountryRepository;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Util\CountriesInfo;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 final class CountryOfBirthAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -51,38 +41,17 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
         $this->translator = $translator;
     }
 
-    public function applyOn()
+    public function addRole()
     {
-        return 'person';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('group_by_level', ChoiceType::class, array(
-            'choices' => array(
-                'Group by continents' => 'continent',
-                'Group by country' => 'country'
-            ),
-            'expanded' => true,
-            'multiple' => false
-        ));
-
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['group_by_level'] === null) {
-            $context->buildViolation("You should select an option")
-                ->addViolation();
-        }
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add a clause in select part
-        if ($data['group_by_level'] === 'country') {
+        if ('country' === $data['group_by_level']) {
             $qb->addSelect('countryOfBirth.countryCode as country_of_birth_aggregator');
-        } elseif ($data['group_by_level'] === 'continent') {
+        } elseif ('continent' === $data['group_by_level']) {
             $clause = 'CASE '
                     . 'WHEN countryOfBirth.countryCode IN(:cob_africa_codes) THEN \'AF\' '
                     . 'WHEN countryOfBirth.countryCode IN(:cob_asia_codes) THEN \'AS\' '
@@ -95,24 +64,24 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                     . 'END as country_of_birth_aggregator ';
             $qb->addSelect($clause);
             $params =
-                    array(
+                    [
                         'cob_africa_codes' => CountriesInfo::getCountriesCodeByContinent('AF'),
                         'cob_asia_codes' => CountriesInfo::getCountriesCodeByContinent('AS'),
                         'cob_europe_codes' => CountriesInfo::getCountriesCodeByContinent('EU'),
                         'cob_north_america_codes' => CountriesInfo::getCountriesCodeByContinent('NA'),
                         'cob_south_america_codes' => CountriesInfo::getCountriesCodeByContinent('SA'),
                         'cob_oceania_codes' => CountriesInfo::getCountriesCodeByContinent('OC'),
-                        'cob_antartica_codes' => CountriesInfo::getCountriesCodeByContinent('AN')
-            );
+                        'cob_antartica_codes' => CountriesInfo::getCountriesCodeByContinent('AN'),
+                    ];
+
             foreach ($params as $k => $v) {
                 $qb->setParameter($k, $v);
             }
         } else {
-            throw new \LogicException("The group_by_level '".$data['group_by_level']
-                    ." is not known.");
+            throw new LogicException("The group_by_level '" . $data['group_by_level']
+                    . ' is not known.');
         }
 
-
         $qb->leftJoin('person.countryOfBirth', 'countryOfBirth');
 
         // add group by
@@ -123,46 +92,51 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
         } else {
             $qb->groupBy('country_of_birth_aggregator');
         }
-
     }
 
-    public function getTitle()
+    public function applyOn()
     {
-        return "Group people by country of birth";
+        return 'person';
     }
 
-    public function getQueryKeys($data)
+    public function buildForm(FormBuilderInterface $builder)
     {
-        return array('country_of_birth_aggregator');
-    }
-
-    public function addRole()
-    {
-        return NULL;
+        $builder->add('group_by_level', ChoiceType::class, [
+            'choices' => [
+                'Group by continents' => 'continent',
+                'Group by country' => 'country',
+            ],
+            'expanded' => true,
+            'multiple' => false,
+        ]);
     }
 
     public function getLabels($key, array $values, $data)
     {
-        if ($data['group_by_level'] === 'country') {
+        $labels = [];
+
+        if ('country' === $data['group_by_level']) {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
             $countries = $qb
-                    ->andWhere($qb->expr()->in('c.countryCode', ':countries'))
-                    ->setParameter('countries', $values)
-                    ->getQuery()
-                    ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                ->andWhere($qb->expr()->in('c.countryCode', ':countries'))
+                ->setParameter('countries', $values)
+                ->getQuery()
+                ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
-            $labels['_header'] = $this->translator->trans('Country of birth');
-            foreach($countries as $row) {
+            $labels = [
+                '' => $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']);
             }
+        }
 
-
-        } elseif ($data['group_by_level'] === 'continent') {
-
-            $labels = array(
+        if ('continent' === $data['group_by_level']) {
+            $labels = [
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
                 'AN' => $this->translator->trans('Antartica'),
@@ -170,15 +144,31 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                 'SA' => $this->translator->trans('South America'),
                 'NA' => $this->translator->trans('North America'),
                 'OC' => $this->translator->trans('Oceania'),
-                ''   => $this->translator->trans('without data'),
-                '_header' => $this->translator->trans('Continent of birth')
-             );
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Continent of birth'),
+            ];
         }
 
-
-        return function($value) use ($labels) {
+        return static function (string $value) use ($labels): string {
             return $labels[$value];
         };
+    }
 
+    public function getQueryKeys($data)
+    {
+        return ['country_of_birth_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group people by country of birth';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['group_by_level']) {
+            $context->buildViolation('You should select an option')
+                ->addViolation();
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
index cd3c022d9..d40f0e739 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
@@ -1,30 +1,23 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator;
 
 use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Translation\TranslatorInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 final class GenderAggregator implements AggregatorInterface
 {
@@ -35,6 +28,18 @@ final class GenderAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
+    public function addRole()
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->addSelect('person.gender as gender');
+
+        $qb->addGroupBy('gender');
+    }
+
     public function applyOn()
     {
         return Declarations::PERSON_TYPE;
@@ -42,51 +47,40 @@ final class GenderAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        
     }
-    
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
 
-        $qb->addSelect('person.gender as gender');
-        
-        $qb->addGroupBy('gender');
-        
-    }
-    
-    public function getTitle()
-    {
-        return "Group people by gender";
-    }
-    
-    public function getQueryKeys($data)
-    {
-        return array('gender');
-    }
-    
     public function getLabels($key, array $values, $data)
-    {    
-        return function($value) {
+    {
+        return function ($value) {
             switch ($value) {
-                case Person::FEMALE_GENDER : 
+                case Person::FEMALE_GENDER:
                     return $this->translator->trans('woman');
-                case Person::MALE_GENDER   : 
+
+                case Person::MALE_GENDER:
                     return $this->translator->trans('man');
+
                 case Person::BOTH_GENDER:
                     return $this->translator->trans('both');
+
                 case null:
                     return $this->translator->trans('Not given');
-                case '_header' : 
+
+                case '_header':
                     return $this->translator->trans('Gender');
+
                 default:
-                    throw new \LogicException(sprintf("The value %s is not valid", $value));
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
             }
         };
     }
 
-    public function addRole()
+    public function getQueryKeys($data)
     {
-        return NULL;
+        return ['gender'];
     }
 
+    public function getTitle()
+    {
+        return 'Group people by gender';
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
index e856bedc6..05a0baa05 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
@@ -1,37 +1,27 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator;
 
 use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\MainBundle\Util\CountriesInfo;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Repository\CountryRepository;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Util\CountriesInfo;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 final class NationalityAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -51,39 +41,17 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
         $this->translator = $translator;
     }
 
-    public function applyOn()
+    public function addRole()
     {
-        return 'person';
-    }
-
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('group_by_level', ChoiceType::class, array(
-            'choices' => array(
-                'Group by continents' => 'continent',
-                'Group by country' => 'country'
-            ),
-            'expanded' => true,
-            'multiple' => false
-        ));
-
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['group_by_level'] === null) {
-            $context->buildViolation("You should select an option")
-                ->addViolation();
-        }
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add a clause in select part
-        if ($data['group_by_level'] === 'country') {
+        if ('country' === $data['group_by_level']) {
             $qb->addSelect('nationality.countryCode as nationality_aggregator');
-        } elseif ($data['group_by_level'] === 'continent') {
+        } elseif ('continent' === $data['group_by_level']) {
             $clause = 'CASE '
                     . 'WHEN nationality.countryCode IN(:africa_codes) THEN \'AF\' '
                     . 'WHEN nationality.countryCode IN(:asia_codes) THEN \'AS\' '
@@ -96,24 +64,24 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
                     . 'END as nationality_aggregator ';
             $qb->addSelect($clause);
             $params =
-                    array(
+                    [
                         'africa_codes' => CountriesInfo::getCountriesCodeByContinent('AF'),
                         'asia_codes' => CountriesInfo::getCountriesCodeByContinent('AS'),
                         'europe_codes' => CountriesInfo::getCountriesCodeByContinent('EU'),
                         'north_america_codes' => CountriesInfo::getCountriesCodeByContinent('NA'),
                         'south_america_codes' => CountriesInfo::getCountriesCodeByContinent('SA'),
                         'oceania_codes' => CountriesInfo::getCountriesCodeByContinent('OC'),
-                        'antartica_codes' => CountriesInfo::getCountriesCodeByContinent('AN')
-            );
+                        'antartica_codes' => CountriesInfo::getCountriesCodeByContinent('AN'),
+                    ];
+
             foreach ($params as $k => $v) {
                 $qb->setParameter($k, $v);
             }
         } else {
-            throw new \LogicException("The group_by_level '".$data['group_by_level']
-                    ." is not known.");
+            throw new LogicException("The group_by_level '" . $data['group_by_level']
+                    . ' is not known.');
         }
 
-
         $qb->leftJoin('person.nationality', 'nationality');
 
         // add group by
@@ -124,46 +92,51 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
         } else {
             $qb->groupBy('nationality_aggregator');
         }
-
     }
 
-    public function getTitle()
+    public function applyOn()
     {
-        return "Group people by nationality";
+        return 'person';
     }
 
-    public function getQueryKeys($data)
+    public function buildForm(FormBuilderInterface $builder)
     {
-        return array('nationality_aggregator');
-    }
-
-    public function addRole()
-    {
-        return NULL;
+        $builder->add('group_by_level', ChoiceType::class, [
+            'choices' => [
+                'Group by continents' => 'continent',
+                'Group by country' => 'country',
+            ],
+            'expanded' => true,
+            'multiple' => false,
+        ]);
     }
 
     public function getLabels($key, array $values, $data)
     {
-        if ($data['group_by_level'] === 'country') {
+        $labels = [];
+
+        if ('country' === $data['group_by_level']) {
             $qb = $this->countriesRepository->createQueryBuilder('c');
 
             $countries = $qb
-                    ->andWhere($qb->expr()->in('c.countryCode', ':countries'))
-                    ->setParameter('countries', $values)
-                    ->getQuery()
-                    ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                ->andWhere($qb->expr()->in('c.countryCode', ':countries'))
+                ->setParameter('countries', $values)
+                ->getQuery()
+                ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
-            $labels[''] = $this->translator->trans('without data');
-            $labels['_header'] = $this->translator->trans('Nationality');
-            foreach($countries as $row) {
+            $labels = [
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Nationality'),
+            ];
+
+            foreach ($countries as $row) {
                 $labels[$row['c_countryCode']] = $this->translatableStringHelper->localize($row['c_name']);
             }
+        }
 
-
-        } elseif ($data['group_by_level'] === 'continent') {
-
-            $labels = array(
+        if ('continent' === $data['group_by_level']) {
+            $labels = [
                 'EU' => $this->translator->trans('Europe'),
                 'AS' => $this->translator->trans('Asia'),
                 'AN' => $this->translator->trans('Antartica'),
@@ -171,15 +144,31 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
                 'SA' => $this->translator->trans('South America'),
                 'NA' => $this->translator->trans('North America'),
                 'OC' => $this->translator->trans('Oceania'),
-                ''   => $this->translator->trans('without data'),
-                '_header' => $this->translator->trans('Continent')
-             );
+                '' => $this->translator->trans('without data'),
+                '_header' => $this->translator->trans('Continent'),
+            ];
         }
 
-
-        return function($value) use ($labels) {
+        return static function (string $value) use ($labels): string {
             return $labels[$value];
         };
+    }
 
+    public function getQueryKeys($data)
+    {
+        return ['nationality_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group people by nationality';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['group_by_level']) {
+            $context->buildViolation('You should select an option')
+                ->addViolation();
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Declarations.php b/src/Bundle/ChillPersonBundle/Export/Declarations.php
index bbdf3e8e4..b23325e5e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Declarations.php
+++ b/src/Bundle/ChillPersonBundle/Export/Declarations.php
@@ -1,32 +1,22 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export;
 
 /**
  * This class declare constants used for the export framework.
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 abstract class Declarations
 {
-    CONST PERSON_TYPE = 'person';
-    CONST PERSON_IMPLIED_IN = 'person_implied_in';
+    public const PERSON_IMPLIED_IN = 'person_implied_in';
+
+    public const PERSON_TYPE = 'person';
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
index 0431095ec..ffa69026a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
@@ -1,136 +1,115 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\Query;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Export\Declarations;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CountPerson implements ExportInterface
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $entityManager;
-    
+
     public function __construct(
-            EntityManagerInterface $em
-            )
-    {
+        EntityManagerInterface $em
+    ) {
         $this->entityManager = $em;
     }
-    
-    /**
-     * 
-     */
-    public function getType()
+
+    public function buildForm(FormBuilderInterface $builder)
     {
-        return Declarations::PERSON_TYPE;
     }
-    
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
     public function getDescription()
     {
-        return "Count peoples by various parameters.";
+        return 'Count peoples by various parameters.';
     }
-    
-    public function getTitle()
+
+    public function getLabels($key, array $values, $data)
     {
-        return "Count peoples";
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
     }
-    
-    public function requiredRole()
+
+    public function getQueryKeys($data)
     {
-        return new Role(PersonVoter::STATS);
+        return ['export_result'];
     }
-    
-    /**
-     * Initiate the query
-     * 
-     * @param QueryBuilder $qb
-     * @return QueryBuilder
-     */
-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
-    {
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
-        
-        $qb = $this->entityManager->createQueryBuilder();
-        
-        $qb->select('COUNT(person.id) AS export_result')
-                ->from('ChillPersonBundle:Person', 'person')
-                ->join('person.center', 'center')
-                ->andWhere('center IN (:authorized_centers)')
-                ->setParameter('authorized_centers', $centers);
-                ;
-        
-        
-        return $qb;
-    }
-    
+
     public function getResult($qb, $data)
     {
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
-    
-    public function getQueryKeys($data)
-    {
-        return array('export_result');
-    }
-    
-    public function getLabels($key, array $values, $data)
-    {
-        if ($key !== 'export_result') {
-            throw new \LogicException("the key $key is not used by this export");
-        }
-        
-        $labels = array_combine($values, $values);
-        $labels['_header'] = $this->getTitle();
-        
-        return function($value) use ($labels) {
-            return $labels[$value];
-        };
-    }
-    
-    public function getAllowedFormattersTypes()
-    {
-        return array(FormatterInterface::TYPE_TABULAR);
-    }
-    
-    public function buildForm(FormBuilderInterface $builder) {
 
+    public function getTitle()
+    {
+        return 'Count peoples';
     }
-    
+
+    public function getType()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    /**
+     * Initiate the query.
+     *
+     * @return QueryBuilder
+     */
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb->select('COUNT(person.id) AS export_result')
+            ->from('ChillPersonBundle:Person', 'person')
+            ->join('person.center', 'center')
+            ->andWhere('center IN (:authorized_centers)')
+            ->setParameter('authorized_centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole()
+    {
+        return new Role(PersonVoter::STATS);
+    }
+
     public function supportsModifiers()
     {
-        return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
+        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
     }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
index dc36c8c57..6c02f4033 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
@@ -1,75 +1,75 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Export;
 
-use Chill\MainBundle\Export\ListInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\Query;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Export\Declarations;
+use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Exception;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\PersonBundle\Entity\Person;
-use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
+use function addcslashes;
+use function array_key_exists;
+use function array_keys;
+use function array_merge;
+use function count;
+use function in_array;
+use function strtolower;
+use function uniqid;
 
 /**
- * Render a list of peoples
- *
- * @author julien
+ * Render a list of people.
  */
-class ListPerson implements ListInterface, ExportElementValidatedInterface
+class ListPerson implements ExportElementValidatedInterface, ListInterface
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $entityManager;
+    protected CustomFieldProvider $customFieldProvider;
 
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected EntityManagerInterface $entityManager;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     *
-     * @var CustomFieldProvider
-     */
-    protected $customFieldProvider;
-
-    protected $fields = array(
+    protected array $fields = [
         'id',  'firstName', 'lastName', 'birthdate',
         'placeOfBirth', 'gender', 'memo', 'email', 'phonenumber',
         'mobilenumber', 'contactInfo', 'countryOfBirth', 'nationality',
         'address_street_address_1', 'address_street_address_2',
         'address_valid_from', 'address_postcode_label', 'address_postcode_code',
-        'address_country_name', 'address_country_code', 'address_isnoaddress'
-    );
-    
+        'address_country_name', 'address_country_code', 'address_isnoaddress',
+    ];
+
+    protected TranslatableStringHelper $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
     private $slugs = [];
-    
+
     public function __construct(
-            EntityManagerInterface $em,
-            TranslatorInterface $translator,
-            TranslatableStringHelper $translatableStringHelper,
-            CustomFieldProvider $customFieldProvider
+        EntityManagerInterface $em,
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper,
+        CustomFieldProvider $customFieldProvider
     ) {
         $this->entityManager = $em;
         $this->translator = $translator;
@@ -77,360 +77,214 @@ class ListPerson implements ListInterface, ExportElementValidatedInterface
         $this->customFieldProvider = $customFieldProvider;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param FormBuilderInterface $builder
-     */
     public function buildForm(FormBuilderInterface $builder)
     {
         $choices = array_combine($this->fields, $this->fields);
 
         foreach ($this->getCustomFields() as $cf) {
-            $choices
-                [$this->translatableStringHelper->localize($cf->getName())]
+            $choices[$this->translatableStringHelper->localize($cf->getName())]
                 =
                 $cf->getSlug();
         }
 
         // Add a checkbox to select fields
-        $builder->add('fields', ChoiceType::class, array(
+        $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $choices,
-            'label'    => 'Fields to include in export',
-            'choice_attr' => function($val, $key, $index) {
+            'label' => 'Fields to include in export',
+            'choice_attr' => static function (string $val): array {
                 // add a 'data-display-target' for address fields
                 if (substr($val, 0, 8) === 'address_') {
                     return ['data-display-target' => 'address_date'];
-                } else {
-                    return [];
                 }
+
+                return [];
             },
-            'constraints' => [new Callback(array(
-                'callback' => function($selected, ExecutionContextInterface $context) {
+            'constraints' => [new Callback([
+                'callback' => static function ($selected, ExecutionContextInterface $context) {
                     if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
-                }
-            ))]
-        ));
+                },
+            ])],
+        ]);
 
         // add a date  field for addresses
-        $builder->add('address_date', DateType::class, array(
-            'label' => "Address valid at this date",
-            'data'  => new \DateTime(),
-            'attr'  => array( 'class' => 'datepicker'),
-            'widget'=> 'single_text',
+        $builder->add('address_date', DateType::class, [
+            'label' => 'Address valid at this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
             'required' => false,
-            'block_name' => 'list_export_form_address_date'
-        ));
+            'block_name' => 'list_export_form_address_date',
+        ]);
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        // get the field starting with address_
-        $addressFields = array_filter(function($el) {
-                return substr($el, 0, 8) === 'address_';
-            }, $this->fields);
-
-        // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
-            // if a field address is checked, the date must not be empty
-            if (empty($data['address_date'])) {
-                $context
-                    ->buildViolation("You must set this date if an address is checked")
-                    ->atPath('address_date')
-                    ->addViolation();
-            }
-        }
-    }
-
-    /**
-     * Get custom fields associated with person
-     *
-     * @return CustomField[]
-     */
-    private function getCustomFields()
-    {
-        return $this->entityManager
-            ->createQuery("SELECT cf "
-                . "FROM ChillCustomFieldsBundle:CustomField cf "
-                . "JOIN cf.customFieldGroup g "
-                . "WHERE cf.type != :title AND g.entity LIKE :entity")
-            ->setParameters(array(
-                'title'  => 'title',
-                'entity' => \addcslashes(Person::class, "\\")
-            ))
-            ->getResult();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return type
-     */
     public function getAllowedFormattersTypes()
     {
-        return array(FormatterInterface::TYPE_LIST);
+        return [FormatterInterface::TYPE_LIST];
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return string
-     */
     public function getDescription()
     {
-        return "Create a list of people according to various filters.";
+        return 'Create a list of people according to various filters.';
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param type $key
-     * @param array $values
-     * @param type $data
-     * @return type
-     */
     public function getLabels($key, array $values, $data)
     {
         switch ($key) {
             case 'birthdate':
                 // for birthdate, we have to transform the string into a date
                 // to format the date correctly.
-                return function($value) {
-                    if ($value === '_header') { return 'birthdate'; }
-
-                    if (empty($value))
-                    {
-                        return "";
+                return static function ($value) {
+                    if ('_header' === $value) {
+                        return 'birthdate';
                     }
 
-                    $date = \DateTime::createFromFormat('Y-m-d', $value);
+                    if (empty($value)) {
+                        return '';
+                    }
+
+                    $date = DateTime::createFromFormat('Y-m-d', $value);
                     // check that the creation could occurs.
-                    if ($date === false) {
-                        throw new \Exception(sprintf("The value %s could "
-                            . "not be converted to %s", $value, \DateTime::class));
+                    if (false === $date) {
+                        throw new Exception(sprintf('The value %s could '
+                            . 'not be converted to %s', $value, DateTime::class));
                     }
 
                     return $date->format('d-m-Y');
                 };
-            case 'gender' :
+
+            case 'gender':
                 // for gender, we have to translate men/women statement
-                return function($value) {
-                    if ($value === '_header') { return 'gender'; }
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'gender';
+                    }
 
                     return $this->translator->trans($value);
                 };
+
             case 'countryOfBirth':
             case 'nationality':
                 $countryRepository = $this->entityManager
                     ->getRepository('ChillMainBundle:Country');
 
                 // load all countries in a single query
-                 $countryRepository->findBy(array('countryCode' => $values));
+                 $countryRepository->findBy(['countryCode' => $values]);
 
-                return function($value) use ($key, $countryRepository) {
-                    if ($value === '_header') { return \strtolower($key); }
+                return function ($value) use ($key, $countryRepository) {
+                    if ('_header' === $value) {
+                        return strtolower($key);
+                    }
 
-                    if ($value === NULL) {
+                    if (null === $value) {
                         return $this->translator->trans('no data');
                     }
 
                     $country = $countryRepository->find($value);
 
                     return $this->translatableStringHelper->localize(
-                            $country->getName());
+                        $country->getName()
+                    );
                 };
-            case 'address_country_name':
-                return function($value) use ($key) {
-                    if ($value === '_header') { return \strtolower($key); }
 
-                    if ($value === NULL) {
+            case 'address_country_name':
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return strtolower($key);
+                    }
+
+                    if (null === $value) {
                         return '';
                     }
 
                     return $this->translatableStringHelper->localize(json_decode($value, true));
                 };
+
             case 'address_isnoaddress':
-                return function($value) use ($key) {
-                    if ($value === '_header') { return 'address.address_homeless'; }
-                    
-                    if ($value) {
-                        return 'X';
-                    } else {
-                        return '';
+                return static function (?string $value): string {
+                    if ('_header' === $value) {
+                        return 'address.address_homeless';
                     }
+
+                    if (null !== $value) {
+                        return 'X';
+                    }
+
+                    return '';
                 };
+
             default:
                 // for fields which are associated with person
-                if (in_array($key, $this->fields)) {
-                    return function($value) use ($key) {
-                        if ($value === '_header') { return \strtolower($key); }
+                if (in_array($key, $this->fields, true)) {
+                    return static function ($value) use ($key) {
+                        if ('_header' === $value) {
+                            return strtolower($key);
+                        }
 
                         return $value;
-
-                        };
-                } else {
-                    return $this->getLabelForCustomField($key, $values, $data);
-                }
-        }
-
-    }
-    
-    private function getLabelForCustomField($key, array $values, $data)
-    {
-        // for fields which are custom fields
-        /* @var $cf CustomField */
-        $cf = $this->entityManager
-            ->getRepository(CustomField::class)
-            ->findOneBy(array('slug' => $this->DQLToSlug($key)));
-        $cfType = $this->customFieldProvider->getCustomFieldByType($cf->getType());
-        $defaultFunction = function($value) use ($cf) {
-                if ($value === '_header') {
-                    return $this->translatableStringHelper->localize($cf->getName()); 
+                    };
                 }
 
-                return $this->customFieldProvider
-                    ->getCustomFieldByType($cf->getType())
-                    ->render(json_decode($value, true), $cf, 'csv');
-            };
-        
-        if ($cfType instanceof CustomFieldChoice and $cfType->isMultiple($cf)) {
-                return function($value) use ($cf, $cfType, $key) {
-                    $slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug'];
-                    $decoded = \json_decode($value, true);
-                    
-                    if ($value === '_header') {
-                        
-                        $label = $cfType->getChoices($cf)[$slugChoice];
-                        
-                        return $this->translatableStringHelper->localize($cf->getName())
-                            .' | '.$label;
-                    }
-                    
-                    if ($slugChoice === '_other' and $cfType->isChecked($cf, $choiceSlug, $decoded)) {
-                        return $cfType->extractOtherValue($cf, $decoded);
-                    } else {
-                        return $cfType->isChecked($cf, $slugChoice, $decoded);
-                    }
-                };
-            
-        } else {
-            return $defaultFunction;
+                return $this->getLabelForCustomField($key, $values, $data);
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param type $data
-     * @return type
-     */
     public function getQueryKeys($data)
     {
-        $fields = array();
+        $fields = [];
 
         foreach ($data['fields'] as $key) {
-            if (in_array($key, $this->fields)) {
+            if (in_array($key, $this->fields, true)) {
                 $fields[] = $key;
             }
         }
-        
+
         // add the key from slugs and return
-        return \array_merge($fields, \array_keys($this->slugs));
+        return array_merge($fields, array_keys($this->slugs));
     }
 
-    /**
-     * clean a slug to be usable by DQL
-     * 
-     * @param string $slugsanitize 
-     * @param string $type the type of the customfield, if required (currently only for choices)
-     * @return string
-     */
-    private function slugToDQL($slug, $type = "default", array $additionalInfos = [])
-    {
-        $uid = 'slug_'.\uniqid();
-        
-        $this->slugs[$uid] = [
-            'slug' => $slug,
-            'type' => $type,
-            'additionnalInfos' => $additionalInfos
-        ];
-        
-        return $uid;
-    }
-
-    private function DQLToSlug($cleanedSlug)
-    {   
-        return $this->slugs[$cleanedSlug]['slug'];
-    }
-    
-    /**
-     * 
-     * @param type $cleanedSlug
-     * @return an array with keys = 'slug', 'type', 'additionnalInfo'
-     */
-    private function extractInfosFromSlug($slug)
-    {
-        return $this->slugs[$slug];
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     */
     public function getResult($query, $data)
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return string
-     */
     public function getTitle()
     {
-        return "List peoples";
+        return 'List peoples';
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     */
     public function getType()
     {
         return Declarations::PERSON_TYPE;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = array())
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
 
         // throw an error if any fields are present
-        if (!\array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException("any fields "
-                . "have been checked");
+        if (!array_key_exists('fields', $data)) {
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
+                . 'have been checked');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
 
         foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'])) {
+            if (in_array($f, $data['fields'], true)) {
                 switch ($f) {
                     case 'countryOfBirth':
                     case 'nationality':
                         $qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $f, $f));
+
                         break;
+
                     case 'address_street_address_1':
                     case 'address_street_address_2':
                     case 'address_valid_from':
@@ -439,14 +293,16 @@ class ListPerson implements ListInterface, ExportElementValidatedInterface
                     case 'address_country_name':
                     case 'address_country_code':
                     case 'address_isnoaddress':
-
                         $qb->addSelect(sprintf(
                             'GET_PERSON_ADDRESS_%s(person.id, :address_date) AS %s',
                             // get the part after address_
                             strtoupper(substr($f, 8)),
-                            $f));
+                            $f
+                        ));
                         $qb->setParameter('address_date', $data['address_date']);
+
                         break;
+
                     default:
                         $qb->addSelect(sprintf('person.%s as %s', $f, $f));
                 }
@@ -455,49 +311,159 @@ class ListPerson implements ListInterface, ExportElementValidatedInterface
 
         foreach ($this->getCustomFields() as $cf) {
             $cfType = $this->customFieldProvider->getCustomFieldByType($cf->getType());
-            if ($cfType instanceof CustomFieldChoice and $cfType->isMultiple($cf)) {
-                foreach($cfType->getChoices($cf) as $choiceSlug => $label) {
-                    $slug = $this->slugToDQL($cf->getSlug(), 'choice', [ 'choiceSlug' => $choiceSlug ]);
+
+            if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
+                foreach ($cfType->getChoices($cf) as $choiceSlug => $label) {
+                    $slug = $this->slugToDQL($cf->getSlug(), 'choice', ['choiceSlug' => $choiceSlug]);
                     $qb->addSelect(
-                        sprintf('GET_JSON_FIELD_BY_KEY(person.cFData, :slug%s) AS %s', 
-                            $slug, $slug));
+                        sprintf(
+                            'GET_JSON_FIELD_BY_KEY(person.cFData, :slug%s) AS %s',
+                            $slug,
+                            $slug
+                        )
+                    );
                     $qb->setParameter(sprintf('slug%s', $slug), $cf->getSlug());
                 }
             } else {
                 $slug = $this->slugToDQL($cf->getSlug());
                 $qb->addSelect(
-                    sprintf('GET_JSON_FIELD_BY_KEY(person.cFData, :slug%s) AS %s',
-                        $slug, $slug));
+                    sprintf(
+                        'GET_JSON_FIELD_BY_KEY(person.cFData, :slug%s) AS %s',
+                        $slug,
+                        $slug
+                    )
+                );
                 $qb->setParameter(sprintf('slug%s', $slug), $cf->getSlug());
             }
         }
 
         $qb
-                ->from('ChillPersonBundle:Person', 'person')
-                ->join('person.center', 'center')
-                ->andWhere('center IN (:authorized_centers)')
-                ->setParameter('authorized_centers', $centers);
-                ;
-
+            ->from('ChillPersonBundle:Person', 'person')
+            ->join('person.center', 'center')
+            ->andWhere('center IN (:authorized_centers)')
+            ->setParameter('authorized_centers', $centers);
 
         return $qb;
     }
 
-    /**
-     *
-     * {@inheritDoc}
-     */
     public function requiredRole()
     {
         return new Role(PersonVoter::LISTS);
     }
 
-    /**
-     *
-     * {@inheritDoc}
-     */
     public function supportsModifiers()
     {
-        return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
+        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        // get the field starting with address_
+        $addressFields = array_filter(
+            $this->fields,
+            static fn (string $el): bool => substr($el, 0, 8) === 'address_'
+        );
+
+        // check if there is one field starting with address in data
+        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+            // if a field address is checked, the date must not be empty
+            if (empty($data['address_date'])) {
+                $context
+                    ->buildViolation('You must set this date if an address is checked')
+                    ->atPath('address_date')
+                    ->addViolation();
+            }
+        }
+    }
+
+    private function DQLToSlug($cleanedSlug)
+    {
+        return $this->slugs[$cleanedSlug]['slug'];
+    }
+
+    /**
+     * @param mixed $slug
+     *
+     * @return array An array with keys = 'slug', 'type', 'additionnalInfo'
+     */
+    private function extractInfosFromSlug($slug): array
+    {
+        return $this->slugs[$slug];
+    }
+
+    /**
+     * Get custom fields associated with person.
+     *
+     * @return CustomField[]
+     */
+    private function getCustomFields()
+    {
+        return $this->entityManager
+            ->createQuery('SELECT cf '
+                . 'FROM ChillCustomFieldsBundle:CustomField cf '
+                . 'JOIN cf.customFieldGroup g '
+                . 'WHERE cf.type != :title AND g.entity LIKE :entity')
+            ->setParameters([
+                'title' => 'title',
+                'entity' => addcslashes(Person::class, '\\'),
+            ])
+            ->getResult();
+    }
+
+    private function getLabelForCustomField($key, array $values, $data)
+    {
+        // for fields which are custom fields
+        /** @var CustomField $cf */
+        $cf = $this->entityManager
+            ->getRepository(CustomField::class)
+            ->findOneBy(['slug' => $this->DQLToSlug($key)]);
+        $cfType = $this->customFieldProvider->getCustomFieldByType($cf->getType());
+        $defaultFunction = function ($value) use ($cf) {
+            if ('_header' === $value) {
+                return $this->translatableStringHelper->localize($cf->getName());
+            }
+
+            return $this->customFieldProvider
+                ->getCustomFieldByType($cf->getType())
+                ->render(json_decode($value, true), $cf, 'csv');
+        };
+
+        if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
+            return function ($value) use ($cf, $cfType, $key) {
+                $slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug'];
+                $decoded = json_decode($value, true);
+
+                if ('_header' === $value) {
+                    $label = $cfType->getChoices($cf)[$slugChoice];
+
+                    return $this->translatableStringHelper->localize($cf->getName())
+                            . ' | ' . $label;
+                }
+
+                if ('_other' === $slugChoice && $cfType->isChecked($cf, $choiceSlug, $decoded)) {
+                    return $cfType->extractOtherValue($cf, $decoded);
+                }
+
+                return $cfType->isChecked($cf, $slugChoice, $decoded);
+            };
+        }
+
+        return $defaultFunction;
+    }
+
+    /**
+     * Clean a slug to be usable by DQL.
+     */
+    private function slugToDQL(string $slug, string $type = 'default', array $additionalInfos = []): string
+    {
+        $uid = 'slug_' . uniqid('', true);
+
+        $this->slugs[$uid] = [
+            'slug' => $slug,
+            'type' => $type,
+            'additionnalInfos' => $additionalInfos,
+        ];
+
+        return $uid;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
index 366e952ba..d82c8b0aa 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
@@ -1,11 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\DirectExportInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -21,25 +28,14 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * Render a list of duplicate peoples
+ * Render a list of duplicate peoples.
  */
 class ListPersonDuplicate implements DirectExportInterface, ExportElementValidatedInterface
 {
     /**
-     *
-     * @var EntityManagerInterface
+     * @var float
      */
-    protected $entityManager;
-
-    /**
-     * @var \Symfony\Component\Translation\TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface
-     */
-    private $router;
+    private const PRECISION_DEFAULT_VALUE = 0.7;
 
     /**
      * @var string
@@ -47,48 +43,33 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
     protected $baseUrl;
 
     /**
-     * @var float
+     * @var EntityManagerInterface
      */
-    private const PRECISION_DEFAULT_VALUE = 0.7;
+    protected $entityManager;
+
+    /**
+     * @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface
+     */
+    private $router;
+
+    /**
+     * @var \Symfony\Component\Translation\TranslatorInterface
+     */
+    private $translator;
 
     public function __construct(
-      EntityManagerInterface $em,
-      TranslatorInterface $translator,
-      UrlGeneratorInterface $router,
-      $routeParameters
+        EntityManagerInterface $em,
+        TranslatorInterface $translator,
+        UrlGeneratorInterface $router,
+        $routeParameters
     ) {
         $this->entityManager = $em;
         $this->translator = $translator;
         $this->router = $router;
-        $this->baseUrl = $routeParameters['scheme'].
-          '://'.$routeParameters['host'];
+        $this->baseUrl = $routeParameters['scheme'] .
+          '://' . $routeParameters['host'];
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return "List duplicates";
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return "Create a list of duplicate people.";
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param FormBuilderInterface $builder
-     */
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('precision', NumberType::class, [
@@ -97,27 +78,23 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         ]);
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-
-    }
-
     public function generate(array $acl, array $data = []): Response
     {
         $values = [];
         $values[] = $this->getHeaders();
 
         $result = $this->getResult($data);
+
         foreach ($result as $row) {
             $values[] = [
                 $row['id1'],
                 $row['firstname1'],
                 $row['lastname1'],
-                $this->baseUrl.$this->router->generate('chill_person_view', ['person_id' => $row['id1']]),
+                $this->baseUrl . $this->router->generate('chill_person_view', ['person_id' => $row['id1']]),
                 $row['id2'],
                 $row['firstname2'],
                 $row['lastname2'],
-                $this->baseUrl.$this->router->generate('chill_person_view', ['person_id' => $row['id2']]),
+                $this->baseUrl . $this->router->generate('chill_person_view', ['person_id' => $row['id2']]),
             ];
         }
 
@@ -125,15 +102,15 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         $spreadsheet->getActiveSheet()->fromArray($values);
 
         // Make links clickable
-        for ($i = 1; $i <= $spreadsheet->getActiveSheet()->getHighestDataRow(); $i++) {
-            $spreadsheet->getActiveSheet()->getCell('D'.$i)->getHyperlink()
-              ->setUrl($spreadsheet->getActiveSheet()->getCell('D'.$i)->getValue());
-            $spreadsheet->getActiveSheet()->getCell('H'.$i)->getHyperlink()
-              ->setUrl($spreadsheet->getActiveSheet()->getCell('H'.$i)->getValue());
+        for ($i = 1; $spreadsheet->getActiveSheet()->getHighestDataRow() >= $i; ++$i) {
+            $spreadsheet->getActiveSheet()->getCell('D' . $i)->getHyperlink()
+                ->setUrl($spreadsheet->getActiveSheet()->getCell('D' . $i)->getValue());
+            $spreadsheet->getActiveSheet()->getCell('H' . $i)->getHyperlink()
+                ->setUrl($spreadsheet->getActiveSheet()->getCell('H' . $i)->getValue());
         }
 
         $writer = new Xlsx($spreadsheet);
-        $temp_file = sys_get_temp_dir().'/'.uniqid('export_').'.xlsx';
+        $temp_file = sys_get_temp_dir() . '/' . uniqid('export_') . '.xlsx';
         $writer->save($temp_file);
 
         $response = new BinaryFileResponse($temp_file);
@@ -143,6 +120,45 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         return $response;
     }
 
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return 'Create a list of duplicate people.';
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return 'List duplicates';
+    }
+
+    public function requiredRole(): Role
+    {
+        return new Role(PersonVoter::DUPLICATE);
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+    }
+
+    protected function getHeaders(): array
+    {
+        return [
+            $this->translator->trans('Departure folder number'),
+            $this->translator->trans('Last name'),
+            $this->translator->trans('First name'),
+            $this->translator->trans('Link'),
+            $this->translator->trans('Arrival folder number'),
+            $this->translator->trans('Last name'),
+            $this->translator->trans('First name'),
+            $this->translator->trans('Link'),
+        ];
+    }
+
     protected function getResult($data = [])
     {
         $precision = $data['precision'] ?? self::PRECISION_DEFAULT_VALUE;
@@ -153,23 +169,23 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
                 SIMILARITY(p.fullnamecanonical, p2.fullnamecanonical) AS "similarity nom + prenom",
                 SIMILARITY(p.lastname, p2.lastname) AS "similarity nom",
                 SIMILARITY(p.firstname, p2.firstname) AS "similarity prenom"
-            FROM chill_person_person AS p 
-            JOIN chill_person_person AS p2 
-                ON p.id != p2.id 
-                    AND (SIMILARITY(p.fullnamecanonical, p2.fullnamecanonical) > :precision 
+            FROM chill_person_person AS p
+            JOIN chill_person_person AS p2
+                ON p.id != p2.id
+                    AND (SIMILARITY(p.fullnamecanonical, p2.fullnamecanonical) > :precision
                     AND p.id < p2.id)
                 OR (UNACCENT(LOWER(p.firstname)) = UNACCENT(LOWER(p2.lastname))
                     AND UNACCENT(LOWER(p.lastname))  = UNACCENT(LOWER(p2.firstname)))
-            JOIN centers AS p1center 
+            JOIN centers AS p1center
                 ON p1center.id = p.center_id
-            JOIN centers AS p2center 
+            JOIN centers AS p2center
                 ON p2center.id = p2.center_id
             WHERE NOT EXISTS (
-                SELECT id 
-                FROM chill_person_not_duplicate as pnd 
-                WHERE (pnd.person1_id = p.id 
+                SELECT id
+                FROM chill_person_not_duplicate as pnd
+                WHERE (pnd.person1_id = p.id
                     AND pnd.person2_id = p2.id)
-                OR (pnd.person2_id = p.id 
+                OR (pnd.person2_id = p.id
                     AND pnd.person1_id = p2.id)
             )
             ORDER BY p.fullnamecanonical, p.id, p2.id';
@@ -180,23 +196,4 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
 
         return $statement->fetchAll();
     }
-
-    protected function getHeaders(): array
-    {
-        return [
-          $this->translator->trans('Departure folder number'),
-          $this->translator->trans('Last name'),
-          $this->translator->trans('First name'),
-          $this->translator->trans('Link'),
-          $this->translator->trans('Arrival folder number'),
-          $this->translator->trans('Last name'),
-          $this->translator->trans('First name'),
-          $this->translator->trans('Link'),
-        ];
-    }
-
-    public function requiredRole(): Role
-    {
-        return new Role(PersonVoter::DUPLICATE);
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
index 7179de4d3..787bf46d6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php
@@ -1,33 +1,24 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Doctrine\DBAL\Types\Type;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- * 
- *
- */
 class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportElement implements FilterInterface
 {
     public function addRole()
@@ -38,14 +29,15 @@ class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportEl
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $this->addJoinAccompanyingPeriod($qb);
-        
+
         $clause = $qb->expr()->andX(
             $qb->expr()->lte('accompanying_period.closingDate', ':date_to'),
-            $qb->expr()->gte('accompanying_period.closingDate', ':date_from'));
+            $qb->expr()->gte('accompanying_period.closingDate', ':date_from')
+        );
 
         $qb->andWhere($clause);
-        $qb->setParameter('date_from', $data['date_from'], Type::DATE);
-        $qb->setParameter('date_to', $data['date_to'], Type::DATE);
+        $qb->setParameter('date_from', $data['date_from'], Types::DATE_MUTABLE);
+        $qb->setParameter('date_to', $data['date_to'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -55,31 +47,31 @@ class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportEl
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_from', ChillDateType::class, array(
-            'label' => "Having an accompanying period closed after this date",
-            'data'  => new \DateTime("-1 month"),
-        ));
-        
-        $builder->add('date_to', ChillDateType::class, array(
-            'label' => "Having an accompanying period closed before this date",
-            'data'  => new \DateTime(),
-        ));
+        $builder->add('date_from', ChillDateType::class, [
+            'label' => 'Having an accompanying period closed after this date',
+            'data' => new DateTime('-1 month'),
+        ]);
+
+        $builder->add('date_to', ChillDateType::class, [
+            'label' => 'Having an accompanying period closed before this date',
+            'data' => new DateTime(),
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            "Filtered by accompanying period: persons having an accompanying period"
-            . " closed between the %date_from% and %date_to%",
+            'Filtered by accompanying period: persons having an accompanying period'
+            . ' closed between the %date_from% and %date_to%',
             [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ]
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ],
         ];
     }
 
     public function getTitle(): string
     {
-        return "Filter by accompanying period: closed between two dates";
+        return 'Filter by accompanying period: closed between two dates';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
index 40f7dd501..1c658527f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php
@@ -1,33 +1,24 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Doctrine\DBAL\Types\Type;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- * 
- *
- */
 class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement implements FilterInterface
 {
     public function addRole()
@@ -38,22 +29,22 @@ class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement i
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $this->addJoinAccompanyingPeriod($qb);
-        
+
         $clause = $qb->expr()->andX();
-            
+
         $clause->add(
             $qb->expr()->lte('accompanying_period.openingDate', ':date_to')
-            );
+        );
         $clause->add(
             $qb->expr()->orX(
                 $qb->expr()->gte('accompanying_period.closingDate', ':date_from'),
                 $qb->expr()->isNull('accompanying_period.closingDate')
-                )
-            );
+            )
+        );
 
         $qb->andWhere($clause);
-        $qb->setParameter('date_from', $data['date_from'], Type::DATE);
-        $qb->setParameter('date_to', $data['date_to'], Type::DATE);
+        $qb->setParameter('date_from', $data['date_from'], Types::DATE_MUTABLE);
+        $qb->setParameter('date_to', $data['date_to'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -63,33 +54,33 @@ class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement i
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_from', ChillDateType::class, array(
-            'label' => "Having an accompanying period opened after this date",
-            'data'  => new \DateTime("-1 month"),
-        ));
-        
-        $builder->add('date_to', ChillDateType::class, array(
-            'label' => "Having an accompanying period ending before this date, or "
-            . "still opened at this date",
-            'data'  => new \DateTime(),
-        ));
+        $builder->add('date_from', ChillDateType::class, [
+            'label' => 'Having an accompanying period opened after this date',
+            'data' => new DateTime('-1 month'),
+        ]);
+
+        $builder->add('date_to', ChillDateType::class, [
+            'label' => 'Having an accompanying period ending before this date, or '
+            . 'still opened at this date',
+            'data' => new DateTime(),
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            "Filtered by accompanying period: persons having an accompanying period"
-            . " opened after the %date_from% and closed before the %date_to% (or still opened "
-            . "at the %date_to%)",
+            'Filtered by accompanying period: persons having an accompanying period'
+            . ' opened after the %date_from% and closed before the %date_to% (or still opened '
+            . 'at the %date_to%)',
             [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ]
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ],
         ];
     }
 
     public function getTitle(): string
     {
-        return "Filter by accompanying period: active period";
+        return 'Filter by accompanying period: active period';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
index 26a8818df..7d00060f4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php
@@ -1,33 +1,24 @@
 <?php
-/*
- * Copyright (C) 2019 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Doctrine\DBAL\Types\Type;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- * 
- *
- */
 class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportElement implements FilterInterface
 {
     public function addRole()
@@ -38,14 +29,15 @@ class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportEl
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $this->addJoinAccompanyingPeriod($qb);
-        
+
         $clause = $qb->expr()->andX(
             $qb->expr()->lte('accompanying_period.openingDate', ':date_to'),
-            $qb->expr()->gte('accompanying_period.openingDate', ':date_from'));
+            $qb->expr()->gte('accompanying_period.openingDate', ':date_from')
+        );
 
         $qb->andWhere($clause);
-        $qb->setParameter('date_from', $data['date_from'], Type::DATE);
-        $qb->setParameter('date_to', $data['date_to'], Type::DATE);
+        $qb->setParameter('date_from', $data['date_from'], Types::DATE_MUTABLE);
+        $qb->setParameter('date_to', $data['date_to'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -55,31 +47,31 @@ class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportEl
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_from', ChillDateType::class, array(
-            'label' => "Having an accompanying period opened after this date",
-            'data'  => new \DateTime("-1 month"),
-        ));
-        
-        $builder->add('date_to', ChillDateType::class, array(
-            'label' => "Having an accompanying period opened before this date",
-            'data'  => new \DateTime(),
-        ));
+        $builder->add('date_from', ChillDateType::class, [
+            'label' => 'Having an accompanying period opened after this date',
+            'data' => new DateTime('-1 month'),
+        ]);
+
+        $builder->add('date_to', ChillDateType::class, [
+            'label' => 'Having an accompanying period opened before this date',
+            'data' => new DateTime(),
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            "Filtered by accompanying period: persons having an accompanying period"
-            . " opened between the %date_from% and %date_to%",
+            'Filtered by accompanying period: persons having an accompanying period'
+            . ' opened between the %date_from% and %date_to%',
             [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ]
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ],
         ];
     }
 
     public function getTitle(): string
     {
-        return "Filter by accompanying period: starting between two dates";
+        return 'Filter by accompanying period: starting between two dates';
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
index 234d6bd3e..36457e0f8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php
@@ -1,43 +1,25 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraints;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class BirthdateFilter implements FilterInterface, ExportElementValidatedInterface
+class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    
     public function addRole()
     {
         return null;
@@ -46,15 +28,18 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
     public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between('person.birthdate', ':date_from', 
-            ':date_to');
+        $clause = $qb->expr()->between(
+            'person.birthdate',
+            ':date_from',
+            ':date_to'
+        );
 
         if ($where instanceof Expr\Andx) {
             $where->add($clause);
         } else {
             $where = $qb->expr()->andX($clause);
         }
-        
+
         $qb->add('where', $where);
         $qb->setParameter('date_from', $data['date_from']);
         $qb->setParameter('date_to', $data['date_to']);
@@ -67,59 +52,30 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, array(
-            'label' => "Born after this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
+        $builder->add('date_from', DateType::class, [
+            'label' => 'Born after this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->add('date_to', DateType::class, array(
-            'label' => "Born before this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
+        ]);
+
+        $builder->add('date_to', DateType::class, [
+            'label' => 'Born before this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
             'format' => 'dd-MM-yyyy',
-        ));
-        
-    }
-    
-    public function validateForm($data, ExecutionContextInterface $context)
-    { 
-        $date_from = $data['date_from'];
-        $date_to   = $data['date_to'];
-        
-        if ($date_from === null) {
-            $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
-                ->addViolation();
-        }
-        
-        if ($date_to === null) {
-            $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
-                ->addViolation();
-        }
-        
-        if (
-            ($date_from !== null && $date_to !== null)
-            &&
-            $date_from >= $date_to
-        ) {
-            $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
-                ->addViolation();
-        }
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return array('Filtered by person\'s birtdate: '
-            . 'between %date_from% and %date_to%', array(
+        return ['Filtered by person\'s birtdate: '
+            . 'between %date_from% and %date_to%', [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ));
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ], ];
     }
 
     public function getTitle()
@@ -127,4 +83,30 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
         return 'Filter by person\'s birthdate';
     }
 
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        $date_from = $data['date_from'];
+        $date_to = $data['date_to'];
+
+        if (null === $date_from) {
+            $context->buildViolation('The "date from" should not be empty')
+                //->atPath('date_from')
+                ->addViolation();
+        }
+
+        if (null === $date_to) {
+            $context->buildViolation('The "date to" should not be empty')
+                //->atPath('date_to')
+                ->addViolation();
+        }
+
+        if (
+            (null !== $date_from && null !== $date_to)
+            && $date_from >= $date_to
+        ) {
+            $context->buildViolation('The date "date to" should be after the '
+                . 'date given in "date from" field')
+                ->addViolation();
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
index 7db76f6a7..c7587874b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
@@ -1,90 +1,56 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
-use Chill\MainBundle\Export\FilterInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_filter;
+use function count;
+use function implode;
+use function in_array;
+use function is_array;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class GenderFilter implements FilterInterface,
-    ExportElementValidatedInterface
+class GenderFilter implements
+    ExportElementValidatedInterface,
+    FilterInterface
 {
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
-    
-    function __construct(TranslatorInterface $translator)
+
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
 
-        public function applyOn()
+    public function addRole()
     {
-        return 'person';
-    }
-
-    /**
-     *
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_genders', ChoiceType::class, array(
-            'choices' => array(
-                'Woman' => Person::FEMALE_GENDER,
-                'Man' => Person::MALE_GENDER,
-                'Both' => Person::BOTH_GENDER,
-                'Not given' => 'null'
-            ),
-            'multiple' => true,
-            'expanded' => true
-        ));
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (!is_array($data['accepted_genders']) || count($data['accepted_genders']) === 0 ) {
-            $context->buildViolation("You should select an option")
-                ->addViolation();
-        }
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
         $isIn = $qb->expr()->in('person.gender', ':person_gender');
-        
-        if (!\in_array('null', $data['accepted_genders'])) {
+
+        if (!in_array('null', $data['accepted_genders'], true)) {
             $clause = $isIn;
         } else {
             $clause = $qb->expr()->orX($isIn, $qb->expr()->isNull('person.gender'));
@@ -97,15 +63,53 @@ class GenderFilter implements FilterInterface,
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('person_gender', \array_filter(
+        $qb->setParameter('person_gender', array_filter(
             $data['accepted_genders'],
-            function($el) {
-                return $el !== 'null';
-            }));
+            static function ($el) {
+                return 'null' !== $el;
+            }
+        ));
+    }
+
+    public function applyOn()
+    {
+        return 'person';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_genders', ChoiceType::class, [
+            'choices' => [
+                'Woman' => Person::FEMALE_GENDER,
+                'Man' => Person::MALE_GENDER,
+                'Both' => Person::BOTH_GENDER,
+                'Not given' => 'null',
+            ],
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $genders = [];
+
+        foreach ($data['accepted_genders'] as $g) {
+            if ('null' === $g) {
+                $genders[] = $this->translator->trans('Not given');
+            } else {
+                $genders[] = $this->translator->trans($g);
+            }
+        }
+
+        return [
+            'Filtering by genders: only %genders%',
+            ['%genders%' => implode(', ', $genders)],
+        ];
     }
 
     /**
-     * A title which will be used in the label for the form
+     * A title which will be used in the label for the form.
      *
      * @return string
      */
@@ -114,26 +118,11 @@ class GenderFilter implements FilterInterface,
         return 'Filter by person gender';
     }
 
-    public function addRole()
+    public function validateForm($data, ExecutionContextInterface $context)
     {
-        return NULL;
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $genders = [];
-        
-        foreach ($data['accepted_genders'] as $g) {
-            if ('null' === $g) {
-                $genders[] = $this->translator->trans('Not given');
-            } else {
-                $genders[] = $this->translator->trans($g);
-            }
+        if (!is_array($data['accepted_genders']) || count($data['accepted_genders']) === 0) {
+            $context->buildViolation('You should select an option')
+                ->addViolation();
         }
-        
-        return [
-            "Filtering by genders: only %genders%",
-            [ "%genders%" => \implode(", ", $genders)]
-        ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
index d6dc52af8..602457024 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/NationalityFilter.php
@@ -1,45 +1,31 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Filter;
 
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\Select2CountryType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class NationalityFilter implements FilterInterface,
-    ExportElementValidatedInterface
+class NationalityFilter implements
+    ExportElementValidatedInterface,
+    FilterInterface
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     private $translatableStringHelper;
@@ -49,25 +35,9 @@ class NationalityFilter implements FilterInterface,
         $this->translatableStringHelper = $helper;
     }
 
-    public function applyOn()
+    public function addRole()
     {
-        return 'person';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('nationalities', Select2CountryType::class, array(
-            'placeholder' => 'Choose countries'
-        ));
-
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['nationalities'] === null) {
-            $context->buildViolation("A nationality must be selected")
-                ->addViolation();
-        }
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -82,7 +52,33 @@ class NationalityFilter implements FilterInterface,
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('person_nationality', array($data['nationalities']));
+        $qb->setParameter('person_nationality', [$data['nationalities']]);
+    }
+
+    public function applyOn()
+    {
+        return 'person';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('nationalities', Select2CountryType::class, [
+            'placeholder' => 'Choose countries',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $countries = $data['nationalities'];
+
+        $names = array_map(function (Country $c) {
+            return $this->translatableStringHelper->localize($c->getName());
+        }, [$countries]);
+
+        return [
+            'Filtered by nationality : %nationalities%',
+            ['%nationalities%' => implode(', ', $names)],
+        ];
     }
 
     public function getTitle()
@@ -90,22 +86,11 @@ class NationalityFilter implements FilterInterface,
         return "Filter by person's nationality";
     }
 
-    public function addRole()
+    public function validateForm($data, ExecutionContextInterface $context)
     {
-        return NULL;
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        $countries = $data['nationalities'];
-
-        $names = array_map(function(Country $c) {
-            return $this->translatableStringHelper->localize($c->getName());
-        }, array($countries));
-
-        return array(
-            "Filtered by nationality : %nationalities%",
-            array('%nationalities%' => implode(", ", $names))
-            );
+        if (null === $data['nationalities']) {
+            $context->buildViolation('A nationality must be selected')
+                ->addViolation();
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php
new file mode 100644
index 000000000..55d7f7c92
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseType.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Form\Type\ClosingMotivePickerType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AccompanyingCourseType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'closingDate',
+            ChillDateType::class,
+            [
+                'required' => true,
+            ]
+        );
+
+        $builder->add('closingMotive', ClosingMotivePickerType::class);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
index b4c146960..ec1766088 100644
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
@@ -1,25 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormInterface;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Form\Type\UserPickerType;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Form\Type\ClosingMotivePickerType;
-
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Role\Role;
 
 /**
- * Class AccompanyingPeriodType
- *
- * @package Chill\PersonBundle\Form
+ * Class AccompanyingPeriodType.
  */
 class AccompanyingPeriodType extends AbstractType
 {
@@ -34,72 +40,65 @@ class AccompanyingPeriodType extends AbstractType
     protected $config = [];
 
     /**
-     *
      * @param string[] $config configuration of visibility of some fields
      */
     public function __construct(array $config)
     {
         $this->config = $config;
     }
-    
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         //if the period_action is close, date opening should not be seen
-        if ($options['period_action'] !== 'close') {
+        if ('close' !== $options['period_action']) {
             $builder
                 ->add('openingDate', DateType::class, [
-                   "required" => true,
-                   'widget' => 'single_text',
-                   'format' => 'dd-MM-yyyy'
-                ])
-            ;
+                    'required' => true,
+                    'widget' => 'single_text',
+                    'format' => 'dd-MM-yyyy',
+                ]);
         }
-        
+
         // closingDate should be seen only if
         // period_action = close
         // OR ( period_action = update AND accompanying period is already closed )
         $accompanyingPeriod = $options['data'];
-        
+
         if (
-              ($options['period_action'] === 'close')
-              OR
-              ($options['period_action'] === 'create')
-              OR
-              ($options['period_action'] === 'update' AND !$accompanyingPeriod->isOpen())
+              ('close' === $options['period_action'])
+              || ('create' === $options['period_action'])
+              || ('update' === $options['period_action'] && !$accompanyingPeriod->isOpen())
         ) {
-            
             $builder->add('closingDate', DateType::class, [
                 'required' => true,
                 'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy'
+                'format' => 'dd-MM-yyyy',
             ]);
-            
+
             $builder->add('closingMotive', ClosingMotivePickerType::class);
         }
-    
-        if ($this->config['user'] === 'visible') {
+
+        if ('visible' === $this->config['user']) {
             $builder->add('user', UserPickerType::class, [
                 'center' => $options['center'],
-                'role'   => new Role(PersonVoter::SEE),
+                'role' => new Role(PersonVoter::SEE),
             ]);
         }
 
-            $builder->add('remark', ChillTextareaType::class, [
-                    'required' => false
-            ]);
+        $builder->add('remark', ChillTextareaType::class, [
+            'required' => false,
+        ]);
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['action'] = $options['period_action'];
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Chill\PersonBundle\Entity\AccompanyingPeriod'
+            'data_class' => 'Chill\PersonBundle\Entity\AccompanyingPeriod',
         ]);
 
         $resolver
@@ -107,18 +106,7 @@ class AccompanyingPeriodType extends AbstractType
             ->addAllowedTypes('period_action', 'string')
             ->addAllowedValues('period_action', ['update', 'open', 'close', 'create'])
             ->setRequired('center')
-            ->setAllowedTypes('center', Center::class)
-            ;
-    }
-    
-    /**
-     * @param FormView $view
-     * @param FormInterface $form
-     * @param array $options
-     */
-    public function buildView(FormView $view, FormInterface $form, array $options)
-    {
-        $view->vars['action'] = $options['period_action'];
+            ->setAllowedTypes('center', Center::class);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
index db1d5c6f8..2924b7e35 100644
--- a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+++ b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
@@ -1,56 +1,116 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\ChoiceLoader;
 
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
-use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
+use RuntimeException;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use function call_user_func;
+use function count;
+use function in_array;
 
 /**
- * Allow to load a list of person
+ * Allow to load a list of person.
  */
 class PersonChoiceLoader implements ChoiceLoaderInterface
 {
-    protected PersonRepository $personRepository;
-    
-    protected array $lazyLoadedPersons = [];
-    
     protected array $centers = [];
-    
+
+    protected array $lazyLoadedPersons = [];
+
+    protected PersonRepository $personRepository;
+
     /**
      * PersonChoiceLoader constructor.
      *
      * @param EntityRepository $personRepository
-     * @param array|null $centers
      */
     public function __construct(
         PersonRepository $personRepository,
-        array $centers = null
+        ?array $centers = null
     ) {
         $this->personRepository = $personRepository;
-        if (NULL !== $centers) {
+
+        if (null !== $centers) {
             $this->centers = $centers;
         }
     }
-    
+
+    /**
+     * @param null $value
+     */
+    public function loadChoiceList($value = null): ChoiceListInterface
+    {
+        return new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
+            $this->lazyLoadedPersons,
+            static function (Person $p) use ($value) {
+                return call_user_func($value, $p);
+            }
+        );
+    }
+
+    /**
+     * @param null $value
+     *
+     * @return array
+     */
+    public function loadChoicesForValues(array $values, $value = null)
+    {
+        $choices = [];
+
+        foreach ($values as $value) {
+            if (empty($value)) {
+                continue;
+            }
+
+            $person = $this->personRepository->find($value);
+
+            if ($this->hasCenterFilter()
+                && !in_array($person->getCenter(), $this->centers, true)) {
+                throw new RuntimeException('chosen a person not in correct center');
+            }
+
+            $choices[] = $person;
+        }
+
+        return $choices;
+    }
+
+    /**
+     * @param null $value
+     *
+     * @return array|string[]
+     */
+    public function loadValuesForChoices(array $choices, $value = null)
+    {
+        $values = [];
+
+        foreach ($choices as $choice) {
+            if (null === $choice) {
+                $values[] = null;
+
+                continue;
+            }
+
+            $id = call_user_func($value, $choice);
+            $values[] = $id;
+            $this->lazyLoadedPersons[$id] = $choice;
+        }
+
+        return $values;
+    }
+
     /**
      * @return bool
      */
@@ -58,69 +118,4 @@ class PersonChoiceLoader implements ChoiceLoaderInterface
     {
         return count($this->centers) > 0;
     }
-    
-    /**
-     * @param null $value
-     * @return ChoiceListInterface
-     */
-    public function loadChoiceList($value = null): ChoiceListInterface
-    {
-        $list = new \Symfony\Component\Form\ChoiceList\ArrayChoiceList(
-            $this->lazyLoadedPersons, 
-            function(Person $p) use ($value) {
-                return \call_user_func($value, $p);
-            });
-        
-        return $list;
-    }
-    
-    /**
-     * @param array $values
-     * @param null $value
-     * @return array
-     */
-    public function loadChoicesForValues(array $values, $value = null)
-    {
-        $choices = [];
-        
-        foreach($values as $value) {
-            if (empty($value)) {
-                continue;
-            }
-            
-            $person = $this->personRepository->find($value);
-            
-            if ($this->hasCenterFilter() && 
-                !\in_array($person->getCenter(), $this->centers)) {
-                throw new \RuntimeException("chosen a person not in correct center");
-            }
-            
-            $choices[] = $person;
-        }
-
-        return $choices;
-    }
-    
-    /**
-     * @param array $choices
-     * @param null $value
-     * @return array|string[]
-     */
-    public function loadValuesForChoices(array $choices, $value = null)
-    {
-        $values = [];
-        
-        foreach ($choices as $choice) {
-            if (NULL === $choice) {
-                $values[] = null;
-                continue;
-            }
-            
-            $id = \call_user_func($value, $choice);
-            $values[] = $id;
-            $this->lazyLoadedPersons[$id] = $choice;
-        }
-        
-        return $values;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
index 672fc4f19..9cf24d8c3 100644
--- a/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
+++ b/src/Bundle/ChillPersonBundle/Form/ClosingMotiveType.php
@@ -1,76 +1,57 @@
 <?php
-/*
- * 
- * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS, <http://www.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\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
-use Chill\PersonBundle\Form\Type\ClosingMotivePickerType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
 
 /**
- * Class ClosingMotiveType
+ * Chill is a software for social workers
  *
- * @package Chill\PersonBundle\Form
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Chill\PersonBundle\Form\Type\ClosingMotivePickerType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class ClosingMotiveType.
  */
 class ClosingMotiveType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Nom'
+                'label' => 'Nom',
             ])
             ->add('active', CheckboxType::class, [
                 'label' => 'Actif ?',
-                'required' => false
+                'required' => false,
             ])
             ->add('ordering', NumberType::class, [
                 'label' => 'Ordre d\'apparition',
                 'required' => true,
-                'scale' => 5
+                'scale' => 5,
             ])
             ->add('parent', ClosingMotivePickerType::class, [
                 'label' => 'Parent',
                 'required' => false,
                 'placeholder' => 'closing_motive.any parent',
                 'multiple' => false,
-                'only_leaf' => false
-            ])
-            ;
+                'only_leaf' => false,
+            ]);
     }
-    
-    /**
-     * @param OptionsResolver $resolver
-     */
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', ClosingMotive::class)
-            ;
+            ->setDefault('class', ClosingMotive::class);
     }
 }
- 
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 8fa95fe4f..3d409129b 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -1,73 +1,52 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
-use Chill\MainBundle\Repository\CenterRepository;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\PickCenterType;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\Type\GenderType;
+use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Form\Type\PickCenterType;
-use Chill\PersonBundle\Form\Type\GenderType;
-use Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer;
-use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Form\Type\PersonAltNameType;
 
 final class CreationPersonType extends AbstractType
 {
     // TODO: This is only used in test.
     // TODO: See if this is still valid and update accordingly.
-    const NAME = 'chill_personbundle_person_creation';
+    public const NAME = 'chill_personbundle_person_creation';
 
-    private CenterRepository $centerRepository;
+    private bool $askCenters;
 
-    /**
-     *
-     * @var ConfigPersonAltNamesHelper
-     */
-    protected $configPersonAltNamesHelper;
+    private ConfigPersonAltNamesHelper $configPersonAltNamesHelper;
 
     private EventDispatcherInterface $dispatcher;
 
     public function __construct(
-        CenterRepository $centerRepository,
         ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
-        EventDispatcherInterface $dispatcher
-     ) {
-        $this->centerTransformer = $centerRepository;
+        EventDispatcherInterface $dispatcher,
+        ParameterBagInterface $parameterBag
+    ) {
         $this->configPersonAltNamesHelper = $configPersonAltNamesHelper;
         $this->dispatcher = $dispatcher;
+        $this->askCenters = $parameterBag->get('chill_main')['acl']['form_show_centers'];
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -76,35 +55,35 @@ final class CreationPersonType extends AbstractType
             ->add('birthdate', ChillDateType::class, [
                 'required' => false,
             ])
-            ->add('gender', GenderType::class, array(
-                'required' => true, 'placeholder' => null
-            ))
-            ->add('center', PickCenterType::class, [
-                'required' => false,
-                'role' => PersonVoter::CREATE,
-            ])
-        ;
+            ->add('gender', GenderType::class, [
+                'required' => true, 'placeholder' => null,
+            ]);
+
+        if ($this->askCenters) {
+            $builder
+                ->add('center', PickCenterType::class, [
+                    'required' => false,
+                    'role' => PersonVoter::CREATE,
+                ]);
+        }
 
         if ($this->configPersonAltNamesHelper->hasAltNames()) {
-                $builder->add('altNames', PersonAltNameType::class, [
-                    'by_reference' => false
+            $builder->add('altNames', PersonAltNameType::class, [
+                'by_reference' => false,
             ]);
         }
 
         $this->dispatcher->dispatch(
-            new CustomizeFormEvent(static::class, $builder),
+            new CustomizeFormEvent(self::class, $builder),
             CustomizeFormEvent::NAME
         );
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => Person::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => Person::class,
+        ]);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
index d1f50404b..13de3b9f5 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
@@ -1,17 +1,24 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\DataMapper;
 
-use Symfony\Component\Form\DataMapperInterface;
+use Chill\PersonBundle\Entity\PersonAltName;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Chill\PersonBundle\Entity\PersonAltName;
+use function array_key_exists;
+use function is_array;
 
-/**
- *  
- *
- */
 class PersonAltNameDataMapper implements DataMapperInterface
 {
     public function mapDataToForms($viewData, $forms)
@@ -19,26 +26,26 @@ class PersonAltNameDataMapper implements DataMapperInterface
         if (null === $viewData) {
             return;
         }
-        
+
         if (!$viewData instanceof Collection) {
             throw new UnexpectedTypeException($viewData, Collection::class);
         }
-        
+
         $mapIndexToKey = [];
+
         foreach ($viewData->getIterator() as $key => $altName) {
             /** @var PersonAltName $altName */
             $mapIndexToKey[$altName->getKey()] = $key;
         }
-        
+
         foreach ($forms as $key => $form) {
-            if (\array_key_exists($key, $mapIndexToKey)) {
+            if (array_key_exists($key, $mapIndexToKey)) {
                 $form->setData($viewData->get($mapIndexToKey[$key])->getLabel());
             }
         }
     }
 
     /**
-     * 
      * @param FormInterface[] $forms
      * @param Collection $viewData
      */
@@ -52,16 +59,16 @@ class PersonAltNameDataMapper implements DataMapperInterface
             $dataIterator = $viewData instanceof ArrayCollection ?
                  $viewData->toArray() : $viewData->getIterator();
         }
-        
+
         foreach ($dataIterator as $key => $altName) {
             /** @var PersonAltName $altName */
             $mapIndexToKey[$altName->getKey()] = $key;
         }
-        
+
         foreach ($forms as $key => $form) {
             $isEmpty = empty($form->getData());
-            
-            if (\array_key_exists($key, $mapIndexToKey)) {
+
+            if (array_key_exists($key, $mapIndexToKey)) {
                 if ($isEmpty) {
                     $viewData->remove($mapIndexToKey[$key]);
                 } else {
@@ -71,8 +78,7 @@ class PersonAltNameDataMapper implements DataMapperInterface
                 if (!$isEmpty) {
                     $altName = (new PersonAltName())
                         ->setKey($key)
-                        ->setLabel($form->getData())
-                        ;
+                        ->setLabel($form->getData());
 
                     if (is_array($viewData)) {
                         $viewData[] = $altName;
@@ -82,6 +88,5 @@ class PersonAltNameDataMapper implements DataMapperInterface
                 }
             }
         }
-        
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
index 2561019d5..5e7ed4043 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php
@@ -1,11 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\DataTransformer;
 
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Doctrine\Persistence\ObjectManager;
-use Chill\PersonBundle\Entity\Person;
 
 class PersonToIdTransformer implements DataTransformerInterface
 {
@@ -14,37 +23,19 @@ class PersonToIdTransformer implements DataTransformerInterface
      */
     private $om;
 
-    /**
-     * @param ObjectManager $om
-     */
     public function __construct(ObjectManager $om)
     {
         $this->om = $om;
     }
 
-    /**
-     * Transforms an object (issue) to a string (id).
-     *
-     * @param  Person|null $issue
-     * @return string
-     */
-    public function transform($issue)
-    {
-        if (null === $issue) {
-            return "";
-        }
-
-        return $issue->getId();
-    }
-
     /**
      * Transforms a string (id) to an object (issue).
      *
      * @param  string $id
      *
-     * @return Person|null
-     *
      * @throws TransformationFailedException if object (issue) is not found.
+     *
+     * @return Person|null
      */
     public function reverseTransform($id)
     {
@@ -54,8 +45,7 @@ class PersonToIdTransformer implements DataTransformerInterface
 
         $issue = $this->om
             ->getRepository('ChillPersonBundle:Person')
-            ->findOneBy(array('id' => $id))
-        ;
+            ->findOneBy(['id' => $id]);
 
         if (null === $issue) {
             throw new TransformationFailedException(sprintf(
@@ -66,5 +56,20 @@ class PersonToIdTransformer implements DataTransformerInterface
 
         return $issue;
     }
+
+    /**
+     * Transforms an object (issue) to a string (id).
+     *
+     * @param  Person|null $issue
+     *
+     * @return string
+     */
+    public function transform($issue)
+    {
+        if (null === $issue) {
+            return '';
+        }
+
+        return $issue->getId();
+    }
 }
-?>
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index 4d8d5a165..e0d2d9d47 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
-use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class HouseholdMemberType extends AbstractType
@@ -16,28 +24,11 @@ class HouseholdMemberType extends AbstractType
             ->add('startDate', ChillDateType::class, [
                 'label' => 'household.Start date',
                 'input' => 'datetime_immutable',
-            ])
-            ->add('endDate', ChillDateType::class, [
-                'label' => 'household.End date',
-                'input' => 'datetime_immutable',
-                'required' => false
-            ])
-            ;
-        if ($options['data']->getPosition()->isAllowHolder()) {
-            $builder
-                ->add('holder', ChoiceType::class, [
-                    'label' => 'household.holder',
-                    'choices' => [
-                        'household.is holder' => true,
-                        'household.is not holder' => false
-                    ]
-                ]);
-        }
+            ]);
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'household.Comment',
-                'required' => false
-            ])
-        ;
-    } 
+                'required' => false,
+            ]);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdType.php
index 999e2ff79..68f00fa22 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdType.php
@@ -1,12 +1,21 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
 use Chill\PersonBundle\Entity\Household\Household;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -17,18 +26,17 @@ class HouseholdType extends AbstractType
         $builder
             ->add('commentMembers', CommentType::class, [
                 'label' => 'household.comment_membership',
-                'required' => false 
+                'required' => false,
             ])
             ->add('waitingForBirth', CheckboxType::class, [
                 'required' => false,
-                'label' => 'household.expecting_birth'
+                'label' => 'household.expecting_birth',
             ])
             ->add('waitingForBirthDate', ChillDateType::class, [
                 'required' => false,
                 'label' => 'household.date_expecting_birth',
-                'input' => 'datetime_immutable'
-            ])
-        ;
+                'input' => 'datetime_immutable',
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php
index 1897c7dc4..fb81331c6 100644
--- a/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/MaritalStatusType.php
@@ -1,45 +1,42 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
-use Symfony\Component\Form\AbstractType;
-use Chill\PersonBundle\Entity\MaritalStatus;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class MaritalStatusType
- *
- * @package Chill\PersonBundle\Form
+ * Class MaritalStatusType.
  */
 class MaritalStatusType extends AbstractType
 {
-    
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('id', TextType::class, [
-                'label' => 'Identifiant'
+                'label' => 'Identifiant',
             ])
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Nom'
-            ])
-        ;
+                'label' => 'Nom',
+            ]);
     }
-    
-    /**
-     * @param OptionsResolver $resolver
-     */
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', MaritalStatus::class)
-        ;
+            ->setDefault('class', MaritalStatus::class);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php
index fd7fa3e50..52ed35db6 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
@@ -8,17 +17,13 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class PersonConfimDuplicateType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-          ->add('confirm', CheckboxType::class, [
-            'label' => 'I confirm the merger of these 2 people',
-            'mapped' => false,
-          ]);
+            ->add('confirm', CheckboxType::class, [
+                'label' => 'I confirm the merger of these 2 people',
+                'mapped' => false,
+            ]);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
index c46f2cf82..7ecbcdc9b 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php
@@ -1,19 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
 use Chill\PersonBundle\Form\Type\PickPersonType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class PersonFindManuallyDuplicateType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -23,8 +27,7 @@ class PersonFindManuallyDuplicateType extends AbstractType
             ])
             ->add('direction', HiddenType::class, [
                 'data' => 'starting',
-            ])
-        ;
+            ]);
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 8bc982713..47baafe2b 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -1,46 +1,42 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form;
 
 use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
+use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\Select2CountryType;
 use Chill\MainBundle\Form\Type\Select2LanguageType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Form\Type\GenderType;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PersonPhoneType;
-use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Form\Type\CommentType;
-use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\TelType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\TelType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -54,30 +50,28 @@ class PersonType extends AbstractType
      *
      * @var string[]
      */
-    protected $config = array();
+    protected $config = [];
 
     /**
-     *
      * @var ConfigPersonAltNamesHelper
      */
     protected $configAltNamesHelper;
 
+    protected TranslatableStringHelper $translatableStringHelper;
+
     /**
-     *
      * @param string[] $personFieldsConfiguration configuration of visibility of some fields
      */
     public function __construct(
         array $personFieldsConfiguration,
-        ConfigPersonAltNamesHelper $configAltNamesHelper
+        ConfigPersonAltNamesHelper $configAltNamesHelper,
+        TranslatableStringHelper $translatableStringHelper
     ) {
         $this->config = $personFieldsConfiguration;
         $this->configAltNamesHelper = $configAltNamesHelper;
+        $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -89,48 +83,63 @@ class PersonType extends AbstractType
             ->add('deathdate', DateType::class, [
                 'required' => false,
                 'input' => 'datetime_immutable',
-                'widget' => 'single_text'
+                'widget' => 'single_text',
             ])
-            ->add('gender', GenderType::class, array(
-                'required' => true
-            ))
-            ->add('genderComment', CommentType::class, array(
-                'required' => false
-            ))
-            ->add('numberOfChildren', IntegerType::class, array(
-                'required' => false
-            ));
+            ->add('gender', GenderType::class, [
+                'required' => true,
+            ])
+            ->add('genderComment', CommentType::class, [
+                'required' => false,
+            ])
+            ->add('numberOfChildren', IntegerType::class, [
+                'required' => false,
+                'attr' => ['min' => 0],
+            ]);
 
         if ($this->configAltNamesHelper->hasAltNames()) {
             $builder->add('altNames', PersonAltNameType::class, [
-                'by_reference' => false
+                'by_reference' => false,
             ]);
         }
 
-        if ($this->config['memo'] === 'visible') {
+        if ('visible' === $this->config['memo']) {
             $builder
-                ->add('memo', ChillTextareaType::class, array('required' => false))
-            ;
+                ->add('memo', ChillTextareaType::class, ['required' => false]);
         }
 
-        if ($this->config['place_of_birth'] === 'visible') {
-            $builder->add('placeOfBirth', TextType::class, array('required' => false));
+        if ('visible' === $this->config['place_of_birth']) {
+            $builder->add('placeOfBirth', TextType::class, [
+                'required' => false,
+                'attr' => ['style' => 'text-transform: uppercase;'],
+            ]);
+
+            $builder->get('placeOfBirth')->addModelTransformer(new CallbackTransformer(
+                static function ($string) {
+                    return strtoupper((string) $string);
+                },
+                static function ($string) {
+                    return strtoupper((string) $string);
+                }
+            ));
         }
 
-        if ($this->config['contact_info'] === 'visible') {
-            $builder->add('contactInfo', ChillTextareaType::class, array('required' => false));
+        if ('visible' === $this->config['contact_info']) {
+            $builder->add('contactInfo', ChillTextareaType::class, ['required' => false]);
         }
 
-        if ($this->config['phonenumber'] === 'visible') {
-            $builder->add('phonenumber', TelType::class, array('required' => false));
+        if ('visible' === $this->config['phonenumber']) {
+            $builder->add('phonenumber', TelType::class, [
+                'required' => false,
+                // 'placeholder' => '+33623124554' //TODO placeholder for phone numbers
+            ]);
         }
 
-        if ($this->config['mobilenumber'] === 'visible') {
+        if ('visible' === $this->config['mobilenumber']) {
             $builder
-                ->add('mobilenumber', TelType::class, array('required' => false))
-                ->add('acceptSMS', CheckboxType::class, array(
-                    'required' => false
-                ));
+                ->add('mobilenumber', TelType::class, ['required' => false])
+                ->add('acceptSMS', CheckboxType::class, [
+                    'required' => false,
+                ]);
         }
 
         $builder->add('otherPhoneNumbers', ChillCollectionType::class, [
@@ -142,55 +151,79 @@ class PersonType extends AbstractType
             'allow_delete' => true,
             'by_reference' => false,
             'label' => false,
-            'delete_empty' => function(PersonPhone $pp = null) {
-                return NULL === $pp || $pp->isEmpty();
+            'delete_empty' => static function (?PersonPhone $pp = null) {
+                return null === $pp || $pp->isEmpty();
             },
-            'error_bubbling' => false
+            'error_bubbling' => false,
+            'empty_collection_explain' => 'No additional phone numbers',
         ]);
 
-        if ($this->config['email'] === 'visible') {
+        if ('visible' === $this->config['email']) {
             $builder
-                ->add('email', EmailType::class, array('required' => false))
-                ->add('acceptEmail', CheckboxType::class, array('required' => false));
+                ->add('email', EmailType::class, ['required' => false]);
         }
 
-        if ($this->config['country_of_birth'] === 'visible') {
-            $builder->add('countryOfBirth', Select2CountryType::class, array(
-                'required' => false
-                ));
+        if ('visible' === $this->config['acceptEmail']) {
+            $builder
+                ->add('acceptEmail', CheckboxType::class, ['required' => false]);
         }
 
-        if ($this->config['nationality'] === 'visible') {
-            $builder->add('nationality', Select2CountryType::class, array(
-                'required' => false
-                ));
-        }
-
-        if ($this->config['spoken_languages'] === 'visible') {
-            $builder->add('spokenLanguages', Select2LanguageType::class, array(
+        if ('visible' === $this->config['country_of_birth']) {
+            $builder->add('countryOfBirth', Select2CountryType::class, [
                 'required' => false,
-                'multiple' => true
-                ));
+            ]);
         }
 
-        if ($this->config['marital_status'] === 'visible'){
-            $builder
-                ->add('maritalStatus', Select2MaritalStatusType::class, array(
-                    'required' => false
-                    ))
-                ->add('maritalStatusDate', ChillDateType::class, array(
-                    'required' => false
-                    ))
-                ->add('maritalStatusComment', CommentType::class, array(
-                    'required' => false
-                    ));
+        if ('visible' === $this->config['nationality']) {
+            $builder->add('nationality', Select2CountryType::class, [
+                'required' => false,
+            ]);
         }
 
-        if($options['cFGroup']) {
+        if ('visible' === $this->config['spoken_languages']) {
+            $builder->add('spokenLanguages', Select2LanguageType::class, [
+                'required' => false,
+                'multiple' => true,
+            ]);
+        }
+
+        if ('visible' === $this->config['civility']) {
             $builder
-                ->add('cFData', CustomFieldType::class,
-                array('attr' => array('class' => 'cf-fields'), 'group' => $options['cFGroup']))
-            ;
+                ->add('civility', EntityType::class, [
+                    'label' => 'Civility',
+                    'class' => Civility::class,
+                    'choice_label' => function (Civility $civility): string {
+                        return $this->translatableStringHelper->localize($civility->getName());
+                    },
+                    'query_builder' => static function (EntityRepository $er): QueryBuilder {
+                        return $er->createQueryBuilder('c')
+                            ->where('c.active = true');
+                    },
+                    'placeholder' => 'choose civility',
+                    'required' => false,
+                ]);
+        }
+
+        if ('visible' === $this->config['marital_status']) {
+            $builder
+                ->add('maritalStatus', Select2MaritalStatusType::class, [
+                    'required' => false,
+                ])
+                ->add('maritalStatusDate', ChillDateType::class, [
+                    'required' => false,
+                ])
+                ->add('maritalStatusComment', CommentType::class, [
+                    'required' => false,
+                ]);
+        }
+
+        if ($options['cFGroup']) {
+            $builder
+                ->add(
+                    'cFData',
+                    CustomFieldType::class,
+                    ['attr' => ['class' => 'cf-fields'], 'group' => $options['cFGroup']]
+                );
         }
     }
 
@@ -199,17 +232,18 @@ class PersonType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Chill\PersonBundle\Entity\Person',
-            'validation_groups' => array('general', 'creation'),
-        ));
+            'validation_groups' => ['general', 'creation'],
+        ]);
 
-        $resolver->setRequired(array(
-            'cFGroup'
-        ));
+        $resolver->setRequired([
+            'cFGroup',
+        ]);
 
         $resolver->setAllowedTypes(
-            'cFGroup', array('null', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup')
+            'cFGroup',
+            ['null', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup']
         );
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
index b45cd327e..0c6bb0d32 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
@@ -1,53 +1,38 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 
 /**
- * Class EvaluationType
- *
- * @package Chill\PersonBundle\Form
+ * Class EvaluationType.
  */
 class EvaluationType extends AbstractType
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -59,13 +44,9 @@ class EvaluationType extends AbstractType
             ->add('notificationDelay');
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', Evaluation::class)
-            ;
+            ->setDefault('class', Evaluation::class);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index c86a7d6b9..4ea0a5e70 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -1,85 +1,68 @@
 <?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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\Form\SocialWork;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\PersonBundle\Entity\SocialWork\Goal;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 
 /**
- * Class GoalType
+ * Chill is a software for social workers
  *
- * @package Chill\PersonBundle\Form
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form\SocialWork;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class GoalType.
  */
 class GoalType extends AbstractType
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TranslatableStringFormType::class, [
-                'label' => 'Nom'
+                'label' => 'Nom',
             ])
 
             ->add('socialActions', EntityType::class, [
                 'class' => SocialAction::class,
-                'required'   => false,
+                'required' => false,
                 'multiple' => true,
                 'choice_label' => function (SocialAction $issue) {
                     return $this->translatableStringHelper->localize($issue->getTitle());
-                }
+                },
             ])
 
             ->add('desactivationDate', DateType::class, [
-                'attr'  => array('class' => 'datepicker'),
-                'widget'=> 'single_text',
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
                 'format' => 'dd-MM-yyyy',
                 'required' => false,
             ]);
-}
+    }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', Goal::class)
-            ;
+            ->setDefault('class', Goal::class);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
index ee2cefe48..a0219aaf3 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
@@ -1,76 +1,58 @@
 <?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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\Form\SocialWork;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\PersonBundle\Entity\SocialWork\Result;
 
 /**
- * Class ResultType
+ * Chill is a software for social workers
  *
- * @package Chill\PersonBundle\Form
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form\SocialWork;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class ResultType.
  */
 class ResultType extends AbstractType
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TranslatableStringFormType::class, [
-                'label' => 'Nom'
+                'label' => 'Nom',
             ])
             ->add('accompanyingPeriodWorks')
             ->add('accompanyingPeriodWorkGoals')
             ->add('desactivationDate', DateType::class, [
-                'attr'  => array('class' => 'datepicker'),
-                'widget'=> 'single_text',
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
                 'format' => 'dd-MM-yyyy',
                 'required' => false,
             ]);
-}
+    }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', Result::class)
-            ;
+            ->setDefault('class', Result::class);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index 7613bc2c7..1f1ae0810 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -1,90 +1,72 @@
 <?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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\Form\SocialWork;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-
 
 /**
- * Class SocialActionType
+ * Chill is a software for social workers
  *
- * @package Chill\PersonBundle\Form
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form\SocialWork;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class SocialActionType.
  */
 class SocialActionType extends AbstractType
 {
     /**
-     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TranslatableStringFormType::class, [
-                'label' => 'Nom'
+                'label' => 'Nom',
             ])
             ->add('issue', EntityType::class, [
                 'class' => SocialIssue::class,
                 'choice_label' => function (SocialIssue $issue) {
                     return $this->translatableStringHelper->localize($issue->getTitle());
-                }
+                },
             ])
             ->add('parent', EntityType::class, [
                 'class' => SocialAction::class,
-                'required'   => false,
+                'required' => false,
                 'choice_label' => function (SocialAction $issue) {
                     return $this->translatableStringHelper->localize($issue->getTitle());
-                }
+                },
             ])
             ->add('defaultNotificationDelay')
             ->add('desactivationDate', DateType::class, [
-                'attr'  => array('class' => 'datepicker'),
-                'widget'=> 'single_text',
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
                 'format' => 'dd-MM-yyyy',
                 'required' => false,
             ]);
-}
+    }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefault('class', SocialIssue::class)
-            ;
+            ->setDefault('class', SocialIssue::class);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
index 1f21defd9..0058b1e51 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
@@ -1,83 +1,56 @@
 <?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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\Form\SocialWork;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 
 /**
- * Class SocialIssueType
+ * Chill is a software for social workers
  *
- * @package Chill\PersonBundle\Form
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form\SocialWork;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
 class SocialIssueType extends AbstractType
 {
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
+    protected TranslatableStringHelperInterface $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper) {
+    public function __construct(
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('title', TranslatableStringFormType::class, [
-                'label' => 'Nom'
+                'label' => 'Nom',
             ])
-
             ->add('parent', EntityType::class, [
                 'class' => SocialIssue::class,
-                'required'   => false,
-                'choice_label' => function (SocialIssue $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
-                }
+                'required' => false,
+                'choice_label' => fn (SocialIssue $issue): ?string => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
-
             ->add('desactivationDate', DateType::class, [
-                'attr'  => ['class' => 'datepicker'],
-                'widget'=> 'single_text',
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
                 'format' => 'dd-MM-yyyy',
                 'required' => false,
             ]);
-}
+    }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver
-            ->setDefault('class', SocialIssue::class)
-            ;
+        $resolver->setDefault('class', SocialIssue::class);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
index d2f85c924..600720ddf 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php
@@ -1,32 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
-use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
-use Symfony\Component\OptionsResolver\Options;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Class ClosingMotivePickerType
- * A type to add a closing motive
- *
- * @package Chill\PersonBundle\Form\Type
+ * A type to add a closing motive.
  */
 class ClosingMotivePickerType extends AbstractType
 {
-
-    /**
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
     /**
      * @var ChillEntityRenderExtension
      */
@@ -37,12 +36,13 @@ class ClosingMotivePickerType extends AbstractType
      */
     protected $repository;
 
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
     /**
      * ClosingMotivePickerType constructor.
-     *
-     * @param TranslatableStringHelper $translatableStringHelper
-     * @param ChillEntityRenderExtension $chillEntityRenderExtension
-     * @param ClosingMotiveRepository $closingMotiveRepository
      */
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
@@ -53,7 +53,27 @@ class ClosingMotivePickerType extends AbstractType
         $this->entityRenderExtension = $chillEntityRenderExtension;
         $this->repository = $closingMotiveRepository;
     }
-    
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'class' => ClosingMotive::class,
+            'empty_data' => null,
+            'placeholder' => 'Choose a motive',
+            'choice_label' => function (ClosingMotive $cm) {
+                return $this->entityRenderExtension->renderString($cm);
+            },
+            'only_leaf' => true,
+        ]);
+
+        $resolver
+            ->setAllowedTypes('only_leaf', 'bool')
+            ->setNormalizer('choices', function (Options $options) {
+                return $this->repository
+                    ->getActiveClosingMotive($options['only_leaf']);
+            });
+    }
+
     /**
      * @return string
      */
@@ -61,38 +81,12 @@ class ClosingMotivePickerType extends AbstractType
     {
         return 'closing_motive';
     }
-    
+
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getParent()
     {
         return EntityType::class;
     }
-    
-    /**
-     * @param OptionsResolver $resolver
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        
-        $resolver->setDefaults([
-            'class' => ClosingMotive::class,
-            'empty_data' => null,
-            'placeholder' => 'Choose a motive',
-            'choice_label' => function(ClosingMotive $cm) {
-               return $this->entityRenderExtension->renderString($cm);
-            },
-            'only_leaf' => true
-        ]);
-        
-        $resolver
-            ->setAllowedTypes('only_leaf', 'bool')
-            ->setNormalizer('choices', function (Options $options) {
-                return $this->repository
-                    ->getActiveClosingMotive($options['only_leaf']);
-            })
-        ;
-    }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php b/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
index bdd31e899..43edfb8d0 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/GenderType.php
@@ -1,38 +1,45 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\Type;
 
+use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * A type to select the civil union state
- *
- * @author julien
+ * A type to select the civil union state.
  */
-class GenderType extends AbstractType {
-
-    public function getParent() {
-        return ChoiceType::class;
-    }
-
-    public function configureOptions(OptionsResolver $resolver) {
-
-        $a = array(
+class GenderType extends AbstractType
+{
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $a = [
             Person::MALE_GENDER => Person::MALE_GENDER,
             Person::FEMALE_GENDER => Person::FEMALE_GENDER,
-            Person::BOTH_GENDER => Person::BOTH_GENDER
-        );
+            Person::BOTH_GENDER => Person::BOTH_GENDER,
+        ];
 
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'choices' => $a,
             'expanded' => true,
             'multiple' => false,
-            'placeholder' => null
-        ));
+            'placeholder' => null,
+        ]);
     }
 
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
index 1ba58e86e..02335c397 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
@@ -1,35 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\Type;
 
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
-/**
- * 
- *
- */
 class PersonAltNameType extends AbstractType
 {
     /**
-     *
      * @var ConfigPersonAltNamesHelper
      */
     private $configHelper;
-    
+
     /**
-     *
      * @var TranslatableStringHelper
      */
     private $translatableStringHelper;
-    
+
     public function __construct(
-        ConfigPersonAltNamesHelper $configHelper, 
+        ConfigPersonAltNamesHelper $configHelper,
         TranslatableStringHelper $translatableStringHelper
     ) {
         $this->configHelper = $configHelper;
@@ -40,28 +43,17 @@ class PersonAltNameType extends AbstractType
     {
         foreach ($this->getKeyChoices() as $label => $key) {
             $builder->add(
-                $key, 
-                $options['force_hidden'] ? HiddenType::class : TextType::class, [
-                'label' => $label,
-                'required' => false
-            ]);
+                $key,
+                $options['force_hidden'] ? HiddenType::class : TextType::class,
+                [
+                    'label' => $label,
+                    'required' => false,
+                ]
+            );
         }
-        
+
         $builder->setDataMapper(new \Chill\PersonBundle\Form\DataMapper\PersonAltNameDataMapper());
     }
-    
-    protected function getKeyChoices()
-    {
-        $choices = $this->configHelper->getChoices();
-        $translatedChoices = [];
-        
-        foreach ($choices as $key => $labels) {
-            $label = $this->translatableStringHelper->localize($labels);
-            $translatedChoices[$label] = $key;
-        }
-        
-        return $translatedChoices;
-    }
 
     public function configureOptions(OptionsResolver $resolver)
     {
@@ -69,8 +61,19 @@ class PersonAltNameType extends AbstractType
             ->setDefault('class', \Chill\PersonBundle\Entity\PersonAltName::class)
             ->setDefined('force_hidden')
             ->setAllowedTypes('force_hidden', 'bool')
-            ->setDefault('force_hidden', false)
-            ;
+            ->setDefault('force_hidden', false);
     }
 
+    protected function getKeyChoices()
+    {
+        $choices = $this->configHelper->getChoices();
+        $translatedChoices = [];
+
+        foreach ($choices as $key => $labels) {
+            $label = $this->translatableStringHelper->localize($labels);
+            $translatedChoices[$label] = $key;
+        }
+
+        return $translatedChoices;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
index f06d5cd72..00243349f 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\Type;
 
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
@@ -11,16 +20,14 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonPhoneType extends AbstractType
 {
-    private PhonenumberHelper $phonenumberHelper;
-
     private EntityManagerInterface $em;
 
+    private PhonenumberHelper $phonenumberHelper;
+
     public function __construct(PhonenumberHelper $phonenumberHelper, EntityManagerInterface $em)
     {
         $this->phonenumberHelper = $phonenumberHelper;
@@ -38,11 +45,11 @@ class PersonPhoneType extends AbstractType
             'required' => false,
         ]);
 
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            if (NULL === $event->getData()) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            if (null === $event->getData()) {
                 return;
             }
-            
+
             $oldPersonPhone = $this->em->getUnitOfWork()
                 ->getOriginalEntityData($event->getData());
 
@@ -59,7 +66,6 @@ class PersonPhoneType extends AbstractType
             ->setDefaults([
                 'data_class' => PersonPhone::class,
                 'validation_groups' => ['general', 'creation'],
-            ])
-        ;
+            ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
index 839c84b69..98572b8bc 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
@@ -1,41 +1,35 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\Type;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\GroupCenter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\ChoiceLoader\PersonChoiceLoader;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Search\PersonSearch;
+use RuntimeException;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Chill\MainBundle\Entity\GroupCenter;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Search\PersonSearch;
 use Symfony\Component\Translation\TranslatorInterface;
-use Chill\PersonBundle\Form\ChoiceLoader\PersonChoiceLoader;
-use Symfony\Component\OptionsResolver\Options;
+use function in_array;
+use function is_array;
 
 /**
  * This type allow to pick a person.
@@ -49,49 +43,41 @@ use Symfony\Component\OptionsResolver\Options;
  * `Chill\MainBundle\Entity\Center`. By default, all the reachable centers as selected.
  * - with the `role` option, only the people belonging to the reachable center for the
  * given role are displayed.
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class PickPersonType extends AbstractType
 {
     /**
-     * @var PersonRepository
-     */
-    protected $personRepository;
-    
-    /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    protected $user;
-
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     /**
-     *
-     * @var UrlGeneratorInterface
+     * @var PersonRepository
      */
-    protected $urlGenerator;
-    
+    protected $personRepository;
+
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
 
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
+
+    /**
+     * @var \Chill\MainBundle\Entity\User
+     */
+    protected $user;
+
     public function __construct(
-            PersonRepository $personRepository,
-            TokenStorageInterface $tokenStorage,
-            AuthorizationHelper $authorizationHelper,
-            UrlGeneratorInterface $urlGenerator,
-            TranslatorInterface $translator
-            )
-    {
+        PersonRepository $personRepository,
+        TokenStorageInterface $tokenStorage,
+        AuthorizationHelper $authorizationHelper,
+        UrlGeneratorInterface $urlGenerator,
+        TranslatorInterface $translator
+    ) {
         $this->personRepository = $personRepository;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;
@@ -99,42 +85,16 @@ class PickPersonType extends AbstractType
         $this->translator = $translator;
     }
 
-    protected function filterCentersfom(Options $options)
+    public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options)
     {
-        if ($options['role'] === NULL) {
-            $centers = array_map(function (GroupCenter $g) {
-
-                return $g->getCenter();
-            }, $this->user->getGroupCenters()->toArray());
-        } else {
-            $centers = $this->authorizationHelper
-                    ->getReachableCenters($this->user, $options['role']);
-        }
-
-        if ($options['centers'] === NULL) {
-            // we select all selected centers
-            $selectedCenters = $centers;
-        } else {
-            $selectedCenters = array();
-            $optionsCenters = is_array($options['centers']) ?
-                    $options['centers'] : array($options['centers']);
-
-            foreach ($optionsCenters as $c) {
-                // check that every member of the array is a center
-                if (!$c instanceof Center) {
-                    throw new \RuntimeException('Every member of the "centers" '
-                            . 'option must be an instance of '.Center::class);
-                }
-                if (!in_array($c->getId(), array_map(
-                        function(Center $c) { return $c->getId();},
-                        $centers))) {
-                    throw new AccessDeniedException('The given center is not reachable');
-                }
-                $selectedCenters[] = $c;
-            }
-        }
-        
-        return $selectedCenters;
+        $view->vars['attr']['data-person-picker'] = true;
+        $view->vars['attr']['data-select-interactive-loading'] = true;
+        $view->vars['attr']['data-search-url'] = $this->urlGenerator
+            ->generate('chill_main_search', ['name' => PersonSearch::NAME, '_format' => 'json']);
+        $view->vars['attr']['data-placeholder'] = $this->translator->trans($options['placeholder']);
+        $view->vars['attr']['data-no-results-label'] = $this->translator->trans('select2.no_results');
+        $view->vars['attr']['data-error-load-label'] = $this->translator->trans('select2.error_loading');
+        $view->vars['attr']['data-searching-label'] = $this->translator->trans('select2.searching');
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -143,49 +103,74 @@ class PickPersonType extends AbstractType
 
         // add the possibles options for this type
         $resolver->setDefined('centers')
-                ->addAllowedTypes('centers', array('array', Center::class, 'null'))
-                ->setDefault('centers', null)
-                ->setDefined('role')
-                ->addAllowedTypes('role', array(Role::class, 'null'))
-                ->setDefault('role', null)
-                ;
+            ->addAllowedTypes('centers', ['array', Center::class, 'null'])
+            ->setDefault('centers', null)
+            ->setDefined('role')
+            ->addAllowedTypes('role', [Role::class, 'null'])
+            ->setDefault('role', null);
 
         // add the default options
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'class' => Person::class,
-            'choice_label' => function(Person $p) {
-                return $p->getFirstname().' '.$p->getLastname();
+            'choice_label' => static function (Person $p) {
+                return $p->getFirstname() . ' ' . $p->getLastname();
             },
             'placeholder' => 'Pick a person',
-            'choice_attr' => function(Person $p) {
-                return array(
-                    'data-center' => $p->getCenter()->getId()
-                );
+            'choice_attr' => static function (Person $p) {
+                return [
+                    'data-center' => $p->getCenter()->getId(),
+                ];
             },
-            'attr' => array('class' => 'select2 '),
-            'choice_loader' => function(Options $options) {
+            'attr' => ['class' => 'select2 '],
+            'choice_loader' => function (Options $options) {
                 $centers = $this->filterCentersfom($options);
-                
+
                 return new PersonChoiceLoader($this->personRepository, $centers);
-            }
-        ));
+            },
+        ]);
     }
 
     public function getParent()
     {
         return EntityType::class;
     }
-    
-    public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options)
-    {
-        $view->vars['attr']['data-person-picker'] = true;
-        $view->vars['attr']['data-select-interactive-loading'] = true;
-        $view->vars['attr']['data-search-url'] = $this->urlGenerator
-            ->generate('chill_main_search', [ 'name' => PersonSearch::NAME, '_format' => 'json' ]);
-        $view->vars['attr']['data-placeholder'] = $this->translator->trans($options['placeholder']);
-        $view->vars['attr']['data-no-results-label'] = $this->translator->trans('select2.no_results');
-        $view->vars['attr']['data-error-load-label'] = $this->translator->trans('select2.error_loading');
-        $view->vars['attr']['data-searching-label'] = $this->translator->trans('select2.searching');
-    }
 
+    protected function filterCentersfom(Options $options)
+    {
+        if (null === $options['role']) {
+            $centers = array_map(static function (GroupCenter $g) {
+                return $g->getCenter();
+            }, $this->user->getGroupCenters()->toArray());
+        } else {
+            $centers = $this->authorizationHelper
+                ->getReachableCenters($this->user, $options['role']);
+        }
+
+        if (null === $options['centers']) {
+            // we select all selected centers
+            $selectedCenters = $centers;
+        } else {
+            $selectedCenters = [];
+            $optionsCenters = is_array($options['centers']) ?
+                    $options['centers'] : [$options['centers']];
+
+            foreach ($optionsCenters as $c) {
+                // check that every member of the array is a center
+                if (!$c instanceof Center) {
+                    throw new RuntimeException('Every member of the "centers" '
+                            . 'option must be an instance of ' . Center::class);
+                }
+
+                if (!in_array($c->getId(), array_map(
+                    static function (Center $c) { return $c->getId(); },
+                    $centers
+                ), true)) {
+                    throw new AccessDeniedException('The given center is not reachable');
+                }
+                $selectedCenters[] = $c;
+            }
+        }
+
+        return $selectedCenters;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
index 34fd9897e..c75b93f7a 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/Select2MaritalStatusType.php
@@ -1,40 +1,29 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Form\Type;
 
+use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
+use Chill\MainBundle\Form\Type\Select2ChoiceType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Form\Type\Select2ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use const SORT_FLAG_CASE;
+use const SORT_STRING;
 
 /**
- * A type to select the marital status
- *
- * @author Champs-Libres COOP
+ * A type to select the marital status.
  */
 class Select2MaritalStatusType extends AbstractType
 {
@@ -48,24 +37,16 @@ class Select2MaritalStatusType extends AbstractType
         $this->em = $em;
     }
 
-    public function getBlockPrefix() {
-        return 'select2_chill_marital_status';
-    }
-
-    public function getParent() {
-        return Select2ChoiceType::class;
-    }
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $transformer = new ObjectToIdTransformer($this->em,'Chill\PersonBundle\Entity\MaritalStatus');
+        $transformer = new ObjectToIdTransformer($this->em, 'Chill\PersonBundle\Entity\MaritalStatus');
         $builder->addModelTransformer($transformer);
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $maritalStatuses = $this->em->getRepository('Chill\PersonBundle\Entity\MaritalStatus')->findAll();
-        $choices = array();
+        $choices = [];
 
         foreach ($maritalStatuses as $ms) {
             $choices[$ms->getId()] = $this->translatableStringHelper->localize($ms->getName());
@@ -73,9 +54,19 @@ class Select2MaritalStatusType extends AbstractType
 
         asort($choices, SORT_STRING | SORT_FLAG_CASE);
 
-        $resolver->setDefaults(array(
-           'class' => MaritalStatus::class,
-           'choices' => array_combine(array_values($choices),array_keys($choices))
-        ));
+        $resolver->setDefaults([
+            'class' => MaritalStatus::class,
+            'choices' => array_combine(array_values($choices), array_keys($choices)),
+        ]);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'select2_chill_marital_status';
+    }
+
+    public function getParent()
+    {
+        return Select2ChoiceType::class;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 2fd322bb4..2d3749fa7 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -1,37 +1,55 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Household;
 
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-use Symfony\Component\Validator\ConstraintViolationList;
-use Doctrine\Common\Collections\Criteria;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
-use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
+use Doctrine\Common\Collections\Criteria;
+use LogicException;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-
+use function in_array;
+use function spl_object_hash;
 
 class MembersEditor
 {
-    private ValidatorInterface $validator;
+    public const VALIDATION_GROUP_AFFECTED = 'household_memberships';
+
+    public const VALIDATION_GROUP_CREATED = 'household_memberships_created';
+
     private ?Household $household = null;
 
-    private array $persistables = [];
     private array $membershipsAffected = [];
 
-    public const VALIDATION_GROUP = 'household_memberships';
+    private array $oldMembershipsHashes = [];
+
+    private array $persistables = [];
+
+    private ValidatorInterface $validator;
 
     public function __construct(ValidatorInterface $validator, ?Household $household)
     {
         $this->validator = $validator;
         $this->household = $household;
     }
-    
-    public function addMovement(\DateTimeImmutable $date, Person $person, Position $position, ?bool $holder = false, ?string $comment = null): self
+
+    public function addMovement(DateTimeImmutable $date, Person $person, Position $position, ?bool $holder = false, ?string $comment = null): self
     {
-        if (NULL === $this->household) {
-            throw new \LogicException("You must define a household first");
+        if (null === $this->household) {
+            throw new LogicException('You must define a household first');
         }
 
         $membership = (new HouseholdMember())
@@ -39,8 +57,7 @@ class MembersEditor
             ->setPerson($person)
             ->setPosition($position)
             ->setHolder($holder)
-            ->setComment($comment)
-            ;
+            ->setComment($comment);
         $this->household->addMember($membership);
 
         if ($position->getShareHousehold()) {
@@ -53,9 +70,10 @@ class MembersEditor
                     continue;
                 }
 
-                if ($participation->getEndDate() === NULL || $participation->getEndDate() > $date) {
+                if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
                     $participation->setEndDate($date);
                     $this->membershipsAffected[] = $participation;
+                    $this->oldMembershipsHashes[] = spl_object_hash($participation);
                 }
             }
         }
@@ -66,8 +84,23 @@ class MembersEditor
         return $this;
     }
 
+    public function getHousehold(): ?Household
+    {
+        return $this->household;
+    }
+
+    public function getPersistable(): array
+    {
+        return $this->persistables;
+    }
+
+    public function hasHousehold(): bool
+    {
+        return null !== $this->household;
+    }
+
     public function leaveMovement(
-        \DateTimeImmutable $date,
+        DateTimeImmutable $date,
         Person $person
     ): self {
         $criteria = new Criteria();
@@ -81,8 +114,7 @@ class MembersEditor
         );
 
         $participations = $person->getHouseholdParticipations()
-            ->matching($criteria)
-            ;
+            ->matching($criteria);
 
         foreach ($participations as $participation) {
             $participation->setEndDate($date);
@@ -92,36 +124,24 @@ class MembersEditor
         return $this;
     }
 
-
     public function validate(): ConstraintViolationListInterface
     {
         if ($this->hasHousehold()) {
             $list = $this->validator
-                ->validate($this->getHousehold(), null, [ self::VALIDATION_GROUP ]);
+                ->validate($this->getHousehold(), null, [self::VALIDATION_GROUP_AFFECTED]);
         } else {
             $list = new ConstraintViolationList();
         }
 
         foreach ($this->membershipsAffected as $m) {
-            $list->addAll($this->validator->validate($m, null, [ self::VALIDATION_GROUP ]));
+            if (in_array(spl_object_hash($m), $this->oldMembershipsHashes, true)) {
+                $list->addAll($this->validator->validate($m, null, [self::VALIDATION_GROUP_AFFECTED]));
+            } else {
+                $list->addAll($this->validator->validate($m, null, [self::VALIDATION_GROUP_CREATED,
+                    self::VALIDATION_GROUP_AFFECTED, ]));
+            }
         }
 
         return $list;
     }
-
-    public function getPersistable(): array
-    {
-        return $this->persistables;
-    }
-
-
-    public function getHousehold(): ?Household
-    {
-        return $this->household;
-    }
-
-    public function hasHousehold(): bool
-    {
-        return $this->household !== null;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
index adf55277e..a26841064 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
@@ -1,12 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Household;
 
-use Chill\PersonBundle\Household\MembersEditor;
 use Chill\PersonBundle\Entity\Household\Household;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-
 class MembersEditorFactory
 {
     public function __construct(ValidatorInterface $validator)
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index d82f8604b..fed840954 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,53 +1,58 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Workflow\Registry;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
- * Class AccompanyingCourseMenuBuilder
- *
- * @package Chill\PersonBundle\Menu
- * @author mathieu.jaumotte@champs-libres.coop
+ * Class AccompanyingCourseMenuBuilder.
  */
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
+    protected Registry $registry;
 
     /**
      * @var TranslatorInterface
      */
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(TranslatorInterface $translator, Registry $registry)
     {
         $this->translator = $translator;
-    }
-
-    public static function getMenuIds(): array
-    {
-        return [ 'accompanyingCourse' ];
+        $this->registry = $registry;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
+        /** @var AccompanyingPeriod $period */
         $period = $parameters['accompanyingCourse'];
 
         $menu->addChild($this->translator->trans('Resume Accompanying Course'), [
             'route' => 'chill_person_accompanying_course_index',
             'routeParameters' => [
-                'accompanying_period_id' => $period->getId()
-        ]])
-        ->setExtras(['order' => 10]);
+                'accompanying_period_id' => $period->getId(),
+            ], ])
+            ->setExtras(['order' => 10]);
 
         $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
             'route' => 'chill_person_accompanying_course_edit',
             'routeParameters' => [
-                'accompanying_period_id' => $period->getId()
-        ]])
-        ->setExtras(['order' => 20]);
+                'accompanying_period_id' => $period->getId(),
+            ], ])
+            ->setExtras(['order' => 20]);
 
         if (AccompanyingPeriod::STEP_DRAFT === $period->getStep()) {
             // no more menu items if the period is draft
@@ -57,17 +62,31 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild($this->translator->trans('Accompanying Course History'), [
             'route' => 'chill_person_accompanying_course_history',
             'routeParameters' => [
-                'accompanying_period_id' => $period->getId()
-        ]])
-        ->setExtras(['order' => 30]);
+                'accompanying_period_id' => $period->getId(),
+            ], ])
+            ->setExtras(['order' => 30]);
 
         $menu->addChild($this->translator->trans('Accompanying Course Action'), [
             'route' => 'chill_person_accompanying_period_work_list',
             'routeParameters' => [
-                'id' => $period->getId()
-        ]])
-        ->setExtras(['order' => 50]);
+                'id' => $period->getId(),
+            ], ])
+            ->setExtras(['order' => 40]);
+
+        $workflow = $this->registry->get($period, 'accompanying_period_lifecycle');
+
+        if ($workflow->can($period, 'close')) {
+            $menu->addChild($this->translator->trans('Close Accompanying Course'), [
+                'route' => 'chill_person_accompanying_course_close',
+                'routeParameters' => [
+                    'accompanying_period_id' => $period->getId(),
+                ], ])
+                ->setExtras(['order' => 99999]);
+        }
     }
 
-
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
index e8a73d2ab..25996f7bf 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
@@ -1,61 +1,48 @@
 <?php
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 
-/**
- * 
- *
- */
 class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
     public function __construct(AuthorizationCheckerInterface $authorizationChecker)
     {
         $this->authorizationChecker = $authorizationChecker;
     }
 
-    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
             return;
         }
-        
+
         $menu->addChild('Person', [
-                'route' => 'chill_person_admin'
-            ])
+            'route' => 'chill_person_admin',
+        ])
             ->setExtras([
-                'order' => 20
+                'order' => 20,
             ]);
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'admin_section' ];
+        return ['admin_section'];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index c6a76445d..feb465f8d 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -1,15 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\PersonBundle\Entity\Household\Household;
 use Knp\Menu\MenuItem;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
 {
-
     /**
      * @var TranslatorInterface
      */
@@ -20,11 +27,6 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
         $this->translator = $translator;
     }
 
-    public static function getMenuIds(): array
-    {
-        return [ 'household' ];
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
         $household = $parameters['household'];
@@ -32,32 +34,34 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild($this->translator->trans('household.Household summary'), [
             'route' => 'chill_person_household_summary',
             'routeParameters' => [
-                'household_id' => $household->getId()
-        ]])
-        ->setExtras(['order' => 10]);
+                'household_id' => $household->getId(),
+            ], ])
+            ->setExtras(['order' => 10]);
 
         $menu->addChild($this->translator->trans('household.Accompanying period'), [
             'route' => 'chill_person_household_accompanying_period',
             'routeParameters' => [
-                'household_id' => $household->getId()
-        ]])
-        ->setExtras(['order' => 20]);
+                'household_id' => $household->getId(),
+            ], ])
+            ->setExtras(['order' => 20]);
 
         $menu->addChild($this->translator->trans('household.Addresses'), [
             'route' => 'chill_person_household_addresses',
             'routeParameters' => [
-                'household_id' => $household->getId()
-        ]])
-        ->setExtras(['order' => 30]);
+                'household_id' => $household->getId(),
+            ], ])
+            ->setExtras(['order' => 30]);
 
         $menu->addChild($this->translator->trans('household.Relationship'), [
             'route' => 'chill_person_household_relationship',
             'routeParameters' => [
-                'household_id' => $household->getId()
-            ]])
+                'household_id' => $household->getId(),
+            ], ])
             ->setExtras(['order' => 40]);
-
     }
 
-
+    public static function getMenuIds(): array
+    {
+        return ['household'];
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 0c83d8a6a..ee359434b 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -1,20 +1,14 @@
 <?php
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
@@ -31,18 +25,15 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  *
  * - person details ;
  * - accompanying period (if `visible`)
- *
  */
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var string 'visible' or 'hidden'
      */
     protected $showAccompanyingPeriod;
 
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
@@ -62,52 +53,52 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         $menu->addChild($this->translator->trans('Person details'), [
-                'route' => 'chill_person_view',
-                'routeParameters' => [
-                    'person_id' => $parameters['person']->getId()
-                ]
-            ])
+            'route' => 'chill_person_view',
+            'routeParameters' => [
+                'person_id' => $parameters['person']->getId(),
+            ],
+        ])
             ->setExtras([
-                'order' => 50
+                'order' => 50,
             ]);
 
         $menu->addChild($this->translator->trans('household.person history'), [
-          'route' => 'chill_person_household_person_history',
-          'routeParameters' => [
-            'person_id' => $parameters['person']->getId()
-          ]
+            'route' => 'chill_person_household_person_history',
+            'routeParameters' => [
+                'person_id' => $parameters['person']->getId(),
+            ],
         ])
-          ->setExtras([
-            'order' => 99999
-          ]);
+            ->setExtras([
+                'order' => 99999,
+            ]);
 
         $menu->addChild($this->translator->trans('Person duplicate'), [
-          'route' => 'chill_person_duplicate_view',
-          'routeParameters' => [
-            'person_id' => $parameters['person']->getId()
-          ]
+            'route' => 'chill_person_duplicate_view',
+            'routeParameters' => [
+                'person_id' => $parameters['person']->getId(),
+            ],
         ])
-          ->setExtras([
-            'order' => 99999
-          ]);
+            ->setExtras([
+                'order' => 99999,
+            ]);
 
-        if ($this->showAccompanyingPeriod === 'visible'
+        if ('visible' === $this->showAccompanyingPeriod
             && $this->security->isGranted(AccompanyingPeriodVoter::SEE, $parameters['person'])
         ) {
             $menu->addChild($this->translator->trans('Accompanying period list'), [
-                    'route' => 'chill_person_accompanying_period_list',
-                    'routeParameters' => [
-                        'person_id' => $parameters['person']->getId()
-                    ]
-                ])
+                'route' => 'chill_person_accompanying_period_list',
+                'routeParameters' => [
+                    'person_id' => $parameters['person']->getId(),
+                ],
+            ])
                 ->setExtras([
-                    'order' => 100
+                    'order' => 100,
                 ]);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'person' ];
+        return ['person'];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
index 0b307204d..eff2e7a3a 100644
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@@ -1,35 +1,24 @@
 <?php
 
-/*
- * Copyright (C) 2018 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**
- * Class SectionMenuBuilder
- *
- * @package Chill\PersonBundle\Menu
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Class SectionMenuBuilder.
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
@@ -37,55 +26,47 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
     /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     /**
      * SectionMenuBuilder constructor.
-     *
-     * @param AuthorizationCheckerInterface $authorizationChecker
-     * @param TranslatorInterface $translator
      */
     public function __construct(AuthorizationCheckerInterface $authorizationChecker, TranslatorInterface $translator)
     {
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
     }
-    
+
     /**
      * @param $menuId
-     * @param MenuItem $menu
-     * @param array $parameters
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->authorizationChecker->isGranted(PersonVoter::CREATE)) {
             $menu->addChild($this->translator->trans('Add a person'), [
-                    'route' => 'chill_person_new'
-                ])
+                'route' => 'chill_person_new',
+            ])
                 ->setExtras([
                     'order' => 10,
-                    'icons' => [ 'plus' ]
+                    'icons' => ['plus'],
                 ]);
         }
 
         $menu->addChild($this->translator->trans('Create an accompanying course'), [
-                'route' => 'chill_person_accompanying_course_new'
-            ])
+            'route' => 'chill_person_accompanying_course_new',
+        ])
             ->setExtras([
                 'order' => 11,
-                'icons' => [ 'plus' ]
+                'icons' => ['plus'],
             ]);
     }
-    
-    /**
-     * @return array
-     */
+
     public static function getMenuIds(): array
     {
-        return [ 'section' ];
+        return ['section'];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php
index ca76fbd5c..c67c3d8a8 100644
--- a/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php
+++ b/src/Bundle/ChillPersonBundle/Notification/AccompanyingPeriodNotificationRenderer.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Notification;
 
 use Chill\MainBundle\Entity\Notification;
@@ -7,11 +16,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 final class AccompanyingPeriodNotificationRenderer
 {
-    public function supports(Notification $notification)
-    {
-        return $notification->getRelatedEntityClass() == AccompanyingPeriod::class;
-    }
-
     public function getTemplate()
     {
         return 'ChillPersonBundle:AccompanyingPeriod:showInNotification.html.twig';
@@ -21,4 +25,9 @@ final class AccompanyingPeriodNotificationRenderer
     {
         return ['notification' => $notification];
     }
+
+    public function supports(Notification $notification)
+    {
+        return $notification->getRelatedEntityClass() === AccompanyingPeriod::class;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
index e8610b4c1..7f8da3671 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/AccompanyingPeriodPrivacyEvent.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Privacy;
 
 /*
@@ -22,31 +31,30 @@ namespace Chill\PersonBundle\Privacy;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use Symfony\Component\EventDispatcher\Event;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Symfony\Component\EventDispatcher\Event;
 
 class AccompanyingPeriodPrivacyEvent extends Event
 {
     public const ACCOMPANYING_PERIOD_PRIVACY_EVENT = 'chill_person.accompanying_period_privacy_event';
 
-    protected AccompanyingPeriod $period;
-
     protected array $args;
 
+    protected AccompanyingPeriod $period;
+
     public function __construct($period, $args = [])
     {
         $this->period = $period;
         $this->args = $args;
     }
 
-    public function getPeriod(): AccompanyingPeriod
-    {
-        return $this->period;
-    }
-
     public function getArgs(): array
     {
         return $this->args;
     }
+
+    public function getPeriod(): AccompanyingPeriod
+    {
+        return $this->period;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
index 65304f96a..0bfd7a435 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Privacy;
 
 /*
@@ -22,83 +31,52 @@ namespace Chill\PersonBundle\Privacy;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use Symfony\Component\EventDispatcher\Event;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\EventDispatcher\Event;
+use function count;
 
 /**
- * Class PrivacyEvent
+ * Class PrivacyEvent.
  *
  * Array $args expects arguments with the following keys: 'element_class', 'element_id', 'action'
  * By default, action is set to 'show'
- *
- * @package Chill\PersonBundle\Privacy
  */
 class PrivacyEvent extends Event
 {
-    const PERSON_PRIVACY_EVENT = 'chill_person.privacy_event';
-    
-    /**
-     * @var Person
-     */
-    private $person;
-    
+    public const PERSON_PRIVACY_EVENT = 'chill_person.privacy_event';
+
     /**
      * @var array
      */
     private $args;
-    
+
+    /**
+     * @var Person
+     */
+    private $person;
+
     /**
      * @var array
      */
     private $persons;
-    
+
     /**
      * PrivacyEvent constructor.
-     *
-     * @param Person $person
-     * @param array $args
      */
-    public function __construct(Person $person, array $args = array('action' => 'show'))
+    public function __construct(Person $person, array $args = ['action' => 'show'])
     {
         $this->person = $person;
         $this->args = $args;
-        $this->persons = array();
+        $this->persons = [];
     }
-    
-    /**
-     * @return Person
-     */
-    public function getPerson()
-    {
-        return $this->person;
-    }
-    
-    /**
-     * @param Person $person
-     */
+
     public function addPerson(Person $person)
     {
         $this->persons[] = $person;
-    
+
         return $this;
     }
-    
-    /**
-     * @return array $persons
-     */
-    public function getPersons()
-    {
-        return $this->persons;
-    }
-    
-    /**
-     * @return bool
-     */
-    public function hasPersons()
-    {
-        return count($this->persons) >= 1;
-    }
-    
+
     /**
      * @return array
      */
@@ -106,5 +84,28 @@ class PrivacyEvent extends Event
     {
         return $this->args;
     }
-    
-}
\ No newline at end of file
+
+    /**
+     * @return Person
+     */
+    public function getPerson()
+    {
+        return $this->person;
+    }
+
+    /**
+     * @return array $persons
+     */
+    public function getPersons()
+    {
+        return $this->persons;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasPersons()
+    {
+        return count($this->persons) >= 1;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
index c37fc67b2..5018743dc 100644
--- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
+++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Privacy;
 
 /*
@@ -22,15 +31,14 @@ namespace Chill\PersonBundle\Privacy;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use Chill\PersonBundle\Entity\Person;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
+use function array_map;
 
 class PrivacyEventSubscriber implements EventSubscriberInterface
 {
-
     /**
      * @var LoggerInterface
      */
@@ -43,8 +51,6 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
 
     /**
      * PrivacyEventSubscriber constructor.
-     *
-     * @param LoggerInterface $logger
      */
     public function __construct(LoggerInterface $logger, TokenStorageInterface $token)
     {
@@ -56,11 +62,11 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
     {
         return [
             PrivacyEvent::PERSON_PRIVACY_EVENT => [
-                ['onPrivacyEvent']
+                ['onPrivacyEvent'],
             ],
             AccompanyingPeriodPrivacyEvent::ACCOMPANYING_PERIOD_PRIVACY_EVENT => [
-                ['onAccompanyingPeriodPrivacyEvent']
-            ]
+                ['onAccompanyingPeriodPrivacyEvent'],
+            ],
         ];
     }
 
@@ -69,11 +75,11 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
         $involved = $this->getInvolved();
         $involved['period_id'] = $event->getPeriod()->getId();
         $involved['persons'] = $event->getPeriod()->getPersons()
-            ->map(function(Person $p) { return $p->getId(); })
+            ->map(static function (Person $p) { return $p->getId(); })
             ->toArray();
 
         $this->logger->notice(
-            "[Privacy Event] An accompanying period has been viewed",
+            '[Privacy Event] An accompanying period has been viewed',
             array_merge($involved, $event->getArgs())
         );
     }
@@ -92,14 +98,14 @@ class PrivacyEventSubscriber implements EventSubscriberInterface
         $involved['person_id'] = $event->getPerson()->getId();
 
         if ($event->hasPersons()) {
-            $involved['persons'] = \array_map(
-                function(Person $p) { return $p->getId(); },
+            $involved['persons'] = array_map(
+                static function (Person $p) { return $p->getId(); },
                 $event->getPersons()
             );
         }
 
         $this->logger->notice(
-            "[Privacy Event] A Person Folder has been viewed",
+            '[Privacy Event] A Person Folder has been viewed',
             array_merge($involved, $event->getArgs())
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
index d9fa5b6e3..1f432e4e0 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 872feebbe..23ccf57a9 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -1,9 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
@@ -17,6 +26,21 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(AccompanyingPeriodWork::class);
     }
 
+    public function countByAccompanyingPeriod(AccompanyingPeriod $period): int
+    {
+        return $this->repository->countByAccompanyingPeriod($period);
+    }
+
+    public function countBySocialActionWithDescendants(SocialAction $action): int
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('COUNT(g)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     public function find($id): ?AccompanyingPeriodWork
     {
         return $this->repository->find($id);
@@ -32,17 +56,10 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function findOneBy(array $criteria): ?AccompanyingPeriodWork
-    {
-        return $this->findOneBy($criteria);
-    }
-
-    public function getClassName()
-    {
-        return AccompanyingPeriodWork::class;
-    }
-
     /**
+     * @param mixed|null $orderBy
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return AccompanyingPeriodWork[]
      */
@@ -51,9 +68,14 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         return $this->repository->findByAccompanyingPeriod($period, $orderBy, $limit, $offset);
     }
 
-    public function countByAccompanyingPeriod(AccompanyingPeriod $period): int
+    public function findOneBy(array $criteria): ?AccompanyingPeriodWork
     {
-        return $this->repository->countByAccompanyingPeriod($period);
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return AccompanyingPeriodWork::class;
     }
 
     public function toDelete()
@@ -62,29 +84,17 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
         $qb->select('g');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('g.'.$sort, $order);
+            $qb->addOrderBy('g.' . $sort, $order);
         }
 
         return $qb
             ->setMaxResults($limit)
             ->setFirstResult($offset)
             ->getQuery()
-            ->getResult()
-            ;
+            ->getResult();
     }
 
-    public function countBySocialActionWithDescendants(SocialAction $action): int
-    {
-        $qb = $this->buildQueryBySocialActionWithDescendants($action);
-        $qb->select('COUNT(g)');
-
-        return $qb
-            ->getQuery()
-            ->getSingleScalarResult()
-            ;
-    }
-
-    protected function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
+    private function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
     {
         $actions = $action->getDescendantsWithThis();
 
@@ -92,6 +102,7 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
 
         $orx = $qb->expr()->orX();
         $i = 0;
+
         foreach ($actions as $action) {
             $orx->add(":action_{$i} MEMBER OF g.socialActions");
             $qb->setParameter("action_{$i}", $action);
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
index 5c1525b52..ea5b1feff 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ClosingMotiveRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
@@ -29,10 +18,10 @@ use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
 final class ClosingMotiveRepository
 {
-    private EntityRepository $repository;
-
     private EntityManagerInterface $entityManager;
 
+    private EntityRepository $repository;
+
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->entityManager = $entityManager;
@@ -47,18 +36,18 @@ final class ClosingMotiveRepository
         $rsm = new ResultSetMappingBuilder($this->entityManager);
         $rsm->addRootEntityFromClassMetadata($this->repository->getClassName(), 'cm');
 
-        $sql = "SELECT " . (string) $rsm . "
+        $sql = 'SELECT ' . (string) $rsm . '
             FROM chill_person_accompanying_period_closingmotive AS cm
             WHERE
-                active IS TRUE ";
+                active IS TRUE ';
 
         if ($onlyLeaf) {
-            $sql .= "AND cm.id NOT IN (
+            $sql .= 'AND cm.id NOT IN (
                 SELECT DISTINCT parent_id FROM chill_person_accompanying_period_closingmotive WHERE parent_id IS NOT NULL
-            )";
+            )';
         }
 
-        $sql .= " ORDER BY cm.ordering ASC";
+        $sql .= ' ORDER BY cm.ordering ASC';
 
         return $this
             ->entityManager
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
index b3a20780e..0da6fc662 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
index 596bfc2ee..5d7c10f7e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
index 3923126aa..8eee0e9e4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/ResourceRepository.php
@@ -1,30 +1,19 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 
 final class ResourceRepository
 {
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
index c8cca82f5..965231e3f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
@@ -1,22 +1,39 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Security;
+use function count;
 
 final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodACLAwareRepositoryInterface
 {
     private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-    private Security $security;
-    private AuthorizationHelper $authorizationHelper;
-    private CenterResolverDispatcher $centerResolverDispatcher;
 
-    public function __construct(AccompanyingPeriodRepository $accompanyingPeriodRepository, Security $security, AuthorizationHelper $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher)
-    {
+    private AuthorizationHelper $authorizationHelper;
+
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+
+    private Security $security;
+
+    public function __construct(
+        AccompanyingPeriodRepository $accompanyingPeriodRepository,
+        Security $security,
+        AuthorizationHelper $authorizationHelper,
+        CenterResolverDispatcherInterface $centerResolverDispatcher
+    ) {
         $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
         $this->security = $security;
         $this->authorizationHelper = $authorizationHelper;
@@ -27,13 +44,16 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
         Person $person,
         string $role,
         ?array $orderBy = [],
-        int $limit = null,
-        int $offset = null
+        ?int $limit = null,
+        ?int $offset = null
     ): array {
         $qb = $this->accompanyingPeriodRepository->createQueryBuilder('ap');
         $scopes = $this->authorizationHelper
-            ->getReachableCircles($this->security->getUser(), $role,
-                $this->centerResolverDispatcher->resolveCenter($person));
+            ->getReachableCircles(
+                $this->security->getUser(),
+                $role,
+                $this->centerResolverDispatcher->resolveCenter($person)
+            );
 
         if (0 === count($scopes)) {
             return [];
@@ -57,20 +77,18 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
             ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('person', $person)
             ->setParameter('user', $this->security->getUser())
-            ->setParameter('creator', $this->security->getUser())
-        ;
+            ->setParameter('creator', $this->security->getUser());
         // add join condition for scopes
         $orx = $qb->expr()->orX(
             $qb->expr()->eq('ap.step', ':draft')
         );
 
         foreach ($scopes as $key => $scope) {
-            $orx->add($qb->expr()->isMemberOf(':scope_'.$key, 'ap.scopes'));
-            $qb->setParameter('scope_'.$key, $scope);
+            $orx->add($qb->expr()->isMemberOf(':scope_' . $key, 'ap.scopes'));
+            $qb->setParameter('scope_' . $key, $scope);
         }
         $qb->andWhere($orx);
 
         return $qb->getQuery()->getResult();
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
index a5798d3e8..778e8d8fe 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
@@ -10,7 +19,7 @@ interface AccompanyingPeriodACLAwareRepositoryInterface
         Person $person,
         string $role,
         ?array $orderBy = [],
-        int $limit = null,
-        int $offset = null
+        ?int $limit = null,
+        ?int $offset = null
     ): array;
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
index f902c7cc8..cbfb3e6d9 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index c9e8397a8..b21431554 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -36,6 +25,12 @@ final class AccompanyingPeriodRepository implements ObjectRepository
     {
         $this->repository = $entityManager->getRepository(AccompanyingPeriod::class);
     }
+
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id): ?AccompanyingPeriod
     {
         return $this->repository->find($id);
@@ -59,11 +54,6 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         return $this->findOneBy($criteria);
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
-    {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
-    }
-
     public function getClassName()
     {
         return AccompanyingPeriod::class;
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
index 38236df14..0649dae1c 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepository.php
@@ -1,22 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
 
 final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryInterface
 {
+    private AuthorizationHelper $authorizationHelper;
 
     private EntityManagerInterface $em;
 
-    private AuthorizationHelper $authorizationHelper;
-
     private Security $security;
 
     public function __construct(EntityManagerInterface $em, AuthorizationHelper $authorizationHelper, Security $security)
@@ -26,6 +35,54 @@ final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryIn
         $this->security = $security;
     }
 
+    public function addACL(QueryBuilder $qb, string $alias = 'h'): QueryBuilder
+    {
+        $centers = $this->authorizationHelper->getReachableCenters(
+            $this->security->getUser(),
+            HouseholdVoter::SHOW
+        );
+
+        if ([] === $centers) {
+            return $qb
+                ->andWhere("'FALSE' = 'TRUE'");
+        }
+
+        $qb
+            ->join($alias . '.members', 'members')
+            ->join('members.person', 'person')
+            ->andWhere(
+                $qb->expr()->in('person.center', ':centers')
+            )
+            ->setParameter('centers', $centers);
+
+        return $qb;
+    }
+
+    public function buildQueryByAddressReference(AddressReference $addressReference): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder();
+        $qb
+            ->select('h')
+            ->from(Household::class, 'h')
+            ->join('h.addresses', 'address')
+            ->where(
+                $qb->expr()->eq('address.addressReference', ':reference')
+            )
+            ->setParameter(':reference', $addressReference)
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('address.validFrom', ':today'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull('address.validTo'),
+                        $qb->expr()->gt('address.validTo', ':today')
+                    )
+                )
+            )
+            ->setParameter('today', new DateTime('today'));
+
+        return $qb;
+    }
+
     public function countByAddressReference(AddressReference $addressReference): int
     {
         $qb = $this->buildQueryByAddressReference($addressReference);
@@ -51,53 +108,4 @@ final class HouseholdACLAwareRepository implements HouseholdACLAwareRepositoryIn
             ->getQuery()
             ->getResult();
     }
-
-    public function buildQueryByAddressReference(AddressReference $addressReference): QueryBuilder
-    {
-        $qb = $this->em->createQueryBuilder();
-        $qb
-            ->select('h')
-            ->from(Household::class, 'h')
-            ->join('h.addresses', 'address')
-            ->where(
-                $qb->expr()->eq('address.addressReference', ':reference')
-            )
-            ->setParameter(':reference', $addressReference)
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('address.validFrom', ':today'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull('address.validTo'),
-                        $qb->expr()->gt('address.validTo', ':today')
-                    )
-                )
-            )
-            ->setParameter('today', new \DateTime('today'))
-            ;
-
-        return $qb;
-    }
-
-    public function addACL(QueryBuilder $qb, string $alias = 'h'): QueryBuilder
-    {
-        $centers = $this->authorizationHelper->getReachableCenters(
-            $this->security->getUser(),
-            HouseholdVoter::SHOW
-        );
-
-        if ([] === $centers) {
-            return $qb
-                ->andWhere("'FALSE' = 'TRUE'");
-        }
-
-        $qb
-            ->join($alias.'.members', 'members')
-            ->join('members.person', 'person')
-            ->andWhere(
-                $qb->expr()->in('person.center', ':centers')
-            )
-            ->setParameter('centers', $centers);
-
-        return $qb;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php
index 56a927ae5..e13d8b888 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdACLAwareRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\MainBundle\Entity\AddressReference;
@@ -10,9 +19,6 @@ interface HouseholdACLAwareRepositoryInterface
     public function countByAddressReference(AddressReference $addressReference): int;
 
     /**
-     * @param AddressReference $addressReference
-     * @param int|null $firstResult
-     * @param int|null $maxResult
      * @return array|Household[]
      */
     public function findByAddressReference(
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
index 1a634f451..e4729cd72 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
@@ -1,8 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+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 +21,6 @@ final class HouseholdMembersRepository
 
     public function __construct(EntityManagerInterface $entityManager)
     {
-        $this->repository = $entityManager->getRepository(HouseholdMembers::class);
+        $this->repository = $entityManager->getRepository(HouseholdMember::class);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
index d9ec6c35e..8becf4409 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Household;
@@ -8,18 +17,45 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use function strtr;
 
 final class HouseholdRepository implements ObjectRepository
 {
-    private EntityRepository $repository;
+    private const SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION = <<<'SQL'
+        WITH participations AS (
+        	SELECT DISTINCT part.accompanyingperiod_id
+        	FROM chill_person_accompanying_period_participation AS part
+        	WHERE person_id = ?),
+        other_participants AS (
+        	SELECT person_id, startDate, endDate
+        	FROM chill_person_accompanying_period_participation
+        	JOIN participations USING (accompanyingperiod_id)
+        	WHERE person_id != ?
+        ),
+        households AS (SELECT DISTINCT household.*
+        	FROM chill_person_household_members AS hmembers
+        	JOIN other_participants AS op USING (person_id)
+        	JOIN chill_person_household AS household ON hmembers.household_id = household.id
+          WHERE daterange(op.startDate, op.endDate) && daterange(hmembers.startDate, hmembers.endDate)
+        )
+        SELECT {select} FROM households {limits}
+        SQL;
+
     private EntityManagerInterface $em;
 
+    private EntityRepository $repository;
+
     public function __construct(EntityManagerInterface $entityManager)
     {
         $this->repository = $entityManager->getRepository(Household::class);
         $this->em = $entityManager;
     }
 
+    public function countByAccompanyingPeriodParticipation(Person $person)
+    {
+        return $this->buildQueryByAccompanyingPeriodParticipation($person, true);
+    }
+
     public function find($id)
     {
         return $this->repository->find($id);
@@ -35,6 +71,11 @@ final class HouseholdRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
+    public function findByAccompanyingPeriodParticipation(Person $person, int $limit, int $offset)
+    {
+        return $this->buildQueryByAccompanyingPeriodParticipation($person, false, $limit, $offset);
+    }
+
     public function findOneBy(array $criteria)
     {
         return $this->findOneBy($criteria);
@@ -45,16 +86,6 @@ final class HouseholdRepository implements ObjectRepository
         return Household::class;
     }
 
-    public function countByAccompanyingPeriodParticipation(Person $person)
-    {
-        return $this->buildQueryByAccompanyingPeriodParticipation($person, true);
-    }
-
-    public function findByAccompanyingPeriodParticipation(Person $person, int $limit, int $offset)
-    {
-        return $this->buildQueryByAccompanyingPeriodParticipation($person, false, $limit, $offset);
-    }
-
     private function buildQueryByAccompanyingPeriodParticipation(Person $person, bool $isCount = false, int $limit = 50, int $offset = 0)
     {
         $rsm = new ResultSetMappingBuilder($this->em);
@@ -62,14 +93,14 @@ final class HouseholdRepository implements ObjectRepository
 
         if ($isCount) {
             $rsm->addScalarResult('count', 'count');
-            $sql = \strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
+            $sql = strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
                 '{select}' => 'COUNT(households.*) AS count',
-                '{limits}' => ''
+                '{limits}' => '',
             ]);
         } else {
-            $sql = \strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
+            $sql = strtr(self::SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION, [
                 '{select}' => $rsm->generateSelectClause(['h' => 'households']),
-                '{limits}' => "OFFSET {$offset} LIMIT {$limit}"
+                '{limits}' => "OFFSET {$offset} LIMIT {$limit}",
             ]);
         }
         $native = $this->em->createNativeQuery($sql, $rsm);
@@ -77,28 +108,8 @@ final class HouseholdRepository implements ObjectRepository
 
         if ($isCount) {
             return $native->getSingleScalarResult();
-        } else {
-            return $native->getResult();
         }
-    }
 
-    private CONST SQL_BY_ACCOMPANYING_PERIOD_PARTICIPATION = <<<SQL
-WITH participations AS (
-	SELECT DISTINCT part.accompanyingperiod_id
-	FROM chill_person_accompanying_period_participation AS part
-	WHERE person_id = ?),
-other_participants AS (
-	SELECT person_id, startDate, endDate 
-	FROM chill_person_accompanying_period_participation
-	JOIN participations USING (accompanyingperiod_id)
-	WHERE person_id != ? 
-),
-households AS (SELECT DISTINCT household.*
-	FROM chill_person_household_members AS hmembers
-	JOIN other_participants AS op USING (person_id)
-	JOIN chill_person_household AS household ON hmembers.household_id = household.id
-  WHERE daterange(op.startDate, op.endDate) && daterange(hmembers.startDate, hmembers.endDate)
-)
-SELECT {select} FROM households {limits}
-SQL;
+        return $native->getResult();
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
index d0676d172..2cd370260 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PersonHouseholdAddressRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
@@ -21,11 +30,6 @@ final class PersonHouseholdAddressRepository implements ObjectRepository
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-    public function findOneBy(array $criteria, array $orderBy = null): ?PersonHouseholdAddress
-    {
-        return $this->repository->findOneBy($criteria, $orderBy);
-    }
-
     /**
      * @return PersonHouseholdAddress[]
      */
@@ -35,14 +39,23 @@ final class PersonHouseholdAddressRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return PersonHouseholdAddress[]
      */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
-    public function getClassName() {
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?PersonHouseholdAddress
+    {
+        return $this->repository->findOneBy($criteria, $orderBy);
+    }
+
+    public function getClassName()
+    {
         return PersonHouseholdAddress::class;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
index 58a0995d6..2ceab9b9e 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\Household;
 
 use Chill\PersonBundle\Entity\Household\Position;
@@ -18,6 +27,16 @@ final class PositionRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Position::class);
     }
 
+    /**
+     * @param mixed $id
+     *
+     * @return Position
+     */
+    public function find($id)
+    {
+        return $this->repository->find($id);
+    }
+
     /**
      * @return Position[]
      */
@@ -26,6 +45,17 @@ final class PositionRepository implements ObjectRepository
         return $this->repository->findAll();
     }
 
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return Position[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
     /**
      * @return Position[]
      */
@@ -38,14 +68,6 @@ final class PositionRepository implements ObjectRepository
             ->getResult();
     }
 
-    /**
-     * @return Position[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
     /**
      * @return Position[]
      */
@@ -54,14 +76,6 @@ final class PositionRepository implements ObjectRepository
         return $this->repository->findOneBy($criteria);
     }
 
-    /**
-     * @return Position
-     */
-    public function find($id)
-    {
-        return $this->repository->find($id);
-    }
-
     public function getClassName()
     {
         return Position::class;
diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
index 1a69d1319..58b4aa7fa 100644
--- a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php
@@ -1,12 +1,20 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 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
 {
@@ -16,6 +24,7 @@ class MaritalStatusRepository implements ObjectRepository
     {
         $this->repository = $entityManager->getRepository(MaritalStatus::class);
     }
+
     public function find($id): ?MaritalStatus
     {
         return $this->repository->find($id);
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index cd4f8c9ce..972264282 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -1,29 +1,45 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
-use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Search\ParsingException;
+use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
-
+use function array_fill;
+use function array_map;
+use function array_merge;
+use function array_push;
+use function count;
+use function explode;
+use function implode;
 
 final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
 {
-    private Security $security;
-
-    private EntityManagerInterface $em;
+    private AuthorizationHelper $authorizationHelper;
 
     private CountryRepository $countryRepository;
 
-    private AuthorizationHelper $authorizationHelper;
+    private EntityManagerInterface $em;
+
+    private Security $security;
 
     public function __construct(
         Security $security,
@@ -37,256 +53,270 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         $this->authorizationHelper = $authorizationHelper;
     }
 
+    public function buildAuthorizedQuery(
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
+    ): SearchApiQuery {
+        $query = $this->createSearchQuery(
+            $default,
+            $firstname,
+            $lastname,
+            $birthdate,
+            $birthdateBefore,
+            $birthdateAfter,
+            $gender,
+            $countryCode,
+            $phonenumber
+        );
+
+        return $this->addAuthorizations($query);
+    }
+
+    public function countBySearchCriteria(
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
+    ): int {
+        $query = $this->buildAuthorizedQuery(
+            $default,
+            $firstname,
+            $lastname,
+            $birthdate,
+            $birthdateBefore,
+            $birthdateAfter,
+            $gender,
+            $countryCode,
+            $phonenumber,
+            $city
+        );
+
+        return $this->fetchQueryCount($query);
+    }
+
     /**
-     * @return array|Person[]
+     * Create a search query without ACL.
+     *
      * @throws NonUniqueResultException
      * @throws ParsingException
      */
+    public function createSearchQuery(
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
+    ): SearchApiQuery {
+        $query = new SearchApiQuery();
+        $query
+            ->setFromClause('chill_person_person AS person');
+
+        $pertinence = [];
+        $pertinenceArgs = [];
+        $orWhereSearchClause = [];
+        $orWhereSearchClauseArgs = [];
+
+        if ('' !== $default) {
+            foreach (explode(' ', $default) as $str) {
+                $pertinence[] =
+                    'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), person.fullnamecanonical) + ' .
+                    "(person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%')::int + " .
+                    "(EXISTS (SELECT 1 FROM unnest(string_to_array(fullnamecanonical, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(?)))))::int + " .
+                    '(starts_with(LOWER(UNACCENT(lastname)), UNACCENT(LOWER(?))))::int';
+                array_push($pertinenceArgs, $str, $str, $str, $str);
+
+                $orWhereSearchClause[] =
+                    '(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR ' .
+                    "person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' )";
+                array_push($orWhereSearchClauseArgs, $str, $str);
+            }
+
+            $query->andWhereClause(
+                implode(' OR ', $orWhereSearchClause),
+                $orWhereSearchClauseArgs
+            );
+        } else {
+            $pertinence = ['1'];
+            $pertinenceArgs = [];
+        }
+        $query
+            ->setSelectPertinence(implode(' + ', $pertinence), $pertinenceArgs);
+
+        if (null !== $birthdate) {
+            $query->andWhereClause(
+                'person.birthdate = ?::date',
+                [$birthdate->format('Y-m-d')]
+            );
+        }
+
+        if (null !== $firstname) {
+            $query->andWhereClause(
+                "UNACCENT(LOWER(person.firstname)) LIKE '%' || UNACCENT(LOWER(?)) || '%'",
+                [$firstname]
+            );
+        }
+
+        if (null !== $lastname) {
+            $query->andWhereClause(
+                "UNACCENT(LOWER(person.lastname)) LIKE '%' || UNACCENT(LOWER(?)) || '%'",
+                [$lastname]
+            );
+        }
+
+        if (null !== $birthdateBefore) {
+            $query->andWhereClause(
+                'person.birthdate <= ?::date',
+                [$birthdateBefore->format('Y-m-d')]
+            );
+        }
+
+        if (null !== $birthdateAfter) {
+            $query->andWhereClause(
+                'person.birthdate >= ?::date',
+                [$birthdateAfter->format('Y-m-d')]
+            );
+        }
+
+        if (null !== $phonenumber) {
+            $query->andWhereClause(
+                "person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR pp.phonenumber LIKE '%' || ? || '%'",
+                [$phonenumber, $phonenumber, $phonenumber]
+            );
+            $query->setFromClause($query->getFromClause() . ' LEFT JOIN chill_person_phone pp ON pp.person_id = person.id');
+        }
+
+        if (null !== $city) {
+            $query->setFromClause($query->getFromClause() . ' ' .
+                'JOIN view_chill_person_current_address vcpca ON vcpca.person_id = person.id ' .
+                'JOIN chill_main_address cma ON vcpca.address_id = cma.id ' .
+                'JOIN chill_main_postal_code cmpc ON cma.postcode_id = cmpc.id');
+
+            foreach (explode(' ', $city) as $cityStr) {
+                $query->andWhereClause(
+                    "(UNACCENT(LOWER(cmpc.label)) LIKE '%' || UNACCENT(LOWER(?)) || '%' OR cmpc.code LIKE '%' || UNACCENT(LOWER(?)) || '%')",
+                    [$cityStr, $city]
+                );
+            }
+        }
+
+        if (null !== $countryCode) {
+            $query->setFromClause($query->getFromClause() . ' JOIN country ON person.nationality_id = country.id');
+            $query->andWhereClause('country.countrycode = UPPER(?)', [$countryCode]);
+        }
+
+        if (null !== $gender) {
+            $query->andWhereClause('person.gender = ?', [$gender]);
+        }
+
+        return $query;
+    }
+
+    public function fetchQueryCount(SearchApiQuery $query): int
+    {
+        $rsm = new Query\ResultSetMapping();
+        $rsm->addScalarResult('c', 'c');
+
+        $nql = $this->em->createNativeQuery($query->buildQuery(true), $rsm);
+        $nql->setParameters($query->buildParameters(true));
+
+        return $nql->getSingleScalarResult();
+    }
+
+    /**
+     * @return array|Person[]
+     */
+    public function fetchQueryPerson(SearchApiQuery $query, ?int $start = 0, ?int $limit = 50): array
+    {
+        $rsm = new Query\ResultSetMappingBuilder($this->em);
+        $rsm->addRootEntityFromClassMetadata(Person::class, 'person');
+
+        $query->addSelectClause($rsm->generateSelectClause());
+
+        $nql = $this->em->createNativeQuery(
+            $query->buildQuery() . ' ORDER BY pertinence DESC OFFSET ? LIMIT ?',
+            $rsm
+        )->setParameters(array_merge($query->buildParameters(), [$start, $limit]));
+
+        return $nql->getResult();
+    }
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws ParsingException
+     *
+     * @return array|Person[]
+     */
     public function findBySearchCriteria(
         int $start,
         int $limit,
         bool $simplify = false,
-        string $default = null,
-        string $firstname = null,
-        string $lastname = null,
-        ?\DateTime $birthdate = null,
-        ?\DateTime $birthdateBefore = null,
-        ?\DateTime $birthdateAfter = null,
-        string $gender = null,
-        string $countryCode = null
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
     ): array {
-        $qb = $this->createSearchQuery($default, $firstname, $lastname,
-            $birthdate, $birthdateBefore, $birthdateAfter, $gender,
-            $countryCode);
-        $this->addACLClauses($qb, 'p');
-
-        return $this->getQueryResult($qb, 'p', $simplify, $limit, $start);
-    }
-
-    /**
-     * Helper method to prepare and return the search query for PersonACL.
-     *
-     * This method replace the select clause with required parameters, depending on the
-     * "simplify" parameter. It also add query limits.
-     *
-     * The given alias must represent the person alias.
-     *
-     * @return array|Person[]
-     */
-    public function getQueryResult(QueryBuilder $qb, string $alias, bool $simplify, int $limit, int $start): array
-    {
-        if ($simplify) {
-            $qb->select(
-                $alias.'.id',
-                $qb->expr()->concat(
-                    $alias.'.firstName',
-                    $qb->expr()->literal(' '),
-                    $alias.'.lastName'
-                ).'AS text'
-            );
-        } else {
-            $qb->select($alias);
-        }
-
-        $qb
-            ->setMaxResults($limit)
-            ->setFirstResult($start);
-
-        //order by firstname, lastname
-        $qb
-            ->orderBy($alias.'.firstName')
-            ->addOrderBy($alias.'.lastName');
-
-        if ($simplify) {
-            return $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-        } else {
-            return $qb->getQuery()->getResult();
-        }
-    }
-
-    public function countBySearchCriteria(
-        string $default = null,
-        string $firstname = null,
-        string $lastname = null,
-        ?\DateTime $birthdate = null,
-        ?\DateTime $birthdateBefore = null,
-        ?\DateTime $birthdateAfter = null,
-        string $gender = null,
-        string $countryCode = null
-    ): int {
-        $qb = $this->createSearchQuery($default, $firstname, $lastname,
-            $birthdate, $birthdateBefore, $birthdateAfter, $gender,
-            $countryCode);
-        $this->addACLClauses($qb, 'p');
-
-        return $this->getCountQueryResult($qb,'p');
-    }
-
-    /**
-     * Helper method to prepare and return the count for search query
-     *
-     * This method replace the select clause with required parameters, depending on the
-     * "simplify" parameter.
-     *
-     * The given alias must represent the person alias in the query builder.
-     */
-    public function getCountQueryResult(QueryBuilder $qb, $alias): int
-    {
-        $qb->select('COUNT('.$alias.'.id)');
-
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-
-    public function findBySimilaritySearch(string $pattern, int $firstResult,
-        int $maxResult, bool $simplify = false)
-    {
-        $qb = $this->createSimilarityQuery($pattern);
-        $this->addACLClauses($qb, 'sp');
-
-        return $this->getQueryResult($qb, 'sp', $simplify, $maxResult, $firstResult);
-    }
-
-    public function countBySimilaritySearch(string $pattern)
-    {
-        $qb = $this->createSimilarityQuery($pattern);
-        $this->addACLClauses($qb, 'sp');
-
-        return $this->getCountQueryResult($qb, 'sp');
-    }
-
-    /**
-     * Create a search query without ACL
-     *
-     * The person alias is a "p"
-     *
-     * @param string|null $default
-     * @param string|null $firstname
-     * @param string|null $lastname
-     * @param \DateTime|null $birthdate
-     * @param \DateTime|null $birthdateBefore
-     * @param \DateTime|null $birthdateAfter
-     * @param string|null $gender
-     * @param string|null $countryCode
-     * @return QueryBuilder
-     * @throws NonUniqueResultException
-     * @throws ParsingException
-     */
-    public function createSearchQuery(
-        string $default = null,
-        string $firstname = null,
-        string $lastname = null,
-        ?\DateTime $birthdate = null,
-        ?\DateTime $birthdateBefore = null,
-        ?\DateTime $birthdateAfter = null,
-        string $gender = null,
-        string $countryCode = null
-    ): QueryBuilder {
-
-        if (!$this->security->getUser() instanceof User) {
-            throw new \RuntimeException("Search must be performed by a valid user");
-        }
-        $qb = $this->em->createQueryBuilder();
-        $qb->from(Person::class, 'p');
-
-        if (NULL !== $firstname) {
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.firstName))', ':firstname'))
-                ->setParameter('firstname', '%'.$firstname.'%');
-        }
-
-        if (NULL !== $lastname) {
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(p.lastName))', ':lastname'))
-                ->setParameter('lastname', '%'.$lastname.'%');
-        }
-
-        if (NULL !== $birthdate) {
-            $qb->andWhere($qb->expr()->eq('p.birthdate', ':birthdate'))
-                ->setParameter('birthdate', $birthdate);
-        }
-
-        if (NULL !== $birthdateAfter) {
-            $qb->andWhere($qb->expr()->gt('p.birthdate', ':birthdateafter'))
-                ->setParameter('birthdateafter', $birthdateAfter);
-        }
-
-        if (NULL !== $birthdateBefore) {
-            $qb->andWhere($qb->expr()->lt('p.birthdate', ':birthdatebefore'))
-                ->setParameter('birthdatebefore', $birthdateBefore);
-        }
-
-        if (NULL !== $gender) {
-            $qb->andWhere($qb->expr()->eq('p.gender', ':gender'))
-                ->setParameter('gender', $gender);
-        }
-
-        if (NULL !== $countryCode) {
-            try {
-                $country = $this->countryRepository->findOneBy(['countryCode' => $countryCode]);
-            } catch (NoResultException $ex)  {
-                throw new ParsingException('The country code "'.$countryCode.'" '
-                    . ', used in nationality, is unknow', 0, $ex);
-            } catch (NonUniqueResultException $e) {
-                throw $e;
-            }
-
-            $qb->andWhere($qb->expr()->eq('p.nationality', ':nationality'))
-                ->setParameter('nationality', $country);
-        }
-
-        if (NULL !== $default) {
-            $grams = explode(' ', $default);
-
-            foreach($grams as $key => $gram) {
-                $qb->andWhere($qb->expr()
-                    ->like('p.fullnameCanonical', 'UNACCENT(LOWER(:default_'.$key.'))'))
-                    ->setParameter('default_'.$key, '%'.$gram.'%');
-            }
-        }
-
-        return $qb;
-    }
-
-    private function addACLClauses(QueryBuilder $qb, string $personAlias): void
-    {
-        // restrict center for security
-        $reachableCenters = $this->authorizationHelper
-            ->getReachableCenters($this->security->getUser(), 'CHILL_PERSON_SEE');
-        $qb->andWhere(
-            $qb->expr()->orX(
-                $qb->expr()
-                    ->in($personAlias.'.center', ':centers'),
-                $qb->expr()
-                    ->isNull($personAlias.'.center')
-            )
+        $query = $this->buildAuthorizedQuery(
+            $default,
+            $firstname,
+            $lastname,
+            $birthdate,
+            $birthdateBefore,
+            $birthdateAfter,
+            $gender,
+            $countryCode,
+            $phonenumber,
+            $city
         );
-        $qb->setParameter('centers', $reachableCenters);
+
+        return $this->fetchQueryPerson($query);
     }
 
-    /**
-     * Create a query for searching by similarity.
-     *
-     * The person alias is "sp".
-     *
-     * @param $pattern
-     * @return QueryBuilder
-     */
-    public function createSimilarityQuery($pattern): QueryBuilder
+    private function addAuthorizations(SearchApiQuery $query): SearchApiQuery
     {
-        $qb = $this->em->createQueryBuilder();
+        $authorizedCenters = $this->authorizationHelper
+            ->getReachableCenters($this->security->getUser(), PersonVoter::SEE);
 
-        $qb->from(Person::class, 'sp');
-
-        $grams = explode(' ', $pattern);
-
-        foreach($grams as $key => $gram) {
-            $qb->andWhere('STRICT_WORD_SIMILARITY_OPS(:default_'.$key.', sp.fullnameCanonical) = TRUE')
-                ->setParameter('default_'.$key, '%'.$gram.'%');
-
-            // remove the perfect matches
-            $qb->andWhere($qb->expr()
-                ->notLike('sp.fullnameCanonical', 'UNACCENT(LOWER(:not_default_'.$key.'))'))
-                ->setParameter('not_default_'.$key, '%'.$gram.'%');
+        if ([] === $authorizedCenters) {
+            return $query->andWhereClause('FALSE = TRUE', []);
         }
 
-        return $qb;
+        return $query
+            ->andWhereClause(
+                strtr(
+                    'person.center_id IN ({{ center_ids }})',
+                    [
+                        '{{ center_ids }}' => implode(
+                            ', ',
+                            array_fill(0, count($authorizedCenters), '?')
+                        ),
+                    ]
+                ),
+                array_map(static function (Center $c) {return $c->getId(); }, $authorizedCenters)
+            );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
index 8e83da03d..72d4682c8 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -1,50 +1,64 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
-use Chill\MainBundle\Search\ParsingException;
+use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\PersonBundle\Entity\Person;
-use Doctrine\ORM\NonUniqueResultException;
+use DateTimeInterface;
 
 interface PersonACLAwareRepositoryInterface
 {
+    public function buildAuthorizedQuery(
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
+    ): SearchApiQuery;
+
+    public function countBySearchCriteria(
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
+    );
 
     /**
      * @return array|Person[]
-     * @throws NonUniqueResultException
-     * @throws ParsingException
      */
     public function findBySearchCriteria(
         int $start,
         int $limit,
         bool $simplify = false,
-        string $default = null,
-        string $firstname = null,
-        string $lastname = null,
-        ?\DateTime $birthdate = null,
-        ?\DateTime $birthdateBefore = null,
-        ?\DateTime $birthdateAfter = null,
-        string $gender = null,
-        string $countryCode = null
+        ?string $default = null,
+        ?string $firstname = null,
+        ?string $lastname = null,
+        ?DateTimeInterface $birthdate = null,
+        ?DateTimeInterface $birthdateBefore = null,
+        ?DateTimeInterface $birthdateAfter = null,
+        ?string $gender = null,
+        ?string $countryCode = null,
+        ?string $phonenumber = null,
+        ?string $city = null
     ): array;
-
-    public function countBySearchCriteria(
-        string $default = null,
-        string $firstname = null,
-        string $lastname = null,
-        ?\DateTime $birthdate = null,
-        ?\DateTime $birthdateBefore = null,
-        ?\DateTime $birthdateAfter = null,
-        string $gender = null,
-        string $countryCode = null
-    );
-
-    public function findBySimilaritySearch(
-        string $pattern,
-        int $firstResult,
-        int $maxResult,
-        bool $simplify = false
-    );
-
-    public function countBySimilaritySearch(string $pattern);
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
index eed330c8a..6e5533f78 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\PersonAltName;
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
index b899f06c1..8fe586760 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonNotDuplicateRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
@@ -20,8 +29,7 @@ final class PersonNotDuplicateRepository
     {
         $qb = $this->repository->createQueryBuilder('pnd');
         $qb->select('pnd')
-            ->where('pnd.person1 = :person OR pnd.person2 = :person')
-        ;
+            ->where('pnd.person1 = :person OR pnd.person2 = :person');
         $qb->setParameter('person', $person);
         $result = $qb->getQuery()->getResult();
 
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index 0235ccc13..57cea2d55 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -1,31 +1,25 @@
 <?php
-/*
- * Copyright (C) 2019 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\PersonBundle\Repository;
+declare(strict_types=1);
 
+namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-use UnexpectedValueException;
-
+use Exception;
+use function count;
+use function in_array;
+use function str_replace;
 
 final class PersonRepository implements ObjectRepository
 {
@@ -36,65 +30,9 @@ final class PersonRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Person::class);
     }
 
-    public function find($id, $lockMode = null, $lockVersion = null): ?Person
-    {
-        return $this->repository->find($id, $lockMode, $lockVersion);
-    }
-
-    public function findByIds($ids): array
-    {
-        return $this->repository->findBy(['id' => $ids]);
-    }
-
-    public function findAll()
-    {
-        return $this->repository->findAll();
-    }
-
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria)
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    public function getClassName()
-    {
-        return Person::class;
-    }
-
-    /**
-     * @param $centers
-     * @param $firstResult
-     * @param $maxResults
-     * @return mixed
-     * @throws \Exception
-     */
-    public function findByPhone(
-        string $phonenumber,
-        $centers,
-        $firstResult,
-        $maxResults,
-        array $only = ['mobile', 'phone']
-    ) {
-        $qb = $this->repository->createQueryBuilder('p');
-        $qb->select('p');
-
-        $this->addByCenters($qb, $centers);
-        $this->addPhoneNumber($qb, $phonenumber, $only);
-
-        $qb->setFirstResult($firstResult)
-            ->setMaxResults($maxResults)
-            ;
-
-        return $qb->getQuery()->getResult();
-    }
-
     /**
      * @param $centers
+     *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
@@ -112,50 +50,103 @@ final class PersonRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    /**
-     * @throws \Exception
-     */
-    protected function addPhoneNumber(QueryBuilder $qb, string $phonenumber, array $only): void
+    public function find($id, $lockMode = null, $lockVersion = null): ?Person
     {
-        if (count($only) === 0) {
-            throw new \Exception("No array field to search");
-        }
-
-        $phonenumber = $this->parsePhoneNumber($phonenumber);
-
-        $orX = $qb->expr()->orX();
-
-        if (\in_array('mobile', $only)) {
-            $orX->add($qb->expr()->like("REPLACE(p.mobilenumber, ' ', '')", ':phonenumber'));
-        }
-        if (\in_array('phone', $only)) {
-            $orX->add($qb->expr()->like("REPLACE(p.phonenumber, ' ', '')", ':phonenumber'));
-        }
-
-        $qb->andWhere($orX);
-
-        $qb->setParameter('phonenumber', '%'.$phonenumber.'%');
+        return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
-
-    /**
-     * @param $phonenumber
-     * @return string
-     */
-    protected function parsePhoneNumber(string $phonenumber): string
+    public function findAll()
     {
-        return \str_replace(' ', '', $phonenumber);
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findByIds($ids): array
+    {
+        return $this->repository->findBy(['id' => $ids]);
     }
 
     /**
-     * @param QueryBuilder $qb
-     * @param array $centers
+     * @param $centers
+     * @param $firstResult
+     * @param $maxResults
+     *
+     * @throws Exception
+     *
+     * @return mixed
      */
-    protected function addByCenters(QueryBuilder $qb, array $centers): void
+    public function findByPhone(
+        string $phonenumber,
+        $centers,
+        $firstResult,
+        $maxResults,
+        array $only = ['mobile', 'phone']
+    ) {
+        $qb = $this->repository->createQueryBuilder('p');
+        $qb->select('p');
+
+        $this->addByCenters($qb, $centers);
+        $this->addPhoneNumber($qb, $phonenumber, $only);
+
+        $qb->setFirstResult($firstResult)
+            ->setMaxResults($maxResults);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function findOneBy(array $criteria)
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Person::class;
+    }
+
+    private function addByCenters(QueryBuilder $qb, array $centers): void
     {
         if (count($centers) > 0) {
             $qb->andWhere($qb->expr()->in('p.center', ':centers'));
             $qb->setParameter('centers', $centers);
         }
     }
+
+    /**
+     * @throws Exception
+     */
+    private function addPhoneNumber(QueryBuilder $qb, string $phonenumber, array $only): void
+    {
+        if (count($only) === 0) {
+            throw new Exception('No array field to search');
+        }
+
+        $phonenumber = $this->parsePhoneNumber($phonenumber);
+
+        $orX = $qb->expr()->orX();
+
+        if (in_array('mobile', $only, true)) {
+            $orX->add($qb->expr()->like("REPLACE(p.mobilenumber, ' ', '')", ':phonenumber'));
+        }
+
+        if (in_array('phone', $only, true)) {
+            $orX->add($qb->expr()->like("REPLACE(p.phonenumber, ' ', '')", ':phonenumber'));
+        }
+
+        $qb->andWhere($orX);
+
+        $qb->setParameter('phonenumber', '%' . $phonenumber . '%');
+    }
+
+    /**
+     * @param $phonenumber
+     */
+    private function parsePhoneNumber(string $phonenumber): string
+    {
+        return str_replace(' ', '', $phonenumber);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
new file mode 100644
index 000000000..ddf82ca8d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationRepository.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Repository\Relationships;
+
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+class RelationRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(Relation::class);
+    }
+
+    public function find($id): ?Relation
+    {
+        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): ?Relation
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return Relation::class;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
new file mode 100644
index 000000000..9549a4564
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/Relationships/RelationshipRepository.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Repository\Relationships;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
+
+class RelationshipRepository implements ObjectRepository
+{
+    private EntityManagerInterface $em;
+
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->repository = $em->getRepository(Relationship::class);
+        $this->em = $em;
+    }
+
+    public function countByPerson(Person $person): int
+    {
+        return $this->buildQueryByPerson($person)
+            ->select('COUNT(p)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function find($id): ?Relationship
+    {
+        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);
+    }
+
+    /**
+     * @return array|Relationship[]
+     */
+    public function findByPerson(Person $person): array
+    {
+        return $this->buildQueryByPerson($person)
+            ->select('r')
+            ->getQuery()
+            ->getResult();
+    }
+
+    public function findOneBy(array $criteria): ?Relationship
+    {
+        return $this->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return Relationship::class;
+    }
+
+    private function buildQueryByPerson(Person $person): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder();
+        $qb
+            ->from(Relationship::class, 'r')
+            ->where(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('r.fromPerson', ':person'),
+                    $qb->expr()->eq('r.toPerson', ':person')
+                )
+            )
+            ->setParameter('person', $person);
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
index d0f11c2d3..cb651b9ae 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
@@ -30,6 +39,9 @@ final class EvaluationRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return array<int, Evaluation>
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -49,6 +61,4 @@ final class EvaluationRepository implements ObjectRepository
     {
         return Evaluation::class;
     }
-
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
index 3c96c837c..ec74b1919 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
@@ -18,6 +27,16 @@ final class GoalRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Goal::class);
     }
 
+    public function countBySocialActionWithDescendants(SocialAction $action): int
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('COUNT(g)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Goal
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
@@ -32,6 +51,9 @@ final class GoalRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return array<int, Goal>
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -40,6 +62,9 @@ final class GoalRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $orderBy
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return Goal[]
      */
@@ -49,44 +74,16 @@ final class GoalRepository implements ObjectRepository
         $qb->select('g');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('g.'.$sort, $order);
+            $qb->addOrderBy('g.' . $sort, $order);
         }
 
         return $qb
             ->setMaxResults($limit)
             ->setFirstResult($offset)
             ->getQuery()
-            ->getResult()
-            ;
+            ->getResult();
     }
 
-    public function countBySocialActionWithDescendants(SocialAction $action): int
-    {
-        $qb = $this->buildQueryBySocialActionWithDescendants($action);
-        $qb->select('COUNT(g)');
-
-        return $qb
-            ->getQuery()
-            ->getSingleScalarResult()
-            ;
-    }
-
-    protected function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
-    {
-        $actions = $action->getDescendantsWithThis();
-
-        $qb = $this->repository->createQueryBuilder('g');
-
-        $orx = $qb->expr()->orX();
-        $i = 0;
-        foreach ($actions as $action) {
-            $orx->add(":action_{$i} MEMBER OF g.socialActions");
-            $qb->setParameter("action_{$i}", $action);
-        }
-        $qb->where($orx);
-
-        return $qb;
-    }
     public function findOneBy(array $criteria, ?array $orderBy = null): ?Goal
     {
         return $this->repository->findOneBy($criteria, $orderBy);
@@ -99,4 +96,22 @@ final class GoalRepository implements ObjectRepository
     {
         return Goal::class;
     }
+
+    private function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
+    {
+        $actions = $action->getDescendantsWithThis();
+
+        $qb = $this->repository->createQueryBuilder('g');
+
+        $orx = $qb->expr()->orX();
+        $i = 0;
+
+        foreach ($actions as $action) {
+            $orx->add(":action_{$i} MEMBER OF g.socialActions");
+            $qb->setParameter("action_{$i}", $action);
+        }
+        $qb->where($orx);
+
+        return $qb;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
index 33bd8f7ef..744c42577 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
@@ -1,10 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\SocialWork;
 
+use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
@@ -19,6 +28,26 @@ final class ResultRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Result::class);
     }
 
+    public function countByGoal(Goal $goal): int
+    {
+        $qb = $this->buildQueryByGoal($goal);
+        $qb->select('COUNT(r)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function countBySocialActionWithDescendants(SocialAction $action): int
+    {
+        $qb = $this->buildQueryBySocialActionWithDescendants($action);
+        $qb->select('COUNT(r)');
+
+        return $qb
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
     public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Result
     {
         return $this->repository->find($id, $lockMode, $lockVersion);
@@ -33,6 +62,43 @@ final class ResultRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return array<int, Result>
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    /**
+     * @param mixed|null $orderBy
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return Result[]
+     */
+    public function findByGoal(Goal $goal, $orderBy = null, $limit = null, $offset = null): array
+    {
+        $qb = $this->buildQueryByGoal($goal);
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('r.' . $sort, $order);
+        }
+
+        return $qb
+            ->select('r')
+            ->setMaxResults($limit)
+            ->setFirstResult($offset)
+            ->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * @param mixed|null $orderBy
+     * @param mixed|null $limit
+     * @param mixed|null $offset
      *
      * @return Result[]
      */
@@ -42,92 +108,14 @@ final class ResultRepository implements ObjectRepository
         $qb->select('r');
 
         foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('r.'.$sort, $order);
+            $qb->addOrderBy('r.' . $sort, $order);
         }
 
         return $qb
             ->setMaxResults($limit)
             ->setFirstResult($offset)
             ->getQuery()
-            ->getResult()
-            ;
-    }
-
-    public function countBySocialActionWithDescendants(SocialAction $action): int
-    {
-        $qb = $this->buildQueryBySocialActionWithDescendants($action);
-        $qb->select('COUNT(r)');
-
-        return $qb
-            ->getQuery()
-            ->getSingleScalarResult()
-            ;
-    }
-
-    protected function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
-    {
-        $actions = $action->getDescendantsWithThis();
-
-        $qb = $this->repository->createQueryBuilder('r');
-
-        $orx = $qb->expr()->orX();
-        $i = 0;
-        foreach ($actions as $action) {
-            $orx->add(":action_{$i} MEMBER OF r.socialActions");
-            $qb->setParameter("action_{$i}", $action);
-        }
-        $qb->where($orx);
-
-        return $qb;
-    }
-    protected function buildQueryByGoal(Goal $goal): QueryBuilder
-    {
-        $qb = $this->repository->createQueryBuilder('r');
-
-        $qb->where(":goal MEMBER OF r.goals")
-            ->setParameter('goal', $goal)
-            ;
-
-        return $qb;
-    }
-
-    /**
-     * @return Result[]
-     */
-    public function findByGoal(Goal $goal, $orderBy = null, $limit = null, $offset = null): array
-    {
-        $qb = $this->buildQueryByGoal($goal);
-
-        foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('r.'.$sort, $order);
-        }
-
-        return $qb
-            ->select('r')
-            ->setMaxResults($limit)
-            ->setFirstResult($offset)
-            ->getQuery()
-            ->getResult()
-            ;
-    }
-
-    public function countByGoal(Goal $goal): int
-    {
-        $qb = $this->buildQueryByGoal($goal);
-        $qb->select('COUNT(r)');
-
-        return $qb
-            ->getQuery()
-            ->getSingleScalarResult()
-            ;
-    }
-
-    /**
-     * @return array<int, Result>
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+            ->getResult();
     }
 
     public function findOneBy(array $criteria, ?array $orderBy = null): ?Result
@@ -142,4 +130,32 @@ final class ResultRepository implements ObjectRepository
     {
         return Result::class;
     }
+
+    private function buildQueryByGoal(Goal $goal): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('r');
+
+        $qb->where(':goal MEMBER OF r.goals')
+            ->setParameter('goal', $goal);
+
+        return $qb;
+    }
+
+    private function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
+    {
+        $actions = $action->getDescendantsWithThis();
+
+        $qb = $this->repository->createQueryBuilder('r');
+
+        $orx = $qb->expr()->orX();
+        $i = 0;
+
+        foreach ($actions as $action) {
+            $orx->add(":action_{$i} MEMBER OF r.socialActions");
+            $qb->setParameter("action_{$i}", $action);
+        }
+        $qb->where($orx);
+
+        return $qb;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
index a81789c0a..fdf9d3b3f 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Repository\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
@@ -30,6 +39,9 @@ final class SocialActionRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return array<int, SocialAction>
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
index 51ced6976..7c5983fd3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 /*
  * Chill is a software for social workers
@@ -51,6 +58,9 @@ final class SocialIssueRepository implements ObjectRepository
     }
 
     /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
      * @return array<int, SocialIssue>
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
index 2e5821659..f39f64eb2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss
@@ -95,7 +95,6 @@ div.person-view {
  *  Header custom for Accompanying Course
  */
 
-
 div.banner {
     div#header-accompanying_course-name {
         background: none repeat scroll 0 0 $chill-accourse-context;
@@ -117,6 +116,37 @@ div.banner {
         color: $white;
         padding-top: 1em;
         padding-bottom: 1em;
+
+        /// AccompanyingCourse: HeaderSlider Carousel
+        button.carousel-control-prev,
+        button.carousel-control-next {
+            width: 8%;
+            opacity: inherit;
+        }
+        button.carousel-control-prev {
+            left: unset;
+            right: 0;
+        }
+        span.to-social-issues,
+        span.to-persons-associated {
+            display: inline-block;
+            border-radius: 15px;
+            width: 24px;
+            height: 24px;
+            box-shadow: 0 0 3px 1px grey;
+            opacity: 0.8;
+            &:hover {
+                opacity: 1;
+            }
+        }
+        span.to-social-issues {
+            background-color: #4bafe8;
+            border-left: 12px solid #32749a;
+        }
+        span.to-persons-associated {
+            background-color: #16d9b4;
+            border-right: 12px solid #ffffff;
+        }
     }
 }
 
@@ -203,42 +233,24 @@ div.household-resume {
     }
 }
 
-/// Horizontal list of persons (Accourse resume page)
-div.accompanyingcourse-resume {
-    div.associated-persons {
-        font-size: 110%;
-        span.household {
-            display: inline-block;
-            border-radius: 8px;
-            border: 1px solid $white;
-            &:hover {
-                border: 1px solid $chill-beige;
-                i {
-                    display: inline-block;
-                }
-            }
-            &.no-household:hover {
-                border: 1px solid $white;
-            }
-            i {
-                color: $chill-beige;
-                display: none;
-            }
-            padding: 0.3em;
-            margin-right: 2px;
-        }
-    }
-}
+/*
+*  GENERIC PERSON STYLES
+*  miscellaneous
+*/
 
-///
 abbr.referrer {   // still used ?
     font-size: 70%;
     padding-right: 0.4em;
     align-self: center; // in flex context
 }
 
-.updatedBy {
+.updatedBy, .createdBy {
     margin-top: 0.3rem;
     font-size: 0.9rem;
     font-style: italic;
 }
+
+.created-updated {
+    border: 1px solid black;
+    padding: 10px;
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index cc56fcbda..daaae9e28 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -1,51 +1,6 @@
 /// AccompanyingCourse Work list Page
 div.accompanying_course_work-list {
 
-    div.timeline {
-        width: 100%;
-        ul {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-
-            padding: 0;
-            list-style-type: none;
-
-            > li {
-                flex-grow: 1; flex-shrink: 1; flex-basis: auto;
-
-                div {
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-
-                    &.date {
-                        margin-bottom: 1em;
-                    }
-                    &.label {
-                        border-top: 3px solid $chill-green;
-
-                        &:before {
-                            content: '';
-                            display: inline-block;
-                            position: relative;
-                            width: 15px;
-                            height: 15px;
-                            top: -9px;
-
-                            background-color: $white;
-                            border-radius: 12px;
-                            border: 2px solid $chill-green;
-                        }
-                        &.no-label:before {
-                            display: none;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     div.objective_results {
         width: 100%;
         display: grid;
@@ -69,8 +24,10 @@ div.accompanying_course_work-list {
         //&:nth-child(even) { background-color: $chill-llight-gray; }
         &.without-objectives {}
         &.with-objectives {}
+    }
 
-
+    div.objective_results,
+    div.evaluations {
         h4.title_label {
             display: block;
             margin: 0.4em 0;
@@ -87,26 +44,12 @@ div.accompanying_course_work-list {
             &.result_list {
                 padding-left: 1em;
                 margin-bottom: 0;
-                li {
-                    padding-left: 0.3em;
-                    &::marker {
-                        /*
-                        content: '→';
-                        font-weight: bold;
-                        font-size: 120%;
-                        */
-                        font-family: ForkAwesome;
-                        content: '\f04b';
-                        font-size: 75%;
-                        transform: rotate(45deg);
-                    }
-                }
             }
-            &.goal_title li::marker {
-                color: $social-issue-color;
+            &.goal_title {
+                @include list_marker_triangle($social-issue-color);
             }
-            &.result_list li::marker {
-                color: $pink;
+            &.result_list {
+                @include list_marker_triangle($pink);
             }
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 7e9f13149..0330900da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -1,7 +1,8 @@
 /*
-*  BADGES PERSON AND THIRDPARTY
+*  BADGES USER, PERSON AND THIRDPARTY
 */
 
+span.badge-user,
 span.badge-person,
 span.badge-thirdparty {
     display: inline-block;
@@ -16,6 +17,10 @@ span.badge-thirdparty {
         text-decoration: none;
     }
 }
+
+span.badge-user {
+    border-bottom-width: 1px;
+}
 span.badge-person {
     border-bottom-color: $chill-green;
 }
@@ -39,24 +44,48 @@ span.fa-holder {
 }
 
 /*
-*   BADGE_TITLE
-*   Display Title like a badge (with background-colored label)
+*   DASHBOARDS
 */
 
+/// Theses links apply on dashboards as parent tag.
+/// They don't look like button, picto or simple text links
+a.dashboard-link {
+    color: unset;
+    text-decoration: unset;
+    & > div.dashboard {
+        &:hover {
+            //box-shadow: 0 0 7px 0 $chill-gray;
+            //opacity: 0.8;
+        }
+        span.title_action {
+            &:hover {
+                background-color: $chill-ll-gray;
+            }
+        }
+    }
+}
+
+div.dashboard {
+    font-weight: 700;
+    font-size: 1.5rem;
+    margin-bottom: 0.5rem;
+    line-height: 1.2;
+    span.like-h3 {
+        color: #334d5c;
+    }
+}
+div.dashboard,
 h2.badge-title {
     display: flex;
     flex-direction: row;
     width: 100%;
     color: $dark;
-
-    a & { text-decoration: none; }  // ?!? keep it ?
-
     span.title_label {
-        border-radius: 0.35rem 0 0 0.35rem;
         color: $white;
         font-size: 80%;
         padding: 0.5em;
         padding-right: 0;
+        border-radius: 0.35rem 0 0 0.35rem;
         h3 {
             margin-bottom: 0.5rem;
         }
@@ -64,33 +93,52 @@ h2.badge-title {
     span.title_action {
         flex-grow: 1;
         margin: 0 0 0 auto;
-        border-radius: 0 0.35rem 0.35rem 0;
-        background-color: $light;
+        background-color: $chill-llight-gray;
         padding: 0.2em 1em;
+        border-radius: 0 0.35rem 0.35rem 0;
 
         ul.small_in_title {
-            margin-top: 0.5em;
             font-size: 70%;
-            padding-left: 1rem;
         }
     }
 }
 
-/// badge_title in AccompanyingCourse Work list Page
+ul.small_in_title {
+    margin: 0;
+    //margin-top: 0.5em;
+    padding-left: 1rem;
+    &.evaluations {
+        @include list_marker_triangle($orange);
+    }
+}
+ul.columns { // XS:1  SM:2  MD:1  LG:2  XL:2  XXL:2
+    @include media-breakpoint-only(sm) {
+        columns: 2; -webkit-columns: 2; -moz-columns: 2;
+    }
+    @include media-breakpoint-up(lg) {
+        columns: 2; -webkit-columns: 2; -moz-columns: 2;
+    }
+}
+
+
+
+/// dashboard_like_badge in AccompanyingCourse Work list Page
 div.accompanying_course_work-list {
+    div.dashboard,
     h2.badge-title {
         span.title_label {
             // Calculate same color then border:groove
             background-color: shade-color($social-action-color, 34%);
         }
         span.title_action {
-            @include badge_title($social-action-color);
+            @include dashboard_like_badge($social-action-color);
         }
     }
 }
 
-/// badge_title in Activities on resume page
-div.activity-list {
+/// dashboard_like_badge in Activities on resume page
+div[class*='activity-'] {
+    div.dashboard,
     h2.badge-title {
         span.title_label {
             // Calculate same color then border:groove
@@ -100,7 +148,7 @@ div.activity-list {
             }
         }
         span.title_action {
-            @include badge_title($activity-color);
+            @include dashboard_like_badge($activity-color);
         }
         span.title_label {
             div.duration {
@@ -117,3 +165,20 @@ div.activity-list {
         }
     }
 }
+
+/*
+* Pill badge by entity
+*/
+.badge {
+    &.bg-person {
+        //@extend .$chill-ll-gray;
+        background-color: $chill-ll-gray;
+        color: $chill-green;
+    }
+    &.bg-user {
+        //@extend .$chill-ll-gray;
+        background-color: $chill-ll-gray;
+        color: $chill-blue;
+    }
+}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss
index 0229f53b1..2383e43b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss
@@ -18,12 +18,6 @@ div.accompanyingcourse-list {
         //&:nth-child(2) { flex-direction: row; }
         //&:last-child { flex-direction: column; }
     }
-    div.title h3 {
-        font-weight: 700;
-        font-size: 100%;
-        font-family: 'Open Sans';
-    }
-    div.list {}
 }
 
 /// Search Page (list_with_period.html.twig)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
index e995f97eb..228f10178 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/mixins.scss
@@ -4,7 +4,7 @@
 ///
 
 @mixin chill_badge($color) {
-    text-transform: capitalize !important;
+    //text-transform: capitalize !important;
     font-weight: 500 !important;
     border-left: 20px groove $color;
     &:before {
@@ -27,13 +27,29 @@
 }
 
 ///
-/// Generic mixin for titles like badge
-//  define visual badge used in title area
+/// Mixin for dashboards (with design like badge_social)
 ///
 
-@mixin badge_title($color) {
+@mixin dashboard_like_badge($color) {
     @include chill_badge($color);
     &:before {
         margin: 0 0.3em 0 -1.05em;
     }
 }
+
+///
+/// Make list with items marker like a colored triangle
+///
+
+@mixin list_marker_triangle($color) {
+    & > li {
+        padding-left: 0.3em;
+        &::marker {
+            font-family: ForkAwesome;
+            content: '\f04b';
+            font-size: 75%;
+            transform: rotate(45deg);
+            color: $color;
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/lib/household.js b/src/Bundle/ChillPersonBundle/Resources/public/lib/household.js
index 52754fa97..c96694dcb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/lib/household.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/lib/household.js
@@ -1,4 +1,4 @@
-import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 const fetchHouseholdByAddressReference = async (reference) => {
   const url = `/api/1.0/person/household/by-address-reference/${reference.id}.json`
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/accompanying_course_index/masonry.js b/src/Bundle/ChillPersonBundle/Resources/public/page/accompanying_course_index/masonry.js
new file mode 100644
index 000000000..e2dadd2a9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/accompanying_course_index/masonry.js
@@ -0,0 +1,6 @@
+import Masonry from 'masonry-layout/masonry';
+
+let elem = document.querySelector('#dashboards');
+let msnry = new Masonry( elem, {
+    // options
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js
index d641e3b36..28ae3380a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/index.js
@@ -7,7 +7,6 @@ const personAcceptEmail = document.getElementById("personAcceptEmail");
 const personPhoneNumber = document.getElementById("personPhoneNumber");
 const personAcceptSMS = document.getElementById("personAcceptSMS");
 
-
 new ShowHide({
     froms: [maritalStatus],
     container: [maritalStatusDate],
@@ -24,21 +23,24 @@ new ShowHide({
     event_name: 'change'
 });
 
-new ShowHide({
-    froms: [personEmail],
-    container: [personAcceptEmail],
-    test: function(froms) {
-        for (let f of froms.values()) {
-            for (let input of f.querySelectorAll('input').values()) {
-                if (input.value) {
-                    return true
+if (personAcceptEmail) {
+    new ShowHide({
+        froms: [personEmail],
+        container: [personAcceptEmail],
+        test: function(froms) {
+            for (let f of froms.values()) {
+                for (let input of f.querySelectorAll('input').values()) {
+                    if (input.value) {
+                        return true
+                    }
                 }
             }
-        }
-        return false;
-    },
-    event_name: 'input'
-});
+            return false;
+        },
+        event_name: 'input'
+    });
+}
+
 
 new ShowHide({
     froms: [personPhoneNumber],
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/vis/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/vis/index.js
deleted file mode 100644
index f11e930c0..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/vis/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import vis from 'vis-network/dist/vis-network.min';
-
-require('./scss/vis.scss');
-
-// create an array with nodes
-let nodes = new vis.DataSet([
-    { id: 1, label: "Node 1" },
-    { id: 2, label: "Node 2" },
-    { id: 3, label: "Node 3" },
-    { id: 4, label: "Node 4" },
-    { id: 5, label: "Node 5", cid: 1 },
-]);
-
-// create an array with edges
-let edges = new vis.DataSet([
-    { from: 1, to: 3 },
-    { from: 1, to: 2 },
-    { from: 2, to: 4 },
-    { from: 2, to: 5 },
-    { from: 3, to: 3 },
-]);
-
-// create a network
-let container = document.getElementById("graph-relationship");
-let data = {
-    nodes: nodes,
-    edges: edges,
-};
-let options = {};
-
-//
-let network = new vis.Network(container, data, options);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/vis/scss/vis.scss b/src/Bundle/ChillPersonBundle/Resources/public/page/vis/scss/vis.scss
deleted file mode 100644
index 3d29c47ce..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/vis/scss/vis.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-div#graph-relationship {
-    margin: 2em auto;
-    height: 500px;
-    border: 1px solid lightgray;
-}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 9c65137bd..30a8bbf2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -16,16 +16,15 @@
    <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 +54,12 @@ export default {
       Comment,
       Confirm,
    },
-   computed: mapState([
-      'accompanyingCourse',
-      'addressContext',
-      'errorMsg'
-   ])
+   computed: {
+      ...mapState([
+         'accompanyingCourse',
+         'addressContext'
+      ]),
+   }
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
index 52f3f6c36..8e4134205 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
@@ -1,4 +1,4 @@
-import { fetchResults } from 'ChillMainAssets/lib/api/download.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js';
 
 /*
 * Endpoint v.2 chill_api_single_accompanying_course__entity
@@ -15,44 +15,17 @@ const getAccompanyingCourse = (id) => {
       });
 };
 
-/*
-* Endpoint v.2 chill_api_single_accompanying_course__entity
-* method PATCH, patch AccompanyingCourse Instance
-*
-*  @id     integer - id of accompanyingCourse
-*  @body   Object - dictionary with changes to post
-*/
-const patchAccompanyingCourse = (id, body) => {
-   //console.log('body', body);
-   const url = `/api/1.0/person/accompanying-course/${id}.json`;
-   return fetch(url, {
-         method: 'PATCH',
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-          console.log(response);
-         throw { msg: 'Error while updating AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
+const getUsers = () => {
+   const url = `/api/1.0/main/user.json`;
+
+   return fetchResults(url);
 };
 
-/*
-* Endpoint to change 'DRAFT' step to 'CONFIRMED'
-*/
-const confirmAccompanyingCourse = (id) => {
-   const url = `/api/1.0/person/accompanying-course/${id}/confirm.json`
-   return fetch(url, {
-         method: 'POST',
-         headers: {'Content-Type': 'application/json;charset=utf-8'}
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while confirming AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
+const getReferrersSuggested = (course) => {
+   const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`;
+
+   return fetchResults(url);
+}
 
 /*
 * Endpoint
@@ -66,114 +39,6 @@ const getSocialIssues = () => {
       });
 };
 
-/*
-* Endpoint v.2 chill_api_single_accompanying_course_participation,
-* method POST/DELETE, add/close a participation to the accompanyingCourse
-*
-*  @id               integer - id of accompanyingCourse
-*  @payload          integer - id of person
-*  @method           string - POST or DELETE
-*/
-const postParticipation = (id, payload, method) => {
-   const body = { type: payload.type, id: payload.id };
-   const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .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 };
-      });
-};
-
-/*
-* Endpoint v.2 chill_api_single_accompanying_course_requestor,
-* method POST/DELETE, add/close a requestor to the accompanyingCourse
-*
-*  @id               integer - id of accompanyingCourse
-*  @payload          object of type person|thirdparty
-*  @method           string - POST or DELETE
-*/
-const postRequestor = (id, payload, method) => {
-   //console.log('payload', payload);
-   const body = (payload)? { type: payload.type, id: payload.id } : {};
-   //console.log('body', body);
-   const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while sending AccompanyingPeriod Course requestor', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-/*
-* Endpoint v.2 chill_api_single_accompanying_course_resource,
-* method POST/DELETE, add/remove a resource to the accompanyingCourse
-*
-*  @id               integer - id of accompanyingCourse
-*  @payload          object of type person|thirdparty
-*  @method           string - POST or DELETE
-*/
-const postResource = (id, payload, method) => {
-   //console.log('payload', payload);
-   const body = { type: "accompanying_period_resource" };
-   switch (method) {
-      case 'DELETE':
-         body['id'] = payload.id;
-         break;
-      default:
-         body['resource'] = { type: payload.type, id: payload.id };
-   }
-   //console.log('body', body);
-   const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while sending AccompanyingPeriod Course resource.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-/*
-* Endpoint to Add/remove SocialIssue
-*/
-const postSocialIssue = (id, body, method) => {
-   //console.log('api body and method', body, method);
-   const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
-   return fetch(url, {
-         method: method,
-         headers: {
-           'Content-Type': 'application/json;charset=utf-8'
-         },
-         body: JSON.stringify(body)
-      })
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while updating SocialIssue.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-const getUsers = () => {
-   const url = `/api/1.0/main/user.json`;
-
-   return fetchResults(url);
-};
-
 const whoami = () => {
    const url = `/api/1.0/main/whoami.json`;
    return fetch(url)
@@ -183,74 +48,10 @@ const whoami = () => {
       });
 };
 
-const getListOrigins = () => {
-   const url = `/api/1.0/person/accompanying-period/origin.json`;
-   return fetch(url)
-      .then(response => {
-         if (response.ok) { return response.json(); }
-         throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-      });
-};
-
-const addScope = (id, scope) => {
-  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
-  console.log(url);
-  console.log(scope);
-
-  return fetch(url, {
-    method: 'POST',
-    body: JSON.stringify({
-      id: scope.id,
-      type: scope.type,
-    }),
-    headers: {
-      'Content-Type': 'application/json;charset=utf-8'
-    },
-  })
-    .then(response => {
-      if (response.ok) { return response.json(); }
-      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-    });
-};
-
-const removeScope = (id, scope) => {
-  const url = `/api/1.0/person/accompanying-course/${id}/scope.json`;
-
-  return fetch(url, {
-    method: 'DELETE',
-    body: JSON.stringify({
-      id: scope.id,
-      type: scope.type,
-    }),
-    headers: {
-      'Content-Type': 'application/json;charset=utf-8'
-    },
-  })
-    .then(response => {
-      if (response.ok) { return response.json(); }
-      throw { msg: 'Error while adding scope', sta: response.status, txt: response.statusText, err: new Error(), body: response.body };
-    });
-};
-
-const getReferrersSuggested = (course) => {
-  const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`;
-
-  return fetchResults(url);
-}
-
 export {
-   getAccompanyingCourse,
-   patchAccompanyingCourse,
-   confirmAccompanyingCourse,
-   getSocialIssues,
-   postParticipation,
-   postRequestor,
-   postResource,
-   getUsers,
    whoami,
-   getListOrigins,
-   postSocialIssue,
-   addScope,
-   removeScope,
+   getSocialIssues,
+   getAccompanyingCourse,
+   getUsers,
    getReferrersSuggested,
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index 84e7fb2c6..7e3b45103 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -11,7 +11,7 @@
             {{ $t('course.step.draft') }}
          </span>
       </span>
-      <span v-else class="text-md-end">
+      <span v-else-if="accompanyingCourse.step === 'CONFIRMED'" class="text-md-end">
          <span class="d-md-block mb-md-3">
             <span class="badge bg-primary">
                {{ $t('course.step.active') }}
@@ -22,20 +22,35 @@
                <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
             </span>
             <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
-               <abbr :title="$t('course.referrer')">{{ $t('course.referrer') }}:</abbr> <b>{{ accompanyingCourse.user.username }}</b>
+               <span class="item-key">{{ $t('course.referrer') }}:</span> <b>{{ accompanyingCourse.user.text }}</b>
+            </span>
+         </span>
+      </span>
+      <span v-else class="text-md-end d-md-block">
+         <span class="badge bg-danger">
+            {{ $t('course.step.closed') }}
+         </span>
+         <span class="d-md-block">
+            <span class="d-md-block ms-3 ms-md-0">
+               <i>{{ $d(accompanyingCourse.openingDate.datetime, 'text') }} - {{ $d(accompanyingCourse.closingDate.datetime, 'text') }}</i>
+            </span>
+            <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
+               <span class="item-key">{{ $t('course.referrer') }}:</span> <b>{{ accompanyingCourse.user.text }}</b>
             </span>
          </span>
       </span>
    </teleport>
 
    <teleport to="#header-accompanying_course-details #banner-social-issues">
-      <div class="col-12">
-         <social-issue
-            v-for="issue in accompanyingCourse.socialIssues"
-            v-bind:key="issue.id"
-            v-bind:issue="issue">
-         </social-issue>
-      </div>
+      <social-issue
+         v-for="issue in accompanyingCourse.socialIssues"
+         v-bind:key="issue.id"
+         v-bind:issue="issue">
+      </social-issue>
+   </teleport>
+
+   <teleport to="#header-accompanying_course-details #banner-persons-associated">
+      <persons-associated :accompanyingCourse="accompanyingCourse"></persons-associated>
    </teleport>
 
 </template>
@@ -43,12 +58,14 @@
 <script>
 import ToggleFlags from './Banner/ToggleFlags';
 import SocialIssue from './Banner/SocialIssue.vue';
+import PersonsAssociated from './Banner/PersonsAssociated.vue';
 
 export default {
    name: 'Banner',
    components: {
       ToggleFlags,
-      SocialIssue
+      SocialIssue,
+      PersonsAssociated
    },
    computed: {
       accompanyingCourse() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue
new file mode 100644
index 000000000..00dc73bd2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue
@@ -0,0 +1,73 @@
+<template>
+   <span v-for="h in personsByHousehold()" :class="{ 'household': householdExists(h.id), 'no-household': !householdExists(h.id)  }">
+      <a v-if="householdExists(h.id)" :href="householdLink(h.id)">
+         <i class="fa fa-home fa-fw text-light" :title="$t('persons_associated.show_household_number', { id: h.id })"></i>
+      </a>
+      <span v-for="person in h.persons" class="me-1">
+         <on-the-fly :type="person.type" :id="person.id" :buttonText="person.text" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
+      </span>
+   </span>
+</template>
+
+<script>
+import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly'
+
+export default {
+   name: "PersonsAssociated",
+   components: {
+      OnTheFly
+   },
+   props: [ 'accompanyingCourse' ],
+   computed: {
+      participations() {
+         return this.accompanyingCourse.participations.filter(p => p.endDate === null)
+      },
+      persons() {
+         return this.participations.map(p => p.person)
+      },
+      resources() {
+         return this.accompanyingCourse.resources
+      },
+      requestor() {
+         return this.accompanyingCourse.requestor
+      }
+   },
+   methods: {
+      uniq(array) {
+         return [...new Set(array)]
+      },
+      personsByHousehold() {
+
+         let households = []
+         this.persons.forEach(p => { households.push(p.current_household_id) })
+
+         let personsByHousehold = []
+         this.uniq(households).forEach(h => {
+               personsByHousehold.push({
+                  id: h !== null ? h : 0,
+                  persons: this.persons.filter(p => p.current_household_id === h)
+               })
+         })
+         //console.log(personsByHousehold)
+         return personsByHousehold
+      },
+      householdExists(id) {
+         return id !== 0
+      },
+      householdLink(id) {
+         return `/fr/person/household/${id}/summary`
+      }
+   }
+}
+</script>
+
+<style lang="scss" scoped>
+span.household {
+   display: inline-block;
+   border-top: 1px solid rgba(255, 255, 255, 0.3);
+   background-color: rgba(255, 255, 255, 0.1);
+   border-radius: 10px;
+   margin-right: 0.3em;
+   padding: 5px;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
index fca3cee20..39fe50acc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
@@ -21,6 +21,7 @@
 
 <script>
 import { mapState } from 'vuex';
+
 export default {
    name: "ToggleFlags",
    computed: {
@@ -28,6 +29,7 @@ export default {
          intensity: state => state.accompanyingCourse.intensity,
          emergency: state => state.accompanyingCourse.emergency,
          confidential: state => state.accompanyingCourse.confidential,
+         permissions: state => state.permissions,
       }),
       isRegular() {
          return (this.intensity === 'regular') ? true : false;
@@ -37,7 +39,7 @@ export default {
       },
       isConfidential() {
          return (this.confidential) ? true : false;
-      }
+      },
    },
    methods: {
       toggleIntensity() {
@@ -53,15 +55,42 @@ export default {
                //temporaire (modif backend)
                value = "occasional";
          }
-         this.$store.dispatch('toggleIntensity', value);
+         this.$store.dispatch('toggleIntensity', value)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       toggleEmergency() {
-         this.$store.dispatch('toggleEmergency', (!this.isEmergency));
+         this.$store.dispatch('toggleEmergency', (!this.isEmergency))
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       toggleConfidential() {
-         this.$store.dispatch('toggleConfidential', (!this.isConfidential));
-      }
-   }
+         this.$store.dispatch('fetchPermissions').then(() => {
+           if (!this.$store.getters.canTogglePermission) {
+             this.$toast.open({message: "Seul le référent peut modifier la confidentialité"});
+             return Promise.resolve();
+           } else {
+             return this.$store.dispatch('toggleConfidential', (!this.isConfidential));
+           }
+         }).catch(({name, violations}) => {
+             if (name === 'ValidationException' || name === 'AccessException') {
+                violations.forEach((violation) => this.$toast.open({message: violation}));
+             } else {
+                this.$toast.open({message: 'An error occurred'})
+             }
+          });
+      },
+   },
 }
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index b9e52f300..344119c44 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -59,7 +59,15 @@ export default {
             locationStatusTo: 'person',
             personId: this.person.id
          };
-         this.$store.dispatch('updateLocation', payload);
+         this.$store.dispatch('updateLocation', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
+            
          window.location.assign('#section-20');
          this.modal.showModal = false;
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 1bff3f44d..7f5b04f99 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -83,12 +83,24 @@ export default {
    },
    methods: {
       submitform() {
-        //console.log('submit');
-         this.$store.dispatch('postFirstComment', this.formdata);
+         this.$store.dispatch('postFirstComment', this.formdata)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       removeComment() {
-        //console.log('remove');
-         this.$store.dispatch('postFirstComment', {});
+         this.$store.dispatch('postFirstComment', {})
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index f23a7c9e5..d3e0ae4d7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -10,7 +10,7 @@
          <div class="alert alert-warning">
             {{ $t('confirm.alert_validation') }}
             <ul class="mt-2">
-               <li v-for="k in validationKeys">
+               <li v-for="k in validationKeys" :key=k>
                   {{ $t(notValidMessages[k].msg) }}
                   <a :href="notValidMessages[k].anchor">
                      <i class="fa fa-level-up fa-fw"></i>
@@ -83,7 +83,11 @@ export default {
             },
             location: {
                msg: 'confirm.location_not_valid',
-               anchor: '#section-20' //
+               anchor: '#section-20'
+            },
+            origin: {
+               msg: 'confirm.origin_not_valid',
+               anchor: '#section-30'
             },
             socialIssue: {
                msg: 'confirm.socialIssue_not_valid',
@@ -103,6 +107,7 @@ export default {
       ...mapGetters([
          'isParticipationValid',
          'isSocialIssueValid',
+         'isOriginValid',
          'isLocationValid',
          'validationKeys',
          'isValidToBeConfirmed'
@@ -110,9 +115,14 @@ export default {
    },
    methods: {
       confirmCourse() {
-        //console.log('@@ CLICK confirmCourse');
-         this.$store.dispatch('confirmAccompanyingCourse');
-        //console.log('confirm last');
+         this.$store.dispatch('confirmAccompanyingCourse')
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 79e983301..ae85af6a9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -187,7 +187,14 @@ export default {
             locationStatusTo: 'none'
          };
          //console.log('remove address');
-         this.$store.dispatch('updateLocation', payload);
+         this.$store.dispatch('updateLocation', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
@@ -195,7 +202,15 @@ export default {
       submitTemporaryAddress(payload) {
          //console.log('@@@ click on Submit Temporary Address Button', payload);
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
-         this.$store.dispatch('updateLocation', payload);
+         this.$store.dispatch('updateLocation', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
+
          this.$store.commit('setEditContextTrue', payload);
       }
    },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
index 30001028c..c3c33e9ef 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
@@ -4,30 +4,33 @@
 
       <div class="mb-4">
          <label for="selectOrigin">
-            {{ $t('origin.label') }}
+            {{ $t('origin.label.fr') }}
          </label>
 
          <VueMultiselect
             name="selectOrigin"
             label="text"
-            v-bind:custom-label="transText"
+            :custom-label="transText"
             track-by="id"
-            v-bind:multiple="false"
-            v-bind:searchable="true"
-            v-bind:placeholder="$t('origin.placeholder')"
+            :multiple="false"
+            :searchable="true"
+            :placeholder="$t('origin.placeholder')"
             v-model="value"
-            v-bind:options="options"
+            :options="options"
             @select="updateOrigin">
          </VueMultiselect>
-
       </div>
+
+      <div v-if="!isOriginValid" class="alert alert-warning to-confirm">
+        {{ $t('origin.not_valid') }}
+     </div>
    </div>
 </template>
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { getListOrigins } from '../api';
-import { mapState } from 'vuex';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import { mapState, mapGetters } from 'vuex';
 
 export default {
    name: 'OriginDemand',
@@ -41,24 +44,38 @@ export default {
       ...mapState({
          value: state => state.accompanyingCourse.origin,
       }),
+      ...mapGetters([
+         'isOriginValid'
+      ])
    },
    mounted() {
       this.getOptions();
    },
    methods: {
       getOptions() {
-         //console.log('loading origins list');
-         getListOrigins().then(response => new Promise((resolve, reject) => {
-            this.options = response.results;
-            resolve();
-         }));
+         const url = `/api/1.0/person/accompanying-period/origin.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               this.options = response.results;
+               return response;
+            })
+            .catch((error) => {
+               commit('catchError', error);
+               this.$toast.open({message: error.txt})
+            })
       },
       updateOrigin(value) {
-         //console.log('value', value);
-         this.$store.dispatch('updateOrigin', value);
+         this.$store.dispatch('updateOrigin', value)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       transText ({ text }) {
-         return text.fr //TODO multilang
+         return text.fr;
       },
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 52b538284..3ea64bd67 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -17,7 +17,7 @@
                <button class="btn btn-update" type="submit">{{ $t('persons_associated.update_household') }}</button>
             </div>
             <p class="mb-3">{{ $t('persons_associated.person_without_household_warning') }}</p>
-            <div class="form-check" v-for="p in participationWithoutHousehold">
+            <div class="form-check" v-for="p in participationWithoutHousehold" :key="p.id">
                <input type="checkbox"
                   class="form-check-input"
                   v-model="hasNoHousehold"
@@ -47,6 +47,14 @@
       </participation-item>
    </div>
 
+   <div v-if="suggestedPersons.length > 0">
+      <ul class="list-suggest add-items inline">
+         <li v-for="p in suggestedPersons" :key="p.id" @click="addSuggestedPerson(p)">
+             <span>{{ p.text }}</span>
+          </li>
+        </ul>
+   </div>
+
    <div>
       <add-persons
          buttonTitle="persons_associated.add_persons"
@@ -66,8 +74,8 @@
 
 <script>
 import {mapGetters, mapState} from 'vuex';
-import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue"
-import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
+import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue";
+import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 
 export default {
    name: 'PersonsAssociated',
@@ -90,7 +98,28 @@ export default {
    computed: {
       ...mapState({
          courseId: state => state.accompanyingCourse.id,
-         participations: state => state.accompanyingCourse.participations
+         participations: state => state.accompanyingCourse.participations,
+         suggestedPersons: state => [
+            state.accompanyingCourse.requestor,
+            ...state.accompanyingCourse.resources.map(r => r.resource)
+         ]
+         .filter((e) => e !== null)
+         .filter((e) => e.type === 'person')
+         .filter(
+            (p) => !state.accompanyingCourse.participations.filter(pa => pa.endDate === null).map((pa) => pa.person.id).includes(p.id)
+         )
+         // filter persons appearing twice in requestor and resources
+         .filter(
+             (e, index, suggested) => {
+               for (let i = 0; i < suggested.length; i = i+1) {
+                 if (i < index && e.id === suggested[i].id) {
+                   return false
+                 }
+               }
+
+               return true;
+             }
+         )
       }),
       ...mapGetters([
          'isParticipationValid'
@@ -106,26 +135,54 @@ export default {
       },
       getReturnPath() {
          return window.location.pathname + window.location.search + window.location.hash;
-      }
+      },
    },
    methods: {
       removeParticipation(item) {
-        //console.log('@@ CLICK remove participation: item', item);
-         this.$store.dispatch('removeParticipation', item);
+         this.$store.dispatch('removeParticipation', item)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       closeParticipation(item) {
-        //console.log('@@ CLICK close participation: item', item);
-         this.$store.dispatch('closeParticipation', item);
+         this.$store.dispatch('closeParticipation', item)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       addNewPersons({ selected, modal }) {
-        //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
-               this.$store.dispatch('addParticipation', item);
+               this.$store.dispatch('addParticipation', item)
+               .catch(({name, violations}) => {
+                  if (name === 'ValidationException' || name === 'AccessException') {
+                     violations.forEach((violation) => this.$toast.open({message: violation}));
+                  } else {
+                     this.$toast.open({message: 'An error occurred'})
+                  }
+               });
             }, this
          );
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
-      }
+      },
+      addSuggestedPerson(person) {
+         this.$store.dispatch('addParticipation', { result: person, type: 'person' })
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            })
+      },
    }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index fd3f59cef..dd6d6c70c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -5,7 +5,7 @@
                addId : false,
                addEntity: false,
                addLink: false,
-               addHouseholdLink: true,
+               addHouseholdLink: false,
                addAltNames: true,
                addAge : true,
                hLevel : 3,
@@ -20,14 +20,15 @@
                v-if="hasCurrentHouseholdAddress"
                v-bind:person="participation.person">
             </button-location>
+            <li v-if="participation.person.current_household_id">
+               <a class="btn btn-sm btn-chill-beige"
+                  :href="getCurrentHouseholdUrl"
+                  :title="$t('persons_associated.show_household_number', { id: participation.person.current_household_id })">
+                  <i class="fa fa-fw fa-home"></i>
+               </a>
+            </li>
             <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="show"></on-the-fly></li>
             <li><on-the-fly :type="participation.person.type" :id="participation.person.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
-            <!-- <li>
-               <button class="btn btn-delete"
-                  :title="$t('action.delete')"
-                  @click.prevent="$emit('remove', participation)">
-               </button>
-            </li> -->
             <li>
                <button v-if="!participation.endDate"
                   class="btn btn-sm btn-remove"
@@ -100,13 +101,23 @@ export default {
       },
       getAccompanyingCourseReturnPath() {
          return `fr/parcours/${this.$store.state.accompanyingCourse.id}/edit#section-10`;
+      },
+      getCurrentHouseholdUrl() {
+         return `/fr/person/household/${this.participation.person.current_household_id}/summary?returnPath=${this.getAccompanyingCourseReturnPath}`
       }
    },
    methods: {
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'participation';
-         this.$store.dispatch('patchOnTheFly', payload);
+         this.$store.dispatch('patchOnTheFly', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index c39e043c6..aa05fe872 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -19,16 +19,15 @@
          @select="updateReferrer">
       </VueMultiselect>
 
-
       <template v-if="referrersSuggested.length > 0">
-        <ul>
-          <li v-for="u in referrersSuggested" @click="updateReferrer(u)">
-            <user-render-box-badge :user="u"></user-render-box-badge>
-          </li>
+         <ul class="list-suggest add-items inline">
+            <li v-for="u in referrersSuggested" @click="updateReferrer(u)">
+               <span>
+                  <user-render-box-badge :user="u"></user-render-box-badge>
+               </span>
+            </li>
         </ul>
       </template>
-
-
    </div>
 
    <div>
@@ -50,7 +49,7 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { getUsers, whoami } from '../api';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 import { mapState } from 'vuex';
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
 
@@ -77,14 +76,26 @@ export default {
    methods: {
       updateReferrer(value) {
          //console.log('value', value);
-         this.$store.dispatch('updateReferrer', value);
+         this.$store.dispatch('updateReferrer', value)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       assignMe() {
-         //console.log('assign me');
-         whoami().then(me => new Promise((resolve, reject) => {
-            this.$store.dispatch('updateReferrer', me);
-            resolve();
-         }));
+         const url = `/api/1.0/main/whoami.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               this.$store.dispatch('updateReferrer', response);
+               return response;
+            })
+            .catch((error) => {
+               commit('catchError', error);
+               this.$toast.open({message: error.body})
+            })
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 6aedd373f..8993ddb8d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -32,7 +32,7 @@
             </third-party-render-box>
          </template>
       </confidential>
-      
+
       <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
@@ -117,12 +117,30 @@
             </ul>
          </template>
       </person-render-box>
+
+      <ul class="record_actions">
+         <li>
+            <button class="btn btn-remove"
+               :title="$t('action.remove')"
+               @click="removeRequestor">
+               {{ $t('action.remove') }}
+            </button>
+         </li>
+      </ul>
    </div>
 
    <div v-else>
       <label class="chill-no-data-statement">{{ $t('requestor.counter') }}</label>
    </div>
 
+   <div v-if="accompanyingCourse.requestor === null && suggestedEntities.length > 0">
+      <ul class="list-suggest add-items inline">
+         <li v-for="p in suggestedEntities" :key="uniqueId(p)" @click="addSuggestedEntity(p)">
+             <span>{{ p.text }}</span>
+          </li>
+        </ul>
+   </div>
+
    <div>
       <add-persons v-if="accompanyingCourse.requestor === null"
          buttonTitle="requestor.add_requestor"
@@ -143,6 +161,7 @@ import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 import PersonRenderBox from '../../_components/Entity/PersonRenderBox.vue';
 import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
+import { mapState } from 'vuex';
 
 export default {
    name: 'Requestor',
@@ -167,12 +186,30 @@ export default {
       }
    },
    computed: {
+      ...mapState({
+         suggestedEntities: state => {
+           return [
+               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.resources.map(r => r.resource)
+             ]
+               .filter((e) => e !== null)
+               // filter for same entity appearing twice
+               .filter((e, index, suggested) => {
+                 for (let i = 0; i < suggested.length; i = i+1) {
+                   if (i < index && e.id === suggested[i].id && e.type === suggested[i].type) {
+                     return false
+                   }
+                 }
+
+                 return true;
+           })
+         }
+      }),
       accompanyingCourse() {
          return this.$store.state.accompanyingCourse
       },
       isAnonymous: {
          set(value) {
-            //console.log('requestorIsAnonymous value',value);
             this.$store.dispatch('requestorIsAnonymous', value);
          },
          get() {
@@ -183,18 +220,53 @@ export default {
    methods: {
       removeRequestor() {
          //console.log('@@ CLICK remove requestor: item');
-         this.$store.dispatch('removeRequestor');
+         this.$store.dispatch('removeRequestor')
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       addNewPersons({ selected, modal }) {
          //console.log('@@@ CLICK button addNewPersons', selected);
-         this.$store.dispatch('addRequestor', selected.shift());
+         this.$store.dispatch('addRequestor', selected.shift())
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
+
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
       },
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'requestor';
-         this.$store.dispatch('patchOnTheFly', payload);
+         this.$store.dispatch('patchOnTheFly', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
+      },
+      addSuggestedEntity(e) {
+         this.$store.dispatch('addRequestor', { result: e, type: e.type })
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            })
+      },
+      uniqueId(e) {
+         return `${e.type}-${e.id}`;
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 0d22c4d0f..599f99b21 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -18,6 +18,15 @@
          @remove="removeResource">
       </resource-item>
    </div>
+
+   <div v-if="suggestedEntities.length > 0">
+      <ul class="list-suggest add-items inline">
+         <li v-for="p in suggestedEntities" :key="uniqueId(p)" @click="addSuggestedEntity(p)">
+             <span>{{ p.text }}</span>
+          </li>
+        </ul>
+   </div>
+
    <div>
       <add-persons
         buttonTitle="resources.add_resources"
@@ -57,21 +66,79 @@ export default {
    },
    computed: mapState({
       resources: state => state.accompanyingCourse.resources,
-      counter: state => state.accompanyingCourse.resources.length
+      counter: state => state.accompanyingCourse.resources.length,
+      suggestedEntities: state => [
+            state.accompanyingCourse.requestor,
+            ...state.accompanyingCourse.participations.map(p => p.person),
+         ]
+         .filter((e) => e !== null)
+         .filter(
+            (e) => {
+               if (e.type === 'person') {
+                  return !state.accompanyingCourse.resources
+                     .filter((r) => r.resource.type === 'person')
+                     .map((r) => r.resource.id).includes(e.id)
+               }
+               if (e.type === 'thirdparty') {
+                  return !state.accompanyingCourse.resources
+                     .filter((r) => r.resource.type === 'thirdparty')
+                     .map((r) => r.resource.id).includes(e.id)
+               }
+            }
+         )
+          // filter persons appearing twice in requestor and resources
+          .filter(
+              (e, index, suggested) => {
+                for (let i = 0; i < suggested.length; i = i+1) {
+                  if (i < index && e.id === suggested[i].id) {
+                    return false
+                  }
+                }
+
+                return true;
+              }
+          )
    }),
    methods: {
       removeResource(item) {
         //console.log('@@ CLICK remove resource: item', item);
-         this.$store.dispatch('removeResource', item);
+         this.$store.dispatch('removeResource', item)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       addNewPersons({ selected, modal }) {
         //console.log('@@@ CLICK button addNewPersons', selected);
          selected.forEach(function(item) {
-               this.$store.dispatch('addResource', item);
+               this.$store.dispatch('addResource', item)
+                  .catch(({name, violations}) => {
+                     if (name === 'ValidationException' || name === 'AccessException') {
+                        violations.forEach((violation) => this.$toast.open({message: violation}));
+                     } else {
+                        this.$toast.open({message: violations})
+                     }
+                  });
             }, this
          );
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
+      },
+      addSuggestedEntity(e) {
+         this.$store.dispatch('addResource', { result: e, type: e.type})
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            })
+      },
+      uniqueId(e) {
+         return `${e.type}-${e.id}`;
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 7f209f0d4..e17555c6a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -2,33 +2,81 @@
    <person-render-box render="bloc"
       v-if="resource.resource.type === 'person'"
       :person="resource.resource"
-      :options="{ addInfo : true, addId : false, addEntity: true, addLink: false, addAltNames: true, addAge : false, hLevel : 3, isConfidential : true }"
-      >
+      :options="{
+         addInfo : true,
+         addId : false,
+         addEntity: true,
+         addLink: false,
+         addAltNames: true,
+         addAge : false,
+         hLevel : 3,
+         isConfidential : true
+      }">
       <template v-slot:record-actions>
          <ul class="record_actions">
-            <!--
-            <button-location v-if="hasCurrentHouseholdAddress" :person="resource.resource"></button-location>
-            -->
-            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
-            <li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li>
+            <li>
+               <on-the-fly
+                  :type="resource.resource.type"
+                  :id="resource.resource.id"
+                  action="show">
+               </on-the-fly>
+            </li>
+            <li>
+               <on-the-fly
+                  :type="resource.resource.type"
+                  :id="resource.resource.id"
+                  action="edit"
+                  @saveFormOnTheFly="saveFormOnTheFly">
+               </on-the-fly>
+            </li>
+            <li>
+               <button
+                  class="btn btn-sm btn-remove"
+                  :title="$t('action.remove')"
+                  @click.prevent="$emit('remove', resource)">
+               </button>
+            </li>
          </ul>
       </template>
-
    </person-render-box>
+
    <third-party-render-box
       v-if="resource.resource.type === 'thirdparty'"
       :thirdparty="resource.resource"
-      :options="{ addLink : false, addId : false, addEntity: true, addInfo: false, hLevel: 3 }"
-      >
+      :options="{
+         addLink : false,
+         addId : false,
+         addEntity: true,
+         addInfo: false,
+         //addComment: true,
+         hLevel: 3
+      }">
       <template v-slot:record-actions>
          <ul class="record_actions">
-            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="show"></on-the-fly></li>
-            <li><on-the-fly :type="resource.resource.type" :id="resource.resource.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
-            <li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li>
+            <li>
+               <on-the-fly
+                  :type="resource.resource.type"
+                  :id="resource.resource.id"
+                  action="show">
+               </on-the-fly>
+            </li>
+            <li>
+               <on-the-fly
+                  :type="resource.resource.type"
+                  :id="resource.resource.id"
+                  action="edit"
+                  @saveFormOnTheFly="saveFormOnTheFly">
+               </on-the-fly>
+            </li>
+            <li>
+               <button
+                  class="btn btn-sm btn-remove"
+                  :title="$t('action.remove')"
+                  @click.prevent="$emit('remove', resource)">
+               </button>
+            </li>
          </ul>
       </template>
-
    </third-party-render-box>
 </template>
 
@@ -60,7 +108,14 @@ export default {
       saveFormOnTheFly(payload) {
          console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
          payload.target = 'resource';
-         this.$store.dispatch('patchOnTheFly', payload);
+         this.$store.dispatch('patchOnTheFly', payload)
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
index 3217afd25..ee4dd822c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -3,8 +3,8 @@
      <h2><a id="section-60"></a>{{ $t('scopes.title') }}</h2>
 
      <div class="mb-4">
-        <div class="form-check" v-for="s in scopes">
-          <input class="form-check-input" type="checkbox" v-model="checkedScopes" :value="s" />
+        <div class="form-check" v-for="s in scopes" :key="s.id">
+          <input class="form-check-input" type="checkbox" v-model="checkedScopes" :value="s"/>
           <label class="form-check-label">
              {{ s.name.fr }}
           </label>
@@ -37,10 +37,22 @@ export default {
         return this.$store.state.accompanyingCourse.scopes;
       },
       set: function(v) {
-        this.$store.dispatch('setScopes', v);
+        this.$store.dispatch('setScopes', v)
+          .catch(({name, violations}) => {
+              if (name === 'ValidationException' || name === 'AccessException') {
+                violations.forEach((violation) => this.$toast.open({message: violation}));
+              } else {
+                this.$toast.open({message: 'An error occurred'})
+              }
+          });
       }
     }
-  }
+  },
+  methods: {
+    restore() {
+      console.log('restore');
+    }
+  },
 }
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index 41fd85f0e..5046e641d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -30,7 +30,7 @@
 
 <script>
 import VueMultiselect from 'vue-multiselect';
-import { getSocialIssues } from '../api';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 import {mapGetters, mapState} from 'vuex';
 
 export default {
@@ -54,14 +54,26 @@ export default {
    },
    methods: {
       getOptions() {
-         getSocialIssues().then(response => new Promise((resolve, reject) => {
-            //console.log('get socialIssues', response.results);
-            this.options = response.results;
-            resolve();
-         })).catch(error => this.$store.commit('catchError', error));
+         const url = `/api/1.0/person/social-work/social-issue.json`;
+         makeFetch('GET', url)
+            .then(response => {
+               this.options = response.results;
+               return response;
+            })
+            .catch((error) => {
+               commit('catchError', error);
+               this.$toast.open({message: error.txt})
+            })
       },
       updateSocialIssues(value) {
-         this.$store.dispatch('updateSocialIssues', this.transformValue(value));
+         this.$store.dispatch('updateSocialIssues', this.transformValue(value))
+            .catch(({name, violations}) => {
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  violations.forEach((violation) => this.$toast.open({message: violation}));
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
       transformValue(updated) {
          let stored = this.value;
@@ -70,8 +82,6 @@ export default {
          let method = (typeof removed === 'undefined') ? 'POST' : 'DELETE';
          let changed = (typeof removed === 'undefined') ? added : removed;
          let body = { type: "social_issue", id: changed.id };
-         //console.log('body', body);
-         //console.log('@@@', method, changed.text);
          let payload = updated;
          return { payload, body, method };
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
index e3fdec4a3..2af2d2d21 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
@@ -2,7 +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,8 +22,14 @@ if (root === 'app') {
       })
       .use(store)
       .use(i18n)
+      .use(VueToast, {
+         position: "bottom-right",
+         type: "error",
+         duration: 5000,
+         dismissible: true
+      })
       .component('app', App)
-      .mount('#accompanying-course');
+      .mount('#accompanying-course')
    });
 }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 10b656e4a..d4bb6a678 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -20,7 +20,8 @@ const appMessages = {
          status: "État",
          step: {
             draft: "Brouillon",
-            active: "En file active"
+            active: "En file active",
+            closed: "Cloturé"
          },
          open_at: "ouvert le ",
          by: "par ",
@@ -34,6 +35,7 @@ const appMessages = {
          title: "Origine de la demande",
          label: "Origine de la demande",
          placeholder: "Renseignez l'origine de la demande",
+         not_valid: "Indiquez une origine à la demande",
       },
       persons_associated: {
          title: "Usagers concernés",
@@ -52,7 +54,7 @@ const appMessages = {
          show_household_number: "Voir le ménage (n° {id})",
          show_household: "Voir le ménage",
          person_without_household_warning: "Certaines usagers n'appartiennent actuellement à aucun ménage. Renseignez leur appartenance dès que possible.",
-         update_household: "Modifier l'appartenance",
+         update_household: "Renseigner l'appartenance",
          participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
       },
       requestor: {
@@ -124,11 +126,16 @@ const appMessages = {
          participation_not_valid: "sélectionnez au minimum 1 usager",
          socialIssue_not_valid: "sélectionnez au minimum une problématique sociale",
          location_not_valid: "indiquez au minimum une localisation temporaire du parcours",
+         origin_not_valid: "Indiquez une origine à la demande",
          set_a_scope: "indiquez au moins un service",
          sure: "Êtes-vous sûr ?",
          sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
          ok: "Confirmer le parcours"
       },
+      action: {
+         choose_other_social_issue: "Veuillez choisir un autre problématique",
+         cancel: "Annuler",
+      },
       // catch errors
       'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
       'Error while retriving AccompanyingPeriod Course.': "Erreur du serveur lors du chargement du parcours d'accompagnement.",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
index 9b69845cf..a1858c6b3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js
@@ -1,20 +1,13 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
-import { fetchScopes } from 'ChillMainAssets/lib/api/scope.js';
+import { fetchScopes } from 'ChillMainAssets/lib/api/apiMethods.js';
 import { getAccompanyingCourse,
-   patchAccompanyingCourse,
-   confirmAccompanyingCourse,
-   postParticipation,
-   postRequestor,
-   postResource,
-   postSocialIssue,
-   addScope,
-   removeScope,
    getReferrersSuggested,
    getUsers,
 } from '../api';
 import { patchPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 import { patchThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
 
 const debug = process.env.NODE_ENV !== 'production';
@@ -44,6 +37,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             referrersSuggested: [],
             // all the users available
             users: [],
+            permissions: {}
          },
          getters: {
             isParticipationValid(state) {
@@ -52,6 +46,9 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             isSocialIssueValid(state) {
                return state.accompanyingCourse.socialIssues.length > 0;
             },
+            isOriginValid(state) {
+               return state.accompanyingCourse.origin !== null;
+            },
             isLocationValid(state) {
                return state.accompanyingCourse.location !== null;
             },
@@ -64,6 +61,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                if (!getters.isParticipationValid) { keys.push('participation'); }
                if (!getters.isLocationValid) { keys.push('location'); }
                if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
+               if (!getters.isOriginValid) { keys.push('origin'); }
                if (!getters.isScopeValid) { keys.push('scopes'); }
                //console.log('getter keys', keys);
                return keys;
@@ -73,22 +71,29 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   return true;
                }
                return false;
-            }
+            },
+            canTogglePermission(state) {
+               if (state.permissions.roles) {
+                  return state.permissions.roles['CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL'];
+               }
+
+               return false;
+            },
          },
          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) {
                //console.log('### mutation: remove participation', participation.id);
                state.accompanyingCourse.participations = state.accompanyingCourse.participations.filter(element => element !== participation);
             },
-            closeParticipation(state, { participation, payload }) {
+            closeParticipation(state, { response, payload }) {
                //console.log('### mutation: close item', { participation, payload });
                // find row position and replace by closed participation
                state.accompanyingCourse.participations.splice(
-                  state.accompanyingCourse.participations.findIndex(element => element === payload), 1, participation
+                  state.accompanyingCourse.participations.findIndex(element => element === payload), 1, response
                );
             },
             addParticipation(state, participation) {
@@ -204,6 +209,10 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   return u;
                });
             },
+            setPermissions(state, permissions) {
+               state.permissions = permissions;
+               // console.log('permissions', state.permissions);
+            },
             updateLocation(state, r) {
                //console.log('### mutation: set location attributes', r);
                state.accompanyingCourse.locationStatus = r.locationStatus;
@@ -236,67 +245,117 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
             }
          },
          actions: {
+            //QUESTION: does this serve a purpose? Participations can be closed...
             removeParticipation({ commit }, payload) {
                commit('removeParticipation', payload);
                // fetch DELETE request...
             },
+            /**
+             * Add/close participation
+             */
             closeParticipation({ commit }, payload) {
-               //console.log('## action: fetch delete participation: payload', payload);
-               postParticipation(id, payload.person, 'DELETE')
-               .then(participation => new Promise((resolve, reject) => {
-                  commit('closeParticipation', { participation, payload });
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: payload.person.type, id: payload.person.id };
+               const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                     commit('closeParticipation', { response, payload });
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             addParticipation({ commit }, payload) {
-               //console.log('## action: fetch post participation (select item): payload', payload);
-               postParticipation(id, payload.result, 'POST')
-               .then(participation => new Promise((resolve, reject) => {
-                  commit('addParticipation', participation);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: payload.result.type, id: payload.result.id };
+               const url = `/api/1.0/person/accompanying-course/${id}/participation.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                        commit('addParticipation', response);
+                     })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
+            /**
+             * Add/remove/display anonymous requestor
+             */
             removeRequestor({ commit, dispatch }) {
-               //console.log('## action: fetch delete requestor');
-               postRequestor(id, null, 'DELETE')
-               .then(requestor => new Promise((resolve, reject) => {
-                  commit('removeRequestor');
-                  dispatch('requestorIsAnonymous', false);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = {};
+               const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                        commit('removeRequestor');
+                        dispatch('requestorIsAnonymous', false);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             addRequestor({ commit }, payload) {
-               //console.log('## action: fetch post requestor: payload', payload);
-               postRequestor(id, payload.result, 'POST')
-               .then(requestor => new Promise((resolve, reject) => {
-                  commit('addRequestor', requestor);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = payload ? { type: payload.result.type, id: payload.result.id } : {};
+               const url = `/api/1.0/person/accompanying-course/${id}/requestor.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     commit('addRequestor', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             requestorIsAnonymous({ commit }, payload) {
-               //console.log('## action: fetch patch AccompanyingCourse: payload', payload);
-               patchAccompanyingCourse(id, { type: "accompanying_period", requestorAnonymous: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('requestorIsAnonymous', course.requestorAnonymous)
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", requestorAnonymous: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('requestorIsAnonymous', response.requestorAnonymous);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
+            /**
+             * Add/remove resource
+             */
             removeResource({ commit }, payload) {
-               //console.log('## action: fetch postResource: payload', payload);
-               postResource(id, payload, 'DELETE')
-               .then(resource => new Promise((resolve, reject) => {
-                  commit('removeResource', payload) // mieux un retour de l'objet !
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: "accompanying_period_resource" };
+               body['id'] = payload.id;
+               const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                     commit('removeResource', payload)
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             addResource({ commit }, payload) {
-               //console.log('## action: fetch postResource: payload', payload);
-               postResource(id, payload.result, 'POST')
-               .then(resource => new Promise((resolve, reject) => {
-                  commit('addResource', resource)
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const body = { type: "accompanying_period_resource" };
+               body['resource'] = { type: payload.result.type, id: payload.result.id };
+               const url = `/api/1.0/person/accompanying-course/${id}/resource.json`;
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     commit('addResource', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
+            /**
+             * On The Fly
+             */
             patchOnTheFly({ commit }, payload) {
                // TODO should be into the dedicated component, no ? JF
                console.log('## action: patch OnTheFly', payload);
@@ -330,29 +389,48 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   }));
                }
             },
+            /**
+             * Update accompanying course intensity/emergency/confidentiality
+             */
             toggleIntensity({ commit }, payload) {
-               //console.log(payload);
-               patchAccompanyingCourse(id, { type: "accompanying_period", intensity: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('toggleIntensity', course.intensity);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", 'intensity': payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('toggleIntensity', response.intensity);
+
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             toggleEmergency({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", emergency: payload })
-                  .then(course => new Promise((resolve, reject) => {
-                     commit('toggleEmergency', course.emergency);
-                     return dispatch('setRefererresAvailable');
-                  }))
-                 .then(() => Promise.resolve())
-                 .catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", emergency: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('toggleEmergency', response.emergency);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             toggleConfidential({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", confidential: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('toggleConfidential', course.confidential);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", confidential: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('toggleConfidential', response.confidential);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             /**
              * Handle the checked/unchecked scopes
@@ -407,19 +485,24 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                let lengthAfterOperation = currentServerScopesIds.length + addedScopesIds.length
                  - removedScopesIds.length;
 
-               if (lengthAfterOperation > 0 || (lengthAfterOperation === 0 && state.scopesAtStart.length === 0) ) {
-                  return dispatch('updateScopes', {
-                     addedScopesIds, removedScopesIds
-                  }).then(() => {
-                     // warning: when the operation of dispatch are too slow, the user may check / uncheck before
-                     // the end of the synchronisation with the server (done by dispatch operation). Then, it leads to
-                     // check/uncheck in the UI. I do not know of to avoid it.
-                     commit('setScopes', scopes);
-                     return Promise.resolve();
-                  }).then(() => {
-                     return dispatch('fetchReferrersSuggested');
-                  });
-               } else {
+               return dispatch('updateScopes', {
+                  addedScopesIds, removedScopesIds
+               })
+                 .catch(error => {
+                  throw error;
+               })
+                 .then(() => {
+                  // warning: when the operation of dispatch are too slow, the user may check / uncheck before
+                  // the end of the synchronisation with the server (done by dispatch operation). Then, it leads to
+                  // check/uncheck in the UI. I do not know of to avoid it.
+                  commit('setScopes', scopes);
+                  return Promise.resolve();
+               })
+                 .then(() => {
+                  return dispatch('fetchReferrersSuggested');
+               });
+               /*
+               else {
                   return dispatch('setScopes', state.scopesAtStart).then(() => {
                      commit('setScopes', scopes);
                      return Promise.resolve();
@@ -427,6 +510,7 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                      return dispatch('fetchReferrersSuggested');
                   });
                }
+                */
             },
             /**
              * Internal function for the store to effectively update scopes.
@@ -442,59 +526,99 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
              */
             updateScopes({ state, commit }, { addedScopesIds, removedScopesIds }) {
                let promises = [];
+               const url = `/api/1.0/person/accompanying-course/${state.accompanyingCourse.id}/scope.json`;
                state.scopes.forEach(scope => {
+                  const body = {
+                     id: scope.id,
+                     type: scope.type
+                  };
+
                   if (addedScopesIds.includes(scope.id)) {
-                     promises.push(addScope(state.accompanyingCourse.id, scope).then(() => {
-                        commit('addScopeAtBackend', scope);
-                        return Promise.resolve();
-                     }));
+                     promises.push(
+                        makeFetch('POST', url, body)
+                           .then((response) => {
+                              commit('addScopeAtBackend', scope);
+                              return response;
+                           })
+                           .catch((error) => {
+                              commit('catchError', error);
+                              throw error;
+                           })
+                     )
                   }
                   if (removedScopesIds.includes(scope.id)) {
-                     promises.push(removeScope(state.accompanyingCourse.id, scope).then(() => {
-                        commit('removeScopeAtBackend', scope);
-                        return Promise.resolve();
-                     }));
+                     promises.push(
+                        makeFetch('DELETE', url, body)
+                        .then((response) => {
+                           commit('removeScopeAtBackend', scope);
+                           return response;
+                        })
+                        .catch((error) => {
+                           commit('catchError', error);
+                           throw error;
+                        })
+                     );
                   }
                });
 
                return Promise.all(promises);
             },
             postFirstComment({ commit }, payload) {
-               //console.log('## action: postFirstComment: payload', payload);
-               patchAccompanyingCourse(id, { type: "accompanying_period", initialComment: payload })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('postFirstComment', course.initialComment);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", initialComment: payload }
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('postFirstComment', response.initialComment);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             updateSocialIssues({ state, commit, dispatch }, { payload, body, method }) {
-               //console.log('## action: payload', { payload, body, method });
-               postSocialIssue(id, body, method)
-               .then(response => new Promise((resolve, reject) => {
-                  //console.log('response', response);
-                  commit('updateSocialIssues', payload);
-                  resolve();
-               })).then(() => {
-                  return getAccompanyingCourse(state.accompanyingCourse.id);
-               }).then(accompanying_course => {
+               const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;
+               return makeFetch(method, url, body)
+                  .then((response) => {
+                     commit('updateSocialIssues', payload);
+                  })
+                  .then(() => {
+                     return getAccompanyingCourse(state.accompanyingCourse.id)
+                  })
+                  .then(accompanying_course => {
                   commit('refreshSocialIssues', accompanying_course.socialIssues);
                   dispatch('fetchReferrersSuggested');
-               })
-                   .catch((error) => { commit('catchError', error) });
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             updateOrigin({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", origin: { id: payload.id, type: payload.type } })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('updateOrigin', course.origin);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", origin: { id: payload.id, type: payload.type }}
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('updateOrigin', response.origin);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             updateReferrer({ commit }, payload) {
-               patchAccompanyingCourse(id, { type: "accompanying_period", user: { id: payload.id, type: payload.type } })
-               .then(course => new Promise((resolve, reject) => {
-                  commit('updateReferrer', course.user);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const body = { type: "accompanying_period", user: { id: payload.id, type: payload.type }}
+
+               return makeFetch('PATCH', url, body)
+                  .then((response) => {
+                     commit('updateReferrer', response.user);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             async fetchReferrersSuggested({ state, commit}) {
                let users = await getReferrersSuggested(state.accompanyingCourse);
@@ -513,8 +637,36 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                let users = await getUsers();
                commit('setUsers', users);
             },
+            /**
+             * By adding more roles to body['roles'], more permissions can be checked.
+             */
+            fetchPermissions({commit}) {
+               const url = '/api/1.0/main/permissions/info.json';
+               const body = {
+                  "object": {
+                     "type": "accompanying_period",
+                     "id": id
+                   },
+                   "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
+                   "roles": [
+                      "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
+                     ]
+               }
+
+               return makeFetch('POST', url, body)
+                  .then((response) => {
+                     commit('setPermissions', response);
+
+                     return Promise.resolve();
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
             updateLocation({ commit, dispatch }, payload) {
                //console.log('## action: updateLocation', payload.locationStatusTo);
+               const url = `/api/1.0/person/accompanying-course/${payload.targetId}.json`;
                let body = { 'type': payload.target, 'id': payload.targetId };
                let location = {};
                if (payload.locationStatusTo === 'person') { // patch for person address (don't remove addressLocation)
@@ -527,26 +679,31 @@ let initPromise = Promise.all([scopesPromise, accompanyingCoursePromise])
                   location = { 'personLocation': null };
                }
                Object.assign(body, location);
-               patchAccompanyingCourse(payload.targetId, body)
-                  .then(accompanyingCourse => new Promise((resolve, reject) => {
+               makeFetch('PATCH', url, body)
+                  .then((response) => {
                      commit('updateLocation', {
-                        location: accompanyingCourse.location,
-                        locationStatus: accompanyingCourse.locationStatus,
-                        personLocation: accompanyingCourse.personLocation
+                        location: response.location,
+                        locationStatus: response.locationStatus,
+                        personLocation: response.personLocation
                      });
-                     resolve();
                      dispatch('fetchReferrersSuggested');
-                  })).catch((error) => { commit('catchError', error) });
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             confirmAccompanyingCourse({ commit }) {
-               //console.log('## action: confirmAccompanyingCourse');
-               confirmAccompanyingCourse(id)
-               .then(response => new Promise((resolve, reject) => {
-                  window.location.replace(`/fr/parcours/${id}`);
-                  //console.log('fetch resolve');
-                  commit('confirmAccompanyingCourse', response);
-                  resolve();
-               })).catch((error) => { commit('catchError', error) });
+               const url = `/api/1.0/person/accompanying-course/${id}/confirm.json`
+               makeFetch('POST', url)
+                  .then((response) => {
+                     window.location.replace(`/fr/parcours/${id}`);
+                     commit('confirmAccompanyingCourse', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             }
          }
       });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index b6333b426..e30c90d08 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -5,28 +5,51 @@
 
   <div id="awc_create_form">
 
-    <div id="picking">
-      <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
-
-      <div v-for="si in socialIssues">
-        <input type="radio" v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"> {{ si.title.fr }}
+      <div id="picking">
+          <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
+          <div v-for="si in socialIssues">
+            <input type="radio" checked v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"><span class="badge bg-chill-l-gray text-dark">{{ si.text }}</span>
+          </div>
+      <div class="my-3">
+        <div class="col-8">
+          <vue-multiselect
+              name="otherIssues"
+              label="text"
+              track-by="id"
+              open-direction="bottom"
+              :close-on-select="true"
+              :preserve-search="false"
+              :reset-after="true"
+              :hide-selected="true"
+              :taggable="false"
+              :multiple="false"
+              :searchable="true"
+              :allow-empty="true"
+              :show-labels="false"
+              :loading="issueIsLoading"
+              :placeholder="$t('action.choose_other_social_issue')"
+              :options="socialIssuesOther"
+              @select="addIssueInList">
+          </vue-multiselect>
+        </div>
       </div>
-
       <div v-if="hasSocialIssuePicked">
         <h2>{{ $t('pick_an_action') }}</h2>
-        <vue-multiselect
-          v-model="socialActionPicked"
-          label="text"
-          :options="socialActionsReachables"
-          :searchable="true"
-          :close-on-select="true"
-          :show-labels="true"
-          track-by="id"
-        ></vue-multiselect>
+        <div class="col-8">
+          <vue-multiselect
+            v-model="socialActionPicked"
+            label="text"
+            :options="socialActionsReachables"
+            :searchable="true"
+            :close-on-select="true"
+            :show-labels="true"
+            track-by="id"
+          ></vue-multiselect>
+        </div>
       </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">
@@ -63,16 +86,16 @@
       <div>
         <ul class="record_actions">
           <li class="cancel">
-            <a href="#" class="btn btn-cancel">
+            <button class="btn btn-cancel" @click="goToPrevious">
               {{ $t('action.cancel') }}
-            </a>
+            </button>
           </li>
           <li v-if="hasSocialActionPicked">
             <button class="btn btn-save" v-show="!isPostingWork" @click="submit">
               {{ $t('action.save') }}
             </button>
             <button class="btn btn-save" v-show="isPostingWork" disabled>
-              {{ $t('Save') }}
+              {{ $t('action.save') }}
             </button>
           </li>
         </ul>
@@ -82,43 +105,7 @@
 
 </template>
 
-<style lang="scss">
 
-#awc_create_form {
-  display: grid;
-  grid-template-areas:
-    "picking picking"
-    "start_date end_date"
-    "confirm confirm"
-    ;
-  grid-template-columns: 50% 50%;
-  column-gap: 1.5rem;
-
-  #picking {
-    grid-area: picking;
-
-    #persons {
-      ul {
-        padding: 0;
-
-        list-style-type: none;
-      }
-    }
-  }
-
-  #start_date {
-    grid-area: start_date;
-  }
-
-  #end_date {
-    grid-area: end_date;
-  }
-
-  #confirm {
-    grid-area: confirm;
-  }
-}
-</style>
 
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
@@ -145,17 +132,38 @@ export default {
   name: 'App',
   components: {
     VueMultiselect,
-     PersonRenderBox,
+    PersonRenderBox,
   },
   methods: {
     submit() {
-      this.$store.dispatch('submit');
-    }
+      this.$store.dispatch('submit')
+          .catch(({name, violations}) => {
+          if (name === 'ValidationException' || name === 'AccessException') {
+            violations.forEach((violation) => this.$toast.open({message: violation}));
+          } else {
+            this.$toast.open({message: 'An error occurred'})
+          }
+      });
+    },
+    addIssueInList(value) {
+      this.$store.commit('addIssueInList', value);
+      this.$store.commit('removeIssueInOther', value);
+      this.$store.dispatch('pickSocialIssue', value.id);
+    },
+    goToPrevious() {
+      let params = new URLSearchParams(window.location.search);
+      if (params.has('returnPath')) {
+        window.location.replace(params.get('returnPath'));
+      } else {
+        return;
+      }
+    },
   },
   i18n,
   computed: {
     ...mapState([
       'socialIssues',
+      'socialIssuesOther',
       'socialActionsReachables',
       'errors',
       'personsReachables',
@@ -170,12 +178,12 @@ export default {
     personsPicked: {
       get() {
         let s = this.$store.state.personsPicked.map(p => p.id);
-        console.log('persons picked', s);
+        // console.log('persons picked', s);
 
         return s;
       },
       set(v) {
-        console.log('persons picked', v);
+        // console.log('persons picked', v);
         this.$store.commit('setPersonsPickedIds', v);
       }
     },
@@ -222,3 +230,54 @@ export default {
 }
 
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+  @include badge_social($social-issue-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
+  margin-left: 1em;
+}
+</style>
+
+<style lang="scss">
+
+#awc_create_form {
+  display: grid;
+  grid-template-areas:
+    "picking picking"
+    "start_date end_date"
+    "confirm confirm"
+    ;
+  grid-template-columns: 50% 50%;
+  column-gap: 1.5rem;
+
+  #picking {
+    grid-area: picking;
+
+    #persons {
+      ul {
+        padding: 0;
+
+        list-style-type: none;
+      }
+    }
+  }
+
+  #start_date {
+    grid-area: start_date;
+  }
+
+  #end_date {
+    grid-area: end_date;
+  }
+
+  #confirm {
+    grid-area: confirm;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
index ce5e2d9c0..8633c003d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
@@ -2,7 +2,8 @@
 import { createStore } from 'vuex';
 import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
-import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
+// import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -12,6 +13,7 @@ const store = createStore({
     accompanyingCourse: window.accompanyingCourse,
     socialIssues: window.accompanyingCourse.socialIssues,
     socialIssuePicked: null,
+    socialIssuesOther: [],
     socialActionsReachables: [],
     socialActionPicked: null,
     personsPicked: window.accompanyingCourse.participations.filter(p => p.endDate == null)
@@ -26,7 +28,6 @@ const store = createStore({
   },
   getters: {
     hasSocialActionPicked(state) {
-      console.log(state.socialActionPicked);
       return null !== state.socialActionPicked;
     },
     hasSocialIssuePicked(state) {
@@ -73,27 +74,43 @@ const store = createStore({
   },
   mutations: {
     setSocialActionsReachables(state, actions) {
-      console.log('set social action reachables');
-      console.log(actions);
+      // console.log('set social action reachables');
+      // console.log(actions);
 
       state.socialActionsReachables = actions;
     },
     setSocialAction(state, socialAction) {
-      console.log('socialAction', socialAction);
+      // console.log('socialAction', socialAction);
       state.socialActionPicked = socialAction;
     },
     setSocialIssue(state, socialIssueId) {
-      console.log('set social issue', socialIssueId);
+      // console.log('set social issue', socialIssueId);
       if (socialIssueId === null) {
         state.socialIssuePicked = null;
       } else {
         let mapped = state.socialIssues
           .find(e => e.id === socialIssueId);
-        console.log('mapped', mapped);
         state.socialIssuePicked = mapped;
-        console.log('social issue setted', state.socialIssuePicked);
+        // console.log('social issue setted', state.socialIssuePicked);
       }
     },
+    addIssueInList(state, issue) {
+      //console.log('add issue list', issue.id);
+      state.socialIssues.push(issue);
+    },
+    updateIssuesOther(state, payload) {
+      //console.log('update issues other');
+      state.socialIssuesOther = payload;
+    },
+    removeIssueInOther(state, issue) {
+      //console.log('remove issue other', issue.id);
+      state.socialIssuesOther = state.socialIssuesOther.filter(
+          (i) => i.id !== issue.id
+      );
+    },
+    updateSelected(state, payload) {
+      state.socialIssueSelected = payload;
+    },
     setIsLoadingSocialActions(state, s) {
       state.isLoadingSocialActions = s;
     },
@@ -131,8 +148,6 @@ const store = createStore({
 
       findSocialActionsBySocialIssue(socialIssueId).then(
         (response) => {
-          console.log(response);
-          console.log(response.results);
           commit('setSocialIssue', socialIssueId);
           commit('setSocialActionsReachables', response.results);
           commit('setIsLoadingSocialActions', false);
@@ -142,34 +157,34 @@ const store = createStore({
         });
     },
     submit({ commit, getters, state }) {
-      console.log('submit');
-      let
-        payload = getters.buildPayloadCreate,
-        errors = [];
-
+      let payload = getters.buildPayloadCreate;
+      const url = `/api/1.0/person/accompanying-course/${state.accompanyingCourse.id}/work.json`;
       commit('setPostingWork');
 
-      create(state.accompanyingCourse.id, payload)
-        .then( ({status, data}) => {
-          console.log('created return', { status, data});
-          if (status === 200) {
-            console.log('created, nothing to do here any more. Bye-bye!');
-            window.location.assign(`/fr/person/accompanying-period/work/${data.id}/edit`);
-          } else if (status === 422) {
-            console.log(data);
-            for (let i in data.violations) {
-              console.log(i);
-              console.log(data.violations[i].title);
-              errors.push(data.violations[i].title);
-            }
-            console.log('errors after reseponse handling', errors);
-            console.log({errors, cancel_posting: true});
-            commit('addErrors', { errors, cancel_posting: true });
-          }
+      makeFetch('POST', url, payload)
+        .then((response) => {
+          window.location.assign(`/fr/person/accompanying-period/work/${response.id}/edit`)
+        })
+        .catch((error) => {
+          throw error;
         });
     },
+    fetchOtherSocialIssues({commit}) {
+      const url = `/api/1.0/person/social-work/social-issue.json`;
+      return makeFetch('GET', url)
+        .then((response) => {
+          commit('updateIssuesOther', response.results);
+        })
+        .catch((error) => {
+          throw error;
+        })
+    }
   },
 
+
+
 });
 
+store.dispatch('fetchOtherSocialIssues');
+
 export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index c99685680..0bdb91ab5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -44,9 +44,9 @@
          <!-- results which **are** attached to an objective -->
          <div v-for="g in goalsPicked">
             <div>
-               <div class="item-title" @click="removeGoal(g)">
-                  <i class="fa fa-times"></i>
+               <div class="item-title">
                   {{ g.goal.title.fr }}
+                  <a @click="removeGoal(g)"></a>
                </div>
             </div>
             <div>
@@ -61,10 +61,9 @@
 
                   <p>{{ $t('available_goals_text') }}</p>
 
-                  <ul class="list-objectives">
-                     <li v-for="g in availableForCheckGoal" class="badge bg-primary" @click="addGoal(g)">
-                        <i class="fa fa-plus"></i>
-                        {{ g.title.fr }}
+                  <ul class="list-suggest add-items">
+                     <li v-for="g in availableForCheckGoal" @click="addGoal(g)">
+                        <span>{{ g.title.fr }}</span>
                      </li>
                   </ul>
                </div>
@@ -84,7 +83,7 @@
 
       <div id="evaluations" class="action-row">
          <div aria="hidden" class="title">
-            <div><h3>{{ $t('Evaluations') }}</h3></div>
+            <div><h3>{{ $t('Evaluations') }} - {{ $t('Forms') }} - {{ $t('Post') }}</h3></div>
          </div>
 
          <!-- list evaluations -->
@@ -98,10 +97,9 @@
          <div class="add_evaluation">
             <div v-if="showAddEvaluation">
                <p>{{ $t('available_evaluations_text') }}</p>
-               <ul class="list-evaluations">
-                  <li v-for="e in evaluationsForAction" class="badge bg-primary" @click="addEvaluation(e)">
-                     <i class="fa fa-plus"></i>
-                     {{ e.title.fr }}
+               <ul class="list-suggest add-items">
+                  <li v-for="e in evaluationsForAction" @click="addEvaluation(e)">
+                     <span>{{ e.title.fr }}</span>
                   </li>
                </ul>
             </div>
@@ -119,9 +117,9 @@
       <div id="persons" class="action-row">
          <h3>{{ $t('persons_involved') }}</h3>
 
-         <ul>
+         <ul class="list-unstyled">
             <li v-for="p in personsReachables" :key="p.id">
-               <input v-model="personsPicked" :value="p.id" type="checkbox">
+               <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2">
                <person-render-box render="badge" :options="{}" :person="p"></person-render-box>
             </li>
          </ul>
@@ -197,6 +195,18 @@
          </ul>
       </div>
 
+     <div>
+       <pick-template
+           entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+           :templates="this.templatesAvailablesForAction"
+           :entityId="work.id"
+           :beforeMove="beforeGenerateTemplate">
+         <template v-slot:title>
+           <h3>{{ $t('Generate doc') }}</h3>
+         </template>
+       </pick-template>
+     </div>
+
       <div v-if="errors.length > 0" id="errors" class="alert alert-danger flashbag">
          <p>{{ $t('fix_these_errors') }}</p>
          <ul>
@@ -232,6 +242,7 @@ import AddEvaluation from './components/AddEvaluation.vue';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
+import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 
 const i18n = {
    messages: {
@@ -247,6 +258,8 @@ const i18n = {
          add_objectif: "Ajouter un motif - objectif - dispositif",
          add_an_objective: "Ajouter un objectif",
          Evaluations: "Évaluations",
+         Forms: "Formulaires",
+         Post: "Courriers",
          add_an_evaluation: "Ajouter une évaluation",
          persons_involved: "Usagers concernés",
          handling_thirdparty: "Tiers traitant",
@@ -276,6 +289,7 @@ export default {
       AddPersons,
       PersonRenderBox,
       AddressRenderBox,
+      PickTemplate,
    },
    i18n,
    data() {
@@ -318,6 +332,7 @@ export default {
          'thirdParties',
          'isPosting',
          'errors',
+         'templatesAvailablesForAction',
       ]),
       ...mapGetters([
          'hasResultsForAction',
@@ -386,7 +401,7 @@ export default {
          this.$store.commit('removeGoal', g);
       },
       addEvaluation(e) {
-         this.$store.commit('addEvaluation', e);
+         this.$store.dispatch('addEvaluation', e);
       },
       toggleAddEvaluation() {
          this.showAddEvaluation = !this.showAddEvaluation;
@@ -414,6 +429,10 @@ export default {
       submit() {
          this.$store.dispatch('submit');
       },
+      beforeGenerateTemplate() {
+          console.log('before generate');
+          return Promise.resolve();
+      }
    }
 };
 
@@ -495,8 +514,8 @@ div#workEditor {
             & > div.results_without_objective {
                background: repeating-linear-gradient(
                      45deg,
-                     $gray-500,
-                     $gray-500 10px,
+                     $gray-200,
+                     $gray-200 10px,
                      $gray-100 10px,
                      $gray-100 20px
                );
@@ -535,31 +554,11 @@ div#workEditor {
             font-size: 85%;
          }
 
-         ul.list-evaluations,
-         ul.list-objectives,
-         ul.list-results {
-
-            list-style-type: none;
-            padding: 0;
-
-            li {
-               margin: 0.5rem;
-
-               &.badge {
-                  padding-bottom: 0;
-                  padding-top: 0;
-                  padding-left: 0;
-               }
-            }
-         }
-
          i.fa {
             padding: 0.25rem;
             color: $white;
 
-            &.fa-plus { background-color: $green; }
-            &.fa-times { background-color: $red; }
-            &.fa-pencil { background-color: $orange; }
+            &.fa-times { color: $red; }
          }
       }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 9dee7693a..60aa1cd2e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -1,9 +1,10 @@
 <template>
    <div>
-      <div class="item-title" @click="removeEvaluation(evaluation)">
-         <i class="fa fa-fw fa-times"></i>
+      <div class="item-title">
          {{ evaluation.evaluation.title.fr }}
+         <a @click="removeEvaluation(evaluation)"></a>
       </div>
+
       <div v-if="!evaluation.editEvaluation">
          <dl class="item-details definition-inline">
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
index 83880ddda..822a11429 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
@@ -1,33 +1,57 @@
 <template>
    <div v-if="hasResult" class="addResult">
+
       <p v-if="pickedResults.length ===0" class="chill-no-data-statement">
          Aucun résultat associé
       </p>
-      <ul class="list-results">
-         <li v-for="r in pickedResults" class="badge bg-primary" @click="removeResult(r)">
-            <i class="fa fa-times"></i>
-            {{ r.title.fr }}
-         </li>
-         <template v-if="isExpanded">
-            <li v-for="r in availableForCheckResults" class="badge bg-primary" @click="addResult(r)">
-               <i class="fa fa-plus"></i>
+
+      <ul class="list-suggest remove-items">
+         <li v-for="r in pickedResults">
+            <span>
                {{ r.title.fr }}
-            </li>
-         </template>
-      </ul>
-      <ul class="record_actions">
-         <li v-if="isExpanded">
-            <button class="btn btn-hide" @click="toggleSelect">
-               <i class="fa fa-eye-slash"></i>
-               Masquer résultats et orientations disponibles
-            </button>
-         </li>
-         <li v-else>
-            <button class="btn btn-show" @click="toggleSelect">
-               Afficher résultats et orientations disponibles
-            </button>
+               <a @click="removeResult(r)"></a>
+            </span>
          </li>
       </ul>
+
+      <div class="accordion" id="expandedSuggestions">
+         <div class="accordion-item">
+            <h2 class="accordion-header" id="heading_expanded_suggestions">
+
+               <button v-if="isExpanded"
+                  class="accordion-button"
+                  type="button"
+                  data-bs-toggle="collapse"
+                  aria-expanded="true"
+                  @click="toggleSelect">
+                  Masquer résultats et orientations disponibles
+               </button>
+
+               <button v-else
+                  class="accordion-button collapsed"
+                  type="button"
+                  data-bs-toggle="collapse"
+                  aria-expanded="false"
+                  @click="toggleSelect">
+                  Afficher résultats et orientations disponibles
+               </button>
+
+            </h2>
+            <div class="accordion-collapse" id="collapse_expanded_suggestions"
+                 aria-labelledby="heading_expanded_suggestions" data-bs-parent="#expandedSuggestions">
+
+               <template v-if="isExpanded">
+                  <ul class="list-suggest add-items">
+                     <li v-for="r in availableForCheckResults" @click="addResult(r)">
+                        <span>{{ r.title.fr }}</span>
+                     </li>
+                  </ul>
+               </template>
+
+            </div>
+         </div>
+      </div>
+
    </div>
    <div v-if="!hasResult" class="noResult">
       <div class="chill-no-data-statement">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 33436f222..7ea4dfc16 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -61,21 +61,18 @@
          </div>
       </div>
 
-      <div class="row mb-3">
-         <label class="col-sm-4 col-form-label">{{ $t('evaluation_generate_a_document') }}</label>
-         <div class="col-sm-8">
-            <div class="input-group">
-               <select class="form-select form-select-sm" v-model="template">
-                  <option disabled value="">{{ $t('evaluation_choose_a_template') }}</option>
-                  <template v-for="t in getTemplatesAvailaibleForEvaluation">
-                    <option  v-bind:value="t.id">{{ t.name.fr }}</option>
-                  </template>
-               </select>
-              <button v-if="canGenerate" class="btn btn-update btn-sm change-icon" type="button" @click="generateDocument"><i class="fa fa-fw fa-cog"></i></button>
-              <button v-else class="btn btn-update btn-sm change-icon" type="button" disabled ><i class="fa fa-fw fa-cog"></i></button>
-            </div>
-         </div>
-      </div>
+     <div class="row mb-3">
+       <pick-template
+           entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
+           :id="evaluation.id"
+           :templates="getTemplatesAvailables"
+           :beforeMove="submitBeforeGenerate"
+       >
+         <template v-slot:title>
+           <label class="col-sm-4 col-form-label">{{ $t('evaluation_generate_a_document') }}</label>
+         </template>
+       </pick-template>
+     </div>
    </div>
 </div>
 </template>
@@ -85,6 +82,7 @@ import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 import { mapGetters, mapState } from 'vuex';
+import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 
 const i18n = {
    messages: {
@@ -111,6 +109,7 @@ export default {
    props: ['evaluation'],
    components: {
       ckeditor: CKEditor.component,
+      PickTemplate,
    },
    i18n,
    data() {
@@ -120,12 +119,12 @@ export default {
       }
    },
    computed: {
-     ...mapGetters([
-        'getTemplatesAvailaibleForEvaluation'
-     ]),
      ...mapState([
        'isPosting'
      ]),
+      getTemplatesAvailables() {
+        return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
+      },
       canGenerate() {
         return !this.$store.state.isPosting && this.template !== null;
       },
@@ -176,13 +175,14 @@ export default {
          })
          ;
       },
-      generateDocument() {
-        console.log('template picked', this.template);
-        this.$store.dispatch('generateDocument', { key: this.evaluation.key, templateId: this.template})
+      submitBeforeGenerate() {
+        const callback = (data) => {
+          let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
+          return Promise.resolve({entityId: evaluationId});
+        };
+
+        return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
       }
    },
-   mounted() {
-      //this.listAllStatus();
-   }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 22218f04f..92ee414a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -2,6 +2,8 @@ import { createStore } from 'vuex';
 import { datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
+import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js';
+import { fetchTemplates } from 'ChillDocGeneratorAssets/api/pickTemplate.js';
 
 const debug = process.env.NODE_ENV !== 'production';
 const evalFQDN = encodeURIComponent("Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation");
@@ -20,20 +22,10 @@ const store = createStore({
     resultsPicked: window.accompanyingCourseWork.results,
     resultsForAction: [],
     resultsForGoal: [],
-    evaluationsPicked: window.accompanyingCourseWork.accompanyingPeriodWorkEvaluations.map((e, index) => {
-      var k = Object.assign(e, {
-        key: index,
-        editEvaluation: false,
-        startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null,
-        endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
-        maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
-        warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
-      });
-
-      return k;
-    }),
+    evaluationsPicked: [],
     evaluationsForAction: [],
-    templatesAvailableForEvaluation: [],
+    templatesAvailablesForAction: [],
+    templatesAvailablesForEvaluation: new Map([]),
     personsPicked: window.accompanyingCourseWork.persons,
     personsReachables: window.accompanyingCourseWork.accompanyingPeriod.participations.filter(p => p.endDate == null)
       .map(p => p.person),
@@ -65,8 +57,8 @@ const store = createStore({
     hasThirdParties(state) {
       return state.thirdParties.length > 0;
     },
-    getTemplatesAvailaibleForEvaluation(state) {
-      return state.templatesAvailableForEvaluation;
+    getTemplatesAvailablesForEvaluation: (state) => (evaluation) => {
+      return state.templatesAvailablesForEvaluation.get(evaluation.id) || [];
     },
     buildPayload(state) {
       return {
@@ -125,6 +117,20 @@ const store = createStore({
     }
   },
   mutations: {
+    setEvaluationsPicked(state, evaluations) {
+      state.evaluationsPicked = evaluations.map((e, index) => {
+        var k = Object.assign(e, {
+          key: index,
+          editEvaluation: false,
+          startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null,
+          endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
+          maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
+          warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
+        });
+
+        return k;
+      });
+    },
     setStartDate(state, date) {
       state.startDate = date;
     },
@@ -222,10 +228,11 @@ const store = createStore({
       let evaluation = state.evaluationsPicked.find(e => e.key === key);
       evaluation.editEvaluation = !evaluation.editEvaluation;
     },
-    setTemplatesAvailableForEvaluation(state, templates) {
-      for (let i in templates) {
-        state.templatesAvailableForEvaluation.push(templates[i]);
-      }
+    setTemplatesForEvaluation(state, {templates, evaluation}) {
+      state.templatesAvailablesForEvaluation.set(evaluation.id, templates);
+    },
+    setTemplatesAvailablesForAction(state, templates) {
+      state.templatesAvailablesForAction = templates;
     },
     setPersonsPickedIds(state, ids) {
       state.personsPicked = state.personsReachables
@@ -328,36 +335,19 @@ const store = createStore({
           commit('setEvaluationsForAction', data.results);
         });
     },
-    getReachableTemplatesForEvaluation({commit}) {
-      const
-          url = `/fr/doc/gen/templates/for/${evalFQDN}`
-      ;
-      window.fetch(url).then(r => {
-        if (r.ok) {
-          return r.json();
-        }
-        throw new Error("not possible to load templates for evaluations")
-      }).then(data => {
-        commit('setTemplatesAvailableForEvaluation', data.results);
-      }).catch(e => {
-        console.error(e);
-      })
+    addEvaluation({commit, dispatch}, evaluation) {
+      commit('addEvaluation', evaluation);
+      dispatch('fetchTemplatesAvailablesForEvaluation', evaluation);
     },
-    generateDocument({ dispatch }, {key, templateId}) {
-      const callback = function(data) {
-        // get the evaluation id from the data
-        const
-            evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === key).id,
-            returnPath = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash),
-            url = `/fr/doc/gen/generate/from/${templateId}/for/${evalFQDN}/${evaluationId}?returnPath=${returnPath}`
-        ;
-        //http://localhost:8001/fr/doc/gen/generate/from/12/for/Chill%5CPersonBundle%5CEntity%5CAccompanyingPeriod%5CAccompanyingPeriodWorkEvaluation/41
-
-        console.log('I will generate your doc at', url);
-        window.location.assign(url);
-      };
-
-      dispatch('submit', callback);
+    fetchTemplatesAvailablesForEvaluation({commit, state}, evaluation) {
+      if (!state.templatesAvailablesForEvaluation.has(evaluation.id)) {
+        // commit an empty array to avoid parallel fetching for same evaluation id
+        commit('setTemplatesForEvaluation', {templates: [], evaluation});
+        fetchResults(`/api/1.0/person/docgen/template/by-evaluation/${evaluation.id}.json`)
+          .then(templates => {
+            commit('setTemplatesForEvaluation', {templates, evaluation});
+          });
+      }
     },
     submit({ getters, state, commit }, callback) {
       let
@@ -368,47 +358,36 @@ const store = createStore({
 
       commit('setIsPosting', true);
 
-      window.fetch(url, {
-        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(payload)
-      }).then(response => {
-        if (response.ok || response.status === 422) {
-          return response.json().then(data => ({data, status: response.status}));
-        }
-
-        throw new Error(response.status);
-      }).then(({data, status}) => {
-        if (status === 422) {
-          for (let i in data.violations) {
-            errors.push(data.violations[i].title);
+      return makeFetch('PUT', url, payload)
+        .then(data => {
+          console.log('data received', data);
+          if (typeof(callback) !== 'undefined') {
+            return callback(data);
+          } else {
+            console.info('nothing to do here, bye bye');window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`);
           }
-          commit('setErrors', errors);
+        }).catch(error => {
+          console.log('error on submit', error);
           commit('setIsPosting', false);
-        } else if (typeof(callback) !== 'undefined') {
-          callback(data);
-        } else {
-          console.info('nothing to do here, bye bye');
-          window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`);
-        }
-      }).catch(e => {
-        commit('setErrors', [
-          'Erreur serveur ou réseau: veuillez ré-essayer. Code erreur: ' + e
-        ]);
-        commit('setIsPosting', false);
-      });
-    },
-    initAsync({ dispatch }) {
-      dispatch('getReachablesResultsForAction');
-      dispatch('getReachablesGoalsForAction');
-      dispatch('getReachablesEvaluationsForAction');
-      dispatch('getReachableTemplatesForEvaluation');
+          commit('setErrors', error.violations);
+        });
     },
   }
 });
 
-store.dispatch('initAsync');
+store.commit('setEvaluationsPicked', window.accompanyingCourseWork.accompanyingPeriodWorkEvaluations);
+store.dispatch('getReachablesResultsForAction');
+store.dispatch('getReachablesGoalsForAction');
+store.dispatch('getReachablesEvaluationsForAction');
+
+store.state.evaluationsPicked.forEach(evaluation => {
+  store.dispatch('fetchTemplatesAvailablesForEvaluation', evaluation.evaluation)
+});
+
+fetchTemplates('Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork')
+  .then(templates => {
+    store.commit('setTemplatesAvailablesForAction', templates);
+  }
+)
 
 export { store };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
index 52eac5ea6..5b098846b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
@@ -15,7 +15,12 @@
   <confirmation v-if="step === 'confirm'"></confirmation>
 
   <ul class="record_actions sticky-form-buttons">
-    <li class="cancel" v-if="step !== 'concerned' || hasReturnPath">
+    <li class="cancel" v-if="step !== 'concerned'">
+      <button class="btn btn-cancel" @click="goToPrevious">
+        {{ $t('household_members_editor.app.previous') }}
+      </button>
+    </li>
+    <li class="cancel" v-else-if="hasReturnPath">
       <button class="btn btn-cancel" @click="goToPrevious">
         {{ $t('household_members_editor.app.cancel') }}
       </button>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue
index 1f76c8a5b..15b8a4346 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-table" v-if="hasHousehold">
+  <div class="flex-table mb-5" v-if="hasHousehold">
     <div class="item-bloc">
       <household-render-box :household="fakeHouseholdWithConcerned"></household-render-box>
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 7dfff9794..527f3a7da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -51,6 +51,7 @@ const appMessages = {
        },
       app: {
        next: 'Suivant',
+       previous: 'Précédent',
        cancel: 'Annuler',
        save: 'Enregistrer',
         steps: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
new file mode 100644
index 000000000..5550c3e54
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -0,0 +1,529 @@
+<template>
+
+   <div id="visgraph"></div>
+
+   <teleport to="#visgraph-legend">
+      <div class="post-menu">
+         <div class="list-group mt-4">
+            <button type="button" class="list-group-item list-group-item-action btn btn-create" @click="createRelationship">
+               {{ $t('visgraph.add_link') }}
+            </button>
+            <a type="button" class="list-group-item list-group-item-action btn btn-misc" id="exportCanvasBtn" @click="exportCanvasAsImage">
+               <i class="fa fa-camera fa-fw"></i> {{ $t('visgraph.screenshot') }}
+            </a>
+            <button type="button" class="list-group-item list-group-item-action btn btn-light" @click="refreshNetwork">
+               <i class="fa fa-refresh fa-fw"></i> {{ $t('visgraph.refresh') }}
+            </button>
+         </div>
+
+         <div v-if="displayHelpMessage" class="alert alert-info mt-3">
+            {{ $t('visgraph.create_link_help') }}
+         </div>
+
+         <div class="my-4 legend">
+            <h3>{{ $t('visgraph.Legend') }}</h3>
+            <div class="list-group">
+               <label class="list-group-item" v-for="layer in legendLayers">
+                  <input
+                     class="form-check-input me-1"
+                     type="checkbox"
+                     :value="layer.id"
+                     v-model="checkedLayers"
+                     @change="toggleLayer"
+                     />
+                     {{ layer.label }}
+               </label>
+            </div>
+         </div>
+      </div>
+   </teleport>
+
+   <teleport to="body">
+      <modal v-if="modal.showModal" :modalDialogClass="modal.modalDialogClass" @close="modal.showModal = false">
+         <template v-slot:header>
+            <h2 class="modal-title">{{ $t(modal.title) }}</h2>
+            <!-- {{ modal.data.id }} -->
+         </template>
+         <template v-slot:body>
+            <div v-if="modal.action === 'delete'">
+               <p>{{ $t('visgraph.delete_confirmation_text') }}</p>
+            </div>
+            <div v-else>
+               <form>
+                  <div class="row">
+                     <div class="col-12 text-center">{{ $t('visgraph.between') }}<br>{{ $t('visgraph.and') }}</div>
+                     <div class="col">
+                        <small>{{ getPersonAge(modal.data.from) }}</small>
+                        <h4>{{ getPerson(modal.data.from).text }}</h4>
+                        <p class="text-start" v-if="relation && relation.title">
+                           <span v-if="reverse">
+                              {{ $t('visgraph.relation_from_to_like', [ getPerson(modal.data.from).text, getPerson(modal.data.to).text, relation.reverseTitle.fr.toLowerCase() ])}}
+                           </span>
+                           <span v-else>
+                              {{ $t('visgraph.relation_from_to_like', [ getPerson(modal.data.from).text, getPerson(modal.data.to).text, relation.title.fr.toLowerCase() ])}}
+                           </span>
+                        </p>
+                     </div>
+                     <div class="col text-end">
+                        <small>{{ getPersonAge(modal.data.to) }}</small>
+                        <h4>{{ getPerson(modal.data.to).text }}</h4>
+                        <p class="text-end" v-if="relation && relation.title">
+                           <span v-if="reverse">
+                              {{ $t('visgraph.relation_from_to_like', [ getPerson(modal.data.to).text, getPerson(modal.data.from).text, relation.title.fr.toLowerCase() ])}}
+                           </span>
+                           <span v-else>
+                              {{ $t('visgraph.relation_from_to_like', [ getPerson(modal.data.to).text, getPerson(modal.data.from).text, relation.reverseTitle.fr.toLowerCase() ])}}
+                           </span>
+                        </p>
+                     </div>
+                  </div>
+                  <div class="my-3">
+                     <VueMultiselect
+                        id="relation"
+                        label="title"
+                        track-by="id"
+                        :custom-label="customLabel"
+                        :placeholder="$t('visgraph.choose_relation')"
+                        :close-on-select="true"
+                        :multiple="false"
+                        :searchable="true"
+                        :options="relations"
+                        v-model="relation"
+                        :value="relation"
+                        >
+                     </VueMultiselect>
+                  </div>
+                  <div class="form-check form-switch">
+                     <input
+                        class="form-check-input"
+                        type="checkbox"
+                        id="reverse"
+                        v-model="reverse"
+                        >
+                     <label class="form-check-label" for="reverse">{{ $t('visgraph.reverse_relation') }}</label>
+                  </div>
+               </form>
+            </div>
+         </template>
+         <template v-slot:footer>
+            <button class="btn" :class="modal.button.class" @click="submitRelationship">
+               {{ $t(modal.button.text)}}
+            </button>
+            <button class="btn btn-delete" v-if="modal.action === 'edit'" @click="dropRelationship"></button>
+         </template>
+      </modal>
+   </teleport>
+
+</template>
+
+<script>
+import vis from 'vis-network/dist/vis-network'
+import { mapState, mapGetters } from "vuex"
+import Modal from 'ChillMainAssets/vuejs/_components/Modal'
+import VueMultiselect from 'vue-multiselect'
+import { getRelationsList, postRelationship, patchRelationship, deleteRelationship } from "./api"
+import { splitId, getAge } from "./vis-network"
+import { visMessages } from "./i18n";
+
+export default {
+   name: "App",
+   components: {
+      Modal,
+      VueMultiselect
+   },
+   props: ['household_id'],
+   data() {
+      return {
+         container: '',
+         checkedLayers: [],
+         relations: [],
+         displayHelpMessage: false,
+         listenPersonFlag: 'normal',
+         newEdgeData: {},
+         modal: {
+            showModal: false,
+            modalDialogClass: "modal-md",
+            title: null,
+            action: null,
+            data: {
+               type: 'relationship',
+               from: null,
+               to: null,
+               relation: null,
+               reverse: false
+            },
+            button: {
+               class: null,
+               text: null
+            },
+         },
+         canvas: null,
+         link: null,
+      }
+   },
+   computed: {
+      ...mapGetters(['nodes', 'edges',
+         // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
+      ]),
+      ...mapState(['persons', 'households', 'courses', 'excludedNodesIds', 'updateHack',
+         // not used 'links', 'relationships', 'whitelistIds', 'personLoadedIds', 'householdLoadingIds', 'courseLoadedIds', 'relationshipLoadedIds',
+      ]),
+
+      visgraph_data() {
+         //console.log('::: visgraph_data :::', this.nodes.length, 'nodes,', this.edges.length, 'edges')
+         return {
+            nodes: this.nodes,
+            edges: this.edges
+         }
+      },
+
+      refreshNetwork() {
+         //console.log('--- refresh network')
+         window.network.setData(this.visgraph_data)
+      },
+
+      legendLayers() {
+         //console.log('--- refresh legend and rebuild checked Layers')
+         this.checkedLayers = []
+         let layersDisplayed = [
+            ...this.nodes.filter(n => n.id.startsWith('household')),
+            ...this.nodes.filter(n => n.id.startsWith('accompanying'))
+         ]
+         layersDisplayed.forEach(layer => {
+            this.checkedLayers.push(layer.id)
+         })
+         return [
+            ...this.households,
+            ...this.courses
+         ]
+      },
+
+      checkedLayers() { // required to refresh data checkedLayers
+         //console.log('--- checkedLayers')
+         return this.checkedLayers
+      },
+
+      relation: {
+         get() {
+            return this.modal.data.relation
+         },
+         set(value) {
+            this.modal.data.relation = value
+         }
+      },
+
+      reverse: {
+         get() {
+            return this.modal.data.reverse
+         },
+         set(value) {
+            this.modal.data.reverse = value
+         }
+      },
+
+   },
+   watch: {
+      updateHack(newValue, oldValue) {
+         //console.log(`--- updateHack ${oldValue} <> ${newValue}`)
+         if (oldValue !== newValue) {
+            this.forceUpdateComponent()
+         }
+      }
+   },
+   mounted() {
+      //console.log('=== mounted: init graph')
+      this.initGraph()
+      this.listenOnGraph()
+      this.getRelationsList()
+
+      this.canvas = document.getElementById('visgraph').querySelector('canvas')
+      this.link = document.getElementById('exportCanvasBtn')
+   },
+   methods: {
+
+      initGraph() {
+         this.container = document.getElementById('visgraph')
+         // Instanciate vis objects in separate window variables, see vis-network.js
+         window.network = new vis.Network(this.container, this.visgraph_data, window.options)
+      },
+      forceUpdateComponent() {
+         //console.log('!! forceUpdateComponent !!')
+         this.refreshNetwork
+         this.$forceUpdate()
+      },
+
+      // events
+      listenOnGraph() {
+         window.network.on('selectNode', (data) => {
+            if (data.nodes.length > 1) {
+               throw 'Multi selection is not allowed. Disable it in options.interaction !'
+            }
+            let node = data.nodes[0]
+            let nodeType = splitId(node, 'type')
+            switch (nodeType) {
+
+               case 'person':
+                  let person = this.nodes.filter(n => n.id === node)[0]
+                  //console.log('@@@@@@ event on selected Node', person.id)
+                  if (this.listenPersonFlag === 'normal') {
+                     if (person.folded === true) {
+                        //console.log('   @@> expand mode event')
+                        this.$store.commit('unfoldPerson', person)
+                     }
+                  } else {
+                     //console.log('   @@> create link mode event')
+                     this.listenStepsToAddRelationship(person)
+                  }
+                  break
+
+               case 'household':
+                  let household = this.nodes.filter(n => n.id === node)[0]
+                  //console.log('@@@@@@ event on selected Node', household.id)
+                  this.$store.dispatch('unfoldPersonsByHousehold', household)
+                  break
+
+               case 'accompanying_period':
+                  let course = this.nodes.filter(n => n.id === node)[0]
+                  //console.log('@@@@@@ event on selected Node', course.id)
+                  this.$store.dispatch('unfoldPersonsByCourse', course)
+                  break
+
+               default:
+                  throw 'event is undefined for this type of node'
+            }
+            this.forceUpdateComponent()
+         })
+         window.network.on('selectEdge', (data) => {
+            if (data.nodes.length !== 0 || data.edges.length !== 1) {
+               return false  //we don't want to trigger nodeEdge or multiselect !
+            }
+            let link = data.edges[0]
+            let linkType = splitId(link, 'link')
+            //console.log('@@@@@ event on selected Edge', data.edges.length, linkType, data)
+
+            if (linkType.startsWith('relationship')) {
+               //console.log('linkType relationship')
+
+               let relationships = this.edges.filter(l => l.id === link)
+               if (relationships.length > 1) {
+                  throw 'error: only one link is allowed between two person!'
+               }
+
+               let relationship = relationships[0]
+               //console.log(relationship)
+
+               this.editRelationshipModal({
+                  from: relationship.from,
+                  to: relationship.to,
+                  id: relationship.id,
+                  relation: relationship.relation,
+                  reverse: relationship.reverse
+               })
+            }
+         })
+      },
+      listenStepsToAddRelationship(person) {
+         //console.log('   @@> listenStep', this.listenPersonFlag)
+         if (this.listenPersonFlag === 'step2') {
+            //console.log('   @@> person 2', person)
+            this.newEdgeData.to = person.id
+            this.addRelationshipModal(this.newEdgeData)
+            this.displayHelpMessage = false
+            this.listenPersonFlag = 'normal'
+            this.newEdgeData = {}
+         }
+         if (this.listenPersonFlag === 'step1') {
+            //console.log('   @@> person 1', person)
+            this.newEdgeData.from = person.id
+            this.listenPersonFlag = 'step2'
+         }
+      },
+
+      /// control Layers
+      toggleLayer(value) {
+         let id = value.target.value
+         //console.log('@@@@@@ toggle Layer', id)
+         this.forceUpdateComponent()
+         if (this.checkedLayers.includes(id)) {
+            this.removeLayer(id)
+         } else {
+            this.addLayer(id)
+         }
+      },
+      addLayer(id) {
+         //console.log('+ addLayer', id)
+         this.checkedLayers.push(id)
+         this.$store.dispatch('excludedNode', ['remove', id])
+      },
+      removeLayer(id) {
+         //console.log('- removeLayer', id)
+         this.checkedLayers = this.checkedLayers.filter(i => i !== id)
+         this.$store.dispatch('excludedNode', ['add', id])
+      },
+
+      /// control Modal
+      addRelationshipModal(edgeData) {
+         //console.log('==- addRelationshipModal', edgeData)
+         this.modal = {
+            data: { from:  edgeData.from, to: edgeData.to, reverse: false },
+            action:  'create',
+            showModal:  true,
+            title:  'visgraph.add_relationship_link',
+            button: { class:  'btn-create', text:  'action.create' }
+         }
+      },
+      editRelationshipModal(edgeData) {
+         //console.log('==- editRelationshipModal', edgeData)
+         this.modal = {
+            data: edgeData,
+            action: 'edit',
+            showModal: true,
+            title: 'visgraph.edit_relationship_link',
+            button: { class: 'btn-edit', text: 'action.edit' }
+         }
+      },
+
+      // form
+      resetForm() {
+         this.modal = {
+            data: { type: 'relationship', from: null, to: null, relation: null, reverse: false },
+            action: null,
+            title: null,
+            button: { class: null, text: null, }
+         }
+         //console.log('==- reset Form', this.modal.data)
+      },
+      getRelationsList() {
+         //console.log('fetch relationsList')
+         return getRelationsList().then(relations => new Promise(resolve => {
+            //console.log('+ relations list', relations.results.length)
+            this.relations = relations.results.filter(r => r.isActive === true)
+            resolve()
+         })).catch()
+      },
+      customLabel(value) {
+         //console.log('customLabel', value)
+         return (value.title && value.reverseTitle) ? `${value.title.fr} ↔ ${value.reverseTitle.fr}` : ''
+      },
+      getPerson(id) {
+         let person = this.persons.filter(p => p.id === id)
+         return person[0]
+      },
+      getPersonAge(id) {
+         let person = this.getPerson(id)
+         return getAge(person)
+      },
+
+      // actions
+      createRelationship() {
+         this.displayHelpMessage = true
+         this.listenPersonFlag = 'step1' // toggle listener in create link mode
+         //console.log('   @@> switch listener to create link mode:', this.listenPersonFlag)
+      },
+      dropRelationship() {
+         //console.log('delete', this.modal.data)
+         deleteRelationship(this.modal.data)
+            .catch()
+         this.$store.commit('removeLink', this.modal.data.id)
+         this.modal.showModal = false
+         this.resetForm()
+         this.forceUpdateComponent()
+      },
+      submitRelationship() {
+         //console.log('submitRelationship', this.modal.action)
+         switch (this.modal.action) {
+
+            case 'create':
+               return postRelationship(this.modal.data)
+               .then(relationship => new Promise(resolve => {
+                  //console.log('post relationship response', relationship)
+                  this.$store.dispatch('addLinkFromRelationship', relationship)
+                  this.modal.showModal = false
+                  this.resetForm()
+                  this.forceUpdateComponent()
+                  resolve()
+               }))
+               .catch()
+
+            case 'edit':
+               return patchRelationship(this.modal.data)
+               .then(relationship => new Promise(resolve => {
+                  //console.log('patch relationship response', relationship)
+                  this.$store.commit('updateLink', relationship)
+                  this.modal.showModal = false
+                  this.resetForm()
+                  this.forceUpdateComponent()
+                  resolve()
+               }))
+               .catch()
+
+            default:
+               throw "uncaught action"
+         }
+      },
+
+      // export image
+      async exportCanvasAsImage() {
+
+         let
+            filename = `filiation_${this.household_id}.jpg`,
+            mime = 'image/jpeg',
+            quality = 0.85,
+            footer = `© Chill ${new Date().getFullYear()}`,
+            timestamp = `${visMessages.fr.visgraph.relationship_household} n° ${this.household_id} — ${new Date().toLocaleString()}`
+
+         // resolve toBlob in a Promise
+         const getCanvasBlob = canvas => new Promise(resolve => {
+            canvas.toBlob(blob => resolve(blob), mime, quality)
+         })
+
+         // build image from new temporary canvas
+         let tmpCanvas = document.createElement('canvas')
+         tmpCanvas.width = this.canvas.width
+         tmpCanvas.height = this.canvas.height
+
+         let ctx = tmpCanvas.getContext('2d')
+         ctx.beginPath()
+         ctx.fillStyle = '#fff'
+         ctx.fillRect(0, 0, tmpCanvas.width, tmpCanvas.height);
+         ctx.fillStyle = '#9d4600'
+         ctx.fillText(footer +' — '+ timestamp, 5, tmpCanvas.height - 10)
+         ctx.drawImage(this.canvas, 0, 0)
+
+         return await getCanvasBlob(tmpCanvas)
+            .then(blob => {
+               let url = document.createElement("a")
+               url.download = filename
+               url.href = window.URL.createObjectURL(blob)
+               url.click()
+               console.log('url', url.href)
+               URL.revokeObjectURL(url.href)
+         })
+      }
+
+   }
+}
+</script>
+
+<style src="vis-network/dist/dist/vis-network.min.css"></style>
+<style src="vue-multiselect/dist/vue-multiselect.css"></style>
+
+<style lang="scss" scoped>
+div#visgraph {
+   height: 700px;
+   margin: auto;
+}
+div#visgraph-legend {
+   div.post-menu.legend {
+   }
+}
+.modal-mask {
+   background-color: rgba(0, 0, 0, 0.25);
+}
+.debug {
+   margin: 1em; padding: 1em;
+   color: dimgray;
+   font-style: italic;
+   font-size: 80%;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js
new file mode 100644
index 000000000..448ff6633
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js
@@ -0,0 +1,195 @@
+import { splitId } from './vis-network'
+
+/**
+ * @function makeFetch
+ * @param method
+ * @param url
+ * @param body
+ * @returns {Promise<Response>}
+ */
+const makeFetch = (method, url, body) => {
+    return fetch(url, {
+        method: method,
+        headers: {
+            'Content-Type': 'application/json;charset=utf-8'
+        },
+        body: (body !== null) ? JSON.stringify(body) : null
+    })
+    .then(response => {
+
+        if (response.ok) {
+            return response.json();
+        }
+
+        if (response.status === 422) {
+            return response.json().then(violations => {
+                throw ValidationException(violations)
+            });
+        }
+
+        throw {
+            msg: 'Error while updating AccompanyingPeriod Course.',
+            sta: response.status,
+            txt: response.statusText,
+            err: new Error(),
+            body: response.body
+        };
+    });
+}
+
+/**
+ * @param violations
+ * @constructor
+ */
+const ValidationException = (violations) => {
+    this.violations = violations
+    this.name = 'ValidationException'
+}
+
+/**
+ * @function getFetch
+ * @param url
+ * @returns {Promise<Response>}
+ */
+const getFetch = (url) => {
+    return makeFetch('GET', url, null)
+}
+
+/**
+ * @function postFetch
+ * @param url
+ * @param body
+ * @returns {Promise<Response>}
+ */
+const postFetch = (url, body) => {
+    return makeFetch('POST', url, body)
+}
+
+/**
+ * @function patchFetch
+ * @param url
+ * @param body
+ * @returns {Promise<Response>}
+ */
+const patchFetch = (url, body) => {
+    return makeFetch('PATCH', url, body)
+}
+
+/**
+ * @function deleteFetch
+ * @param url
+ * @param body
+ * @returns {Promise<Response>}
+ */
+const deleteFetch = (url, body) => {
+    return makeFetch('DELETE', url, null)
+}
+
+
+/**
+ * @function getHouseholdByPerson
+ * @param person
+ * @returns {Promise<Response>}
+ */
+const getHouseholdByPerson = (person) => {
+    //console.log('getHouseholdByPerson', person.id)
+    if (person.current_household_id === null) {
+        throw 'Currently the person has not household!'
+    }
+    return getFetch(
+        `/api/1.0/person/household/${person.current_household_id}.json`)
+}
+
+/**
+ * @function getCoursesByPerson
+ * @param person
+ * @returns {Promise<Response>}
+ */
+const getCoursesByPerson = (person) => {
+    //console.log('getCoursesByPerson', person._id)
+    return getFetch(
+        `/api/1.0/person/accompanying-course/by-person/${person._id}.json`)
+}
+
+/**
+ * @function getRelationshipsByPerson
+ * @param person
+ * @returns {Promise<Response>}
+ */
+const getRelationshipsByPerson = (person) => {
+    //console.log('getRelationshipsByPerson', person.id)
+    return getFetch(
+        `/api/1.0/relations/relationship/by-person/${person._id}.json`)
+}
+
+/**
+ * Return list of relations
+ * @returns {Promise<Response>}
+ */
+const getRelationsList = () => {
+    return getFetch(`/api/1.0/relations/relation.json`)
+}
+
+/**
+ * @function postRelationship
+ * @param relationship
+ * @returns {Promise<Response>}
+ */
+const postRelationship = (relationship) => {
+    //console.log(relationship)
+    return postFetch(
+        `/api/1.0/relations/relationship.json`,
+        {
+            type: 'relationship',
+            fromPerson: { type: 'person', id: splitId(relationship.from, 'id') },
+            toPerson: { type: 'person', id: splitId(relationship.to, 'id') },
+            relation: { type: 'relation', id: relationship.relation.id },
+            reverse: relationship.reverse
+        }
+    )
+}
+
+/**
+ * @function patchRelationship
+ * @param relationship
+ * @returns {Promise<Response>}
+ */
+const patchRelationship = (relationship) => {
+    //console.log(relationship)
+    let linkType = splitId(relationship.id, 'link')
+    let id = splitId(linkType, 'id')
+    return patchFetch(
+        `/api/1.0/relations/relationship/${id}.json`,
+        {
+            type: 'relationship',
+            fromPerson: { type: 'person', id: splitId(relationship.from, 'id') },
+            toPerson: { type: 'person', id: splitId(relationship.to, 'id') },
+            relation: { type: 'relation', id: relationship.relation.id },
+            reverse: relationship.reverse
+        }
+    )
+}
+
+/**
+ * @function deleteRelationship
+ * @param relationship
+ * @returns {Promise<Response>}
+ */
+const deleteRelationship = (relationship) => {
+    //console.log(relationship)
+    let linkType = splitId(relationship.id, 'link')
+    let id = splitId(linkType, 'id')
+    return deleteFetch(
+        `/api/1.0/relations/relationship/${id}.json`
+    )
+}
+
+export {
+    getHouseholdByPerson,
+    getCoursesByPerson,
+    getRelationshipsByPerson,
+    getRelationsList,
+    postRelationship,
+    patchRelationship,
+    deleteRelationship
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
new file mode 100644
index 000000000..8047aea11
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -0,0 +1,63 @@
+const visMessages = {
+    fr: {
+        visgraph: {
+            Course: 'Parcours',
+            Household: 'Ménage',
+            Holder: 'Titulaire',
+            Legend: 'Calques',
+            concerned: 'concerné',
+            both: 'neutre, non binaire',
+            woman: 'féminin',
+            man: 'masculin',
+            years: 'ans',
+            click_to_expand: 'cliquez pour étendre',
+            add_relationship_link: "Créer un lien de filiation",
+            edit_relationship_link: "Modifier le lien de filiation",
+            delete_relationship_link: "Êtes-vous sûr ?",
+            delete_confirmation_text: "Vous allez supprimer le lien entre ces 2 usagers.",
+            reverse_relation: "Inverser la relation",
+            relation_from_to_like: "{2} de {1}", // disable {0}
+            between: "entre",
+            and: "et",
+            add_link: "Créer un lien de filiation",
+            create_link_help: "Pour créer un lien de filiation, cliquez d'abord sur un usager, puis sur un second ; précisez ensuite la nature du lien dans le formulaire d'édition.",
+            refresh: "Rafraîchir",
+            screenshot: "Prendre une photo",
+            choose_relation: "Choisissez le lien de parenté",
+            relationship_household: "Filiation du ménage",
+        },
+        edit: 'Éditer',
+        del: 'Supprimer',
+        back: 'Revenir en arrière',
+        addNode: 'Ajouter un noeuds',
+        addEdge: 'Ajouter un lien de filiation',
+        editNode: 'Éditer le noeuds',
+        editEdge: 'Éditer le lien',
+        addDescription: 'Cliquez dans un espace vide pour créer un nouveau nœud.',
+        edgeDescription: 'Cliquez sur un usager et faites glisser le lien vers un autre usager pour les connecter.',
+        editEdgeDescription: 'Cliquez sur les points de contrôle et faites-les glisser vers un nœud pour les relier.',
+        createEdgeError: 'Il est impossible de relier des arêtes à un cluster.',
+        deleteClusterError: 'Les clusters ne peuvent pas être supprimés.',
+        editClusterError: 'Les clusters ne peuvent pas être modifiés.'
+    },
+    en: {
+        edit: 'Edit',
+        del: 'Delete selected',
+        back: 'Back',
+        addNode: 'Add Node',
+        addEdge: 'Add Link',
+        editNode: 'Edit Switch',
+        editEdge: 'Edit Link',
+        addDescription: 'Click in an empty space to place a new node.',
+        edgeDescription: 'Click on a node and drag the link to another node to connect them.',
+        editEdgeDescription: 'Click on the control points and drag them to a node to connect to it.',
+        createEdgeError: 'Cannot link edges to a cluster.',
+        deleteClusterError: 'Clusters cannot be deleted.',
+        editClusterError: 'Clusters cannot be edited.'
+
+    }
+}
+
+export {
+    visMessages
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js
new file mode 100644
index 000000000..5e8989e49
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js
@@ -0,0 +1,29 @@
+import { createApp } from "vue"
+import { store } from "./store.js"
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { visMessages } from './i18n'
+import App from './App.vue'
+
+import './vis-network'
+
+const i18n = _createI18n(visMessages)
+const container = document.getElementById('relationship-graph')
+const persons = JSON.parse(container.dataset.persons)
+
+persons.forEach(person => {
+    store.dispatch('addPerson', person)
+    store.commit('markInWhitelist', person)
+})
+
+const app = createApp({
+    template: `<app :household_id="this.household_id"></app>`,
+    data() {
+        return {
+            household_id: JSON.parse(container.dataset.householdId)
+        }
+    }
+})
+.use(store)
+.use(i18n)
+.component('app', App)
+.mount('#relationship-graph')
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
new file mode 100644
index 000000000..10269c6c8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -0,0 +1,539 @@
+import { createStore } from 'vuex'
+import { getHouseholdByPerson, getCoursesByPerson, getRelationshipsByPerson } from './api'
+import { getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getGender, getAge } from './vis-network'
+import {visMessages} from "./i18n";
+
+const debug = process.env.NODE_ENV !== 'production'
+
+const store = createStore({
+    strict: debug,
+    state: {
+        persons: [],
+        households: [],
+        courses: [],
+        relationships: [],
+        links: [],
+        whitelistIds: [],
+        personLoadedIds: [],
+        householdLoadingIds: [],
+        courseLoadedIds: [],
+        relationshipLoadedIds: [],
+        excludedNodesIds: [],
+        updateHack: 0
+    },
+    getters: {
+        nodes(state) {
+            let nodes = []
+            state.persons.forEach(p => {
+                nodes.push(p)
+            })
+            state.households.forEach(h => {
+                nodes.push(h)
+            })
+            state.courses.forEach(c => {
+                nodes.push(c)
+            })
+            // except excluded nodes (unchecked layers)
+            state.excludedNodesIds.forEach(excluded => {
+                nodes = nodes.filter(n => n.id !== excluded)
+            })
+            return nodes
+        },
+        edges(state) {
+            return state.links
+        },
+        isInWhitelist: (state) => (person_id) => {
+            return state.whitelistIds.includes(person_id)
+        },
+        isHouseholdLoading: (state) => (household_id) => {
+            return state.householdLoadingIds.includes(household_id)
+        },
+        isCourseLoaded: (state) => (course_id) => {
+            return state.courseLoadedIds.includes(course_id)
+        },
+        isRelationshipLoaded: (state) => (relationship_id) => {
+            return state.relationshipLoadedIds.includes(relationship_id)
+        },
+        isPersonLoaded: (state) => (person_id) => {
+            return state.personLoadedIds.includes(person_id)
+        },
+        isExcludedNode: (state) => (id) => {
+            return state.excludedNodesIds.includes(id)
+        },
+
+        countLinksByNode: (state) => (node_id) => {
+            let array = []
+            state.links.filter(link => ! link.id.startsWith('relationship'))
+            .forEach(link => {
+                if (link.from === node_id || link.to === node_id) {
+                    if (state.excludedNodesIds.indexOf(splitId(link.id, 'link')) === -1) {
+                        array.push(link)
+                    }
+                    //console.log(link.id, state.excludedNodesIds.indexOf(splitId(link.id, 'link')))
+                }
+            })
+            //console.log('count links', array.length, array.map(i => i.id))
+            return array.length
+        },
+
+        getParticipationsByCourse: (state) => (course_id) => {
+            const course = state.courses.filter(c => c.id === course_id)[0]
+            const currentParticipations = course.participations.filter(p => p.endDate === null)
+            //console.log('get persons in', course_id, currentParticipations.map(p => p.person.id),
+            //    'with folded', currentParticipations.filter(p => p.person.folded === true).map(p => p.person.id))
+            return currentParticipations
+        },
+
+        getMembersByHousehold: (state) => (household_id) => {
+            const household = state.households.filter(h => h.id === household_id)[0]
+            const currentMembers = household.members.filter(m => household.current_members_id.includes(m.id))
+            //console.log('get persons in', household_id, currentMembers.map(m => m.person.id),
+            //    'with folded', currentMembers.filter(m => m.person.folded === true).map(m => m.person.id))
+            return currentMembers
+        },
+
+        /**
+         * This getter is a little bit mysterious :
+         * The 2 previous getters return complete array, but folded (missing) persons are not taken into consideration and are not displayed (!?!)
+         * This getter compare input array (participations|members) to personLoadedIds array
+         * and return complete array with folded persons taken into consideration
+         *
+         * @param state
+         * @param array - An array of persons from course or household.
+         *         This array is dirty, melting persons adapted (or not) to vis, with _id and _label.
+         * @return array - An array of persons mapped and taken in state.persons
+         */
+        getPersonsGroup: (state) => (array) => {
+            let group = []
+            array.forEach(item => {
+                let id = splitId(item.person.id, 'id')
+                if (state.personLoadedIds.includes(id)) {
+                    group.push(state.persons.filter(person => person._id === id)[0])
+                }
+            })
+            //console.log('array', array.map(item => item.person.id))
+            //console.log('get persons group', group.map(f => f.id))
+            return group
+        },
+
+
+    },
+    mutations: {
+        addPerson(state, [person, options]) {
+            let age = getAge(person)
+            age = (age === '')? '' : ' - ' + age
+
+            let debug = ''
+            /// Debug mode: uncomment to display person_id on visgraph
+            //debug = `\nid ${person.id}`
+
+            person.group = person.type
+            person._id = person.id
+            person.id = `person_${person.id}`
+            person.label = `*${person.text}*\n_${getGender(person.gender)}${age}_${debug}`
+            person.folded = false
+            // folded is used for missing persons
+            if (options.folded) {
+                person.title = visMessages.fr.visgraph.click_to_expand
+                person._label = person.label  // keep label
+                person.label = null
+                person.folded = true
+            }
+            state.persons.push(person)
+        },
+        addHousehold(state, household) {
+            household.group = household.type
+            household._id = household.id
+            household.label = `${visMessages.fr.visgraph.Household} n° ${household.id}`
+            household.id = `household_${household.id}`
+            state.households.push(household)
+        },
+        addCourse(state, course) {
+            course.group = course.type
+            course._id = course.id
+            course.label = `${visMessages.fr.visgraph.Course} n° ${course.id}`
+            course.id = `accompanying_period_${course.id}`
+            state.courses.push(course)
+        },
+        addRelationship(state, relationship) {
+            relationship.group = relationship.type
+            relationship._id = relationship.id
+            relationship.id = `relationship_${relationship.id}`
+            state.relationships.push(relationship)
+        },
+        addLink(state, link) {
+            state.links.push(link)
+        },
+        updateLink(state, link) {
+            //console.log('updateLink', link)
+            let link_ = {
+                from: `person_${link.fromPerson.id}`,
+                to: `person_${link.toPerson.id}`,
+                id: 'relationship_' + splitId(link.id,'id')
+                    + '-person_' + link.fromPerson.id + '-person_' + link.toPerson.id,
+                arrows: getRelationshipDirection(link),
+                color: 'lightblue',
+                font: { color: '#33839d' },
+                dashes: true,
+                label: getRelationshipLabel(link),
+                title: getRelationshipTitle(link),
+                relation: link.relation,
+                reverse: link.reverse
+            }
+            // find row position and replace by updatedLink
+            state.links.splice(
+                state.links.findIndex(item => item.id === link_.id), 1, link_
+            )
+        },
+        removeLink(state, link_id) {
+            state.links = state.links.filter(l => l.id !== link_id)
+        },
+
+        //// id markers
+        markInWhitelist(state, person) {
+            state.whitelistIds.push(person.id)
+        },
+        markPersonLoaded(state, id) {
+            state.personLoadedIds.push(id)
+        },
+            unmarkPersonLoaded(state, id) {
+                state.personLoadedIds = state.personLoadedIds.filter(i => i !== id)
+            },
+        markHouseholdLoading(state, id) {
+            //console.log('..loading household', id)
+            state.householdLoadingIds.push(id)
+        },
+            unmarkHouseholdLoading(state, id) {
+                state.householdLoadingIds = state.householdLoadingIds.filter(i => i !== id)
+            },
+        markCourseLoaded(state, id) {
+            state.courseLoadedIds.push(id)
+        },
+            unmarkCourseLoaded(state, id) {
+                state.courseLoadedIds = state.courseLoadedIds.filter(i => i !== id)
+            },
+        markRelationshipLoaded(state, id) {
+            state.relationshipLoadedIds.push(id)
+        },
+            unmarkRelationshipLoaded(state, id) {
+                state.relationshipLoadedIds = state.relationshipLoadedIds.filter(i => i !== id)
+            },
+
+        //// excluded
+        addExcludedNode(state, id) {
+            //console.log('==> exclude list: +', id)
+            state.excludedNodesIds.push(id)
+        },
+        removeExcludedNode(state, id) {
+            //console.log('<== exclude list: -', id)
+            state.excludedNodesIds = state.excludedNodesIds.filter(e => e !== id)
+        },
+
+        //// unfold
+        unfoldPerson(state, person) {
+            //console.log('unfoldPerson', person)
+            person.label = person._label
+            delete person._label
+            delete person.title
+            person.folded = false
+        },
+
+        //// force update hack
+        updateHack(state) {
+            state.updateHack = state.updateHack + 1
+        }
+    },
+    actions: {
+        /**
+         *  Expand loop (steps 1->10), always start from a person.
+         *  Fetch household, courses, relationships, and others persons.
+         *  These persons are "missing" and will be first display in fold mode.
+         *
+         *  1) Add a new person
+         *  @param object
+         *  @param person
+         */
+        addPerson({ commit, dispatch }, person) {
+            commit('markPersonLoaded', person.id)
+            commit('addPerson', [person, { folded: false }])
+            commit('updateHack')
+            dispatch('fetchInfoForPerson', person)
+        },
+
+        /**
+         *  2) Fetch infos for this person (hub)
+         *  @param object
+         *  @param person
+         */
+        fetchInfoForPerson({ dispatch }, person) {
+                // TODO enfants hors ménages
+                // example: household 61
+                //console.log(person.text, 'household', person.current_household_id)
+            if (null !== person.current_household_id) {
+                dispatch('fetchHouseholdForPerson', person)
+            }
+            dispatch('fetchCoursesByPerson', person)
+            dispatch('fetchRelationshipByPerson', person)
+        },
+
+        /**
+         *  3) Fetch person current household (if it is not already loading)
+         *  check first isHouseholdLoading to fetch household once
+         *  @param object
+         *  @param person
+         */
+        fetchHouseholdForPerson({ commit, getters, dispatch }, person) {
+            //console.log('  isHouseholdLoading ?', getters.isHouseholdLoading(person.current_household_id))
+            if (! getters.isHouseholdLoading(person.current_household_id)) {
+                commit('markHouseholdLoading', person.current_household_id)
+                getHouseholdByPerson(person)
+                    .then(household => new Promise(resolve => {
+                        commit('addHousehold', household)
+                            // DISABLED: in init or expand loop, layer is uncheck when added
+                            //commit('addExcludedNode', household.id)
+                            //commit('updateHack')
+                        dispatch('addLinkFromPersonsToHousehold', household)
+                        commit('updateHack')
+                        resolve()
+                        })
+                    ).catch( () => {
+                        commit('unmarkHouseholdLoading', person.current_household_id)
+                })
+            }
+        },
+
+        /**
+         *  4) Add an edge for each household member (household -> person)
+         *  @param object
+         *  @param household
+         */
+        addLinkFromPersonsToHousehold({ commit, getters, dispatch }, household) {
+            let members = getters.getMembersByHousehold(household.id)
+            //console.log('add link for', members.length, 'members')
+            members.forEach(m => {
+                commit('addLink', {
+                    from: `${m.person.type}_${m.person.id}`,
+                    to: `${household.id}`,
+                    id: `${household.id}-person_${m.person.id}`,
+                    arrows: 'from',
+                    color: 'pink',
+                    font: { color: '#D04A60' },
+                    dashes: (getHouseholdWidth(m) === 1)? [0,4] : false,  //edge style:  [dash, gap, dash, gap]
+                    label: getHouseholdLabel(m),
+                    width: getHouseholdWidth(m),
+                })
+                if (!getters.isPersonLoaded(m.person.id)) {
+                    dispatch('addMissingPerson', [m.person, household])
+                }
+            })
+        },
+
+        /**
+         *  5) Fetch AccompanyingCourses for the person
+         *  @param object
+         *  @param person
+         */
+        fetchCoursesByPerson({ commit, dispatch }, person) {
+            getCoursesByPerson(person)
+                .then(courses => new Promise(resolve => {
+                    dispatch('addCourses', courses)
+                    resolve()
+                }))
+        },
+
+        /**
+         *  6) Add each distinct course (a person can have multiple courses)
+         *  @param object
+         *  @param courses
+         */
+        addCourses({ commit, getters, dispatch }, courses) {
+            let currentCourses = courses.filter(c => c.closingDate === null)
+            currentCourses.forEach(course => {
+                //console.log('  isCourseLoaded ?', getters.isCourseLoaded(course.id))
+                if (! getters.isCourseLoaded(course.id)) {
+                    commit('markCourseLoaded', course.id)
+                    commit('addCourse', course)
+                    commit('addExcludedNode', course.id)  // in init or expand loop, layer is uncheck when added
+                    dispatch('addLinkFromPersonsToCourse', course)
+                    commit('updateHack')
+                }
+            })
+        },
+
+        /**
+         *  7) Add an edge for each course participation (course <- person)
+         *  @param object
+         *  @param course
+         */
+        addLinkFromPersonsToCourse({ commit, getters, dispatch }, course) {
+            const participations = getters.getParticipationsByCourse(course.id)
+            //console.log('add link for', participations.length, 'participations')
+            participations.forEach(p => {
+                //console.log(p.person.id)
+                commit('addLink', {
+                    from: `${p.person.type}_${p.person.id}`,
+                    to: `${course.id}`,
+                    id: `accompanying_period_${splitId(course.id,'id')}-person_${p.person.id}`,
+                    arrows: 'from',
+                    color: 'orange',
+                    font: { color: 'darkorange' },
+                })
+                if (!getters.isPersonLoaded(p.person.id)) {
+                    dispatch('addMissingPerson', [p.person, course])
+                }
+            })
+        },
+
+        /**
+         *  8) Fetch Relationship
+         *  @param object
+         *  @param person
+         */
+        fetchRelationshipByPerson({ dispatch }, person) {
+            //console.log('fetchRelationshipByPerson', person)
+            getRelationshipsByPerson(person)
+                .then(relationships => new Promise(resolve => {
+                    dispatch('addRelationships', relationships)
+                    resolve()
+                }))
+        },
+
+        /**
+         *  9) Add each distinct relationship
+         *  @param object
+         *  @param relationships
+         */
+        addRelationships({ commit, getters, dispatch }, relationships) {
+            relationships.forEach(relationship => {
+                //console.log('  isRelationshipLoaded ?', getters.isRelationshipLoaded(relationship.id))
+                if (! getters.isRelationshipLoaded(relationship.id)) {
+                    commit('markRelationshipLoaded', relationship.id)
+                    commit('addRelationship', relationship)
+                    dispatch('addLinkFromRelationship', relationship)
+                    commit('updateHack')
+                }
+            })
+        },
+
+        /**
+         *  10) Add an edge for each relationship (person -> person)
+         *  @param object
+         *  @param relationship
+         */
+        addLinkFromRelationship({ commit, getters, dispatch }, relationship) {
+            //console.log('-> addLink from person', relationship.fromPerson.id, 'to person', relationship.toPerson.id)
+            commit('addLink', {
+                from: `person_${relationship.fromPerson.id}`,
+                to: `person_${relationship.toPerson.id}`,
+                id: 'relationship_' + splitId(relationship.id,'id')
+                    + '-person_' + relationship.fromPerson.id + '-person_' + relationship.toPerson.id,
+                arrows: getRelationshipDirection(relationship),
+                color: 'lightblue',
+                font: { color: '#33839d' },
+                dashes: true,
+                label: getRelationshipLabel(relationship),
+                title: getRelationshipTitle(relationship),
+                relation: relationship.relation,
+                reverse: relationship.reverse
+            })
+            for (let person of [relationship.fromPerson, relationship.toPerson]) {
+                if (!getters.isPersonLoaded(person.id)) {
+                    dispatch('addMissingPerson', [person, relationship])
+                }
+            }
+        },
+
+        /**
+         *  Add missing person. node is displayed without label (folded).
+         *  We stop here and listen on events to unfold person and expand its fetch infos
+         *  @param object
+         *  @param array
+         */
+        addMissingPerson({ commit, getters, dispatch }, [person, parent]) {
+            //console.log('! add missing Person', person.id)
+            commit('markPersonLoaded', person.id)
+            commit('addPerson', [person, { folded: true }])
+            if (getters.isExcludedNode(parent.id)) {
+                // in init or expand loop, exclude too missing persons if parent have been excluded
+                commit('addExcludedNode', person.id)
+            }
+            commit('updateHack')
+        },
+
+        /**
+         * ==================================================================
+         * Triggered by a vis-network event when clicking on a Course Node.
+         * Each folded node is unfold, then expanded with fetch infos
+         * @param object
+         * @param course
+         */
+        unfoldPersonsByCourse({ getters, commit, dispatch }, course) {
+            const participations = getters.getParticipationsByCourse(course.id)
+            getters.getPersonsGroup(participations)
+            .forEach(person => {
+                if (person.folded === true) {
+                    //console.log('-=. unfold and expand person', person.id)
+                    commit('unfoldPerson', person)
+                    dispatch('fetchInfoForPerson', person)
+                }
+            })
+        },
+
+        /**
+         * Triggered by a vis-network event when clicking on a Household Node.
+         * Each folded node is unfold, then expanded with fetch infos
+         * @param object
+         * @param household
+         */
+        unfoldPersonsByHousehold({ getters, commit, dispatch }, household) {
+            const members = getters.getMembersByHousehold(household.id)
+            getters.getPersonsGroup(members)
+            .forEach(person => {
+                if (person.folded === true) {
+                    //console.log('-=. unfold and expand person', person.id)
+                    commit('unfoldPerson', person)
+                    dispatch('fetchInfoForPerson', person)
+                }
+            })
+        },
+
+        /**
+         * ==================================================================
+         * For an excluded node, add|remove relative persons excluded too
+         * @param object
+         * @param array (add|remove action, id)
+         */
+        excludedNode({ getters, commit }, [action, id]) {
+            const personGroup = () => {
+                switch (splitId(id, 'type')) {
+                    case 'accompanying_period':
+                        return getters.getParticipationsByCourse(id)
+                    case 'household':
+                        return getters.getMembersByHousehold(id)
+                    default:
+                        throw 'undefined case with this id'
+                }
+            }
+            let group = getters.getPersonsGroup(personGroup())
+            if (action === 'add') {
+                commit('addExcludedNode', id)
+                group.forEach(person => {
+                    // countLinks < 2 but parent has just already been added !
+                    if (!getters.isInWhitelist(person.id) && getters.countLinksByNode(person.id) < 1) {
+                        commit('addExcludedNode', person.id)
+                    }
+                })
+            }
+            if (action === 'remove') {
+                commit('removeExcludedNode', id)
+                group.forEach(person => {
+                    commit('removeExcludedNode', person.id)
+                })
+            }
+            commit('updateHack')
+        },
+
+    }
+})
+
+export { store }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
new file mode 100644
index 000000000..3e00db883
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
@@ -0,0 +1,265 @@
+import { visMessages } from './i18n'
+
+/**
+ * Vis-network initial data/configuration script
+ * Notes:
+ *   Use window.network and window.options to avoid conflict between vue and vis
+ *   cfr. https://github.com/almende/vis/issues/2524#issuecomment-307108271
+ */
+
+window.network = {}
+
+window.options = {
+    locale: 'fr',
+    locales: visMessages,
+    /*
+    */
+    configure: {
+        enabled: true,
+        filter: 'physics',
+        showButton: true
+    },
+    physics: {
+        enabled: true,
+        barnesHut: {
+            theta: 0.5,
+            gravitationalConstant: -2000,
+            centralGravity: 0.08, //// 0.3
+            springLength: 220, //// 95
+            springConstant: 0.04,
+            damping: 0.09,
+            avoidOverlap: 0
+        },
+        forceAtlas2Based: {
+            theta: 0.5,
+            gravitationalConstant: -50,
+            centralGravity: 0.01,
+            springLength: 100,
+            springConstant: 0.08,
+            damping: 0.75,
+            avoidOverlap: 0.00
+        },
+        repulsion: {
+            centralGravity: 0.2,
+            springLength: 200,
+            springConstant: 0.05,
+            nodeDistance: 100,
+            damping: 0.09
+        },
+        hierarchicalRepulsion: {
+            centralGravity: 0.0,
+            springLength: 100,
+            springConstant: 0.01,
+            nodeDistance: 120,
+            damping: 0.09,
+            avoidOverlap: 0
+        },
+        maxVelocity: 50,
+        minVelocity: 0.1,
+        solver: 'forceAtlas2Based', //'barnesHut', //
+        stabilization: {
+            enabled: true,
+            iterations: 1000,
+            updateInterval: 100,
+            onlyDynamicEdges: false,
+            fit: true
+        },
+        timestep: 0.5,
+        adaptiveTimestep: true,
+        wind: { x: 0, y: 0 }
+    },
+    interaction: {
+        hover: true,
+        multiselect: true,
+        navigationButtons: false,
+    },
+    manipulation: {
+        enabled: false,
+        initiallyActive: false,
+        addNode: false,
+        deleteNode: false
+    },
+    nodes: {
+        borderWidth: 1,
+        borderWidthSelected: 3,
+        font: {
+            multi: 'md'
+        }
+    },
+    edges: {
+        font: {
+            color: '#b0b0b0',
+            size: 9,
+            face: 'arial',
+            background: 'none',
+            strokeWidth: 2, // px
+            strokeColor: '#ffffff',
+            align: 'middle',
+            multi: false,
+            vadjust: 0,
+        },
+        scaling:{
+            label: true,
+        },
+        smooth: true,
+    },
+    groups: {
+        person: {
+            shape: 'box',
+            shapeProperties: {
+                borderDashes: false,
+                borderRadius: 3,
+            },
+            color: {
+                border: '#b0b0b0',
+                background: 'rgb(193,229,222)',
+                highlight: {
+                    border: '#89c9a9',
+                    background: 'rgb(156,213,203)'
+                },
+                hover: {
+                    border: '#89c9a9',
+                    background: 'rgb(156,213,203)'
+                }
+            },
+            opacity: 0.85,
+            shadow:{
+                enabled: true,
+                color: 'rgba(0,0,0,0.5)',
+                size:10,
+                x:5,
+                y:5
+            },
+        },
+        household: {
+            color: 'pink'
+        },
+        accompanying_period: {
+            color: 'orange',
+        },
+    }
+}
+
+/**
+ * @param gender
+ * @returns {string}
+ */
+const getGender = (gender) => {
+    switch (gender) {
+        case 'both':
+            return visMessages.fr.visgraph.both
+        case 'woman':
+            return visMessages.fr.visgraph.woman
+        case 'man':
+            return visMessages.fr.visgraph.man
+        default:
+            throw 'gender undefined'
+    }
+}
+
+/**
+ * TODO only one abstract function (-> getAge() is repeated in PersonRenderBox.vue)
+ * @param person
+ * @returns {string|null}
+ */
+const getAge = (person) => {
+    if (person.birthdate) {
+        let birthdate = new Date(person.birthdate.datetime)
+        if (person.deathdate) {
+            let deathdate = new Date(person.deathdate.datetime)
+            return (deathdate.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
+        }
+        let now = new Date()
+        return (now.getFullYear() - birthdate.getFullYear()) + visMessages.fr.visgraph.years
+    }
+    return ''
+}
+
+/**
+ * Return member position in household
+ * @param member
+ * @returns string
+ */
+const getHouseholdLabel = (member) => {
+    let position = member.position.label.fr
+    let holder = member.holder ? ` ${visMessages.fr.visgraph.Holder}` : ''
+    return position + holder
+}
+
+/**
+ * Return edge width for member (depends of position in household)
+ * @param member
+ * @returns integer (width)
+ */
+const getHouseholdWidth = (member) => {
+    if (member.holder) {
+        return 5
+    }
+    if (member.shareHousehold) {
+        return 2
+    }
+    return 1
+}
+
+/**
+ * Return direction edge
+ * @param relationship
+ * @returns string
+ */
+const getRelationshipDirection = (relationship) => {
+    return (!relationship.reverse) ? 'to' : 'from'
+}
+
+/**
+ * Return label edge
+ *  !! always set label in title direction (arrow is reversed, see in previous method) !!
+ * @param relationship
+ * @returns string
+ */
+const getRelationshipLabel = (relationship) => {
+    return relationship.relation.title.fr
+}
+
+/**
+ * Return title edge
+ * @param relationship
+ * @returns string
+ */
+const getRelationshipTitle = (relationship) => {
+    return (!relationship.reverse) ?
+        relationship.relation.title.fr + ': ' + relationship.fromPerson.text + '\n' + relationship.relation.reverseTitle.fr + ': ' + relationship.toPerson.text :
+        relationship.relation.title.fr + ': ' + relationship.toPerson.text + '\n' + relationship.relation.reverseTitle.fr + ': ' + relationship.fromPerson.text
+}
+
+/**
+ * Split string id and return type|id substring
+ * @param id
+ * @param position
+ * @returns string|integer
+ */
+const splitId = (id, position) => {
+    //console.log(id, position)
+    switch (position) {
+        case 'type':                    // return 'accompanying_period'
+            return /(.+)_/.exec(id)[1]
+        case 'id':                      // return 124
+            return parseInt(id.toString()
+                .split("_")
+                .pop())
+        case 'link':
+            return id.split("-")[0]     // return first segment
+        default:
+            throw 'position undefined'
+    }
+}
+
+export {
+    getGender,
+    getAge,
+    getHouseholdLabel,
+    getHouseholdWidth,
+    getRelationshipDirection,
+    getRelationshipLabel,
+    getRelationshipTitle,
+    splitId
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AccompanyingCourseWork.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AccompanyingCourseWork.js
index 7c73d01f8..59879c439 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AccompanyingCourseWork.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AccompanyingCourseWork.js
@@ -1,30 +1,30 @@
-const create = (accompanying_period_id, payload) => {
-  const url = `/api/1.0/person/accompanying-course/${accompanying_period_id}/work.json`;
-  let status;
-  console.log('create', payload);
+// const create = (accompanying_period_id, payload) => {
+//   const url = `/api/1.0/person/accompanying-course/${accompanying_period_id}/work.json`;
+//   let status;
+//   console.log('create', payload);
 
-  return fetch(url, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(payload),
-  })
-    .then(response => {
-      if (response.ok || response.status === 422) {
-        status = response.status;
+//   return fetch(url, {
+//     method: 'POST',
+//     headers: {
+//       'Content-Type': 'application/json',
+//     },
+//     body: JSON.stringify(payload),
+//   })
+//     .then(response => {
+//       if (response.ok || response.status === 422) {
+//         status = response.status;
 
-        return response.json();
-      }
+//         return response.json();
+//       }
 
-      throw new Error("Error while retrieving social actions: " + response.status +
-        " " + response.statusText);
-    })
-    .then(data => {
-      return new Promise((resolve, reject) => {
-        resolve({ status, data });
-      });
-    });
-};
+//       throw new Error("Error while retrieving social actions: " + response.status +
+//         " " + response.statusText);
+//     })
+//     .then(data => {
+//       return new Promise((resolve, reject) => {
+//         resolve({ status, data });
+//       });
+//     });
+// };
 
-export { create };
+// export { create };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index 931830fd3..ce2f52a50 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -1,40 +1,49 @@
 <template>
    <div class="list-item" :class="{ checked: isChecked }">
-         
+
+      <label>
          <div>
-            <input 
-               v-bind:type="type" 
+            <input
+               v-bind:type="type"
                v-model="selected"
                name="item"
                v-bind:id="item"
                v-bind:value="setValueByType(item, type)" />
          </div>
-            
-         <suggestion-person 
+
+         <suggestion-person
             v-if="item.result.type === 'person'"
             v-bind:item="item">
          </suggestion-person>
-         
-         <suggestion-third-party 
+
+         <suggestion-third-party
             v-if="item.result.type === 'thirdparty'"
             v-bind:item="item">
          </suggestion-third-party>
 
+         <suggestion-user
+            v-if="item.result.type === 'user'"
+            v-bind:item="item">
+         </suggestion-user>
+      </label>
+
    </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', 
+      'item',
       'search',
       'type'
    ],
@@ -62,7 +71,7 @@ export default {
 </script>
 
 <style lang="scss">
-   div.results {   
+   div.results {
       div.list-item {
          padding: 0.4em 0.8em;
          display: flex;
@@ -71,32 +80,36 @@ export default {
             background-color: #ececec;
             border-bottom: 1px dotted #8b8b8b;
          }
-         div.container {
-            & > input {
-               margin-right: 0.8em;
+         label {
+            display: inline-flex;
+            width: 100%;
+            div.container {
+               & > input {
+                  margin-right: 0.8em;
+               }
+               span:not(.name) {
+                  margin-left: 0.5em;
+                  opacity: 0.5;
+                  font-size: 90%;
+                  font-style: italic;
+               }
             }
-            span:not(.name) {
-               margin-left: 0.5em;
-               opacity: 0.5;
-               font-size: 90%;
-               font-style: italic;
+            div.right_actions {
+               margin: 0 0 0 auto;
+               display: flex;
+               align-items: flex-end;
+               & > * {
+                  margin-left: 0.5em;
+                  align-self: baseline;
+               }
+
+               a.btn {
+                  border: 1px solid lightgrey;
+                  font-size: 70%;
+                  padding: 4px;
+               }
             }
          }
-         div.right_actions {
-            margin: 0 0 0 auto;
-            display: flex;
-            align-items: flex-end;
-            & > * {
-               margin-left: 0.5em;
-               align-self: baseline;
-            }
-            
-            a.btn {
-               border: 1px solid lightgrey;
-               font-size: 70%;
-               padding: 4px;
-            } 
-         }
       }
    }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index a6b4695f9..8bd4887cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -1,6 +1,5 @@
 <template>
    <div class="container">
-   
       <span class="name">
          {{ item.result.text }}
       </span>
@@ -8,32 +7,33 @@
          {{ $d(item.result.birthdate.datetime, 'short') }}
        </span>
       <span class="location" v-if="hasAddress">
-         {{ item.result.current_household_address.text }} - 
+         {{ item.result.current_household_address.text }} -
          {{ item.result.current_household_address.postcode.name }}
       </span>
-      
    </div>
+
    <div class="right_actions">
-      
-      <span class="badge rounded-pill bg-secondary" :title="item.key">
-         {{ $t('item.type_person') }}
-      </span>
+      <badge-entity
+        :entity="item.result"
+        :options="{ displayLong: true }">
+      </badge-entity>
       <on-the-fly
          type="person"
          v-bind:id="item.result.id"
          action="show">
       </on-the-fly>
-      
    </div>
 </template>
 
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 
 export default {
    name: 'SuggestionPerson',
    components: {
      OnTheFly,
+     BadgeEntity
    },
    props: ['item'],
    computed: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index de24c6fbf..5a367a474 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -17,33 +17,23 @@
         </span>
       </div>
     </div>
+
     <div class="right_actions">
-
-     <span class="badge bg-thirdparty-child" v-if="item.result.kind == 'child'">
-        {{ $t('thirdparty.child')}}
-     </span>
-      <span class="badge bg-thirdparty-company" v-else-if="item.result.kind == 'company'">
-       {{ $t('thirdparty.company')}}
-      </span>
-      <span class="badge bg-thirdparty-contact" v-else="item.result.kind == 'contact'">
-        {{ $t('thirdparty.contact')}}
-      </span>
-
-      <span class="badge rounded-pill bg-secondary" :title="item.key">
-         {{ $t('item.type_thirdparty') }}
-      </span>
-
-      <on-the-fly
-          type="thirdparty"
-          v-bind:id="item.result.id"
-          action="show">
-      </on-the-fly>
-
+       <badge-entity
+         :entity="item.result"
+         :options="{ displayLong: true }">
+       </badge-entity>
+       <on-the-fly
+           type="thirdparty"
+           v-bind:id="item.result.id"
+           action="show">
+       </on-the-fly>
     </div>
 </template>
 
 <script>
 import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 
 const i18n = {
   messages: {
@@ -60,7 +50,8 @@ const i18n = {
 export default {
    name: 'SuggestionThirdParty',
    components: {
-      OnTheFly
+      OnTheFly,
+      BadgeEntity
    },
    props: ['item'],
    i18n,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
new file mode 100644
index 000000000..7a8b302c7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -0,0 +1,43 @@
+<template>
+    <div class="container usercontainer">
+      <div class="user-identification">
+        <span class="name">
+           {{ item.result.text }}
+        </span>
+      </div>
+    </div>
+    <div class="right_actions">
+       <badge-entity
+          :entity="item.result"
+          :options="{ displayLong: true }">
+       </badge-entity>
+    </div>
+</template>
+
+<script>
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+
+export default {
+   name: 'SuggestionUser',
+   components: {
+      BadgeEntity
+   },
+   props: ['item'],
+   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>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 89ff6886f..ac4ea5ea5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -18,12 +18,17 @@
 
                    <span class="firstname">{{ person.firstName }}</span>
                    <span class="lastname">{{ person.lastName }}</span>
+                   <span v-if="person.deathdate" class="deathdate"> (‡)</span>
                    <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                        <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
                    </span>
 
                    <span v-if="options.addId ==  true" class="id-number" :title="'n° ' + person.id">{{ person.id }}</span>
-                   <span v-if="options.addEntity ==  true" class="badge rounded-pill bg-secondary">{{ $t('renderbox.person') }}</span>
+
+                   <badge-entity v-if="options.addEntity === true"
+                      :entity="person"
+                      :options="{ displayLong: options.entityDisplayLong }">
+                   </badge-entity>
 
                 </div>
 
@@ -78,7 +83,7 @@
                           {{ $t('renderbox.no_data') }}
                        </p>
                     </li>
-                    
+
                     <li v-if="person.mobilenumber">
                        <i class="fa fa-li fa-mobile"></i>
                        <a :href="'tel: ' + person.mobilenumber">{{ person.mobilenumber }}</a>
@@ -96,9 +101,9 @@
                        <p class="chill-no-data-statement">{{ $t('renderbox.no_data') }}</p>
                     </li>
 
-                    <li v-if="person.center && options.addCenter">
-                       <i class="fa fa-li fa-long-arrow-right"></i>
-                       {{ person.center.name }}
+                    <li v-if="person.centers !== undefined && person.centers.length > 0 && options.addCenter">
+                        <i class="fa fa-li fa-long-arrow-right"></i>
+                        <template v-for="c in person.centers">{{ c.name }}</template>
                     </li>
                     <li v-else-if="options.addNoData">
                        <i class="fa fa-li fa-long-arrow-right"></i>
@@ -139,12 +144,14 @@
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 
 export default {
     name: "PersonRenderBox",
     components: {
         AddressRenderBox,
-        Confidential
+        Confidential,
+        BadgeEntity
     },
     props: ['person', 'options', 'render', 'returnPath'],
     computed: {
@@ -192,6 +199,7 @@ export default {
             return `/fr/person/${this.person.id}/general`;
         },
         getAge: function() {
+            // TODO only one abstract function
             if(this.person.birthdate && !this.person.deathdate){
                 const birthday = new Date(this.person.birthdate.datetime)
                 const now = new Date()
diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php
index 29c257406..d39adffaf 100644
--- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -1,13 +1,38 @@
 <?php
 
-use Symfony\Component\HttpKernel\Kernel;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/PersonBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/PersonBundle/logs';
+    }
+
     public function registerBundles()
     {
-        return array(
+        return [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -19,29 +44,12 @@ class AppKernel extends Kernel
             new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            #add here all the required bundle (some bundle are not required)
-        );
+            //add here all the required bundle (some bundle are not required)
+        ];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir().'/PersonBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir().'/PersonBundle/logs';
+        $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
     }
 }
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php
index 39dc0e2ba..ea351fb8a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -1,11 +1,20 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
-$loader = require __DIR__.'/../../../../../vendor/autoload.php';
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml
index e11599661..0b12be8d0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml
+++ b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml
@@ -15,4 +15,5 @@ chill_person:
         phonenumber: hidden
         country_of_birth: hidden
         marital_status: hidden
-        spoken_languages: hidden
\ No newline at end of file
+        spoken_languages: hidden
+        civility: hidden
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php
index e0279c2ae..914d09ffd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php
+++ b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php
@@ -1,7 +1,16 @@
 <?php
 
-use Symfony\Component\HttpFoundation\Request;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Debug\Debug;
+use Symfony\Component\HttpFoundation\Request;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
@@ -11,16 +20,17 @@ use Symfony\Component\Debug\Debug;
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
-    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+
+    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
 }
 
-$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
 Debug::enable();
 
-require_once __DIR__.'/../app/AppKernel.php';
+require_once __DIR__ . '/../app/AppKernel.php';
 
 $kernel = new AppKernel('dev', true);
 $kernel->loadClassCache();
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
index 7ef2de466..fda36da85 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig
@@ -6,7 +6,7 @@
                     <a class="btn btn-sm btn-update change-icon"
                        href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-10' }) }}">
                         <i class="fa fa-fw fa-crosshairs"></i>
-                        Corriger
+                        {{ 'fix it'|trans }}
                     </a>
                 </li>
             </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
index f04a8a376..2febc7967 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig
@@ -8,7 +8,7 @@
                     <a class="btn btn-sm btn-update change-icon"
                        href="{{ path('chill_person_accompanying_course_edit', { 'accompanying_period_id': accompanyingCourse.id, '_fragment': 'section-20' }) }}">
                         <i class="fa fa-fw fa-crosshairs"></i>
-                        Corriger
+                        {{ 'fix it'|trans }}
                     </a>
                 </li>
             </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
index e55b39f64..ded5590a2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
@@ -23,11 +23,28 @@
 	</div>
 	<div id="header-accompanying_course-details" class="header-details">
 		<div class="container-xxl">
-			<div
-				class="row justify-content-md-right">
+			<div class="row">
 
-				{# vue teleport fragment here #}
-				<div class="col-md-10 ps-md-5 ps-xxl-0" id="banner-social-issues"></div>
+                <div class="col-md-12 px-md-5 px-xxl-0">
+                    <div id="ACHeaderSlider" class="carousel carousel-dark slide" data-bs-ride="carousel">
+                        <div class="carousel-inner">
+                            <div class="carousel-item active">
+                                {# vue teleport fragment here #}
+                                <div id="banner-social-issues" class="col-11"></div>
+                            </div>
+                            <div class="carousel-item">
+                                {# vue teleport fragment here #}
+                                <div id="banner-persons-associated" class="col-11"></div>
+                            </div>
+                        </div>
+                        <button class="carousel-control-prev justify-content-end visually-hidden" type="button" data-bs-target="#ACHeaderSlider" data-bs-slide="prev">
+                            <span class="to-social-issues" title="{{ 'see social issues'|trans }}"></span>
+                        </button>
+                        <button class="carousel-control-next justify-content-end visually-hidden" type="button" data-bs-target="#ACHeaderSlider" data-bs-slide="next">
+                            <span class="to-persons-associated" title="{{ 'see persons associated'|trans }}"></span>
+                        </button>
+                    </div>
+                </div>
 
 			</div>
 		</div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig
new file mode 100644
index 000000000..f0c819b35
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig
@@ -0,0 +1,28 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% block content %}
+    <h1>{{ "Close accompanying course"|trans }}</h1>
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.closingDate) }}
+    {{ form_row(form.closingMotive) }}
+
+    {% set accompanying_course_id = null %}
+    {% if accompanyingCourse %}
+        {% set accompanying_course_id = accompanyingCourse.id %}
+    {% endif %}
+
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ chill_return_path_or('chill_person_accompanying_course_index',  {'accompanying_period_id' : accompanyingCourse.id}) }}" class="btn btn-cancel">
+                    {{ 'Return'|trans }}
+                </a>
+            </li>
+            <li>
+                <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+
+    {{ form_end(form) }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 612c3a46b..cdd0363b4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -4,91 +4,111 @@
     {{ 'Resume Accompanying Course'|trans }}
 {% endblock %}
 
-{%  macro button_person(person) %}
-    {% if person.isSharingHousehold %}
-        <li>
-            <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': person.getCurrentHousehold.id }) }}"
-               class="btn btn-sm btn-chill-beige" title="{{ 'Show household'|trans ~ ' n° ' ~ person.getCurrentHousehold.id }}">
-                <i class="fa fa-home"></i>
-            </a>
-        </li>
-    {% endif %}
+{% macro insert_onthefly(type, entity) %}
+    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+        action: 'show', displayBadge: true,
+        targetEntity: { name: type, id: entity.id },
+        buttonText: entity|chill_entity_render_string
+    } %}
 {% endmacro %}
 
 {% block js %}
 {{ parent() }}
 {{ encore_entry_script_tags('page_accompanying_course_index_person_locate') }}
+{{ encore_entry_script_tags('page_accompanying_course_index_masonry') }}
 {% endblock %}
 
 {% block content %}
-<div class="accompanyingcourse-resume row">
+<div class="accompanyingcourse-resume">
 
-    <div class="associated-persons mb-5">
-        {% for h in participationsByHousehold %}
-            {% set householdClass = (h.household is not null) ? 'household-' ~ h.household.id : 'no-household alert alert-warning' %}
-            {% set householdTitle = (h.household is not null) ?
-                'household.Household number'|trans({'household_num': h.household.id }) : 'household.Never in any household'|trans %}
-            <span class="household {{ householdClass }}" title="{{ householdTitle }}">
-                {% if h.household is not null %}
-                    <a href="{{ path('chill_person_household_summary', { 'household_id': h.household.id }) }}"
-                       title="{{ 'household.Household number'|trans({'household_num': h.household.id }) }}"
-                    ><i class="fa fa-home fa-fw"></i></a>
-                {% endif %}
-                {% for p in h.members %}
-
-                    {# include vue_onthefly component #}
-                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                        targetEntity: { name: 'person', id: p.person.id },
-                        action: 'show',
-                        displayBadge: true,
-                        buttonText: p.person|chill_entity_render_string
-                    } %}
-
-                {% endfor %}
-            </span>
-        {% endfor %}
-    </div>
-
-    {% if 'DRAFT' == accompanyingCourse.step %}
-        <div class="col-md-6 warnings mb-5">
-            {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
-        </div>
-    {% endif %}
-
-    {% if 'DRAFT' != accompanyingCourse.step %}
-        {% if withoutHousehold|length > 0 %}
-            <div class="col-md-6 warnings mb-5">
-                {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
+    <div id="dashboards" class="row" data-masonry='{"percentPosition": true }'>
+        {% if 'DRAFT' == accompanyingCourse.step %}
+            <div class="col-4 warnings mb-4">
+                {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
             </div>
         {% endif %}
-    {% endif %}
 
-    {% if accompanyingCourse.locationStatus == 'address' or accompanyingCourse.locationStatus == 'none' %}
-        <div class="col-md-6 warnings mb-5">
-            {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
-        </div>
-    {% endif %}
-
-    <div class="col-md-6 location mb-5">
-        {% if accompanyingCourse.locationStatus == 'person' %}
-            <h2>{{ 'This course is located by'|trans }}</h2>
-            <h4>{{ accompanyingCourse.personLocation|chill_entity_render_string }}</h4>
-        {%  elseif accompanyingCourse.locationStatus == 'address' %}
-            <h4>{{ 'This course has a temporarily location'|trans }}</h4>
+        {% if 'DRAFT' != accompanyingCourse.step %}
+            {% if withoutHousehold|length > 0 %}
+                <div class="col-4 warnings mb-4">
+                    {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
+                </div>
+            {% endif %}
         {% endif %}
 
-        {% if accompanyingCourse.locationStatus != 'none' %}
-            {{ accompanyingCourse.location|chill_entity_render_box }}
+        {% if accompanyingCourse.locationStatus == 'address'
+            or accompanyingCourse.locationStatus == 'none' %}
+            <div class="col-4 warnings mb-4">
+                {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
+            </div>
+        {% endif %}
+
+        <div class="col col-sm-6 col-lg-4 location mb-4">
+            {% if accompanyingCourse.locationStatus == 'person' %}
+                <h2>{{ 'This course is located by'|trans }}</h2>
+                <h4>{{ accompanyingCourse.personLocation|chill_entity_render_string }}</h4>
+            {%  elseif accompanyingCourse.locationStatus == 'address' %}
+                <h4>{{ 'This course has a temporarily location'|trans }}</h4>
+            {% endif %}
+
+            {% if accompanyingCourse.locationStatus != 'none' %}
+                {{ accompanyingCourse.location|chill_entity_render_box }}
+            {% endif %}
+        </div>
+
+        {% if accompanyingCourse.participations is not empty %}
+            <div class="col col-sm-6 col-lg-4 persons mb-4">
+                <h4 class="item-key">{{ 'Persons associated'|trans }}</h4>
+                {% for r in accompanyingCourse.participations %}
+                    {{ _self.insert_onthefly('person', r.person) }}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {% if accompanyingCourse.resources is not empty %}
+            <div class="col col-sm-6 col-lg-4 resources mb-4">
+                <h4 class="item-key">{{ 'Resources'|trans }}</h4>
+                {% for r in accompanyingCourse.resources %}
+                    {% if r.person is not null %}
+                        {{ _self.insert_onthefly('person', r.person) }}
+                    {% elseif r.thirdParty is not null %}
+                        {{ _self.insert_onthefly('thirdparty', r.thirdParty) }}
+                    {% endif %}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {% if accompanyingCourse.scopes is not empty %}
+            <div class="col col-sm-6 col-lg-4 scopes mb-4">
+                <h4 class="item-key">{{ 'Scopes'|trans }}</h4>
+                <div>
+                    {% for s in accompanyingCourse.scopes  %}
+                        <span>{{ s.name|localize_translatable_string|capitalize }}</span>{% if not loop.last %}, {% endif %}
+                    {% endfor %}
+                </div>
+            </div>
+        {% endif %}
+
+        {% if accompanyingCourse.requestorPerson is not null or accompanyingCourse.requestorThirdParty is not null %}
+            <div class="col col-sm-6 col-lg-4 requestor mb-4">
+                {% if accompanyingCourse.requestorPerson is not null %}
+                    <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
+                    {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}
+                {% elseif accompanyingCourse.requestorThirdParty is not null %}
+                    <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
+                    {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}
+                {% endif %}
+            </div>
         {% endif %}
     </div>
 
-    <div class="social-actions mb-5">
-        <h2 class="mb-3">{{ 'Last social actions'|trans }}</h2>
+    <div class="social-actions my-4">
+        <h2 class="mb-3 visually-hidden">{{ 'Last social actions'|trans }}</h2>
         {% include 'ChillPersonBundle:AccompanyingCourseWork:list_recent_by_accompanying_period.html.twig' with {'buttonText': false } %}
     </div>
 
     {% block contentActivity %}
-    <div class="activities mb-5">
+    <div class="activities my-4">
         {% set person = null %}
 
         {% set person_id = null %}
@@ -101,8 +121,7 @@
             {% set accompanying_course_id = accompanyingCourse.id %}
         {% endif %}
 
-        <h2 class="mb-3">{{ 'Last activities' |trans }}</h2>
-
+        <h2 class="mb-3 visually-hidden">{{ 'Last activities' |trans }}</h2>
         {% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
     </div>
     {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
index b1d4682d8..b09f91cfd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig
@@ -18,6 +18,7 @@
     window.accompanyingCourse = {{ json|json_encode|raw }};
   </script>
 
+  {{ parent() }}
   {{ encore_entry_script_tags('vue_accourse_work_create') }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/delete.html.twig
new file mode 100644
index 000000000..37a6812bb
--- /dev/null
+++ b/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"></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 %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
index 92b1919af..844b2d611 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig
@@ -7,7 +7,217 @@
 
         <h1>{{ block('title') }}</h1>
 
-        {% include 'ChillPersonBundle:AccompanyingCourseWork:list_by_accompanying_period.html.twig' %}
+        {% if works|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
+                <a class="btn btn-sm btn-create"
+                    title="{{ 'accompanying_course_work.create'|trans }}"
+                    href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
+                ></a>
+            </p>
+
+        {% else %}
+            <div class="flex-table accompanying_course_work-list">
+                {% for w in works %}
+                    <div class="item-bloc">
+
+                        <div class="item-row">
+                            <h2 class="badge-title">
+                                <span class="title_label"></span>
+                                <span class="title_action">{{ w.socialAction|chill_entity_render_string }}
+
+                                    <ul class="small_in_title columns mt-1">
+                                        <li>
+                                            <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                                            <b>{{ w.startDate|format_date('short') }}</b>
+                                        </li>
+                                        {% if w.endDate %}
+                                            <li>
+                                                <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                                <b>{{ w.endDate|format_date('short') }}</b>
+                                            </li>
+                                        {% endif %}
+                                    </ul>
+
+                                </span>
+                            </h2>
+                        </div>
+
+                        <div class="item-row separator">
+                            <div class="wrap-list">
+
+                                {% if w.createdBy %}
+                                    <div class="wl-row">
+                                        <div class="wl-col title">
+                                            <h3>{{ 'Referrer'|trans }}</h3>
+                                        </div>
+                                        <div class="wl-col list">
+                                            <p class="wl-item">
+                                                {{ w.createdBy.usernameCanonical|chill_entity_render_string|capitalize }}
+                                            </p>
+                                        </div>
+                                    </div>
+                                {% endif %}
+
+                                {%- if w.persons -%}
+                                    <div class="wl-row">
+                                        <div class="wl-col title">
+                                            <h3>{{ 'Persons in accompanying course'|trans }}</h3>
+                                        </div>
+                                        <div class="wl-col list">
+                                            {% for p in w.persons %}
+                                                <span class="wl-item badge-person">
+                                                    {{ p|chill_entity_render_box({
+                                                        'render': 'raw',
+                                                        'addAltNames': false
+                                                    }) }}
+                                                </span>
+                                            {% endfor %}
+                                        </div>
+                                    </div>
+                                {% endif %}
+
+                                {%- if w.handlingThierParty -%}
+                                    <div class="wl-row">
+                                        <div class="wl-col title">
+                                            <h3>{{ 'Thirdparty handling'|trans }}</h3>
+                                        </div>
+                                        <div class="wl-col list">
+                                            <span class="wl-item badge-thirdparty">
+                                                {{ w.handlingThierParty|chill_entity_render_box({
+                                                    'render': 'raw',
+                                                    'addAltNames': false
+                                                }) }}
+                                            </span>
+                                        </div>
+                                    </div>
+                                {% endif %}
+
+                                {%- if w.socialAction.issue -%}
+                                    <div class="wl-row">
+                                        <div class="wl-col title">
+                                            <h3>{{ 'Social issue'|trans }}</h3>
+                                        </div>
+                                        <div class="wl-col list">
+                                            <p class="wl-item social-issues">
+                                                {{ w.socialAction.issue|chill_entity_render_box }}
+                                            </p>
+                                        </div>
+                                    </div>
+                                {% endif %}
+
+                                {% if w.accompanyingPeriodWorkEvaluations|length > 0 %}
+                                    <div class="wl-row">
+                                        <div class="wl-col title">
+                                            <h3>{{ 'accompanying_course_work.evaluations'|trans }}</h3>
+                                        </div>
+                                        <div class="wl-col list">
+                                            <ul class="small_in_title evaluations mt-1">
+                                                {% for e in w.accompanyingPeriodWorkEvaluations %}
+                                                    <li>
+                                                        {{ e.evaluation.title|localize_translatable_string }}
+
+                                                        <ul class="columns">
+                                                            <li>
+                                                                <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                                                                <b>{{ e.startDate|format_date('short') }}</b>
+                                                            </li>
+                                                            {% if e.endDate %}
+                                                                <li>
+                                                                    <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                                                    <b>{{ e.endDate|format_date('short') }}</b>
+                                                                </li>
+                                                            {% endif %}
+                                                            {% if e.maxDate %}
+                                                                <li>
+                                                                    <span class="item-key">{{ 'accompanying_course_work.max_date'|trans ~ ' : ' }}</span>
+                                                                    <b>{{ e.maxDate|format_date('short') }}</b>
+                                                                </li>
+                                                            {% endif %}
+                                                            {% if e.warningInterval and e.warningInterval.d > 0 %}
+                                                                <li>
+                                                                    {% set days = (e.warningInterval.d + e.warningInterval.m * 30) %}
+                                                                    <span class="item-key">{{ 'accompanying_course_work.warning_interval'|trans ~ ' : ' }}</span>
+                                                                    {{ 'accompanying_course_work.%days% days before max_date'|trans({'%days%': days }) }}
+                                                                </li>
+                                                            {% endif %}
+                                                        </ul>
+
+                                                    </li>
+                                                {% endfor %}
+                                            </ul>
+                                        </div>
+                                    </div>
+                                {% endif %}
+
+                            </div>
+                        </div>
+
+                        <div class="item-row column">
+                        {# SEULEMENT SI DÉTAILLÉ
+                            {% if w.results|length > 0 %}
+                                <div class="objective_results without-objectives">
+                                    <div class="objective">
+                                        <h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
+                                        <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
+                                    </div>
+                                    <div class="results">
+                                        <h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
+                                        <ul class="result_list">
+                                            {% for r in w.results %}
+                                                <li>{{ r.title|localize_translatable_string }}</li>
+                                            {% endfor %}
+                                        </ul>
+                                    </div>
+                                </div>
+                            {% endif %}
+                            {% if w.goals|length > 0 %}
+                                {% for g in w.goals %}
+                                    <div class="objective_results with-objectives">
+                                        <div class="objective">
+                                            <h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
+                                            <ul class="goal_title"><li>{{ g.goal.title|localize_translatable_string }}</li></ul>
+                                        </div>
+                                        <div class="results">
+                                            <h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
+                                            {% if g.results|length == 0 %}
+                                                <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
+                                            {% else %}
+                                                <ul class="result_list">
+                                                    {% for r in g.results %}
+                                                        <li>{{ r.title|localize_translatable_string }}</li>
+                                                    {% endfor %}
+                                                </ul>
+                                            {% endif %}
+                                        </div>
+                                    </div>
+                                {% endfor %}
+                            {% endif %}
+                        #}
+                        </div>
+
+                        <div class="item-row separator">
+                            <div class="updatedBy">
+                                {{ 'Last updated by'|trans}} <b>{{ w.updatedBy|chill_entity_render_box }}</b>,<br>
+                                {{ 'le ' ~ w.updatedAt|format_datetime('long', 'short') }}
+                            </div>
+                            <ul class="record_actions">
+                                <li>
+                                    <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
+                                       href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+                                    ></a>
+                                </li>
+                                <li>
+                                    <a class="btn btn-delete" title="{{ 'Delete'|trans }}"
+                                       href="{{ path('chill_person_accompanying_period_work_delete', { 'id': w.id } ) }}"
+                                    ></a>
+                                </li>
+                            </ul>
+                        </div>
+
+                    </div>
+                {% endfor %}
+            </div>
+        {% endif %}
 
         <ul class="record_actions sticky-form-buttons">
             <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
deleted file mode 100644
index dd8beded5..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ /dev/null
@@ -1,113 +0,0 @@
-  {% if works|length == 0 %}
-    <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
-      <a class="btn btn-sm btn-create"
-        href="" title="TODO"></a>{# TODO link #}
-    </p>
-  {% endif %}
-
-  <div class="flex-table accompanying_course_work-list">
-    {% for w in works %}
-      <div class="item-bloc">
-        <div class="item-row">
-
-          <h2 class="badge-title">
-            <span class="title_label">{{ 'accompanying_course_work.action'|trans }}</span>
-            <span class="title_action">{{ w.socialAction|chill_entity_render_string }}</span>
-          </h2>
-
-        </div>
-        <div class="item-row separator">
-
-          <div class="timeline">
-            <ul>
-              <li class="completed">
-                <div class="date">
-                  <span>{{ w.startDate|format_date('long') }}</span>
-                </div>
-                <div class="label">
-                  <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
-                </div>
-              </li>
-              {% if w.endDate == null %}
-              <li>
-                <div class="label no-label"></div>
-              </li>
-              {% else %}
-              <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
-                <div class="date">
-                  <span>{{ w.endDate|format_date('long') }}</span>
-               </div>
-                <div class="label">
-                  <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
-                </div>
-              </li>
-              {% endif %}
-            </ul>
-          </div>
-
-        </div>
-        <div class="">
-
-          {% if w.results|length > 0 and w.goals|length > 0 %}
-
-          {% endif %}
-          {% if w.results|length > 0 %}
-            <div class="objective_results without-objectives">
-              <div class="objective">
-                <h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
-                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
-              </div>
-              <div class="results">
-                <h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
-                <ul class="result_list">
-                  {% for r in w.results %}
-                    <li>{{ r.title|localize_translatable_string }}</li>
-                  {% endfor %}
-                </ul>
-              </div>
-            </div>
-          {% endif %}
-          {% if w.goals|length > 0 %}
-            {% for g in w.goals %}
-              <div class="objective_results with-objectives">
-                <div class="objective">
-                  <h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4>
-                  <ul class="goal_title"><li>{{ g.goal.title|localize_translatable_string }}</li></ul>
-                </div>
-                <div class="results">
-                  <h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4>
-                  {% if g.results|length == 0 %}
-                    <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
-                  {% else %}
-                    <ul class="result_list">
-                      {% for r in g.results %}
-                        <li>{{ r.title|localize_translatable_string }}</li>
-                      {% endfor %}
-                    </ul>
-                  {% endif %}
-                </div>
-              </div>
-            {% endfor %}
-          {% endif %}
-
-        </div>
-        <div class="item-row separator">
-
-          <div class="updatedBy">
-            {{ 'Last updated by'|trans}} <b>{{ w.updatedBy|chill_entity_render_box }}</b>,<br>
-            {{ 'le ' ~ w.updatedAt|format_datetime('long', 'short') }}
-          </div>
-          <ul class="record_actions">
-            <li>
-              <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
-                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>
-          </ul>
-
-        </div>
-      </div>
-    {% endfor %}
-  </div>
-
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index 61f48aa76..b5fcb6c40 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
@@ -1,31 +1,80 @@
-  {% if works|length == 0 %}
-    <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
-      <a class="btn btn-sm btn-create"
-        href="" title="TODO"></a>{# TODO link #}
-    </p>
-  {% endif %}
-
   <div class="accompanying_course_work-list">
     {% for w in works | slice(0,5) %}
-        <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"></a>
 
-        <h2 class="badge-title">
-            <span class="title_label">{{ 'accompanying_course_work.action'|trans }}</span>
-            <span class="title_action">{{ w.socialAction|chill_entity_render_string }}
+    <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+       class="dashboard-link" title="{{ 'crud.social_action.title_link'|trans }}">
+
+        <div class="dashboard">
+            <span class="title_label"></span>
+            <span class="title_action"><span class="like-h3">{{ w.socialAction|chill_entity_render_string }}</span>
+
+                <ul class="small_in_title columns mt-3">
+                    <li>
+                        <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                        <b>{{ w.startDate|format_date('short') }}</b>
+                    </li>
+                    {% if w.endDate %}
+                    <li>
+                        <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                        <b>{{ w.endDate|format_date('short') }}</b>
+                    </li>
+                    {% endif %}
+                </ul>
 
                 <ul class="small_in_title">
+                    {% if w.handlingThierParty %}
                     <li>
-                        <abbr title="{{ 'accompanying_course_work.start_date'|trans }}">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</abbr>
-                        {{ w.startDate|format_date('short') }}
+                        <span class="item-key">{{ 'Thirdparty handling'|trans ~ ' : ' }}</span>
+                        <span class="badge-thirdparty">{{ w.handlingThierParty|chill_entity_render_box }}</span>
                     </li>
-                    <li>
-                        <abbr title="{{ 'Last updated by'|trans }}">{{ 'Last updated by'|trans ~ ' : ' }}</abbr>
-                        {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('short', 'short') }}
+                    {% endif %}
+                    <li class="associated-persons">
+                        <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
+                        {% for p in w.persons %}
+                            <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                        {% endfor %}
                     </li>
                 </ul>
 
+                <ul class="list-content my-3">
+                    <li class="social-issues">
+                        {{ w.socialAction.issue|chill_entity_render_box }}
+                    </li>
+                </ul>
+
+                <ul class="small_in_title evaluations mb-3">
+                    {% for e in w.accompanyingPeriodWorkEvaluations %}
+                        <li>
+                            <span class="item-key">{{ 'accompanying_course_work.social_evaluation'|trans ~ ' : ' }}</span>
+                            {{ e.evaluation.title|localize_translatable_string }}
+                            <ul class="columns">
+                                {% if e.startDate %}
+                                <li>
+                                    <span class="item-key">{{ 'accompanying_course_work.start_date'|trans ~ ' : ' }}</span>
+                                    <b>{{ e.startDate|format_date('short') }}</b>
+                                </li>
+                                {% endif %}
+                                {% if e.endDate %}
+                                    <li>
+                                    <span class="item-key">{{ 'accompanying_course_work.end_date'|trans ~ ' : ' }}</span>
+                                    <b>{{ e.endDate|format_date('short') }}</b>
+                                </li>
+                                {% endif %}
+                            </ul>
+                        </li>
+                    {% endfor %}
+                </ul>
+
+                <div class="metadata text-end" style="font-size: 60%">
+                    {{ 'Last updated by'|trans }}
+                    <span class="user">{{ w.updatedBy|chill_entity_render_box }}</span>:
+                    <span class="date">{{ w.updatedAt|format_datetime('short', 'short') }}</span>
+                </div>
+
             </span>
-        </h2>
+        </div>
+
+    </a>{# {{ dump(w) }} #}
     {% endfor %}
   </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index a53a7c0d0..af8657e28 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -21,8 +21,10 @@
                             <div class="wh-col">
                                 {% if accompanying_period.step == 'DRAFT' %}
                                     <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
-                                {% else %}
+                                {% elseif accompanying_period.step == 'CONFIRMED' %}
                                     <span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
+                                {% else %}
+                                    <span class="badge bg-primary">{{- 'Closed'|trans|upper -}}</span>
                                 {% endif %}
                             </div>
                         </div>
@@ -77,7 +79,7 @@
                             <div class="wl-row">
                                 <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
                                 <div class="wl-col list">
-                                    {% for p in accompanying_period.participations %}
+                                    {% for p in accompanying_period.getCurrentParticipations %}
                                         <span class="wl-item badge-person">
                                             <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
                                                 {{ p.person|chill_entity_render_string }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 0d0aa289b..61bf3e83b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -10,6 +10,7 @@
     * addAge        bool
     * addCenter     bool
     * hLevel        integer
+    * addDeath      bool
     * address_multiline     bool
     * customButtons [
         'before'    Twig\Markup, (injected with macro)
@@ -24,7 +25,12 @@
 
 {% macro raw(person, options) %}
     <span class="firstname">{{ person.firstName }}</span>
-    <span class="lastname">{{ person.lastName }}</span>
+    <span class="lastname">
+        {{ person.lastName }}
+        {%- if options['addDeath'] -%}
+            {% if person.deathdate is not null %} (‡){% endif %}
+        {% endif %}
+    </span>
     {%- if options['addAltNames'] -%}
         <span class="altnames">
         {%- for n in person.altNames -%}
@@ -62,12 +68,12 @@
             {%- endif -%}
             {%- if options['addId'] -%}
                 <span class="id-number" title="{{ 'Person'|trans ~ ' n° ' ~ person.id }}">
-                    {{ person.id|upper }}
+                    {{ person.id|upper -}}
                 </span>
             {%- endif -%}
         </div>
         {%- if options['addInfo'] -%}
-            {% set gender = (person.gender == 'woman') ? 'fa-venus' : 
+            {% set gender = (person.gender == 'woman') ? 'fa-venus' :
                 (person.gender == 'man') ? 'fa-mars' : (person.gender == 'neuter') ? 'fa-neuter' : 'fa-genderless' %}
             {% set genderTitle = (person.gender == 'woman') ? 'woman' :
                 (person.gender == 'man') ? 'man' : (person.gender == 'neuter') ? 'neuter' : 'Not given'|trans %}
@@ -82,21 +88,17 @@
                     {{ 'Date of death'|trans }}:
                 {%- endif -%}
                 {#- must be on one line to avoid spaces with dash -#}
-                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'Deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
-                {% if options['addAge'] %}
-                    <span class="age">
-                        ({{ 'years_old'|trans({ 'age': person.age }) }})
-                    </span>
-                {% endif %}
+                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
+                {%- if options['addAge'] -%}
+                    <span class="age">{{ 'years_old'|trans({ 'age': person.age }) }}</span>
+                {%- endif -%}
             {%- elseif person.birthdate is not null -%}
                 <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
                 {{ 'Born the date'|trans({'gender': person.gender,
                     'birthdate': person.birthdate|format_date("medium") }) }}
                 </time>
                 {%- if options['addAge'] -%}
-                    <span class="age">
-                        ({{ 'years_old'|trans({ 'age': person.age }) }})
-                    </span>
+                    <span class="age">{{- 'years_old'|trans({ 'age': person.age }) -}}</span>
                 {%- endif -%}
             {%- endif -%}
             </p>
@@ -123,13 +125,15 @@
     </div>
     <div class="item-col">
         <ul class="list-content fa-ul">
-            {% set multiline = (options['address_multiline']) ? true : false %}
-            {{ person.getLastAddress|chill_entity_render_box({
-                'render': 'list',
-                'with_picto': true,
-                'multiline': multiline,
-                'with_valid_from': false
-            }) }}
+            {% if person.getCurrentPersonAddress is not null %}
+                {% set multiline = (options['address_multiline']) ? true : false %}
+                {{ person.getCurrentPersonAddress|chill_entity_render_box({
+                    'render': 'list',
+                    'with_picto': true,
+                    'multiline': multiline,
+                    'with_valid_from': false
+                }) }}
+            {% endif %}
             <li>
                 {% if person.mobilenumber %}
                     <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ person.mobilenumber }}">
@@ -146,10 +150,12 @@
                     {% endif %}
                 {% endif %}
             </li>
-            {% if options['addCenter'] and person|chill_resolve_center is not null %}
+            {% if options['addCenter'] and person|chill_resolve_center|length > 0 %}
                 <li>
                     <i class="fa fa-li fa-long-arrow-right"></i>
-                    {{ person|chill_resolve_center.name }}
+                    {% for c in person|chill_resolve_center %}
+                        {{  c.name|upper }}{% if not loop.last %}, {% endif %}
+                    {% endfor %}
                 </li>
             {% endif %}
         </ul>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
index d06559950..5a8d2acf8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -9,6 +9,37 @@
 
     {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
+    {% if accompanying_periods_old|length > 0 %}
+        <style>
+                button[aria-expanded="true"] > span.folded,
+                button[aria-expanded="false"] > span.unfolded { display: none; }
+                button[aria-expanded="false"] > span.folded,
+                button[aria-expanded="true"] > span.unfolded { display: inline; }
+            </style>
+            <div class="accordion" id="nonCurrent">
+                <div class="accordion-item">
+                    <h2 class="accordion-header" id="heading_{{ household.id }}">
+                        <button
+                            class="accordion-button collapsed"
+                            type="button"
+                            data-bs-toggle="collapse"
+                            data-bs-target="#collapse_{{ household.id }}"
+                            aria-expanded="false"
+                            aria-controls="collapse_{{ household.id }}">
+                            <span class="folded">{{ 'household.Show accompanying periods of past or future memberships'|trans({'length': accompanying_periods_old|length}) }}</span>
+                            <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
+                        </button>
+                    </h2>
+                    <div id="collapse_{{ household.id }}"
+                        class="accordion-collapse collapse"
+                        aria-labelledby="heading_{{ household.id }}"
+                        data-bs-parent="#nonCurrent">
+                        {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
+                    </div>
+                </div>
+            </div>
+    {% endif %}
+
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index 990a7cdd3..50822794c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -22,8 +22,11 @@
 
                             {%- for m in members -%}
                                 <span
-                                    class="badge-member{%- if m.holder %} holder{% endif -%}{%- if m.position.ordering >= 2 %} child{% endif -%}"
-                                    title="{{ m.position.label.fr }}">
+                                    class="badge-member{%- if m.holder %} holder{% endif -%}"
+                                    {% if m.position is not null %}
+                                        title="{{ m.position.label.fr }}"
+                                    {% endif %}
+                                >
                                     <a href="{{ path('chill_person_view', { person_id: m.person.id}) }}">
                                         {%- if m.holder %}
                                             <span class="fa-stack fa-holder" title="{{ 'household.holder'|trans }}">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
index 301054666..ee578203a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig
@@ -4,7 +4,7 @@
 {% block title 'household.Edit household members'|trans  %}
 
 {% block content %}
-<div class="household-members">
+<div class="col-md-10 col-xxl household-members">
 
     <h1>{{ block('title') }}</h1>
     <div id="household_members_editor"></div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/relationship.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/relationship.html.twig
index 5d5fc77af..acaeebb96 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/relationship.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/relationship.html.twig
@@ -2,26 +2,35 @@
 
 {% block title 'household.Relationship'|trans %}
 
-{% block content %}
-    <h1>{{ block('title') }}</h1>
-    <div id="graph-relationship"></div>
+{#
+     Give more space to graph:
+     * use parent twig block (layout_wvm_content)
+     * hide title (d-none)
+     * apply negative margin-top
+#}
+{% block layout_wvm_content %}
+<div class="row justify-content-center">
 
-    {% for m in household.members %}
-        {% if m.endDate is null %}
-            {{ dump(m) }}
-        {% endif %}
-    {% endfor %}
+    <div class="col-md-10 col-xxl d-none">
+        <h1>{{ block('title') }}</h1>
+    </div>
 
+    <div id="relationship-graph"
+        style="margin-top: -3rem"
+        data-persons="{{ persons|e('html_attr') }}"
+        data-household-id="{{ household.id|e('html_attr') }}">
+    </div>
+</div>
+{% endblock %}
+
+{% block block_post_menu %}
+    <div id="visgraph-legend"></div>
 {% endblock %}
 
 {% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('page_vis') }}
+    {{ encore_entry_script_tags('vue_visgraph') }}
 {% endblock %}
 
 {% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('page_vis') }}
+    {{ encore_entry_link_tags('vue_visgraph') }}
 {% endblock %}
-
-{% block block_post_menu %}{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index e99c1dc1a..3567d1f7e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -106,81 +106,95 @@
 
     <h2 class="my-5">{{ 'household.Household members'|trans }}</h2>
 
-    {% for p in positions %}
-    <div class="mb-5">
-      <h3>{{ p.label|localize_translatable_string }}
-          {% if false == p.shareHousehold %}
-              <i class="chill-help-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true"
-                 title="{{ 'household.Those members does not share address'|trans }}"></i>
-          {% endif %}
-      </h3>
+    {% for p in positions|merge([ '_none' ]) %}
 
-      {%- set members = household.currentMembersByPosition(p) %}
+        {% if p == '_none' %}
+            {% set members = household.currentMembersWithoutPosition %}
+            {% set old_members = household.nonCurrentMembersWithoutPosition %}
+        {% else %}
+            {%- set members = household.currentMembersByPosition(p) %}
+            {% set old_members = household.nonCurrentMembersByPosition(p) %}
+        {% endif %}
 
-      {% macro customButtons(member, household) %}
-          <li>
-              <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
-                 class="btn btn-sm btn-unlink" title="{{ 'household.person.leave'|trans }}"></a>
-          </li>
-          <li>
-              <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
-                 class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
-          </li>
-      {% endmacro %}
+        {% if not (p == '_none' and members|length == 0 and old_members|length == 0) %}
+            <div class="mb-5">
+                {% if p != '_none' %}
+                  <h3>{{ p.label|localize_translatable_string }}
+                      {% if false == p.shareHousehold %}
+                          <i class="chill-help-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true"
+                             title="{{ 'household.Those members does not share address'|trans }}"></i>
+                      {% endif %}
+                  </h3>
+                {% else %}
+                    <h3 class="chill-entity">{{ 'household.Members without position'|trans }}</h3>
+                {% endif %}
 
-      {% if members|length > 0 %}
-        <div class="flex-table list-household-members">
-          {% for m in members %}
-              {% include '@ChillPerson/Household/_render_member.html.twig' with {
-                  'member': m,
-                  'customButtons': { 'after': _self.customButtons(m, household) }
-              } %}
-          {% endfor %}
-        </div>
-      {% else %}
-        <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
-      {% endif %}
 
-      {% set members = household.nonCurrentMembersByPosition(p) %}
-      {% if members|length > 0 %}
+              {% macro customButtons(member, household) %}
+                  <li>
+                      <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
+                         class="btn btn-sm btn-unlink" title="{{ 'household.person.leave'|trans }}"></a>
+                  </li>
+                  <li>
+                      <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
+                         class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
+                  </li>
+              {% endmacro %}
 
-        <style>
-            button[aria-expanded="true"] > span.folded,
-            button[aria-expanded="false"] > span.unfolded { display: none; }
-            button[aria-expanded="false"] > span.folded,
-            button[aria-expanded="true"] > span.unfolded { display: inline; }
-        </style>
-        <div class="accordion" id="nonCurrent">
-            <div class="accordion-item">
-                <h2 class="accordion-header" id="heading_{{ p.id }}">
-                    <button
-                        class="accordion-button collapsed"
-                        type="button"
-                        data-bs-toggle="collapse"
-                        data-bs-target="#collapse_{{ p.id }}"
-                        aria-expanded="false"
-                        aria-controls="collapse_{{ p.id }}">
-                        <span class="folded">{{ 'household.Show future or past memberships'|trans({'length': members|length}) }}</span>
-                        <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
-                    </button>
-                </h2>
-                <div id="collapse_{{ p.id }}"
-                    class="accordion-collapse collapse"
-                    aria-labelledby="heading_{{ p.id }}"
-                    data-bs-parent="#nonCurrent">
-                    <div class="flex-table my-0 list-household-members">
-                        {% for m in members %}
-                            {% include '@ChillPerson/Household/_render_member.html.twig' with { 'member': m } %}
-                        {% endfor %}
+              {% if members|length > 0 %}
+                <div class="flex-table list-household-members">
+                  {% for m in members %}
+                      {% include '@ChillPerson/Household/_render_member.html.twig' with {
+                          'member': m,
+                          'customButtons': { 'after': _self.customButtons(m, household) }
+                      } %}
+                  {% endfor %}
+                </div>
+              {% else %}
+                <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
+              {% endif %}
+
+              {% if old_members|length > 0 %}
+                <style>
+                    button[aria-expanded="true"] > span.folded,
+                    button[aria-expanded="false"] > span.unfolded { display: none; }
+                    button[aria-expanded="false"] > span.folded,
+                    button[aria-expanded="true"] > span.unfolded { display: inline; }
+                </style>
+                <div class="accordion" id="nonCurrent">
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="heading_{{ p == '_none' ? '_none' : p.id }}">
+                            <button
+                                class="accordion-button collapsed"
+                                type="button"
+                                data-bs-toggle="collapse"
+                                data-bs-target="#collapse_{{ p == '_none' ? '_none' : p.id }}"
+                                aria-expanded="false"
+                                aria-controls="collapse_{{ p == '_none' ? '_none' : p.id }}">
+                                <span class="folded">{{ 'household.Show future or past memberships'|trans({'length': old_members|length}) }}</span>
+                                <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
+                            </button>
+                        </h2>
+                        <div id="collapse_{{ p == '_none' ? '_none' : p.id }}"
+                            class="accordion-collapse collapse"
+                            aria-labelledby="heading_{{ p == '_none' ? '_none' : p.id }}"
+                            data-bs-parent="#nonCurrent">
+                            <div class="flex-table my-0 list-household-members">
+                                {% for m in old_members %}
+                                    {% include '@ChillPerson/Household/_render_member.html.twig' with { 'member': m } %}
+                                {% endfor %}
+                            </div>
+                        </div>
                     </div>
                 </div>
-            </div>
-        </div>
-      {% endif %}
+              {% endif %}
 
-    </div>
+            </div>
+        {% endif %}
     {% endfor %}
 
+
+
     <ul class="record_actions">
       <li>
         <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
index 378eda5c5..75acc93a7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig
@@ -17,18 +17,14 @@
         {%- endif -%}
     </div>
     <div class="text-md-end">
-        {% if person|chill_resolve_center is not null %}
+        {% if person|chill_resolve_center|length > 0 %}
             <span class="open_sansbold">
                 {{ 'Center'|trans|upper}} :
             </span>
 
-            {% if person|chill_resolve_center is iterable %}
-                {% for c in person|chill_resolve_center %}
-                    {{  c.name|upper }}{% if not loop.last %}, {% endif %}
-                {% endfor %}
-            {% else %}
-                {{  person|chill_resolve_center.name|upper }}
-            {% endif %}
+            {% for c in person|chill_resolve_center %}
+                {{  c.name|upper }}{% if not loop.last %}, {% endif %}
+            {% endfor %}
 
         {%- endif -%}
     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 799d71e19..857e33abe 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -83,7 +83,7 @@
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
             <a class="btn btn-create dropdown-toggle"
-               href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
+            href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
                 {{ 'Add the person'|trans }}
             </a>
             <ul class="dropdown-menu" aria-labelledby="newPersonMore">
@@ -93,10 +93,7 @@
                 <li>
                     {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
                 </li>
-                <li>
-                    {{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
-                </li>
-            </ul>
+           </ul>
         </li>
     </ul>
 
@@ -106,5 +103,5 @@
 {% endblock content %}
 
 {% block js %}
-    {{ encore_entry_script_tags('mod_disablebuttons') }}
+    {# {{ encore_entry_script_tags('mod_disablebuttons') }} #}
 {% endblock js %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 2bb7fa4bb..d394a75a8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -37,6 +37,9 @@
 
     <fieldset>
         <legend><h2>{{ 'General information'|trans }}</h2></legend>
+        {%- if form.civility is defined -%}
+        {{ form_row(form.civility, {'label' : 'Civility'}) }}
+        {% endif %}
         {{ form_row(form.firstName, {'label' : 'First name'}) }}
         {{ form_row(form.lastName, {'label' : 'Last name'}) }}
         {% if form.altNames is defined %}
@@ -95,6 +98,8 @@
             <div id="personEmail">
                 {{ form_row(form.email, {'label': 'Email'}) }}
             </div>
+        {% endif %}
+        {%- if form.acceptEmail is defined -%}
             <div id="personAcceptEmail">
                 {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
             </div>
@@ -135,12 +140,11 @@
             </button>
         </li>
     </ul>
-
     {{ form_end(form) }}
 
 </div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('page_person') }}
+    {{ encore_entry_script_tags('page_person') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index 172d564e2..f28115d8d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -1,7 +1,12 @@
-{%  macro button_person(person) %}
+{% macro button_person_after(person) %}
+    {% set household = person.getCurrentHousehold %}
+    {% if household is not null %}
+        <li>
+            <a href="{{ path('chill_person_household_summary', { 'household_id': household.id }) }}" class="btn btn-sm btn-chill-beige"><i class="fa fa-home"></i></a>
+        </li>
+    {% endif %}
     <li>
-        <a href="{{ path('chill_person_accompanying_course_new', { 'person_id': [ person.id ]}) }}"
-           class="btn btn-sm btn-create change-icon" title="{{ 'Create an accompanying period'|trans }}"><i class="fa fa-random"></i></a>
+        <a href="{{ path('chill_person_accompanying_course_new', { 'person_id': [ person.id ]}) }}" class="btn btn-sm btn-create change-icon" title="{{ 'Create an accompanying period'|trans }}"><i class="fa fa-random"></i></a>
     </li>
 {% endmacro %}
 
@@ -53,10 +58,10 @@
                         'addLink': true,
                         'addInfo': true,
                         'addAge': true,
-                        'addAltNames': false,
+                        'addAltNames': true,
                         'addCenter': true,
                         'address_multiline': false,
-                        'customButtons': { 'after': _self.button_person(person) }
+                        'customButtons': { 'after': _self.button_person_after(person) }
                     }) }}
 
                     {#- 'acps' is for AcCompanyingPeriodS #}
@@ -76,12 +81,20 @@
                                     <div class="wl-row separator">
                                         <div class="wl-col title">
 
-                                            <div class="date">
-                                                {% if acp.requestorPerson == person %}
-                                                    <span class="as-requestor badge bg-info" title="{{ 'Requestor'|trans|e('html_attr') }}">
+                                            {% if acp.step == 'DRAFT' %}
+                                                <div class="is-draft">
+                                                    <span class="course-draft badge bg-secondary" title="{{ 'course.draft'|trans }}">{{ 'course.draft'|trans }}</span>
+                                                </div>
+                                            {% endif %}
+                                            {% if acp.requestorPerson == person %}
+                                               <div>
+                                                <span class="as-requestor badge bg-info" title="{{ 'Requestor'|trans|e('html_attr') }}">
                                                        {{ 'Requestor'|trans({'gender': person.gender}) }}
-                                                    </span>
-                                                {% endif %}
+                                                </span>
+                                               </div>
+                                            {% endif %}
+
+                                            <div class="date">
                                                 {% if app != null %}
                                                     {{ 'Since %date%'|trans({'%date%': app.startDate|format_date('medium') }) }}
                                                 {% endif %}
@@ -94,6 +107,11 @@
                                                 </div>
                                             {% endif %}
 
+                                            <div class="courseid">
+                                                {{ 'File number'|trans }} {{ acp.id }}
+                                            </div>
+
+
                                         </div>
                                         <div class="wl-col list">
 
@@ -101,17 +119,76 @@
                                                 {{ issue|chill_entity_render_box }}
                                             {% endfor %}
 
-                                            <ul class="record_actions">
+                                            <ul class="record_actions record_actions_column">
                                                 <li>
                                                     <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
                                                        class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
                                                         <i class="fa fa-random fa-fw"></i>
                                                     </a>
                                                 </li>
+                                                <li>
+                                                </li>
                                             </ul>
 
                                         </div>
                                     </div>
+                                    {% if acp.currentParticipations|length > 1 %}
+                                    <div class="wl-row">
+                                       <div class="wl-col title">
+                                           <div class="participants">
+                                               {{ 'Participants'|trans }}
+                                           </div>
+                                       </div>
+                                        <div class="wl-col list">
+                                            {% set participating = false %}
+                                            {% for part in acp.currentParticipations  %}
+                                                {% if part.person.id != person.id %}
+                                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                        targetEntity: { name: 'person', id: part.person.id },
+                                                        action: 'show',
+                                                        displayBadge: true,
+                                                        buttonText: part.person|chill_entity_render_string
+                                                    } %}
+                                                {% else %}
+                                                    {% set participating = true %}
+                                                {% endif %}
+                                            {% endfor %}
+                                            {% if participating %}
+                                            {{ 'person.and_himself'|trans({'gender': person.gender}) }}
+                                            {% endif %}
+                                        </div>
+                                    </div>
+                                    {% endif %}
+                                        {% if (acp.requestorPerson is not null and acp.requestorPerson.id != person.id) or acp.requestorThirdParty is not null %}
+                                            <div class="wl-row">
+                                                <div class="wl-col title">
+                                                    <div>
+                                                        {% if acp.requestorPerson is not null %}
+                                                            {{ 'Requestor'|trans({'gender': acp.requestorPerson.gender}) }}
+                                                        {% else %}
+                                                            {{ 'Requestor'|trans({'gender': 'other'})}}
+                                                        {% endif %}
+                                                    </div>
+                                                </div>
+                                                <div class="wl-col list">
+                                                    {% if acp.requestorThirdParty is not null %}
+                                                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                        targetEntity: { name: 'thirdparty', id: acp.requestorThirdParty.id },
+                                                        action: 'show',
+                                                        displayBadge: true,
+                                                        buttonText: acp.requestorThirdParty|chill_entity_render_string
+                                                    } %}
+                                                    {% else %}
+                                                        {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                            targetEntity: { name: 'person', id: acp.requestorPerson.id },
+                                                            action: 'show',
+                                                            displayBadge: true,
+                                                            buttonText: acp.requestorPerson|chill_entity_render_string
+                                                        } %}
+                                                    {% endif %}
+                                                </div>
+                                            </div>
+                                        {% endif %}
                                 {% endfor %}
                             </div>
                         </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index cd86add62..3ff3fe47b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -51,6 +51,15 @@ This view should receive those arguments:
             <figure class="person-details">
                 <h2 class="chill-red">{{ 'General information'|trans }}</h2>
                 <dl>
+                    {% if person.civility is not null %}
+                        <dt>{{ 'Civility'|trans }}&nbsp;:</dt>
+                        <dd>
+                        {% if person.civility.name|length > 0 %}
+                        {{ person.civility.name|first }}
+                        {% endif %}
+                        </dd>
+                    {% endif %}
+
                     <dt>{{ 'First name'|trans }}&nbsp;:</dt>
                     <dd>{{ person.firstName }}</dd>
 
@@ -83,6 +92,13 @@ This view should receive those arguments:
                         {%- endif -%}
                     </dd>
 
+                    {%- if chill_person.fields.deathdate == 'visible' -%}
+                        {%- if person.deathdate is not null -%}
+                        <dt>{{ 'Date of death'|trans }}&nbsp;:</dt>
+                        <dd>{{ person.deathdate|format_date('long') }}</dd>
+                        {%- endif -%}
+                    {%- endif -%}
+
                     {%- if chill_person.fields.place_of_birth == 'visible' -%}
                     <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
                     {% if person.placeOfBirth is not empty %}
@@ -102,6 +118,7 @@ This view should receive those arguments:
                                 {% endif %}
                             {% endapply %}</dd>
                     {%- endif -%}
+
                 </dl>
             </figure>
         </div>
@@ -150,12 +167,27 @@ This view should receive those arguments:
                     </dd>
                 </dl>
                 {%- endif -%}
+                {%- if chill_person.fields.number_of_children == 'visible' -%}
+                <dl>
+                    <dt>{{'Number of children'|trans}}&nbsp;:</dt>
+                    <dd>
+                    {% if person.numberOfChildren is not null %}
+                        {{ person.numberOfChildren }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                    </dd>
+                </dl>
+                {%- endif -%}
                 {%- if chill_person.fields.marital_status == 'visible' -%}
                 <dl>
                     <dt>{{'Marital status'|trans}}&nbsp;:</dt>
                     <dd>
                         {% if person.maritalStatus is not null %}
                             {{ person.maritalStatus.name|localize_translatable_string }}
+                            {% if person.maritalStatusDate is not null %}
+                                {{ 'person.from_the'|trans }} {{ person.maritalStatusDate|format_date('long') }}
+                            {% endif %}
                         {% else %}
                             <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                         {% endif %}
@@ -207,13 +239,24 @@ This view should receive those arguments:
                 {%- if chill_person.fields.mobilenumber == 'visible' -%}
                 <dl>
                     <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
-                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}"><pre>{{ person.mobilenumber|chill_format_phonenumber }}</pre></a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                    <p>{% if person.acceptSMS %}{{ 'Accept short text message'|trans }}{% endif %}</p>
                 </dl>
                 {% endif %}
 
-                {# TODO
-                    display collection of others phonenumbers
-                #}
+                {%- if chill_person.fields.mobilenumber == 'visible' -%}
+                {% if person.otherPhoneNumbers is not empty %}
+                <dl>
+                    <dt>{{ 'Others phone numbers'|trans }}&nbsp;:</dt>
+                    {% for el in person.otherPhoneNumbers %}
+                        {% if el.phonenumber is not empty %}
+                        <dd>{% if el.description is not empty %}{{ el.description }}&nbsp;:&nbsp;{% endif %}<a href="tel:{{ el.phonenumber }}">{{ el.phonenumber|chill_format_phonenumber }}</a></dd>
+                        {% endif %}
+                    {% endfor %}
+                    </ul>
+                </dl>
+                {% endif %}
+                {% endif %}
 
                 {%- if chill_person.fields.contact_info == 'visible' -%}
                 <dl>
@@ -250,6 +293,21 @@ This view should receive those arguments:
     </div>
     {% endif %}
 
+    <div class="created-updated">
+        {% if person.createdBy %}
+            <div class="createdBy">
+                {{ 'Created by'|trans}}: <b>{{ person.createdBy|chill_entity_render_box }}</b>,<br>
+                {{ 'on'|trans ~ person.createdAt|format_datetime('long', 'short') }}
+            </div>
+        {% endif %}
+        {% if person.updatedBy %}
+            <div class="updatedBy">
+            {{ 'Last updated by'|trans}}: <b>{{ person.updatedBy|chill_entity_render_box }}</b>,<br>
+            {{ 'on'|trans ~ person.updatedAt|format_datetime('long', 'short') }}
+            </div>
+        {% endif %}
+    </div>
+
     {% if is_granted('CHILL_PERSON_UPDATE', person) %}
     <ul class="sticky-form-buttons record_actions">
         <li>
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
index f62b90006..456b6fca4 100644
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
+++ b/src/Bundle/ChillPersonBundle/Search/PersonSearch.php
@@ -1,261 +1,132 @@
 <?php
 
-/*
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Search;
 
-use Chill\MainBundle\Search\AbstractSearch;
-use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Search\SearchInterface;
-use Chill\MainBundle\Search\ParsingException;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Search\AbstractSearch;
 use Chill\MainBundle\Search\HasAdvancedSearchFormInterface;
+use Chill\MainBundle\Search\ParsingException;
+use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Search\Utils\ExtractDateFromPattern;
+use Chill\MainBundle\Search\Utils\ExtractPhonenumberFromPattern;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\Type\GenderType;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use DateTime;
+use Exception;
+use Symfony\Component\Form\Extension\Core\Type\TelType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Templating\EngineInterface;
+use function array_fill_keys;
+use function array_filter;
+use function array_key_exists;
+use function array_merge;
 
 class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterface
 {
-    protected EngineInterface $templating;
-    protected PaginatorFactory $paginatorFactory;
-    protected PersonACLAwareRepositoryInterface $personACLAwareRepository;
-
-    const NAME = "person_regular";
+    public const NAME = 'person_regular';
 
     private const POSSIBLE_KEYS = [
         '_default', 'firstname', 'lastname', 'birthdate', 'birthdate-before',
-        'birthdate-after', 'gender', 'nationality'
+        'birthdate-after', 'gender', 'nationality', 'phonenumber', 'city',
     ];
 
+    private ExtractDateFromPattern $extractDateFromPattern;
+
+    private ExtractPhonenumberFromPattern $extractPhonenumberFromPattern;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
+
+    private EngineInterface $templating;
+
     public function __construct(
         EngineInterface $templating,
+        ExtractDateFromPattern $extractDateFromPattern,
+        ExtractPhonenumberFromPattern $extractPhonenumberFromPattern,
         PaginatorFactory $paginatorFactory,
         PersonACLAwareRepositoryInterface $personACLAwareRepository
     ) {
         $this->templating = $templating;
+        $this->extractDateFromPattern = $extractDateFromPattern;
+        $this->extractPhonenumberFromPattern = $extractPhonenumberFromPattern;
         $this->paginatorFactory = $paginatorFactory;
         $this->personACLAwareRepository = $personACLAwareRepository;
     }
 
-    /*
-     * (non-PHPdoc)
-     * @see \Chill\MainBundle\Search\SearchInterface::getOrder()
-     */
-    public function getOrder()
-    {
-        return 100;
-    }
-
-    /*
-     * (non-PHPdoc)
-     * @see \Chill\MainBundle\Search\SearchInterface::isActiveByDefault()
-     */
-    public function isActiveByDefault()
-    {
-        return true;
-    }
-
-    public function supports($domain, $format)
-    {
-        return 'person' === $domain;
-    }
-
-    /*
-     * (non-PHPdoc)
-     * @see \Chill\MainBundle\Search\SearchInterface::renderResult()
-     */
-    public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
-    {
-        $total = $this->count($terms);
-        $paginator = $this->paginatorFactory->create($total);
-
-        if ($format === 'html') {
-            return $this->templating->render('@ChillPerson/Person/list_with_period.html.twig',
-                    array(
-                        'persons' => $this->search($terms, $start, $limit, $options),
-                        'pattern' => $this->recomposePattern(
-                            $terms,
-                            \array_filter(self::POSSIBLE_KEYS, fn($item) => $item !== '_default'),
-                            $terms['_domain']
-                        ),
-                        'total' => $total,
-                        'start' => $start,
-                        'search_name' => self::NAME,
-                        'preview' => $options[SearchInterface::SEARCH_PREVIEW_OPTION],
-                        'paginator' => $paginator
-                    ));
-        } elseif ($format === 'json') {
-            return [
-                'results' => $this->search($terms, $start, $limit, \array_merge($options, [ 'simplify' => true ])),
-                'pagination' => [
-                    'more' => $paginator->hasNextPage()
-                ]
-            ];
-        }
-    }
-
-    /**
-     *
-     * @param string $pattern
-     * @param int $start
-     * @param int $limit
-     * @param array $options
-     * @return Person[]
-     */
-    protected function search(array $terms, $start, $limit, array $options = array())
-    {
-        [
-            '_default' => $default,
-            'firstname' => $firstname,
-            'lastname' => $lastname,
-            'birthdate' => $birthdate,
-            'birthdate-before' => $birthdateBefore,
-            'birthdate-after' => $birthdateAfter,
-            'gender' => $gender,
-            'nationality' => $countryCode,
-
-        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
-
-        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
-            if (NULL !== ${$v}) {
-                try {
-                    ${$v} = new \DateTime(${$v});
-                } catch (\Exception $e) {
-                    throw new ParsingException('The date is '
-                          . 'not parsable', 0, $e);
-                }
-            }
-        }
-
-        return $this->personACLAwareRepository
-            ->findBySearchCriteria(
-                $start,
-                $limit,
-                $options['simplify'] ?? false,
-                $default,
-                $firstname,
-                $lastname,
-                $birthdate,
-                $birthdateBefore,
-                $birthdateAfter,
-                $gender,
-                $countryCode,
-            );
-    }
-
-    protected function count(array $terms): int
-    {
-        [
-            '_default' => $default,
-            'firstname' => $firstname,
-            'lastname' => $lastname,
-            'birthdate' => $birthdate,
-            'birthdate-before' => $birthdateBefore,
-            'birthdate-after' => $birthdateAfter,
-            'gender' => $gender,
-            'nationality' => $countryCode,
-
-        ] = $terms + \array_fill_keys(self::POSSIBLE_KEYS, null);
-
-        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
-            if (NULL !== ${$v}) {
-                try {
-                    ${$v} = new \DateTime(${$v});
-                } catch (\Exception $e) {
-                    throw new ParsingException('The date is '
-                        . 'not parsable', 0, $e);
-                }
-            }
-        }
-
-        return $this->personACLAwareRepository
-            ->countBySearchCriteria(
-                $default,
-                $firstname,
-                $lastname,
-                $birthdate,
-                $birthdateBefore,
-                $birthdateAfter,
-                $gender,
-                $countryCode,
-            );
-    }
-
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
             ->add('_default', TextType::class, [
                 'label' => 'First name or Last name',
-                'required' => false
+                'required' => false,
             ])
             ->add('firstname', TextType::class, [
                 'label' => 'First name',
-                'required' => false
+                'required' => false,
             ])
             ->add('lastname', TextType::class, [
                 'label' => 'Last name',
-                'required' => false
+                'required' => false,
             ])
             ->add('birthdate-after', ChillDateType::class, [
                 'label' => 'Birthdate after',
-                'required' => false
+                'required' => false,
             ])
             ->add('birthdate', ChillDateType::class, [
                 'label' => 'Birthdate',
-                'required' => false
+                'required' => false,
             ])
             ->add('birthdate-before', ChillDateType::class, [
                 'label' => 'Birthdate before',
-                'required' => false
+                'required' => false,
             ])
-            ->add('gender', ChoiceType::class, [
-                'choices' => [
-                    'Man' => Person::MALE_GENDER,
-                    'Woman' => Person::FEMALE_GENDER
-                ],
+            ->add('phonenumber', TelType::class, [
+                'required' => false,
+                'label' => 'Part of the phonenumber',
+            ])
+            ->add('gender', GenderType::class, [
                 'label' => 'Gender',
-                'required' => false
+                'required' => false,
+                'expanded' => false,
+                'placeholder' => 'All genders',
             ])
-            ;
+            ->add('city', TextType::class, [
+                'required' => false,
+                'label' => 'City or postal code',
+            ]);
     }
 
     public function convertFormDataToQuery(array $data)
     {
         $string = '@person ';
 
-        $string .= empty($data['_default']) ? '' : $data['_default'].' ';
+        $string .= empty($data['_default']) ? '' : $data['_default'] . ' ';
 
-        foreach(['firstname', 'lastname', 'gender'] as $key) {
-            $string .= empty($data[$key]) ? '' : $key.':'.
+        foreach (['firstname', 'lastname', 'gender', 'phonenumber', 'city'] as $key) {
+            $string .= empty($data[$key]) ? '' : $key . ':' .
                 // add quote if contains spaces
-                (strpos($data[$key], ' ') !== false ?  '"'.$data[$key].'"': $data[$key])
-                .' ';
+                (strpos($data[$key], ' ') !== false ? '"' . $data[$key] . '"' : $data[$key])
+                . ' ';
         }
 
         foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) {
             $string .= empty($data[$key]) ?
                 ''
                 :
-                $key.':'.$data[$key]->format('Y-m-d').' '
-                ;
+                $key . ':' . $data[$key]->format('Y-m-d') . ' ';
         }
 
         return $string;
@@ -263,18 +134,19 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
 
     public function convertTermsToFormData(array $terms)
     {
-        foreach(['firstname', 'lastname', 'gender', '_default']
-            as $key) {
+        $data = [];
+
+        foreach (['firstname', 'lastname', 'gender', '_default', 'phonenumber', 'city'] as $key) {
             $data[$key] = $terms[$key] ?? null;
         }
 
         // parse dates
         foreach (['birthdate', 'birthdate-before', 'birthdate-after'] as $key) {
-            if (\array_key_exists($key, $terms)) {
+            if (array_key_exists($key, $terms)) {
                 try {
-                        $date = new \DateTime($terms[$key]);
-                } catch (\Exception $ex) {
-                        throw new ParsingException("The date for $key is "
+                    $date = new DateTime($terms[$key]);
+                } catch (Exception $ex) {
+                    throw new ParsingException("The date for {$key} is "
                               . 'not parsable', 0, $ex);
                 }
             }
@@ -294,5 +166,180 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
         return self::NAME;
     }
 
+    /**
+     * (non-PHPdoc).
+     *
+     * @see \Chill\MainBundle\Search\SearchInterface::getOrder()
+     */
+    public function getOrder()
+    {
+        return 100;
+    }
 
+    /**
+     * (non-PHPdoc).
+     *
+     * @see \Chill\MainBundle\Search\SearchInterface::isActiveByDefault()
+     */
+    public function isActiveByDefault()
+    {
+        return true;
+    }
+
+    /**
+     * (non-PHPdoc).
+     *
+     * @see \Chill\MainBundle\Search\SearchInterface::renderResult()
+     *
+     * @param mixed $start
+     * @param mixed $limit
+     * @param mixed $format
+     */
+    public function renderResult(array $terms, $start = 0, $limit = 50, array $options = [], $format = 'html')
+    {
+        $terms = $this->findAdditionnalInDefault($terms);
+        $total = $this->count($terms);
+        $paginator = $this->paginatorFactory->create($total);
+
+        if ('html' === $format) {
+            return $this->templating->render(
+                '@ChillPerson/Person/list_with_period.html.twig',
+                [
+                    'persons' => $this->search($terms, $start, $limit, $options),
+                    'pattern' => $this->recomposePattern(
+                        $terms,
+                        array_filter(self::POSSIBLE_KEYS, static fn ($item) => '_default' !== $item),
+                        $terms['_domain']
+                    ),
+                    'total' => $total,
+                    'start' => $start,
+                    'search_name' => self::NAME,
+                    'preview' => $options[SearchInterface::SEARCH_PREVIEW_OPTION],
+                    'paginator' => $paginator,
+                ]
+            );
+        }
+
+        if ('json' === $format) {
+            return [
+                'results' => $this->search($terms, $start, $limit, array_merge($options, ['simplify' => true])),
+                'pagination' => [
+                    'more' => $paginator->hasNextPage(),
+                ],
+            ];
+        }
+    }
+
+    public function supports($domain, $format)
+    {
+        return 'person' === $domain;
+    }
+
+    protected function count(array $terms): int
+    {
+        [
+            '_default' => $default,
+            'firstname' => $firstname,
+            'lastname' => $lastname,
+            'birthdate' => $birthdate,
+            'birthdate-before' => $birthdateBefore,
+            'birthdate-after' => $birthdateAfter,
+            'gender' => $gender,
+            'nationality' => $countryCode,
+            'phonenumber' => $phonenumber,
+            'city' => $city,
+        ] = $terms + array_fill_keys(self::POSSIBLE_KEYS, null);
+
+        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
+            if (null !== ${$v}) {
+                try {
+                    ${$v} = new DateTime(${$v});
+                } catch (Exception $e) {
+                    throw new ParsingException('The date is '
+                        . 'not parsable', 0, $e);
+                }
+            }
+        }
+
+        return $this->personACLAwareRepository
+            ->countBySearchCriteria(
+                $default,
+                $firstname,
+                $lastname,
+                $birthdate,
+                $birthdateBefore,
+                $birthdateAfter,
+                $gender,
+                $countryCode,
+                $phonenumber,
+                $city
+            );
+    }
+
+    /**
+     * @return Person[]
+     */
+    protected function search(array $terms, int $start, int $limit, array $options = [])
+    {
+        [
+            '_default' => $default,
+            'firstname' => $firstname,
+            'lastname' => $lastname,
+            'birthdate' => $birthdate,
+            'birthdate-before' => $birthdateBefore,
+            'birthdate-after' => $birthdateAfter,
+            'gender' => $gender,
+            'nationality' => $countryCode,
+            'phonenumber' => $phonenumber,
+            'city' => $city,
+        ] = $terms + array_fill_keys(self::POSSIBLE_KEYS, null);
+
+        foreach (['birthdateBefore', 'birthdateAfter', 'birthdate'] as $v) {
+            if (null !== ${$v}) {
+                try {
+                    ${$v} = new DateTime(${$v});
+                } catch (Exception $e) {
+                    throw new ParsingException('The date is '
+                          . 'not parsable', 0, $e);
+                }
+            }
+        }
+
+        return $this->personACLAwareRepository
+            ->findBySearchCriteria(
+                $start,
+                $limit,
+                $options['simplify'] ?? false,
+                $default,
+                $firstname,
+                $lastname,
+                $birthdate,
+                $birthdateBefore,
+                $birthdateAfter,
+                $gender,
+                $countryCode,
+                $phonenumber,
+                $city
+            );
+    }
+
+    private function findAdditionnalInDefault(array $terms): array
+    {
+        // chaining some extractor
+        $datesResults = $this->extractDateFromPattern->extractDates($terms['_default']);
+        $phoneResults = $this->extractPhonenumberFromPattern->extractPhonenumber($datesResults->getFilteredSubject());
+        $terms['_default'] = $phoneResults->getFilteredSubject();
+
+        if ($datesResults->hasResult() && (!array_key_exists('birthdate', $terms)
+            || null !== $terms['birthdate'])) {
+            $terms['birthdate'] = $datesResults->getFound()[0]->format('Y-m-d');
+        }
+
+        if ($phoneResults->hasResult() && (!array_key_exists('phonenumber', $terms)
+            || null !== $terms['phonenumber'])) {
+            $terms['phonenumber'] = $phoneResults->getFound()[0];
+        }
+
+        return $terms;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/PersonSearchByPhone.php b/src/Bundle/ChillPersonBundle/Search/PersonSearchByPhone.php
deleted file mode 100644
index 08152144b..000000000
--- a/src/Bundle/ChillPersonBundle/Search/PersonSearchByPhone.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/*
- *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, <http://www.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\Search;
-
-use Chill\MainBundle\Search\AbstractSearch;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Search\SearchInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Templating\EngineInterface;
-
-/**
- * 
- *
- */
-class PersonSearchByPhone extends AbstractSearch
-{
-    
-    /**
-     *
-     * @var PersonRepository
-     */
-    private $personRepository;
-
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    private $tokenStorage;
-
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    private $helper;
-
-    /**
-     *
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
-    
-    /**
-     *
-     * @var bool
-     */
-    protected $activeByDefault;
-    
-    /**
-     *
-     * @var Templating
-     */
-    protected $engine;
-    
-    const NAME = 'phone';
-    
-    public function __construct(
-        PersonRepository $personRepository, 
-        TokenStorageInterface $tokenStorage, 
-        AuthorizationHelper $helper, 
-        PaginatorFactory $paginatorFactory,
-        EngineInterface $engine,
-        $activeByDefault)
-    {
-        $this->personRepository = $personRepository;
-        $this->tokenStorage = $tokenStorage;
-        $this->helper = $helper;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->engine = $engine;
-        $this->activeByDefault = $activeByDefault === 'always';
-    }
-    
-    public function getOrder(): int
-    {
-        return 110;
-    }
-
-    public function isActiveByDefault(): bool
-    {
-        return $this->activeByDefault;
-    }
-
-    public function renderResult(array $terms, $start = 0, $limit = 50, $options = array(), $format = 'html')
-    {
-        $phonenumber = $terms['_default'];
-        $centers     = $this->helper->getReachableCenters($this->tokenStorage
-            ->getToken()->getUser(), new Role(PersonVoter::SEE));
-        $total = $this->personRepository
-            ->countByPhone($phonenumber, $centers);
-        $persons = $this->personRepository
-            ->findByPhone($phonenumber, $centers, $start, $limit)
-            ;
-        $paginator = $this->paginatorFactory
-            ->create($total);
-        
-        return $this->engine->render('ChillPersonBundle:Person:list_by_phonenumber.html.twig',
-                    array(
-                        'persons' => $persons,
-                        'pattern' => $this->recomposePattern($terms, array(), $terms['_domain'] ?? self::NAME),
-                        'phonenumber' => $phonenumber,
-                        'total' => $total,
-                        'start' => $start,
-                        'search_name' => self::NAME,
-                        'preview' => $options[SearchInterface::SEARCH_PREVIEW_OPTION],
-                        'paginator' => $paginator
-                    ));
-    }
-
-    public function supports($domain, $format): bool
-    {
-        return $domain === 'phone' && $format === 'html';
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
index dd0ae67c7..fb842b4ae 100644
--- a/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+++ b/src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
@@ -1,57 +1,98 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Search;
 
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Search\SearchApiInterface;
+use Chill\MainBundle\Search\SearchApiQuery;
+use Chill\MainBundle\Search\Utils\ExtractDateFromPattern;
+use Chill\MainBundle\Search\Utils\ExtractPhonenumberFromPattern;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Symfony\Component\Security\Core\Security;
+use function array_map;
+use function count;
+use function in_array;
 
 class SearchPersonApiProvider implements SearchApiInterface
 {
+    private AuthorizationHelperInterface $authorizationHelper;
+
+    private ExtractDateFromPattern $extractDateFromPattern;
+
+    private ExtractPhonenumberFromPattern $extractPhonenumberFromPattern;
+
+    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
+
     private PersonRepository $personRepository;
 
-    public function __construct(PersonRepository $personRepository)
-    {
+    private Security $security;
+
+    public function __construct(
+        PersonRepository $personRepository,
+        PersonACLAwareRepositoryInterface $personACLAwareRepository,
+        Security $security,
+        AuthorizationHelperInterface $authorizationHelper,
+        ExtractDateFromPattern $extractDateFromPattern,
+        ExtractPhonenumberFromPattern $extractPhonenumberFromPattern
+    ) {
         $this->personRepository = $personRepository;
-    }
-
-    public function provideQuery(string $pattern, array $parameters): SearchApiQuery
-    {
-        $query = new SearchApiQuery();
-        $query
-            ->setSelectKey("person")
-            ->setSelectJsonbMetadata("jsonb_build_object('id', person.id)")
-            ->setSelectPertinence("GREATEST(".
-                "STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), person.fullnamecanonical), ".
-                "(person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%')::int".
-                ")", [ $pattern, $pattern ])
-            ->setFromClause("chill_person_person AS person")
-            ->setWhereClauses("LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR ".
-                "person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' ", [ $pattern, $pattern ])
-            ;
-
-        return $query;
-    }
-
-    public function supportsTypes(string $pattern, array $types, array $parameters): bool
-    {
-        return \in_array('person', $types);
-    }
-
-    public function prepare(array $metadatas): void
-    {
-        $ids = \array_map(fn($m) => $m['id'], $metadatas);
-
-        $this->personRepository->findByIds($ids);
-    }
-
-    public function supportsResult(string $key, array $metadatas): bool
-    {
-        return $key === 'person';
+        $this->personACLAwareRepository = $personACLAwareRepository;
+        $this->security = $security;
+        $this->authorizationHelper = $authorizationHelper;
+        $this->extractDateFromPattern = $extractDateFromPattern;
+        $this->extractPhonenumberFromPattern = $extractPhonenumberFromPattern;
     }
 
     public function getResult(string $key, array $metadata, float $pertinence)
     {
         return $this->personRepository->find($metadata['id']);
     }
+
+    public function prepare(array $metadatas): void
+    {
+        $ids = array_map(static fn ($m) => $m['id'], $metadatas);
+
+        $this->personRepository->findByIds($ids);
+    }
+
+    public function provideQuery(string $pattern, array $parameters): SearchApiQuery
+    {
+        $datesResult = $this->extractDateFromPattern->extractDates($pattern);
+        $phoneResult = $this->extractPhonenumberFromPattern->extractPhonenumber($datesResult->getFilteredSubject());
+        $filtered = $phoneResult->getFilteredSubject();
+
+        return $this->personACLAwareRepository->buildAuthorizedQuery(
+            $filtered,
+            null,
+            null,
+            count($datesResult->getFound()) > 0 ? $datesResult->getFound()[0] : null,
+            null,
+            null,
+            null,
+            null,
+            count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
+        )
+            ->setSelectKey('person')
+            ->setSelectJsonbMetadata("jsonb_build_object('id', person.id)");
+    }
+
+    public function supportsResult(string $key, array $metadatas): bool
+    {
+        return 'person' === $key;
+    }
+
+    public function supportsTypes(string $pattern, array $types, array $parameters): bool
+    {
+        return in_array('person', $types, true);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
index 273367711..8448844a6 100644
--- a/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+++ b/src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
@@ -1,48 +1,30 @@
 <?php
-/*
- *
- * Copyright (C) 2018, Champs Libres Cooperative SCRLFS, <http://www.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\Search;
-
-use Chill\PersonBundle\Entity\PersonNotDuplicate;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 
 /**
+ * Chill is a software for social workers
  *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Search;
+
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use function count;
+
 class SimilarPersonMatcher
 {
-    CONST SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
+    public const SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL = 'alphabetical';
 
-    CONST SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
-
-    /**
-     * @var EntityManagerInterface
-     */
-    protected $em;
+    public const SIMILAR_SEARCH_ORDER_BY_SIMILARITY = 'similarity';
 
     /**
      * @var AuthorizationHelper
@@ -50,14 +32,19 @@ class SimilarPersonMatcher
     protected $authorizationHelper;
 
     /**
-     * @var TokenStorageInterface
+     * @var EntityManagerInterface
      */
-    protected $tokenStorage;
+    protected $em;
 
     protected PersonNotDuplicateRepository $personNotDuplicateRepository;
 
     protected PersonRender $personRender;
 
+    /**
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+
     public function __construct(
         EntityManagerInterface $em,
         AuthorizationHelper $authorizationHelper,
@@ -80,7 +67,7 @@ class SimilarPersonMatcher
     ) {
         $centers = $this->authorizationHelper->getReachableCenters(
             $this->tokenStorage->getToken()->getUser(),
-            new Role(PersonVoter::SEE)
+            PersonVoter::SEE
         );
         $query = $this->em->createQuery();
 
@@ -88,11 +75,9 @@ class SimilarPersonMatcher
             . ' WHERE ('
             . '   SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName))) >= :precision '
             . ' ) '
-            . ' AND p.center IN (:centers)'
+            . ' AND p.center IN (:centers)';
 
-        ;
-
-        if ($person->getId() !== NULL) {
+        if ($person->getId() !== null) {
             $dql .= ' AND p.id != :personId ';
             $notDuplicatePersons = $this->personNotDuplicateRepository->findNotDuplicatePerson($person);
 
@@ -107,9 +92,11 @@ class SimilarPersonMatcher
         switch ($orderBy) {
             case self::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL:
                 $dql .= ' ORDER BY p.fullnameCanonical ASC ';
+
                 break;
+
             case self::SIMILAR_SEARCH_ORDER_BY_SIMILARITY:
-            default :
+            default:
                 $dql .= ' ORDER BY SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName))) DESC ';
         }
 
@@ -117,8 +104,7 @@ class SimilarPersonMatcher
             ->setDQL($dql)
             ->setParameter('fullName', $this->personRender->renderString($person, []))
             ->setParameter('centers', $centers)
-            ->setParameter('precision', $precision)
-        ;
+            ->setParameter('precision', $precision);
 
         return $query->getResult();
     }
diff --git a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php b/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
deleted file mode 100644
index e62c2ee55..000000000
--- a/src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Chill\PersonBundle\Search;
-
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Search\AbstractSearch;
-use Chill\MainBundle\Search\SearchInterface;
-use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
-use Symfony\Component\Templating\EngineInterface;
-
-class SimilarityPersonSearch extends AbstractSearch
-{
-    protected PaginatorFactory $paginatorFactory;
-
-    private PersonACLAwareRepositoryInterface $personACLAwareRepository;
-
-    private EngineInterface $templating;
-
-    const NAME = "person_similarity";
-
-    public function __construct(
-        PaginatorFactory $paginatorFactory,
-        PersonACLAwareRepositoryInterface $personACLAwareRepository,
-        EngineInterface $templating
-    ) {
-        $this->paginatorFactory = $paginatorFactory;
-        $this->personACLAwareRepository = $personACLAwareRepository;
-        $this->templating = $templating;
-    }
-
-    /*
-     * (non-PHPdoc)
-     * @see \Chill\MainBundle\Search\SearchInterface::getOrder()
-     */
-    public function getOrder()
-    {
-        return 200;
-    }
-
-    /*
-     * (non-PHPdoc)
-     * @see \Chill\MainBundle\Search\SearchInterface::isActiveByDefault()
-     */
-    public function isActiveByDefault()
-    {
-        return true;
-    }
-
-    public function supports($domain, $format)
-    {
-        return 'person' === $domain;
-    }
-
-    /**
-     * @param array $terms
-     * @param int $start
-     * @param int $limit
-     * @param array $options
-     * @param string $format
-     */
-    public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
-    {
-        $total = $this->count($terms);
-        $paginator = $this->paginatorFactory->create($total);
-
-        if ($format === 'html') {
-            if ($total !== 0) {
-                return $this->templating->render('ChillPersonBundle:Person:list.html.twig',
-                    array(
-                        'persons' => $this->search($terms, $start, $limit, $options),
-                        'pattern' => $this->recomposePattern($terms, array('nationality',
-                            'firstname', 'lastname', 'birthdate', 'gender',
-                            'birthdate-before','birthdate-after'), $terms['_domain']),
-                        'total' => $total,
-                        'start' => $start,
-                        'search_name' => self::NAME,
-                        'preview' => $options[SearchInterface::SEARCH_PREVIEW_OPTION],
-                        'paginator' => $paginator,
-                        'title' => "Similar persons"
-                    ));
-            }
-            else {
-                return null;
-            }
-
-        } elseif ($format === 'json') {
-            return [
-                'results' => $this->search($terms, $start, $limit, \array_merge($options, [ 'simplify' => true ])),
-                'pagination' => [
-                    'more' => $paginator->hasNextPage()
-                ]
-            ];
-        }
-    }
-
-    /**
-     *
-     * @param string $pattern
-     * @param int $start
-     * @param int $limit
-     * @param array $options
-     * @return Person[]
-     */
-    protected function search(array $terms, $start, $limit, array $options = array())
-    {
-        return $this->personACLAwareRepository
-            ->findBySimilaritySearch($terms['_default'], $start, $limit, $options['simplify'] ?? false);
-    }
-
-    protected function count(array $terms)
-    {
-        return $this->personACLAwareRepository->countBySimilaritySearch($terms['_default']);
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
index 5247df505..ca212108a 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
@@ -1,35 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
+use function in_array;
 
-class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRoleHierarchyInterface
+class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE';
-    /**
-     * details are for seeing:
-     *
-     * * SocialIssues
-     */
-    public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
-    public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
-    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE';
-    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
-
-    /**
-     * Give all the right above
-     */
-    public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL';
-
     public const ALL = [
         self::SEE,
         self::SEE_DETAILS,
@@ -37,12 +31,40 @@ class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRole
         self::EDIT,
         self::DELETE,
         self::FULL,
+        self::TOGGLE_CONFIDENTIAL_ALL,
     ];
 
-    private VoterHelperInterface $voterHelper;
+    public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
+
+    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
+
+    public const EDIT = 'CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE';
+
+    /**
+     * Give all the right above.
+     */
+    public const FULL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_FULL';
+
+    public const SEE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE';
+
+    /**
+     * details are for seeing:.
+     *
+     * * SocialIssues
+     */
+    public const SEE_DETAILS = 'CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS';
+
+    public const TOGGLE_CONFIDENTIAL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL';
+
+    /**
+     * Right to toggle confidentiality.
+     */
+    public const TOGGLE_CONFIDENTIAL_ALL = 'CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL_ALL';
 
     private Security $security;
 
+    private VoterHelperInterface $voterHelper;
+
     public function __construct(
         Security $security,
         VoterHelperFactoryInterface $voterHelperFactory
@@ -51,11 +73,26 @@ class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRole
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)
             ->addCheckFor(null, [self::CREATE])
-            ->addCheckFor(AccompanyingPeriod::class, self::ALL)
+            ->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
             ->addCheckFor(Person::class, [self::SEE])
             ->build();
     }
 
+    public function getRoles(): array
+    {
+        return self::ALL;
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Accompanying period' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
+    }
+
     protected function supports($attribute, $subject)
     {
         return $this->voterHelper->supports($attribute, $subject);
@@ -68,16 +105,30 @@ class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRole
         }
 
         if ($subject instanceof AccompanyingPeriod) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+                if (in_array($attribute, [self::EDIT, self::DELETE], true)) {
+                    return false;
+                }
+            }
+
             if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
                 // only creator can see, edit, delete, etc.
                 if ($subject->getCreatedBy() === $token->getUser()
-                    || NULL === $subject->getCreatedBy()) {
+                    || null === $subject->getCreatedBy()) {
                     return true;
                 }
 
                 return false;
             }
 
+            if (self::TOGGLE_CONFIDENTIAL === $attribute) {
+                if ($subject->getUser() === $token->getUser()) {
+                    return true;
+                }
+
+                return $this->voterHelper->voteOnAttribute(self::TOGGLE_CONFIDENTIAL_ALL, $subject, $token);
+            }
+
             // if confidential, only the referent can see it
             if ($subject->isConfidential()) {
                 return $token->getUser() === $subject->getUser();
@@ -86,19 +137,4 @@ class AccompanyingPeriodVoter extends AbstractChillVoter  implements ProvideRole
 
         return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
     }
-
-    public function getRoles()
-    {
-        return self::ALL;
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return [];
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return [ 'Accompanying period' => $this->getRoles() ];
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
index 2cc3f0d17..b702e798e 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php
@@ -1,8 +1,17 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Security\Authorization;
 
 class HouseholdVoter
 {
-    const SHOW = PersonVoter::SEE;
+    public const SHOW = PersonVoter::SEE;
 }
diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
index 2d585e80e..14984fc67 100644
--- a/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
+++ b/src/Bundle/ChillPersonBundle/Security/Authorization/PersonVoter.php
@@ -1,44 +1,37 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Security\Authorization;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_PERSON_CREATE';
-    const UPDATE = 'CHILL_PERSON_UPDATE';
-    const SEE    = 'CHILL_PERSON_SEE';
-    const STATS  = 'CHILL_PERSON_STATS';
-    const LISTS  = 'CHILL_PERSON_LISTS';
-    const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
+    public const CREATE = 'CHILL_PERSON_CREATE';
+
+    public const DUPLICATE = 'CHILL_PERSON_DUPLICATE';
+
+    public const LISTS = 'CHILL_PERSON_LISTS';
+
+    public const SEE = 'CHILL_PERSON_SEE';
+
+    public const STATS = 'CHILL_PERSON_STATS';
+
+    public const UPDATE = 'CHILL_PERSON_UPDATE';
 
     protected VoterHelperInterface $voter;
 
@@ -49,9 +42,23 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
             ->generate(self::class)
             ->addCheckFor(Center::class, [self::STATS, self::LISTS, self::DUPLICATE])
             ->addCheckFor(Person::class, [self::CREATE, self::UPDATE, self::SEE, self::DUPLICATE])
-            ->addCheckFor(null, [self::CREATE] )
-            ->build()
-            ;
+            ->addCheckFor(null, [self::CREATE])
+            ->build();
+    }
+
+    public function getRoles(): array
+    {
+        return $this->getAttributes();
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Person' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return $this->getAttributes();
     }
 
     protected function supports($attribute, $subject)
@@ -66,22 +73,6 @@ class PersonVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
 
     private function getAttributes()
     {
-        return array(self::CREATE, self::UPDATE, self::SEE, self::STATS, self::LISTS, self::DUPLICATE);
+        return [self::CREATE, self::UPDATE, self::SEE, self::STATS, self::LISTS, self::DUPLICATE];
     }
-
-    public function getRoles()
-    {
-        return $this->getAttributes();
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return $this->getAttributes();
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return [ 'Person' => $this->getRoles() ];
-    }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
new file mode 100644
index 000000000..244184ff6
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Templating\Entity\ClosingMotiveRender;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTime;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function is_array;
+
+class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    private const IGNORE_FIRST_PASS_KEY = 'acc_period_ignore_first_pass';
+
+    private const PERIOD_NULL = [
+        'id',
+        'closingDate' => DateTime::class,
+        'confidential',
+        'confidentialText',
+        'createdAt' => DateTime::class,
+        'createdBy' => User::class,
+        'emergency',
+        'emergencyText',
+        'openingDate' => DateTime::class,
+        'origin' => AccompanyingPeriod\Origin::class,
+        'originText',
+        'requestorAnonymous',
+        'socialIssues',
+        'intensity',
+        'step',
+        'closingMotiveText',
+        'socialIssuesText',
+        'scopes' => Collection::class,
+        'scopesText',
+        'ref' => User::class,
+        'participations' => Collection::class,
+        'currentParticipations' => Collection::class,
+        'requestorPerson' => Person::class,
+        'requestorThirdParty' => ThirdParty::class,
+        'resources' => Collection::class,
+    ];
+
+    private ClosingMotiveRender $closingMotiveRender;
+
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    private SocialIssueRender $socialIssueRender;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper,
+        SocialIssueRender $socialIssueRender,
+        ClosingMotiveRender $closingMotiveRender,
+        ScopeResolverDispatcher $scopeResolverDispatcher
+    ) {
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->socialIssueRender = $socialIssueRender;
+        $this->closingMotiveRender = $closingMotiveRender;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
+    }
+
+    /**
+     * @param AccompanyingPeriod|null $period
+     */
+    public function normalize($period, ?string $format = null, array $context = [])
+    {
+        if ($period instanceof AccompanyingPeriod) {
+            $scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : [];
+
+            if (!is_array($scopes)) {
+                $scopes = [$scopes];
+            }
+
+            $dateContext = array_merge($context, ['docgen:expects' => DateTime::class, 'groups' => 'docgen:read']);
+            $userContext = array_merge($context, ['docgen:expects' => User::class, 'groups' => 'docgen:read']);
+            $participationContext = array_merge($context, ['docgen:expects' => AccompanyingPeriodParticipation::class, 'groups' => 'docgen:read']);
+
+            return [
+                'id' => $period->getId(),
+                'type' => 'accompanying_period',
+                'isNull' => false,
+                'closingDate' => $this->normalizer->normalize($period->getClosingDate(), $format, $dateContext),
+                'confidential' => $period->isConfidential(),
+                'createdAt' => $this->normalizer->normalize($period->getCreatedAt(), $format, $dateContext),
+                'createdBy' => $this->normalizer->normalize($period->getCreatedBy(), $format, $userContext),
+                'emergency' => $period->isEmergency(),
+                'openingDate' => $this->normalizer->normalize($period->getOpeningDate(), $format, $dateContext),
+                'origin' => $this->normalizer->normalize($period->getOrigin(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Origin::class])),
+                'participations' => $this->normalizer->normalize($period->getParticipations(), $format, $participationContext),
+                'currentParticipations' => $this->normalizer->normalize($period->getCurrentParticipations(), $format, $participationContext),
+                'requestorAnonymous' => $period->isRequestorAnonymous(),
+                'requestorPerson' => $this->normalizer->normalize($period->getRequestorPerson(), $format, array_merge($context, ['docgen:expects' => Person::class])),
+                'hasRequestorPerson' => $period->getRequestorPerson() !== null,
+                'requestorThirdParty' => $this->normalizer->normalize($period->getRequestorThirdParty(), $format, array_merge($context, ['docgen:expects' => ThirdParty::class])),
+                'hasRequestorThirdParty' => $period->getRequestorThirdParty() !== null,
+                'resources' => $this->normalizer->normalize($period->getResources(), $format, $context),
+                'scopes' => $this->normalizer->normalize($scopes, $format, array_merge($context, ['docgen:expects' => Scope::class, 'groups' => 'docgen:read'])),
+                'socialIssues' => $this->normalizer->normalize($period->getSocialIssues(), $format, $context),
+                'intensity' => $this->translator->trans($period->getIntensity()),
+                'step' => $this->translator->trans('accompanying_period.' . $period->getStep()),
+                'emergencyText' => $period->isEmergency() ? $this->translator->trans('accompanying_period.emergency') : '',
+                'confidentialText' => $period->isConfidential() ? $this->translator->trans('confidential') : '',
+                'originText' => null !== $period->getOrigin() ? $this->translatableStringHelper->localize($period->getOrigin()->getLabel()) : '',
+                'isClosed' => $period->getClosingDate() !== null,
+                'closingMotiveText' => null !== $period->getClosingMotive() ?
+                    $this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '',
+                'ref' => $this->normalizer->normalize($period->getUser(), $format, $userContext),
+                'hasRef' => $period->getUser() !== null,
+                'socialIssuesText' => implode(', ', array_map(function (SocialIssue $s) {
+                    return $this->socialIssueRender->renderString($s, []);
+                }, $period->getSocialIssues()->toArray())),
+                'scopesText' => implode(', ', array_map(function (Scope $s) {
+                    return $this->translatableStringHelper->localize($s->getName());
+                }, $scopes)),
+                'hasRequestor' => $period->getRequestor() !== null,
+                'requestorKind' => $period->getRequestorKind(),
+            ];
+        } elseif (null === $period) {
+            return array_merge(
+                (new NormalizeNullValueHelper($this->normalizer, 'type', 'accompanying_period'))
+                    ->normalize(self::PERIOD_NULL, $format, $context),
+                [
+                    'hasRef' => false,
+                    'requestorKind' => 'none',
+                    'hasRequestor' => false,
+                    'hasRequestorPerson' => false,
+                    'hasRequestorThirdParty' => false,
+                    'isClosed' => false,
+                    'confidential' => false,
+                ]
+            );
+        }
+
+        throw new InvalidArgumentException('this neither an accompanying period or null');
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    {
+        if ('docgen' !== $format) {
+            return false;
+        }
+
+        if ($data instanceof AccompanyingPeriod) {
+            return true;
+        }
+
+        if (null === $data && AccompanyingPeriod::class === ($context['docgen:expects'] ?? null)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
index 7c9174217..5c05d111e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
@@ -1,45 +1,36 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
- *
  * @internal we keep this normalizer, because the property 'text' may be replace by a rendering in the future
  */
-class AccompanyingPeriodOriginNormalizer implements NormalizerInterface
+final class AccompanyingPeriodOriginNormalizer implements NormalizerInterface
 {
-    public function normalize($origin, string $format = null, array $context = array())
+    public function normalize($origin, ?string $format = null, array $context = [])
     {
         /** @var Origin $origin */
         return [
             'type' => 'origin',
             'id' => $origin->getId(),
             'label' => $origin->getLabel(),
-            'text' => $origin->getLabel()
+            'text' => $origin->getLabel(),
         ];
     }
 
-    public function supportsNormalization($data, string $format = null): bool
+    public function supportsNormalization($data, ?string $format = null): bool
     {
         return $data instanceof Origin;
     }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
index a1321b3ef..b4110a8ae 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
@@ -1,52 +1,44 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-
-
-class AccompanyingPeriodParticipationNormalizer implements NormalizerInterface, NormalizerAwareInterface {
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
+class AccompanyingPeriodParticipationNormalizer implements NormalizerAwareInterface, NormalizerInterface
+{
     protected ?NormalizerInterface $normalizer = null;
 
-    public function normalize($participation, string $format = null, array $context = array())
+    public function normalize($participation, ?string $format = null, array $context = [])
     {
         /** @var AccompanyingPeriodParticipation $participation */
         return [
             'id' => $participation->getId(),
             'startDate' => $this->normalizer->normalize($participation->getStartDate(), $format),
             'endDate' => $this->normalizer->normalize($participation->getEndDate(), $format),
-            'person' => $this->normalizer->normalize($participation->getPerson(), $format)
+            'person' => $this->normalizer->normalize($participation->getPerson(), $format),
         ];
     }
 
-    public function supportsNormalization($data, string $format = null): bool
-    {
-        return false;
-        return $data instanceof AccompanyingPeriodParticipation;
-    }
-
     public function setNormalizer(NormalizerInterface $normalizer)
     {
         $this->normalizer = $normalizer;
     }
+
+    public function supportsNormalization($data, ?string $format = null): bool
+    {
+        return false;
+
+        return $data instanceof AccompanyingPeriodParticipation;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
index b5fca8d59..0cd71c29e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
@@ -1,23 +1,33 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use Chill\PersonBundle\Entity\Person;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Symfony\Component\Serializer\Exception;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
-use Symfony\Component\Serializer\Exception;
-use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
+use function array_key_exists;
+use function array_merge;
+use function count;
 
-
-class AccompanyingPeriodResourceNormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+class AccompanyingPeriodResourceNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
     use DenormalizerAwareTrait;
-
     use ObjectToPopulateTrait;
 
     private ResourceRepository $repository;
@@ -27,59 +37,57 @@ class AccompanyingPeriodResourceNormalizer implements DenormalizerInterface, Den
         $this->repository = $repository;
     }
 
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         $resource = $this->extractObjectToPopulate($type, $context);
 
-        if ('accompanying_period_resource' !== ($data['type'] ?? NULL)) {
+        if ('accompanying_period_resource' !== ($data['type'] ?? null)) {
             throw new Exception\InvalidArgumentException("the key type must be present in data and set to 'accompanying_period_resource'");
         }
 
-        if ($resource === NULL && \array_key_exists('id', $data)) {
+        if (null === $resource && array_key_exists('id', $data)) {
             $resource = $this->repository->find($data['id']);
 
-            if (NULL === $resource) {
-                throw new Exception\UnexpectedValueException(sprintf("the resource with".
-                    "id %d is not found", $data['id']));
+            if (null === $resource) {
+                throw new Exception\UnexpectedValueException(sprintf('the resource with' .
+                    'id %d is not found', $data['id']));
             }
 
             // if resource found, available only for read-only
             if (count($data) > 2) {
-                unset($data['id']);
-                unset($data['type']);
+                unset($data['id'], $data['type']);
+
                 throw new Exception\ExtraAttributesException($data);
             }
         }
 
-        if ($resource === NULL) {
+        if (null === $resource) {
             $resource = new Resource();
         }
 
-        if (\array_key_exists('resource', $data)) {
+        if (array_key_exists('resource', $data)) {
             $res = $this->denormalizer->denormalize(
                 $data['resource'],
                 DiscriminatedObjectDenormalizer::TYPE,
                 $format,
-                \array_merge(
+                array_merge(
                     $context,
-                    [ 
-                        DiscriminatedObjectDenormalizer::ALLOWED_TYPES => 
-                        [ 
-                            Person::class, ThirdParty::class
-                        ]
+                    [
+                        DiscriminatedObjectDenormalizer::ALLOWED_TYPES => [
+                            Person::class, ThirdParty::class,
+                        ],
                     ]
                 )
             );
 
             $resource->setResource($res);
-        } 
+        }
 
         return $resource;
     }
-    
 
-    public function supportsDenormalization($data, string $type, string $format = null)
+    public function supportsDenormalization($data, string $type, ?string $format = null)
     {
-        return $type === Resource::class;
-    }  
+        return Resource::class === $type;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
index 4a8d51aa1..15551cf86 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
@@ -1,48 +1,47 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\Goal;
-use Chill\PersonBundle\Entity\SocialWork\Result;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Serializer\Exception\BadMethodCallException;
-use Symfony\Component\Serializer\Exception\ExceptionInterface;
-use Symfony\Component\Serializer\Exception\ExtraAttributesException;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\RuntimeException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+use function array_key_exists;
+use function array_merge;
+use function in_array;
+use function is_array;
 
 /**
  * This denormalizer rely on AbstractNormalizer for most of the job, and
  * add some logic for synchronizing collection.
  */
-class AccompanyingPeriodWorkDenormalizer implements DenormalizerAwareInterface, ContextAwareDenormalizerInterface
+class AccompanyingPeriodWorkDenormalizer implements ContextAwareDenormalizerInterface, DenormalizerAwareInterface
 {
     use DenormalizerAwareTrait;
     use ObjectToPopulateTrait;
 
-    private AccompanyingPeriodWorkRepository $workRepository;
+    public const GROUP_CREATE = 'accompanying_period_work:create';
+
+    public const GROUP_EDIT = 'accompanying_period_work:edit';
+
     private EntityManagerInterface $em;
 
-    public const GROUP_CREATE = 'accompanying_period_work:create';
-    public const GROUP_EDIT   = 'accompanying_period_work:edit';
+    private AccompanyingPeriodWorkRepository $workRepository;
 
-    /**
-     * @param AccompanyingPeriodWorkRepository $workRepository
-     */
     public function __construct(
         AccompanyingPeriodWorkRepository $workRepository,
         EntityManagerInterface $em
@@ -51,37 +50,46 @@ class AccompanyingPeriodWorkDenormalizer implements DenormalizerAwareInterface,
         $this->em = $em;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
-        $work = $this->denormalizer->denormalize($data, $type, $format, \array_merge($context,
-            ['skip' => self::class]));
+        $work = $this->denormalizer->denormalize($data, $type, $format, array_merge(
+            $context,
+            ['skip' => self::class]
+        ));
 
-        if (\in_array('accompanying_period_work:edit', $context['groups'] ?? [])) {
+        if (in_array('accompanying_period_work:edit', $context['groups'] ?? [], true)) {
             $this->handleEvaluationCollection($data, $work, $format, $context);
         }
 
         return $work;
     }
 
+    public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool
+    {
+        return AccompanyingPeriodWork::class === $type
+            && self::class !== ($context['skip'] ?? null)
+            && is_array($data)
+            && array_key_exists('type', $data)
+            && 'accompanying_period_work' === $data['type'];
+    }
+
     private function handleEvaluationCollection(array $data, AccompanyingPeriodWork $work, string $format, array $context)
     {
         $dataById = [];
         $dataWithoutId = [];
+
         foreach ($data['accompanyingPeriodWorkEvaluations'] as $e) {
-           if (\array_key_exists('id', $e)) {
-               $dataById[$e['id']] = $e;
-           } else {
-               $dataWithoutId[] = $e;
-           }
+            if (array_key_exists('id', $e)) {
+                $dataById[$e['id']] = $e;
+            } else {
+                $dataWithoutId[] = $e;
+            }
         }
 
         // partition the separate kept evaluations and removed one
-        list($kept, $removed) = $work->getAccompanyingPeriodWorkEvaluations()
+        [$kept, $removed] = $work->getAccompanyingPeriodWorkEvaluations()
             ->partition(
-                fn(int $key, AccompanyingPeriodWorkEvaluation $a) => \array_key_exists($a->getId(), $dataById)
+                static fn (int $key, AccompanyingPeriodWorkEvaluation $a) => array_key_exists($a->getId(), $dataById)
             );
 
         // remove the evaluations from work
@@ -92,13 +100,13 @@ class AccompanyingPeriodWorkDenormalizer implements DenormalizerAwareInterface,
         foreach ($kept as $k) {
             $this->denormalizer->denormalize(
                 $dataById[$k->getId()],
-               AccompanyingPeriodWorkEvaluation::class,
+                AccompanyingPeriodWorkEvaluation::class,
                 $format,
-                \array_merge(
+                array_merge(
                     $context,
                     [
-                        'groups' => [ 'write' ],
-                        AbstractNormalizer::OBJECT_TO_POPULATE => $k
+                        'groups' => ['write'],
+                        AbstractNormalizer::OBJECT_TO_POPULATE => $k,
                     ]
                 )
             );
@@ -109,24 +117,12 @@ class AccompanyingPeriodWorkDenormalizer implements DenormalizerAwareInterface,
                 $newData,
                 AccompanyingPeriodWorkEvaluation::class,
                 $format,
-                \array_merge($context, ['groups' => [ 'accompanying_period_work_evaluation:create']]
+                array_merge(
+                    $context,
+                    ['groups' => ['accompanying_period_work_evaluation:create']]
                 )
             );
             $work->addAccompanyingPeriodWorkEvaluation($evaluation);
         }
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
-    {
-        return $type === AccompanyingPeriodWork::class
-            && ($context['skip'] ?? null) !== self::class
-            && \is_array($data)
-            && \array_key_exists("type", $data)
-            && $data["type"] === 'accompanying_period_work';
-    }
-
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index b2c21c048..527434e50 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -1,29 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Household\MembersEditor;
+use Chill\PersonBundle\Household\MembersEditorFactory;
+use DateTimeImmutable;
+use Symfony\Component\Serializer\Exception;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Exception;
-use Chill\PersonBundle\Household\MembersEditorFactory;
-use Chill\PersonBundle\Household\MembersEditor;
+use function array_key_exists;
 
-class MembersEditorNormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+class MembersEditorNormalizer implements DenormalizerAwareInterface, DenormalizerInterface
 {
-    private MembersEditorFactory $factory;
-
     use DenormalizerAwareTrait;
 
+    private MembersEditorFactory $factory;
+
     public function __construct(MembersEditorFactory $factory)
     {
         $this->factory = $factory;
     }
 
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         // some test about schema first...
         $this->performChecks($data);
@@ -31,23 +42,16 @@ class MembersEditorNormalizer implements DenormalizerInterface, DenormalizerAwar
         // route to "leave movement" (all concerned leave household)
         // or "move to another household" (all concerned go to another
         // household)
-        if (NULL === $data['destination']) {
+        if (null === $data['destination']) {
             return $this->denormalizeLeave($data, $type, $format, $context);
-        } else {
-            return $this->denormalizeMove($data, $type, $format, $context);
         }
+
+        return $this->denormalizeMove($data, $type, $format, $context);
     }
 
-    private  function performChecks($data): void
+    public function supportsDenormalization($data, string $type, ?string $format = null)
     {
-        if (NULL == $data['concerned'] ?? NULL 
-            && FALSE === ·\is_array('concerned')) {
-            throw new Exception\UnexpectedValueException("The schema does not have any key 'concerned'");
-        }
-
-        if (FALSE === \array_key_exists('destination', $data)) {
-            throw new Exception\UnexpectedValueException("The schema does not have any key 'destination'");
-        }
+        return MembersEditor::class === $type;
     }
 
     protected function denormalizeLeave($data, string $type, string $format, array $context = [])
@@ -55,18 +59,26 @@ class MembersEditorNormalizer implements DenormalizerInterface, DenormalizerAwar
         $editor = $this->factory->createEditor(null);
 
         foreach ($data['concerned'] as $key => $concerned) {
-            $person = $this->denormalizer->denormalize($concerned['person'] ?? null, Person::class, 
-                $format, $context); 
-            $startDate = $this->denormalizer->denormalize($concerned['start_date'] ?? null, \DateTimeImmutable::class,
-                $format, $context);
+            $person = $this->denormalizer->denormalize(
+                $concerned['person'] ?? null,
+                Person::class,
+                $format,
+                $context
+            );
+            $startDate = $this->denormalizer->denormalize(
+                $concerned['start_date'] ?? null,
+                DateTimeImmutable::class,
+                $format,
+                $context
+            );
 
             if (
-                NULL === $person
-                && NULL === $startDate
+                null === $person
+                && null === $startDate
             ) {
-                throw new Exception\InvalidArgumentException("position with ".
-                    "key $key could not be denormalized: missing ".
-                    "person or start_date.");
+                throw new Exception\InvalidArgumentException('position with ' .
+                    "key {$key} could not be denormalized: missing " .
+                    'person or start_date.');
             }
 
             $editor->leaveMovement($startDate, $person);
@@ -80,46 +92,73 @@ class MembersEditorNormalizer implements DenormalizerInterface, DenormalizerAwar
         $householdContext = $context;
         $householdContext['groups'][] = 'create';
 
-        $household = $this->denormalizer->denormalize($data['destination'], Household::class, 
-            $format, $householdContext);
+        $household = $this->denormalizer->denormalize(
+            $data['destination'],
+            Household::class,
+            $format,
+            $householdContext
+        );
 
-        if (NULL === $household) {
-           throw new Exception\InvalidArgumentException("household could not be denormalized. Impossible to process"); 
+        if (null === $household) {
+            throw new Exception\InvalidArgumentException('household could not be denormalized. Impossible to process');
         }
 
         $editor = $this->factory->createEditor($household);
 
         foreach ($data['concerned'] as $key => $concerned) {
-            $person = $this->denormalizer->denormalize($concerned['person'] ?? null, Person::class, 
-                $format, $context); 
-            $position = $this->denormalizer->denormalize($concerned['position'] ?? null, Position::class,
-                $format, $context);
-            $startDate = $this->denormalizer->denormalize($concerned['start_date'] ?? null, \DateTimeImmutable::class,
-                $format, $context);
+            $person = $this->denormalizer->denormalize(
+                $concerned['person'] ?? null,
+                Person::class,
+                $format,
+                $context
+            );
+            $position = $this->denormalizer->denormalize(
+                $concerned['position'] ?? null,
+                Position::class,
+                $format,
+                $context
+            );
+            $startDate = $this->denormalizer->denormalize(
+                $concerned['start_date'] ?? null,
+                DateTimeImmutable::class,
+                $format,
+                $context
+            );
 
             $holder = (bool) $concerned['holder'] ?? false;
             $comment = (string) $concerned['comment'] ?? false;
 
             if (
-                NULL === $person
-                && NULL === $position
-                && NULL === $startDate
+                null === $person
+                && null === $position
+                && null === $startDate
             ) {
-                throw new Exception\InvalidArgumentException("position with ".
-                    "key $key could not be denormalized: missing ".
-                    "person, position or start_date.");
+                throw new Exception\InvalidArgumentException('position with ' .
+                    "key {$key} could not be denormalized: missing " .
+                    'person, position or start_date.');
             }
 
-            $editor->addMovement($startDate, $person, $position, $holder, 
-                $comment);
+            $editor->addMovement(
+                $startDate,
+                $person,
+                $position,
+                $holder,
+                $comment
+            );
         }
-        
+
         return $editor;
     }
 
-    public function supportsDenormalization($data, string $type, string $format = null)
+    private function performChecks($data): void
     {
-        return $type === MembersEditor::class;
-    }
+        if (null === $data['concerned'] ?? null
+            && false === ·\is_array('concerned')) {
+            throw new Exception\UnexpectedValueException("The schema does not have any key 'concerned'");
+        }
 
+        if (false === array_key_exists('destination', $data)) {
+            throw new Exception\UnexpectedValueException("The schema does not have any key 'destination'");
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
new file mode 100644
index 000000000..a1f8b1f83
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use DateTimeInterface;
+use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_map;
+use function implode;
+
+class PersonDocGenNormalizer implements
+    ContextAwareNormalizerInterface,
+    NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    private PersonRender $personRender;
+
+    private RelationshipRepository $relationshipRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        PersonRender $personRender,
+        RelationshipRepository $relationshipRepository,
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->personRender = $personRender;
+        $this->relationshipRepository = $relationshipRepository;
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function normalize($person, ?string $format = null, array $context = [])
+    {
+        /** @var Person $person */
+        $dateContext = $context;
+        $dateContext['docgen:expects'] = DateTimeInterface::class;
+        $addressContext = array_merge($context, ['docgen:expects' => Address::class]);
+
+        if (null === $person) {
+            return $this->normalizeNullValue($format, $context);
+        }
+
+        if (!$person instanceof Person) {
+            throw new UnexpectedValueException();
+        }
+
+        $data = [
+            'type' => 'person',
+            'isNull' => false,
+            'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expect' => Civility::class])),
+            'firstname' => $person->getFirstName(),
+            'lastname' => $person->getLastName(),
+            'altNames' => implode(
+                ', ',
+                array_map(
+                    static function (PersonAltName $altName) {
+                        return $altName->getLabel();
+                    },
+                    $person->getAltNames()->toArray()
+                )
+            ),
+            'text' => $this->personRender->renderString($person, []),
+            'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $dateContext),
+            'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $dateContext),
+            'gender' => $this->translator->trans($person->getGender()),
+            'maritalStatus' => null !== ($ms = $person->getMaritalStatus()) ? $this->translatableStringHelper->localize($ms->getName()) : '',
+            'maritalStatusDate' => $this->normalizer->normalize($person->getMaritalStatusDate(), $format, $dateContext),
+            'email' => $person->getEmail(),
+            'firstPhoneNumber' => $person->getPhonenumber() ?? $person->getMobilenumber(),
+            'fixPhoneNumber' => $person->getPhonenumber(),
+            'mobilePhoneNumber' => $person->getMobilenumber(),
+            'nationality' => null !== ($c = $person->getNationality()) ? $this->translatableStringHelper->localize($c->getName()) : '',
+            'placeOfBirth' => $person->getPlaceOfBirth(),
+            'memo' => $person->getMemo(),
+            'numberOfChildren' => (string) $person->getNumberOfChildren(),
+            'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
+        ];
+
+        if ($context['docgen:person:with-household'] ?? false) {
+            $data['household'] = $this->normalizer->normalize(
+                $person->getCurrentHousehold(),
+                $format,
+                array_merge($context, [
+                    'docgen:expects' => Household::class,
+                    'docgen:person:with-household' => false,
+                    'docgen:person:with-relations' => false,
+                ])
+            );
+        }
+
+        if ($context['docgen:person:with-relations'] ?? false) {
+            $data['relations'] = $this->normalizer->normalize(
+                new ArrayCollection($this->relationshipRepository->findByPerson($person)),
+                $format,
+                array_merge($context, [
+                    'docgen:person:with-household' => false,
+                    'docgen:person:with-relation' => false,
+                    'docgen:relationship:counterpart' => $person,
+                ])
+            );
+        }
+
+        return $data;
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = [])
+    {
+        if ('docgen' !== $format) {
+            return false;
+        }
+
+        return
+            $data instanceof Person
+            || (
+                null === $data
+                && Person::class === ($context['docgen:expects'] ?? null)
+            );
+    }
+
+    private function normalizeNullValue(string $format, array $context)
+    {
+        $normalizer = new NormalizeNullValueHelper($this->normalizer, 'type', 'person');
+
+        $attributes = [
+            'firstname', 'lastname', 'altNames', 'text',
+            'civility' => Civility::class,
+            'birthdate' => DateTimeInterface::class,
+            'deathdate' => DateTimeInterface::class,
+            'gender', 'maritalStatus',
+            'maritalStatusDate' => DateTimeInterface::class,
+            'email', 'firstPhoneNumber', 'fixPhoneNumber', 'mobilePhoneNumber', 'nationality',
+            'placeOfBirth', 'memo', 'numberOfChildren',
+            'address' => Address::class,
+        ];
+
+        if ($context['docgen:person:with-household'] ?? false) {
+            $attributes['household'] = Household::class;
+        }
+
+        $data = $normalizer->normalize($attributes, $format, $context);
+
+        if ($context['docgen:person:with-relations'] ?? false) {
+            $data['relations'] = [];
+        }
+
+        return $data;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
new file mode 100644
index 000000000..7049b7c00
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use DateTime;
+use DateTimeImmutable;
+use LogicException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+use function array_key_exists;
+
+/**
+ * Serialize a Person entity.
+ */
+class PersonJsonNormalizer implements
+    DenormalizerAwareInterface,
+    DenormalizerInterface,
+    NormalizerAwareInterface,
+    NormalizerInterface
+{
+    use DenormalizerAwareTrait;
+    use NormalizerAwareTrait;
+    use ObjectToPopulateTrait;
+
+    private CenterResolverManagerInterface $centerResolverManager;
+
+    private ChillEntityRenderExtension $render;
+
+    private PersonRepository $repository;
+
+    public function __construct(
+        ChillEntityRenderExtension $render,
+        PersonRepository $repository,
+        CenterResolverManagerInterface $centerResolverManager
+    ) {
+        $this->render = $render;
+        $this->repository = $repository;
+        $this->centerResolverManager = $centerResolverManager;
+    }
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    {
+        $person = $this->extractObjectToPopulate($type, $context);
+
+        if (array_key_exists('id', $data)) {
+            $person = $this->repository->find($data['id']);
+
+            if (null === $person) {
+                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does " .
+                    'not exists');
+            }
+            // currently, not allowed to update a person through api
+            // if instantiated with id
+            return $person;
+        }
+
+        if (null === $person) {
+            $person = new Person();
+        }
+
+        foreach (['firstName', 'lastName', 'phonenumber', 'mobilenumber', 'gender',
+            'birthdate', 'deathdate', 'center', ]
+            as $item) {
+            if (!array_key_exists($item, $data)) {
+                continue;
+            }
+
+            switch ($item) {
+                case 'firstName':
+                    $person->setFirstName($data[$item]);
+
+                    break;
+
+                case 'lastName':
+                    $person->setLastName($data[$item]);
+
+                    break;
+
+                case 'phonenumber':
+                    $person->setPhonenumber($data[$item]);
+
+                    break;
+
+                case 'mobilenumber':
+                    $person->setMobilenumber($data[$item]);
+
+                    break;
+
+                case 'gender':
+                    $person->setGender($data[$item]);
+
+                    break;
+
+                case 'birthdate':
+                    $object = $this->denormalizer->denormalize($data[$item], DateTime::class, $format, $context);
+
+                    $person->setBirthdate($object);
+
+                    break;
+
+                case 'deathdate':
+                    $object = $this->denormalizer->denormalize($data[$item], DateTimeImmutable::class, $format, $context);
+
+                    $person->setDeathdate($object);
+
+                    break;
+
+                case 'center':
+                    $object = $this->denormalizer->denormalize($data[$item], Center::class, $format, $context);
+                    $person->setCenter($object);
+
+                    break;
+
+                default:
+                    throw new LogicException("item not defined: {$item}");
+            }
+        }
+
+        return $person;
+    }
+
+    public function normalize($person, ?string $format = null, array $context = [])
+    {
+        /** @var Household $household */
+        $household = $person->getCurrentHousehold();
+
+        /** @var Person $person */
+        return [
+            'type' => 'person',
+            'id' => $person->getId(),
+            'text' => $this->render->renderString($person),
+            'firstName' => $person->getFirstName(),
+            'lastName' => $person->getLastName(),
+            'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $context),
+            'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $context),
+            'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context),
+            'phonenumber' => $person->getPhonenumber(),
+            'mobilenumber' => $person->getMobilenumber(),
+            'altNames' => $this->normalizeAltNames($person->getAltNames()),
+            'gender' => $person->getGender(),
+            'current_household_address' => $this->normalizer->normalize($person->getCurrentHouseholdAddress(), $format, $context),
+            'current_household_id' => $household ? $this->normalizer->normalize($household->getId(), $format, $context) : null,
+        ];
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return Person::class === $type && 'person' === ($data['type'] ?? null);
+    }
+
+    public function supportsNormalization($data, ?string $format = null): bool
+    {
+        return $data instanceof Person && 'json' === $format;
+    }
+
+    protected function normalizeAltNames($altNames): array
+    {
+        $r = [];
+
+        foreach ($altNames as $n) {
+            $r[] = ['key' => $n->getKey(), 'label' => $n->getLabel()];
+        }
+
+        return $r;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
deleted file mode 100644
index 2b82780c2..000000000
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/*
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.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\Serializer\Normalizer;
-
-use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Symfony\Component\Serializer\Exception\RuntimeException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
-
-/**
- * Serialize a Person entity
- *
- */
-class PersonNormalizer implements
-    NormalizerInterface,
-    NormalizerAwareInterface,
-    DenormalizerInterface,
-    DenormalizerAwareInterface
-{
-    private ChillEntityRenderExtension $render;
-
-    private PersonRepository $repository;
-
-    use NormalizerAwareTrait;
-
-    use ObjectToPopulateTrait;
-
-    use DenormalizerAwareTrait;
-
-    public function __construct(ChillEntityRenderExtension $render, PersonRepository $repository)
-    {
-        $this->render = $render;
-        $this->repository = $repository;
-    }
-
-    public function normalize($person, string $format = null, array $context = array())
-    {
-        /** @var Household $household */
-        $household = $person->getCurrentHousehold();
-
-        /** @var Person $person */
-        return [
-            'type' => 'person',
-            'id' => $person->getId(),
-            'text' => $this->render->renderString($person),
-            'firstName' => $person->getFirstName(),
-            'lastName' => $person->getLastName(),
-            'birthdate' => $this->normalizer->normalize($person->getBirthdate()),
-            'deathdate' => $this->normalizer->normalize($person->getDeathdate()),
-            'center' => $this->normalizer->normalize($person->getCenter()),
-            'phonenumber' => $person->getPhonenumber(),
-            'mobilenumber' => $person->getMobilenumber(),
-            'altNames' => $this->normalizeAltNames($person->getAltNames()),
-            'gender' => $person->getGender(),
-            'gender_numeric' => $person->getGenderNumeric(),
-            'current_household_address' => $this->normalizer->normalize($person->getCurrentHouseholdAddress()),
-            'current_household_id' => $household ? $this->normalizer->normalize($household->getId()) : null,
-        ];
-    }
-
-    protected function normalizeAltNames($altNames): array
-    {
-        $r = [];
-
-        foreach ($altNames as $n) {
-            $r[] = [ 'key' => $n->getKey(), 'label' => $n->getLabel() ];
-        }
-
-        return $r;
-    }
-
-
-    public function supportsNormalization($data, string $format = null): bool
-    {
-        return $data instanceof Person;
-    }
-
-    public function denormalize($data, string $type, string $format = null, array $context = [])
-    {
-        $person = $this->extractObjectToPopulate($type, $context);
-
-        if (\array_key_exists('id', $data)) {
-            $person = $this->repository->find($data['id']);
-
-            if (null === $person) {
-                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does ".
-                    "not exists");
-            }
-            // currently, not allowed to update a person through api
-            // if instantiated with id
-            return $person;
-        }
-
-        if (null === $person) {
-            $person = new Person();
-        }
-
-        foreach (['firstName', 'lastName', 'phonenumber', 'mobilenumber', 'gender']
-            as $item) {
-            if (\array_key_exists($item, $data)) {
-                $person->{'set'.\ucfirst($item)}($data[$item]);
-            }
-        }
-
-        foreach ([
-            'birthdate' => \DateTime::class,
-            'deathdate' => \DateTime::class,
-            'center' => Center::class
-        ] as $item => $class) {
-            if (\array_key_exists($item, $data)) {
-                $object = $this->denormalizer->denormalize($data[$item], $class, $format, $context);
-                if ($object instanceof $class) {
-                    $person->{'set'.\ucfirst($item)}($object);
-                }
-            }
-        }
-
-        return $person;
-    }
-
-    public function supportsDenormalization($data, string $type, string $format = null)
-    {
-        return $type === Person::class && ($data['type'] ?? NULL) === 'person';
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
new file mode 100644
index 000000000..7d90e40e2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+
+class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    /**
+     * @param Relationship $relation
+     */
+    public function normalize($relation, ?string $format = null, array $context = [])
+    {
+        $counterpart = $context['docgen:relationship:counterpart'] ?? null;
+        $contextPerson = array_merge($context, [
+            'docgen:person:with-relations' => false,
+            'docgen:relationship:counterpart' => null,
+            'docgen:expects' => Person::class,
+        ]);
+
+        if (null !== $counterpart) {
+            $opposite = $relation->getOpposite($counterpart);
+        } else {
+            $opposite = null;
+        }
+
+        if (null === $relation) {
+            return [
+                'id' => '',
+                'fromPerson' => $nullPerson = $this->normalizer->normalize(null, $format, $contextPerson),
+                'toPerson' => $nullPerson,
+                'opposite' => $nullPerson,
+                'text' => '',
+                'relationId' => '',
+            ];
+        }
+
+        return [
+            'id' => $relation->getId(),
+            'fromPerson' => $this->normalizer->normalize(
+                $relation->getFromPerson(),
+                $format,
+                $contextPerson
+            ),
+            'toPerson' => $this->normalizer->normalize(
+                $relation->getToPerson(),
+                $format,
+                $contextPerson
+            ),
+            'text' => $relation->getReverse() ?
+                $this->translatableStringHelper->localize($relation->getRelation()->getReverseTitle()) :
+                $this->translatableStringHelper->localize($relation->getRelation()->getTitle()),
+            'opposite' => $this->normalizer->normalize($opposite, $format, $contextPerson),
+            'relationId' => $relation->getRelation()->getId(),
+        ];
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = [])
+    {
+        if ('docgen' !== $format) {
+            return false;
+        }
+
+        return $data instanceof Relationship || (null === $data
+            && Relationship::class === ($context['docgen:expects'] ?? null));
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
index 1ced09a1e..1274b46b9 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
@@ -1,15 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-
-class SocialActionNormalizer implements NormalizerInterface, NormalizerAwareInterface
+class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
     use NormalizerAwareTrait;
 
@@ -20,26 +28,51 @@ class SocialActionNormalizer implements NormalizerInterface, NormalizerAwareInte
         $this->render = $render;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function normalize($socialAction, string $format = null, array $context = [])
+    public function normalize($socialAction, ?string $format = null, array $context = [])
     {
-        return [
-            'id' => $socialAction->getId(),
-            'type' => 'social_work_social_action',
-            'text' => $this->render->renderString($socialAction, []),
-            'parent' => $this->normalizer->normalize($socialAction->getParent()),
-            'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate()),
-            'title' => $socialAction->getTitle()
-        ];
+        switch ($format) {
+            case 'json':
+                return [
+                    'id' => $socialAction->getId(),
+                    'type' => 'social_work_social_action',
+                    'text' => $this->render->renderString($socialAction, []),
+                    'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, $context),
+                    'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate(), $format, $context),
+                    'title' => $socialAction->getTitle(),
+                ];
+
+            case 'docgen':
+                if (null === $socialAction) {
+                    return ['id' => 0, 'title' => '', 'text' => ''];
+                }
+
+                return [
+                    'id' => $socialAction->getId(),
+                    'text' => $this->render->renderString($socialAction, []),
+                    'title' => $socialAction->getTitle(),
+                ];
+
+            default:
+                throw new \Symfony\Component\Serializer\Exception\RuntimeException('format not supported');
+        }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function supportsNormalization($data, string $format = null)
+    public function supportsNormalization($data, ?string $format = null, array $context = [])
     {
-        return $data instanceof SocialAction;
+        if ($data instanceof SocialAction && 'json' === $format) {
+            return true;
+        }
+
+        if ('docgen' === $format) {
+            if ($data instanceof SocialAction) {
+                return true;
+            }
+
+            if (null === $data && SocialAction::class === ($context['docgen:expects'] ?? null)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
index 383110764..5be7df4bc 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
@@ -1,39 +1,76 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 
-class SocialIssueNormalizer implements NormalizerInterface, NormalizerAwareInterface
+class SocialIssueNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
 {
-    private SocialIssueRender $render;
-
     use NormalizerAwareTrait;
 
+    private SocialIssueRender $render;
+
     public function __construct(SocialIssueRender $render)
     {
         $this->render = $render;
     }
 
-    public function normalize($socialIssue, string $format = null, array $context = [])
+    public function normalize($socialIssue, ?string $format = null, array $context = [])
     {
         /** @var SocialIssue $socialIssue */
-        return [
-            'type' => 'social_issue',
-            'id' => $socialIssue->getId(),
-            'parent_id' => $socialIssue->hasParent() ? $socialIssue->getParent()->getId() : null,
-            'children_ids' => $socialIssue->getChildren()->map(function (SocialIssue $si) { return $si->getId(); }),
-            'title' => $socialIssue->getTitle(),
-            'text' => $this->render->renderString($socialIssue, [])
-        ];
+        switch ($format) {
+            case 'json':
+                return [
+                    'type' => 'social_issue',
+                    'id' => $socialIssue->getId(),
+                    'parent_id' => $socialIssue->hasParent() ? $socialIssue->getParent()->getId() : null,
+                    'children_ids' => $socialIssue->getChildren()->map(static function (SocialIssue $si) { return $si->getId(); }),
+                    'title' => $socialIssue->getTitle(),
+                    'text' => $this->render->renderString($socialIssue, []),
+                ];
+
+            case 'docgen':
+                if (null === $socialIssue) {
+                    return ['id' => 0, 'title' => '', 'text' => ''];
+                }
+
+                return [
+                    'id' => $socialIssue->getId(),
+                    'title' => $socialIssue->getTitle(),
+                    'text' => $this->render->renderString($socialIssue, []),
+                ];
+        }
     }
 
-    public function supportsNormalization($data, string $format = null): bool
+    public function supportsNormalization($data, ?string $format = null, array $context = [])
     {
-        return $data instanceof SocialIssue;
+        if ($data instanceof SocialIssue && 'json' === $format) {
+            return true;
+        }
+
+        if ('docgen' === $format) {
+            if ($data instanceof SocialIssue) {
+                return true;
+            }
+
+            if (null === $data && SocialIssue::class === ($context['docgen:expects'] ?? null)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
new file mode 100644
index 000000000..345fa2556
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -0,0 +1,252 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\DocGenerator;
+
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
+use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
+
+class AccompanyingPeriodContext implements
+    DocGeneratorContextWithAdminFormInterface,
+    DocGeneratorContextWithPublicFormInterface
+{
+    private DocumentCategoryRepository $documentCategoryRepository;
+
+    private EntityManagerInterface $em;
+
+    private NormalizerInterface $normalizer;
+
+    private PersonRender $personRender;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        DocumentCategoryRepository $documentCategoryRepository,
+        NormalizerInterface $normalizer,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        EntityManagerInterface $em,
+        PersonRender $personRender,
+        TranslatorInterface $translator
+    ) {
+        $this->documentCategoryRepository = $documentCategoryRepository;
+        $this->normalizer = $normalizer;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->em = $em;
+        $this->personRender = $personRender;
+        $this->translator = $translator;
+    }
+
+    public function adminFormReverseTransform(array $data): array
+    {
+        dump($data);
+
+        if (array_key_exists('category', $data)) {
+            $data['category'] = [
+                'idInsideBundle' => $data['category']->getIdInsideBundle(),
+                'bundleId' => $data['category']->getBundleId(),
+            ];
+        }
+
+        return $data;
+    }
+
+    public function adminFormTransform(array $data): array
+    {
+        $r = [
+            'mainPerson' => $data['mainPerson'] ?? false,
+            'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
+            'person1' => $data['person1'] ?? false,
+            'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
+            'person2' => $data['person2'] ?? false,
+            'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
+        ];
+
+        if (array_key_exists('category', $data)) {
+            $r['category'] = array_key_exists('category', $data) ?
+                $this->documentCategoryRepository->find($data['category']) : null;
+        }
+
+        return $r;
+    }
+
+    public function buildAdminForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('mainPerson', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for main person',
+            ])
+            ->add('mainPersonLabel', TextType::class, [
+                'label' => 'main person label',
+                'required' => true,
+            ])
+            ->add('person1', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for person 1',
+            ])
+            ->add('person1Label', TextType::class, [
+                'label' => 'person 1 label',
+                'required' => true,
+            ])
+            ->add('person2', CheckboxType::class, [
+                'required' => false,
+                'label' => 'docgen.Ask for person 2',
+            ])
+            ->add('person2Label', TextType::class, [
+                'label' => 'person 2 label',
+                'required' => true,
+            ])
+            ->add('category', EntityType::class, [
+                'placeholder' => 'Choose a document category',
+                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.documentClass = :docClass')
+                        ->setParameter('docClass', AccompanyingCourseDocument::class);
+                },
+                'choice_label' => function ($entity = null) {
+                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
+                },
+            ]);
+    }
+
+    /**
+     * @param AccompanyingPeriod $entity
+     */
+    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
+    {
+        $options = $template->getOptions();
+        $persons = $entity->getCurrentParticipations()->map(static function (AccompanyingPeriodParticipation $p) { return $p->getPerson(); })
+            ->toArray();
+
+        foreach (['mainPerson', 'person1', 'person2'] as $key) {
+            if ($options[$key] ?? false) {
+                $builder->add($key, EntityType::class, [
+                    'class' => Person::class,
+                    'choices' => $persons,
+                    'choice_label' => function (Person $p) { return $this->personRender->renderString($p, []); },
+                    'multiple' => false,
+                    'expanded' => true,
+                    'label' => $options[$key . 'Label'],
+                ]);
+            }
+        }
+    }
+
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    {
+        if (!$entity instanceof AccompanyingPeriod) {
+            throw new UnexpectedTypeException($entity, AccompanyingPeriod::class);
+        }
+        $options = $template->getOptions();
+
+        $data = [];
+        $data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
+
+        foreach (['mainPerson', 'person1', 'person2'] as $k) {
+            if ($options[$k]) {
+                $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [
+                    'docgen:expects' => Person::class,
+                    'groups' => 'docgen:read',
+                    'docgen:person:with-household' => true,
+                    'docgen:person:with-relations' => true,
+                ]);
+            }
+        }
+
+        return $data;
+    }
+
+    public function getDescription(): string
+    {
+        return 'docgen.A basic context for accompanying period';
+    }
+
+    public function getEntityClass(): string
+    {
+        return AccompanyingPeriod::class;
+    }
+
+    public function getFormData(DocGeneratorTemplate $template, $entity): array
+    {
+        return [
+            'course' => $entity,
+        ];
+    }
+
+    public static function getKey(): string
+    {
+        return self::class;
+    }
+
+    public function getName(): string
+    {
+        return 'docgen.Accompanying Period basic';
+    }
+
+    public function hasAdminForm(): bool
+    {
+        return true;
+    }
+
+    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
+    {
+        $options = $template->getOptions();
+
+        return $options['mainPerson'] || $options['person1'] || $options['person2'];
+    }
+
+    /**
+     * @param AccompanyingPeriod $entity
+     */
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
+    {
+        $doc = new AccompanyingCourseDocument();
+        $doc->setTitle($this->translatableStringHelper->localize($template->getName()))
+            ->setDate(new DateTime())
+            ->setDescription($this->translatableStringHelper->localize($template->getName()))
+            ->setCourse($entity)
+            ->setObject($storedObject);
+
+        if (array_key_exists('category', $template->getOptions())) {
+            $doc
+                ->setCategory(
+                    $this->documentCategoryRepository->find(
+                        $template->getOptions()['category']
+                    )
+                );
+        }
+
+        $this->em->persist($doc);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
new file mode 100644
index 000000000..b47c46b00
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkContext.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\DocGenerator;
+
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class AccompanyingPeriodWorkContext implements
+    DocGeneratorContextInterface,
+    DocGeneratorContextWithAdminFormInterface,
+    DocGeneratorContextWithPublicFormInterface
+{
+    private NormalizerInterface $normalizer;
+
+    private AccompanyingPeriodContext $periodContext;
+
+    public function __construct(
+        AccompanyingPeriodContext $periodContext,
+        NormalizerInterface $normalizer
+    ) {
+        $this->periodContext = $periodContext;
+        $this->normalizer = $normalizer;
+    }
+
+    public function adminFormReverseTransform(array $data): array
+    {
+        return $this->periodContext->adminFormReverseTransform($data);
+    }
+
+    public function adminFormTransform(array $data): array
+    {
+        return $this->periodContext->adminFormTransform($data);
+    }
+
+    public function buildAdminForm(FormBuilderInterface $builder): void
+    {
+        $this->periodContext->buildAdminForm($builder);
+
+        $builder->remove('category');
+    }
+
+    /**
+     * @param AccompanyingPeriodWork $entity
+     */
+    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
+    {
+        $this->periodContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriod());
+    }
+
+    /**
+     * @param AccompanyingPeriodWork $entity
+     */
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    {
+        $data = $this->periodContext->getData($template, $entity->getAccompanyingPeriod(), $contextGenerationData);
+        $data['work'] = $this->normalizer->normalize($entity, 'docgen', [
+            AbstractNormalizer::GROUPS => ['docgen:read'],
+            'docgen:expects' => AccompanyingPeriodWork::class,
+        ]);
+
+        return $data;
+    }
+
+    public function getDescription(): string
+    {
+        return 'docgen.A context for accompanying period work';
+    }
+
+    public function getEntityClass(): string
+    {
+        return AccompanyingPeriodWork::class;
+    }
+
+    /**
+     * @param AccompanyingPeriodWork $entity
+     */
+    public function getFormData(DocGeneratorTemplate $template, $entity): array
+    {
+        return $this->periodContext->getFormData($template, $entity->getAccompanyingPeriod());
+    }
+
+    public static function getKey(): string
+    {
+        return 'accompanying_period_work_regular';
+    }
+
+    public function getName(): string
+    {
+        return 'docgen.Accompanying period work';
+    }
+
+    public function hasAdminForm(): bool
+    {
+        return $this->periodContext->hasAdminForm();
+    }
+
+    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
+    {
+        return $this->periodContext->hasPublicForm($template, $entity);
+    }
+
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
+    {
+        // TODO: Implement storeGenerated() method.
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
new file mode 100644
index 000000000..26004eee3
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Service\DocGenerator;
+
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class AccompanyingPeriodWorkEvaluationContext implements
+    DocGeneratorContextWithAdminFormInterface,
+    DocGeneratorContextWithPublicFormInterface
+{
+    private AccompanyingPeriodWorkContext $accompanyingPeriodWorkContext;
+
+    private EntityManagerInterface $em;
+
+    private EvaluationRepository $evaluationRepository;
+
+    private NormalizerInterface $normalizer;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        AccompanyingPeriodWorkContext $accompanyingPeriodWorkContext,
+        EntityManagerInterface $em,
+        EvaluationRepository $evaluationRepository,
+        NormalizerInterface $normalizer,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->accompanyingPeriodWorkContext = $accompanyingPeriodWorkContext;
+        $this->em = $em;
+        $this->evaluationRepository = $evaluationRepository;
+        $this->normalizer = $normalizer;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function adminFormReverseTransform(array $data): array
+    {
+        return array_merge(
+            $this->accompanyingPeriodWorkContext->adminFormReverseTransform($data),
+            [
+                'evaluations' => array_map(
+                    static function (Evaluation $e) { return $e->getId(); },
+                    $data['evaluations']
+                ),
+            ]
+        );
+    }
+
+    public function adminFormTransform(array $data): array
+    {
+        return array_merge(
+            $this->accompanyingPeriodWorkContext->adminFormTransform($data),
+            [
+                'evaluations' => array_map(
+                    function ($id) { return $this->evaluationRepository->find($id); },
+                    $data['evaluations'] ?? []
+                ),
+            ]
+        );
+    }
+
+    public function buildAdminForm(FormBuilderInterface $builder): void
+    {
+        $this->accompanyingPeriodWorkContext->buildAdminForm($builder);
+
+        $builder->remove('category');
+
+        $builder->add('evaluations', EntityType::class, [
+            'class' => Evaluation::class,
+            'label' => 'Linked evaluations',
+            'choices' => $this->evaluationRepository->findAll(),
+            'choice_label' => function (Evaluation $e) {
+                return $this->translatableStringHelper->localize($e->getTitle());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    /**
+     * @param AccompanyingPeriodWorkEvaluation $entity
+     */
+    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
+    {
+        $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
+    }
+
+    /**
+     * @param AccompanyingPeriodWorkEvaluation $entity
+     */
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    {
+        $data = $this->accompanyingPeriodWorkContext
+            ->getData($template, $entity->getAccompanyingPeriodWork(), $contextGenerationData);
+        $data['evaluation'] = $this->normalizer->normalize(
+            $entity,
+            'docgen',
+            [
+                'docgen:expect' => AccompanyingPeriodWorkEvaluation::class,
+                AbstractNormalizer::GROUPS => ['docgen:read'],
+            ]
+        );
+
+        return $data;
+    }
+
+    public function getDescription(): string
+    {
+        return 'docgen.A context for accompanying period work evaluation';
+    }
+
+    public function getEntityClass(): string
+    {
+        return AccompanyingPeriodWorkEvaluation::class;
+    }
+
+    /**
+     * @param AccompanyingPeriodWorkEvaluation $entity
+     */
+    public function getFormData(DocGeneratorTemplate $template, $entity): array
+    {
+        return $this->accompanyingPeriodWorkContext->getFormData(
+            $template,
+            $entity->getAccompanyingPeriodWork()
+        );
+    }
+
+    public static function getKey(): string
+    {
+        return 'accompanying_period_work_evaluation_regular';
+    }
+
+    public function getName(): string
+    {
+        return 'docgen.Accompanying period work context';
+    }
+
+    public function hasAdminForm(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param AccompanyingPeriodWorkEvaluation $entity
+     */
+    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
+    {
+        return $this->accompanyingPeriodWorkContext
+            ->hasPublicForm($template, $entity->getAccompanyingPeriodWork());
+    }
+
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
+    {
+        $doc = new AccompanyingPeriodWorkEvaluationDocument();
+        $doc->setStoredObject($storedObject)
+            ->setAccompanyingPeriodWorkEvaluation($entity)
+            ->setTemplate($template);
+        $this->em->persist($doc);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php b/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
index 4360a7cfa..8f0a53157 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/ChillImporter.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\Import;
diff --git a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
index 015ef7485..00d1de6ef 100644
--- a/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
+++ b/src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadataInterface.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\Import;
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
index 8b54fca02..d4c7c6d10 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
@@ -1,75 +1,82 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 
 /**
- * Render closing motive
- *
+ * Render closing motive.
  */
 class ClosingMotiveRender extends AbstractChillEntityRender
 {
-    private CONST SEPARATOR = ' > ';
-    
+    private const SEPARATOR = ' > ';
+
     /**
-     *
      * @var TranslatableStringHelper
      */
     private $translatableStringHelper;
-    
+
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }
-    
+
     public function renderBox($entity, array $options): string
     {
-        return 
-            $this->getDefaultOpeningBox('closing-motive').
-            $this->renderString($entity, $options).
-            $this->getDefaultClosingBox()
-            ;
+        return
+            $this->getDefaultOpeningBox('closing-motive') .
+            $this->renderString($entity, $options) .
+            $this->getDefaultClosingBox();
     }
 
     /**
-     * 
      * @param ClosingMotive $entity
-     * @param array $options
-     * @return string
      */
     public function renderString($entity, array $options): string
     {
-        return $this->renderStringRecursive($entity, 
-            '', //$this->translatableStringHelper->localize($entity->getName()), 
-            $options);
-    }
-    
-    protected function renderStringRecursive(ClosingMotive $motive, $existing, array $options)
-    {
-        $newExisting = $this->translatableStringHelper->localize($motive->getName());
-        
-        if ($motive->hasParent()) {
-            
-            if (!empty($existing)) {
-                $newExisting = $newExisting.self::SEPARATOR.$existing;
-            }
-            
-            return $this->renderStringRecursive($motive->getParent(), $newExisting,
-                $options);
-        } else {
-            if (!empty($existing)) {
-                return $newExisting.self::SEPARATOR.$existing;
-            } else {
-                return $newExisting;
-            }
-        }
+        return $this->renderStringRecursive(
+            $entity,
+            '', //$this->translatableStringHelper->localize($entity->getName()),
+            $options
+        );
     }
 
     public function supports($entity, array $options): bool
     {
         return $entity instanceof ClosingMotive;
     }
+
+    protected function renderStringRecursive(ClosingMotive $motive, $existing, array $options)
+    {
+        $newExisting = $this->translatableStringHelper->localize($motive->getName());
+
+        if ($motive->hasParent()) {
+            if (!empty($existing)) {
+                $newExisting = $newExisting . self::SEPARATOR . $existing;
+            }
+
+            return $this->renderStringRecursive(
+                $motive->getParent(),
+                $newExisting,
+                $options
+            );
+        }
+
+        if (!empty($existing)) {
+            return $newExisting . self::SEPARATOR . $existing;
+        }
+
+        return $newExisting;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index fc112a1e7..1f1601920 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -1,33 +1,24 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS,
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Templating\EngineInterface;
+use function array_key_exists;
 
 /**
- * Render a Person
- *
+ * Render a Person.
  */
 class PersonRender extends AbstractChillEntityRender
 {
@@ -44,10 +35,7 @@ class PersonRender extends AbstractChillEntityRender
     }
 
     /**
-     *
      * @param Person $person
-     * @param array $options
-     * @return string
      */
     public function renderBox($person, array $options): string
     {
@@ -63,6 +51,7 @@ class PersonRender extends AbstractChillEntityRender
             'hLevel' => $options['hLevel'] ?? 3,
             'customButtons' => $options['customButtons'] ?? [],
             'customArea' => $options['customArea'] ?? [],
+            'addDeath' => $options['addDeath'] ?? true,
         ];
 
         return
@@ -70,21 +59,23 @@ class PersonRender extends AbstractChillEntityRender
             $this->engine->render('@ChillPerson/Entity/person.html.twig', [
                 'person' => $person,
                 'render' => $options['render'] ?? 'raw',
-                'options' => $params
+                'options' => $params,
             ]) .
             $this->getDefaultClosingBox();
     }
 
     /**
-     *
      * @param Person $person
-     * @param array $options
-     * @return string
      */
     public function renderString($person, array $options): string
     {
-        return $person->getFirstName().' '.$person->getLastName()
-            .$this->addAltNames($person, false);
+        return $person->getFirstName() . ' ' . $person->getLastName()
+            . $this->addAltNames($person, false);
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof Person;
     }
 
     protected function addAltNames(Person $person, bool $addSpan): string
@@ -97,34 +88,30 @@ class PersonRender extends AbstractChillEntityRender
 
             foreach ($person->getAltNames()->getIterator() as $altName) {
                 /** @var \Chill\PersonBundle\Entity\PersonAltName $altName */
-                if (\array_key_exists($altName->getKey(), $altNames)) {
+                if (array_key_exists($altName->getKey(), $altNames)) {
                     if ($isFirst) {
-                        $str .= " (";
+                        $str .= ' (';
                         $isFirst = false;
                     } else {
-                        $str.= " ";
+                        $str .= ' ';
                     }
+
                     if ($addSpan) {
-                        $str .= '<span class="altname altname-'.$altName->getKey().'">';
+                        $str .= '<span class="altname altname-' . $altName->getKey() . '">';
                     }
                     $str .= $altName->getLabel();
 
                     if ($addSpan) {
-                        $str .= "</span>";
+                        $str .= '</span>';
                     }
                 }
             }
 
             if (!$isFirst) {
-                $str .= ")";
+                $str .= ')';
             }
         }
 
         return $str;
     }
-
-    public function supports($entity, array $options): bool
-    {
-        return $entity instanceof Person;
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
index 7da1a8cad..e5afe1d66 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php
@@ -1,27 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Symfony\Component\Templating\EngineInterface;
+use function array_merge;
+use function array_reverse;
+use function implode;
 
 class SocialActionRender implements ChillEntityRenderInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-    private EngineInterface $engine;
-
-    public const SEPARATOR_KEY = 'default.separator';
-    /**
-     * if true, the action will not be encapsulated into a "badge"
-     */
-    public const NO_BADGE = 'no-badge';
-
     public const DEFAULT_ARGS = [
         self::SEPARATOR_KEY => ' > ',
         self::NO_BADGE => false,
-   ];
+    ];
+
+    /**
+     * if true, the action will not be encapsulated into a "badge".
+     */
+    public const NO_BADGE = 'no-badge';
+
+    public const SEPARATOR_KEY = 'default.separator';
+
+    private EngineInterface $engine;
+
+    private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
     {
@@ -29,16 +43,24 @@ class SocialActionRender implements ChillEntityRenderInterface
         $this->engine = $engine;
     }
 
-    public function supports($entity, array $options): bool
+    public function renderBox($socialAction, array $options): string
     {
-        return $entity instanceof SocialAction;
+        $options = array_merge(self::DEFAULT_ARGS, $options);
+        // give some help to twig: an array of parents
+        $parents = $this->buildParents($socialAction);
+
+        return $this->engine->render('@ChillPerson/Entity/social_action.html.twig', [
+            'socialAction' => $socialAction,
+            'parents' => $parents,
+            'options' => $options,
+        ]);
     }
 
     public function renderString($socialAction, array $options): string
     {
-        /** @var $socialAction SocialAction */
-        $options = \array_merge(self::DEFAULT_ARGS, $options);
-        $titles[] = $this->translatableStringHelper->localize($socialAction->getTitle());
+        /** @var SocialAction $socialAction */
+        $options = array_merge(self::DEFAULT_ARGS, $options);
+        $titles = [$this->translatableStringHelper->localize($socialAction->getTitle())];
 
         while ($socialAction->hasParent()) {
             $socialAction = $socialAction->getParent();
@@ -47,31 +69,24 @@ class SocialActionRender implements ChillEntityRenderInterface
             );
         }
 
-        $titles = \array_reverse($titles);
+        $titles = array_reverse($titles);
 
-        return \implode($options[self::SEPARATOR_KEY], $titles);
+        return implode($options[self::SEPARATOR_KEY], $titles);
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof SocialAction;
     }
 
     protected function buildParents($socialAction): array
     {
         $parents = [];
+
         while ($socialAction->hasParent()) {
             $socialAction = $parents[] = $socialAction->getParent();
         }
 
         return $parents;
     }
-
-    public function renderBox($socialAction, array $options): string
-    {
-        $options = \array_merge(self::DEFAULT_ARGS, $options);
-        // give some help to twig: an array of parents
-        $parents = $this->buildParents($socialAction);
-
-        return $this->engine->render('@ChillPerson/Entity/social_action.html.twig', [
-            'socialAction' => $socialAction,
-            'parents' => $parents,
-            'options' => $options
-        ]);
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
index 5ed80182c..ecc71038a 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php
@@ -1,23 +1,34 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use RuntimeException;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Component\Templating\EngineInterface;
+use function array_reverse;
+use function implode;
 
 final class SocialIssueRender implements ChillEntityRenderInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
-    private EngineInterface $engine;
+    public const DEFAULT_ARGS = [
+        self::SEPARATOR_KEY => ' > ',
+    ];
 
     public const SEPARATOR_KEY = 'default.separator';
 
-    public const DEFAULT_ARGS = [
-       self::SEPARATOR_KEY => ' > ',
-   ];
+    private EngineInterface $engine;
+
+    private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
     {
@@ -25,50 +36,9 @@ final class SocialIssueRender implements ChillEntityRenderInterface
         $this->engine = $engine;
     }
 
-    public function supports($entity, array $options): bool
-    {
-        return $entity instanceof SocialIssue;
-    }
-
     /**
      * @param SocialIssue $socialIssue
      */
-    public function renderString($socialIssue, array $options): string
-    {
-        /** @var $socialIssue SocialIssue */
-        $options = array_merge(self::DEFAULT_ARGS, $options);
-
-        $titles[] = $this->translatableStringHelper
-            ->localize($socialIssue->getTitle());
-
-        // loop to parent, until root
-        while ($socialIssue->hasParent()) {
-            $socialIssue = $socialIssue->getParent();
-            $titles[] = $this->translatableStringHelper->localize(
-                $socialIssue->getTitle()
-            );
-        }
-
-        $titles = \array_reverse($titles);
-
-        return \implode($options[self::SEPARATOR_KEY], $titles);
-    }
-
-    protected function buildParents(SocialIssue $socialIssue): array
-    {
-        $parents = [];
-
-        while ($socialIssue->hasParent()) {
-            $socialIssue = $parents[] = $socialIssue->getParent();
-        }
-
-        return $parents;
-    }
-
-    /**
-     *
-     * @param SocialIssue $socialIssue
-     */
     public function renderBox($socialIssue, array $options): string
     {
         $options = array_merge(self::DEFAULT_ARGS, $options);
@@ -82,8 +52,47 @@ final class SocialIssueRender implements ChillEntityRenderInterface
                 [
                     'socialIssue' => $socialIssue,
                     'parents' => $parents,
-                    'options' => $options
+                    'options' => $options,
                 ]
             );
     }
+
+    /**
+     * @param SocialIssue $socialIssue
+     */
+    public function renderString($socialIssue, array $options): string
+    {
+        /** @var SocialIssue $socialIssue */
+        $options = array_merge(self::DEFAULT_ARGS, $options);
+
+        $titles = [$this->translatableStringHelper->localize($socialIssue->getTitle())];
+
+        // loop to parent, until root
+        while ($socialIssue->hasParent()) {
+            $socialIssue = $socialIssue->getParent();
+            $titles[] = $this->translatableStringHelper->localize(
+                $socialIssue->getTitle()
+            );
+        }
+
+        $titles = array_reverse($titles);
+
+        return implode($options[self::SEPARATOR_KEY], $titles);
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof SocialIssue;
+    }
+
+    private function buildParents(SocialIssue $socialIssue): array
+    {
+        $parents = [];
+
+        while ($socialIssue->hasParent()) {
+            $socialIssue = $parents[] = $socialIssue->getParent();
+        }
+
+        return $parents;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php b/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php
index e8e495a04..dfbcd6d15 100644
--- a/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php
+++ b/src/Bundle/ChillPersonBundle/Test/PreparePersonTrait.php
@@ -1,56 +1,39 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Test;
 
-use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Person;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 trait PreparePersonTrait
 {
-    
     /**
-     * prepare a person
-     * 
-     * Properties added are : 
+     * prepare a person.
+     *
+     * Properties added are :
      * - firstname
      * - lastname
      * - gender
-     * 
+     *
      * This person should not be persisted in a database
-     * 
-     * @param Center $center
+     *
      * @return Person
      */
     protected function preparePerson(Center $center)
     {
         return (new Person())
-              ->setCenter($center)
-              ->setFirstName('test firstname')
-              ->setLastName('default lastname')
-              ->setGender(Person::MALE_GENDER)
-              ;
+            ->setCenter($center)
+            ->setFirstName('test firstname')
+            ->setLastName('default lastname')
+            ->setGender(Person::MALE_GENDER);
     }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
new file mode 100644
index 000000000..f1551554c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\AccompanyingPeriod;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingPeriodConfidentialTest extends WebTestCase
+{
+    /**
+     * Setup before the first test of this class (see phpunit doc).
+     */
+    public static function setUpBeforeClass()
+    {
+        self::bootKernel();
+    }
+
+    /**
+     * Setup before each test method (see phpunit doc).
+     */
+    public function setUp()
+    {
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'fred',
+            'PHP_AUTH_PW' => 'password',
+        ]);
+    }
+
+    public function dataGenerateRandomAccompanyingCourse()
+    {
+        $maxGenerated = 3;
+        $maxResults = $maxGenerated * 8;
+
+        self::bootKernel();
+        $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+
+        $qb = $em->createQueryBuilder();
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.confidential', ':confidential')
+            )
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
+            ->setParameter('confidential', true)
+            ->setMaxResults($maxResults)
+            ->getQuery()
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($personIds);
+
+        $nbGenerated = 0;
+
+        while ($nbGenerated < $maxGenerated) {
+            $id = array_pop($personIds)['id'];
+
+            $person = $em->getRepository(Person::class)
+                ->find($id);
+            $periods = $person->getAccompanyingPeriods();
+
+            yield [array_pop($personIds)['id'], $periods[array_rand($periods)]->getId()];
+
+            ++$nbGenerated;
+        }
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomAccompanyingCourse
+     */
+    public function testRemoveUserWhenConfidential(int $periodId)
+    {
+        $period = self::$container->get(AccompanyingPeriodRepository::class)
+            ->find($periodId);
+        $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+
+        $isConfidential = $period->isConfidential();
+        $step = $period->getStep();
+
+        $initialUser = $period->getUser();
+
+        $user = new stdClass();
+        $user->id = 0;
+        $user->type = 'user';
+        dump($user);
+
+        $this->client->request(
+            Request::METHOD_PATCH,
+            sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'accompanying_period', 'user' => $user])
+        );
+        $response = $this->client->getResponse();
+
+        // if ($isConfidential === true && $step === 'CONFIRMED') {
+        $this->assertEquals(422, $response->getStatusCode());
+        // }
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($periodId);
+        $this->assertEquals($user, $period->getUser());
+
+        // assign initial user again
+        $period->setUser($initialUser);
+        $em->flush();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
index a94280dd0..8888868cb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\AccompanyingPeriod\SocialIssueConsistency;
 
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
@@ -11,8 +20,33 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use PHPUnit\Framework\TestCase;
 
-class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends TestCase
 {
+    public function testPrePersist()
+    {
+        $socialIssues = new ArrayCollection([
+            $parent = new SocialIssue(),
+            $child = (new SocialIssue())->setParent($parent),
+            $grandChild = (new SocialIssue())->setParent($child),
+            $grandGrandChild = (new SocialIssue())->setParent($grandChild),
+        ]);
+        $period = (new AccompanyingPeriod())->addSocialIssue($unrelated = new SocialIssue());
+        $entity = $this->generateClass($period, $socialIssues);
+        $consistency = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
+
+        $consistency->prePersist($entity, $this->generateLifecycleArgs());
+
+        $this->assertCount(2, $period->getSocialIssues());
+        $this->assertContains($grandGrandChild, $period->getSocialIssues());
+        $this->assertContains($unrelated, $period->getSocialIssues());
+
+        $this->assertCount(1, $entity->getSocialIssues());
+        $this->assertContains($grandGrandChild, $entity->getSocialIssues());
+    }
 
     public function testPrePersistAccompanyingPeriod()
     {
@@ -57,29 +91,6 @@ class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends TestCas
         $this->assertContains($grandGrandChild, $entity->getSocialIssues());
     }
 
-    public function testPrePersist()
-    {
-        $socialIssues = new ArrayCollection([
-            $parent = new SocialIssue(),
-            $child = (new SocialIssue())->setParent($parent),
-            $grandChild = (new SocialIssue())->setParent($child),
-            $grandGrandChild = (new SocialIssue())->setParent($grandChild),
-        ]);
-        $period = (new AccompanyingPeriod())->addSocialIssue($unrelated = new SocialIssue());
-        $entity = $this->generateClass($period, $socialIssues);
-        $consistency = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
-
-        $consistency->prePersist($entity, $this->generateLifecycleArgs());
-
-        $this->assertCount(2, $period->getSocialIssues());
-        $this->assertContains($grandGrandChild, $period->getSocialIssues());
-        $this->assertContains($unrelated, $period->getSocialIssues());
-
-        $this->assertCount(1, $entity->getSocialIssues());
-        $this->assertContains($grandGrandChild, $entity->getSocialIssues());
-
-    }
-
     public function testPreUpdateAccompanyingPeriod()
     {
         $arraySocialIssues = [
@@ -101,40 +112,40 @@ class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends TestCas
         $this->assertSame($grandGrandChild, $period->getSocialIssues()->first());
     }
 
+    protected function generateClass(AccompanyingPeriod $period, Collection $socialIssues): AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
+    {
+        return new class($period, $socialIssues) implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface {
+            public Collection $socialIssues;
+
+            public AccompanyingPeriod $period;
+
+            public function __construct($period, $socialIssues)
+            {
+                $this->period = $period;
+                $this->socialIssues = $socialIssues;
+            }
+
+            public function getAccompanyingPeriod(): AccompanyingPeriod
+            {
+                return $this->period;
+            }
+
+            public function getSocialIssues(): Collection
+            {
+                return $this->socialIssues;
+            }
+
+            public function removeSocialIssue(SocialIssue $issue): AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
+            {
+                $this->socialIssues->removeElement($issue);
+
+                return $this;
+            }
+        };
+    }
+
     protected function generateLifecycleArgs(): LifecycleEventArgs
     {
         return $this->createMock(LifecycleEventArgs::class);
     }
-
-    protected function generateClass(AccompanyingPeriod $period, Collection $socialIssues): AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
-    {
-       return new class($period, $socialIssues) implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
-       {
-           public Collection $socialIssues;
-           public AccompanyingPeriod $period;
-
-           public function __construct($period, $socialIssues)
-           {
-               $this->period = $period;
-               $this->socialIssues = $socialIssues;
-           }
-
-           public function getAccompanyingPeriod(): AccompanyingPeriod
-           {
-               return $this->period;
-           }
-
-           public function getSocialIssues(): Collection
-           {
-               return $this->socialIssues;
-           }
-
-           public function removeSocialIssue(SocialIssue $issue): AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
-           {
-               $this->socialIssues->removeElement($issue);
-
-               return $this;
-           }
-       };
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
index 78376b8bd..cfd126ad2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php
@@ -1,102 +1,378 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-
-use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
-use Doctrine\Common\Collections\Criteria;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use Iterator;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use function array_map;
+use function array_pop;
+use function array_rand;
+use function count;
+use function in_array;
+use function json_decode;
+use function json_encode;
 
 /**
- * Test api for AccompanyingCourseControllerTest
+ * Test api for AccompanyingCourseControllerTest.
+ *
+ * @internal
+ * @coversNothing
  */
-class AccompanyingCourseApiControllerTest extends WebTestCase
+final class AccompanyingCourseApiControllerTest extends WebTestCase
 {
     protected static EntityManagerInterface $em;
 
-    protected ?int $personId = NULL;
+    protected ?AccompanyingPeriod $period = null;
 
-    protected ?AccompanyingPeriod $period = NULL;
+    protected ?int $periodId = null;
 
-    protected ?int $periodId = NULL;
+    protected ?int $personId = null;
 
     /**
-     * Setup before the first test of this class (see phpunit doc)
+     * Setup before the first test of this class (see phpunit doc).
      */
     public static function setUpBeforeClass()
     {
-        static::bootKernel();
+        self::bootKernel();
     }
 
     /**
-     * Setup before each test method (see phpunit doc)
+     * Setup before each test method (see phpunit doc).
      */
     public function setUp()
     {
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
+    }
+
+    public function dataGenerateNewAccompanyingCourse()
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $period = new AccompanyingPeriod(new DateTime('1 week ago'));
+        $user = $em->getRepository(User::class)
+            ->findOneByUsernameCanonical('center a_social');
+        $period->setCreatedBy($user);
+        //$period->setCreatedAt(new \DateTime('yesterday'));
+
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+
+        $personIds = $em->createQuery('SELECT p.id FROM ' .
+            Person::class . ' p ' .
+            ' WHERE p.center = :center')
+            ->setParameter('center', $center)
+            ->setMaxResults(100)
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($personIds);
+
+        for ($i = 0; 2 > $i; ++$i) {
+            $person = $em->getRepository(Person::class)->find(array_pop($personIds));
+            $period->addPerson($person);
+        }
+
+        $em->persist($period);
+        $em->flush();
+
+        yield [$period];
+    }
+
+    public function dataGenerateRandomAccompanyingCourse()
+    {
+        // note about max result for person query, and maxGenerated:
+        //
+        // in the final loop, an id is popped out of the personIds array twice:
+        //
+        // * one for getting the person, which will in turn provide his accompanying period;
+        // * one for getting the personId to populate to the data manager
+        //
+        // Ensure to keep always $maxGenerated to the double of $maxResults. x8 is a good compromize :)
+        $maxGenerated = 3;
+        $maxResults = $maxGenerated * 8;
+
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+
+        $qb = $em->createQueryBuilder();
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0
+                )
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
+            ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
+            ->setMaxResults($maxResults)
+            ->getQuery()
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($personIds);
+
+        $nbGenerated = 0;
+
+        while ($nbGenerated < $maxGenerated) {
+            $id = array_pop($personIds)['id'];
+
+            $person = $em->getRepository(Person::class)
+                ->find($id);
+            $periods = $person->getAccompanyingPeriods();
+
+            yield [array_pop($personIds)['id'], $periods[array_rand($periods)]->getId()];
+
+            ++$nbGenerated;
+        }
+    }
+
+    public function dataGenerateRandomAccompanyingCourseWithSocialIssue()
+    {
+        // note about max result for person query, and maxGenerated:
+        //
+        // in the final loop, an id is popped out of the personIds array twice:
+        //
+        // * one for getting the person, which will in turn provide his accompanying period;
+        // * one for getting the personId to populate to the data manager
+        //
+        // Ensure to keep always $maxGenerated to the double of $maxResults. x8 is a good compromize :)
+        $maxGenerated = 3;
+        $maxResults = $maxGenerated * 8;
+
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+        $qb = $em->createQueryBuilder();
+
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0
+                )
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
+            ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
+            ->setMaxResults($maxResults)
+            ->getQuery()
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($personIds);
+
+        $socialIssues = $em->createQuery('SELECT s FROM ' .
+            SocialIssue::class . ' s ')
+            ->setMaxResults(10)
+            ->getResult();
+
+        $nbGenerated = 0;
+
+        while ($nbGenerated < $maxGenerated) {
+            $id = array_pop($personIds)['id'];
+
+            $person = $em->getRepository(Person::class)
+                ->find($id);
+            $periods = $person->getAccompanyingPeriods();
+
+            yield [$periods[array_rand($periods)], $socialIssues[array_rand($socialIssues)]];
+
+            ++$nbGenerated;
+        }
+    }
+
+    public function dataGenerateRandomRequestorValidData(): Iterator
+    {
+        $dataLength = 2;
+        $maxResults = 100;
+
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+        $qb = $em->createQueryBuilder();
+
+        $personIds = $qb
+            ->select('p.id')
+            ->distinct(true)
+            ->from(Person::class, 'p')
+            ->join('p.accompanyingPeriodParticipations', 'participation')
+            ->join('participation.accompanyingPeriod', 'ap')
+            ->where(
+                $qb->expr()->eq(
+                    'p.center',
+                    ':center'
+                )
+            )
+            ->andWhere(
+                $qb->expr()->gt(
+                    'SIZE(p.accompanyingPeriodParticipations)',
+                    0
+                )
+            )
+            ->andWhere(
+                $qb->expr()->eq('ap.step', ':step')
+            )
+            ->setParameter('center', $center)
+            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
+            ->setMaxResults($maxResults)
+            ->getQuery()
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($personIds);
+
+        $thirdPartyIds = $em->createQuery('SELECT t.id FROM ' .
+            ThirdParty::class . ' t ')
+            ->setMaxResults($maxResults)
+            ->getScalarResult();
+
+        // create a random order
+        shuffle($thirdPartyIds);
+
+        $i = 0;
+
+        while ($i <= $dataLength) {
+            $person = $em->getRepository(Person::class)
+                ->find(array_pop($personIds)['id']);
+
+            if (count($person->getAccompanyingPeriods()) === 0) {
+                continue;
+            }
+
+            $period = $person->getAccompanyingPeriods()[0];
+
+            yield [$period, array_pop($personIds)['id'], array_pop($thirdPartyIds)['id']];
+            ++$i;
+        }
     }
 
     /**
-     *
      * @dataProvider dataGenerateRandomAccompanyingCourse
      */
-    public function testAccompanyingCourseShow(int $personId, int $periodId)
+    public function testAccompanyingCourseAddParticipation(int $personId, int $periodId)
     {
-        $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
-        $response = $this->client->getResponse();
-
-        $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
-
-        $data = \json_decode($response->getContent());
-        $this->assertEquals($data->id, $periodId,
-            "test that the response's data contains the id of the period"
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'person', 'id' => $personId])
         );
-        $this->assertGreaterThan(0, $data->participations);
-    }
-
-    public function testShow404()
-    {
-        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', 99999));
         $response = $this->client->getResponse();
+        $data = json_decode($response->getContent(), true);
 
-        $this->assertEquals(404, $response->getStatusCode(), "Test that the response of rest api has a status code 'not found' (404)");
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $this->assertArrayHasKey('id', $data);
+        $this->assertArrayHasKey('startDate', $data);
+        $this->assertNotNull($data['startDate']);
+
+        // check by deownloading the accompanying cours
+
+        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $response = $this->client->getResponse();
+        $data = json_decode($response->getContent());
+
+        // check that the person id is contained
+        $participationsPersonsIds = array_map(
+            static function ($participation) { return $participation->person->id; },
+            $data->participations
+        );
+
+        $this->assertContains($personId, $participationsPersonsIds);
+
+        // check removing the participation
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'person', 'id' => $personId])
+        );
+        $response = $this->client->getResponse();
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $this->assertArrayHasKey('id', $data);
+        $this->assertArrayHasKey('startDate', $data);
+        $this->assertNotNull($data['startDate']);
+        $this->assertArrayHasKey('endDate', $data);
+        $this->assertNotNull($data['endDate']);
     }
 
     /**
-     *
      * @dataProvider dataGenerateRandomAccompanyingCourseWithSocialIssue
      */
     public function testAccompanyingCourseAddRemoveSocialIssue(AccompanyingPeriod $period, SocialIssue $si)
@@ -107,31 +383,95 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [],
-            \json_encode([ 'type' => 'social_issue', 'id' => $si->getId() ])
+            json_encode(['type' => 'social_issue', 'id' => $si->getId()])
         );
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
 
-        $data = \json_decode($this->client->getResponse()->getContent(), true);
+        if ($this->client->getResponse()->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $data = json_decode($this->client->getResponse()->getContent(), true);
         $this->assertArrayHasKey('id', $data);
         $this->assertArrayHasKey('type', $data);
         $this->assertEquals('social_issue', $data['type']);
 
-
         $this->client->request(
             Request::METHOD_DELETE,
             sprintf('/api/1.0/person/accompanying-course/%d/socialissue.json', $period->getId()),
             [],
             [],
             [],
-            \json_encode([ 'type' => 'social_issue', 'id' => $si->getId() ])
+            json_encode(['type' => 'social_issue', 'id' => $si->getId()])
         );
 
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomAccompanyingCourse
+     */
+    public function testAccompanyingCourseShow(int $personId, int $periodId)
+    {
+        $c = $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
+        $response = $this->client->getResponse();
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $data = json_decode($response->getContent());
+        $this->assertEquals(
+            $data->id,
+            $periodId,
+            "test that the response's data contains the id of the period"
+        );
+        $this->assertGreaterThan(0, $data->participations);
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomAccompanyingCourse
+     */
+    public function testAccompanyingPeriodPatch(int $personId, int $periodId)
+    {
+        $period = self::$container->get(AccompanyingPeriodRepository::class)
+            ->find($periodId);
+        $initialValueEmergency = $period->isEmergency();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $this->client->request(
+            Request::METHOD_PATCH,
+            sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'accompanying_period', 'emergency' => !$initialValueEmergency])
+        );
+        $response = $this->client->getResponse();
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($periodId);
+        $this->assertEquals(!$initialValueEmergency, $period->isEmergency());
+
+        // restore the initial value
+        $period->setEmergency($initialValueEmergency);
+        $em->flush();
     }
 
     /**
      * @dataProvider dataGenerateRandomRequestorValidData
+     *
+     * @param mixed $personId
+     * @param mixed $thirdPartyId
      */
     public function testCommentWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
     {
@@ -143,12 +483,17 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            \json_encode([ 'type' => 'accompanying_period_comment', 'content' => "this is a text"])
+            json_encode(['type' => 'accompanying_period_comment', 'content' => 'this is a text'])
         );
         $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
 
-        $this->assertEquals(200, $response->getStatusCode());
         $this->assertArrayHasKey('id', $data);
 
         $this->client->request(
@@ -157,16 +502,135 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            \json_encode([ 'type' => 'accompanying_period_comment', 'id' => $data['id']])
+            json_encode(['type' => 'accompanying_period_comment', 'id' => $data['id']])
         );
         $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
+        $data = json_decode($response->getContent(), true);
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+    }
+
+    /**
+     * @dataProvider dataGenerateNewAccompanyingCourse
+     */
+    public function testConfirm(AccompanyingPeriod $period)
+    {
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/confirm.json', $period->getId())
+        );
+
+        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
+
+        if ($this->client->getResponse()->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        // add period to remove it in tear down
+        $this->period = $period;
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomAccompanyingCourse
+     */
+    public function testReferralAvailable(int $personId, int $periodId)
+    {
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/referrers-suggested.json', $periodId)
+        );
+
+        $this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
     }
 
     /**
      * @dataProvider dataGenerateRandomRequestorValidData
+     *
+     * @param mixed $personId
+     * @param mixed $thirdPartyId
+     */
+    public function testRequestorWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        // post a person
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'person', 'id' => $personId])
+        );
+        $response = $this->client->getResponse();
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals($personId, $data['id']);
+
+        // check into database
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $this->assertInstanceOf(Person::class, $period->getRequestor());
+        $this->assertEquals($personId, $period->getRequestor()->getId());
+
+        // post a third party
+        $this->client->request(
+            Request::METHOD_POST,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
+            [], // parameters
+            [], // files
+            [], // server parameters
+            json_encode(['type' => 'thirdparty', 'id' => $thirdPartyId])
+        );
+        $response = $this->client->getResponse();
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals($thirdPartyId, $data['id']);
+
+        // check into database
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $this->assertInstanceOf(ThirdParty::class, $period->getRequestor());
+        $this->assertEquals($thirdPartyId, $period->getRequestor()->getId());
+
+        // remove the requestor
+        $this->client->request(
+            Request::METHOD_DELETE,
+            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId())
+        );
+        $response = $this->client->getResponse();
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        // check into database
+        $period = $em->getRepository(AccompanyingPeriod::class)
+            ->find($period->getId());
+        $em->refresh($period);
+        $this->assertNull($period->getRequestor());
+    }
+
+    /**
+     * @dataProvider dataGenerateRandomRequestorValidData
+     *
+     * @param mixed $personId
+     * @param mixed $thirdPartyId
      */
     public function testResourceWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
     {
@@ -179,12 +643,17 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [], // parameters
             [], // files
             [], // server parameters
-            \json_encode([ 'type' => 'accompanying_period_resource', 'resource' => [ 'type' => 'person', 'id' => $personId ]])
+            json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'person', 'id' => $personId]])
         );
         $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
 
-        $this->assertEquals(200, $response->getStatusCode());
         $this->assertArrayHasKey('id', $data);
         $this->assertEquals($personId, $data['resource']['id']);
 
@@ -202,24 +671,33 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [], //server
-            \json_encode([ 'type' => 'accompanying_period_resource', 'id' => $resource->getId()])
+            json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()])
         );
         $response = $this->client->getResponse();
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
 
-       // post a third party
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
+
+        // post a third party
         $this->client->request(
             Request::METHOD_POST,
             sprintf('/api/1.0/person/accompanying-course/%d/resource.json', $period->getId()),
             [], // parameters
             [], // files
             [], // server parameters
-            \json_encode([ 'type' => 'accompanying_period_resource', 'resource' => [ 'type' => 'thirdparty', 'id' => $thirdPartyId ]])
+            json_encode(['type' => 'accompanying_period_resource', 'resource' => ['type' => 'thirdparty', 'id' => $thirdPartyId]])
         );
         $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
+        $data = json_decode($response->getContent(), true);
+
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
+
+        if ($response->getStatusCode() === 422) {
+            $this->markTestSkipped('the next tests should appears only on valid accompanying period');
+        }
 
-        $this->assertEquals(200, $response->getStatusCode());
         $this->assertArrayHasKey('id', $data);
         $this->assertEquals($thirdPartyId, $data['resource']['id']);
 
@@ -237,420 +715,17 @@ class AccompanyingCourseApiControllerTest extends WebTestCase
             [],
             [],
             [], //server
-            \json_encode([ 'type' => 'accompanying_period_resource', 'id' => $resource->getId()])
+            json_encode(['type' => 'accompanying_period_resource', 'id' => $resource->getId()])
         );
         $response = $this->client->getResponse();
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertTrue(in_array($response->getStatusCode(), [200, 422], true));
     }
 
-    /**
-     * @dataProvider dataGenerateRandomRequestorValidData
-     */
-    public function testRequestorWithValidData(AccompanyingPeriod $period, $personId, $thirdPartyId)
+    public function testShow404()
     {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        // post a person
-        $this->client->request(
-            Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
-            [], // parameters
-            [], // files
-            [], // server parameters
-            \json_encode([ 'type' => 'person', 'id' => $personId ])
-        );
-        $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertArrayHasKey('id', $data);
-        $this->assertEquals($personId, $data['id']);
-
-        // check into database
-        $period = $em->getRepository(AccompanyingPeriod::class)
-            ->find($period->getId());
-        $this->assertInstanceOf(Person::class, $period->getRequestor());
-        $this->assertEquals($personId, $period->getRequestor()->getId());
-
-       // post a third party
-        $this->client->request(
-            Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId()),
-            [], // parameters
-            [], // files
-            [], // server parameters
-            \json_encode([ 'type' => 'thirdparty', 'id' => $thirdPartyId ])
-        );
-        $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertArrayHasKey('id', $data);
-        $this->assertEquals($thirdPartyId, $data['id']);
-
-        // check into database
-        $period = $em->getRepository(AccompanyingPeriod::class)
-            ->find($period->getId());
-        $this->assertInstanceOf(ThirdParty::class, $period->getRequestor());
-        $this->assertEquals($thirdPartyId, $period->getRequestor()->getId());
-
-        // remove the requestor
-        $this->client->request(
-            Request::METHOD_DELETE,
-            sprintf('/api/1.0/person/accompanying-course/%d/requestor.json', $period->getId())
-        );
-        $response = $this->client->getResponse();
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // check into database
-        $period = $em->getRepository(AccompanyingPeriod::class)
-            ->find($period->getId());
-        $em->refresh($period);
-        $this->assertNull($period->getRequestor());
-    }
-
-    /**
-     * @dataProvider dataGenerateNewAccompanyingCourse
-     */
-    public function testConfirm(AccompanyingPeriod $period)
-    {
-        $this->client->request(
-            Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/confirm.json', $period->getId())
-        );
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-
-        // add period to remove it in tear down
-        $this->period = $period;
-    }
-
-    /**
-     * @dataProvider dataGenerateRandomAccompanyingCourse
-     */
-    public function testReferralAvailable(int $personId, int $periodId)
-    {
-        $this->client->request(
-            Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/referrers-suggested.json', $periodId)
-        );
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    /**
-     *
-     * @dataProvider dataGenerateRandomAccompanyingCourse
-     */
-    public function testAccompanyingPeriodPatch(int $personId, int $periodId)
-    {
-        $period = self::$container->get(AccompanyingPeriodRepository::class)
-            ->find($periodId);
-        $initialValueEmergency = $period->isEmergency();
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $this->client->request(
-            Request::METHOD_PATCH,
-            sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId),
-            [], // parameters
-            [], // files
-            [], // server parameters
-            \json_encode([ 'type' => 'accompanying_period', 'emergency' => !$initialValueEmergency ])
-        );
+        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', 99999));
         $response = $this->client->getResponse();
 
-        $this->assertEquals(200, $response->getStatusCode());
-        $period = $em->getRepository(AccompanyingPeriod::class)
-            ->find($periodId);
-        $this->assertEquals(!$initialValueEmergency, $period->isEmergency());
-
-        // restore the initial value
-        $period->setEmergency($initialValueEmergency);
-        $em->flush();
-    }
-
-    public function dataGenerateRandomRequestorValidData(): \Iterator
-    {
-        $dataLength = 2;
-        $maxResults = 100;
-
-        static::bootKernel();
-        $em = static::$container->get(EntityManagerInterface::class);
-        $center = $em->getRepository(Center::class)
-            ->findOneBy(array('name' => 'Center A'));
-        $qb = $em->createQueryBuilder();
-
-        $personIds = $qb
-            ->select('p.id')
-            ->distinct(true)
-            ->from(Person::class, 'p')
-            ->join('p.accompanyingPeriodParticipations', 'participation')
-            ->join('participation.accompanyingPeriod', 'ap')
-            ->where(
-                $qb->expr()->eq(
-                    'p.center',
-                    ':center'
-                )
-            )
-            ->andWhere(
-                $qb->expr()->gt(
-                    'SIZE(p.accompanyingPeriodParticipations)',
-                    0)
-            )
-            ->andWhere(
-                $qb->expr()->eq('ap.step', ':step')
-            )
-            ->setParameter('center', $center)
-            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
-            ->setMaxResults($maxResults)
-            ->getQuery()
-            ->getScalarResult();
-
-        // create a random order
-        shuffle($personIds);
-
-        $thirdPartyIds = $em->createQuery("SELECT t.id FROM ".
-            ThirdParty::class." t ")
-            ->setMaxResults($maxResults)
-            ->getScalarResult();
-
-        // create a random order
-        shuffle($thirdPartyIds);
-
-        $i = 0;
-        while ($i <= $dataLength) {
-            $person = $em->getRepository(Person::class)
-                ->find(\array_pop($personIds)['id']);
-
-            if (count($person->getAccompanyingPeriods()) === 0) {
-                continue;
-            }
-
-            $period = $person->getAccompanyingPeriods()[0];
-
-            yield [$period, \array_pop($personIds)['id'], \array_pop($thirdPartyIds)['id'] ];
-            $i++;
-        }
-    }
-
-    /**
-     *
-     * @dataProvider dataGenerateRandomAccompanyingCourse
-     */
-    public function testAccompanyingCourseAddParticipation(int $personId, int $periodId)
-    {
-        $this->client->request(
-            Request::METHOD_POST,
-            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
-            [], // parameters
-            [], // files
-            [], // server parameters
-            \json_encode([ 'type' => 'person', 'id' => $personId ])
-        );
-        $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
-
-        $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
-        $this->assertArrayHasKey('id', $data);
-        $this->assertArrayHasKey('startDate', $data);
-        $this->assertNotNull($data['startDate']);
-
-        // check by deownloading the accompanying cours
-
-        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/person/accompanying-course/%d.json', $periodId));
-        $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
-
-        $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent());
-
-        // check that the person id is contained
-        $participationsPersonsIds = \array_map(
-            function($participation) { return $participation->person->id; },
-            $data->participations);
-
-        $this->assertContains($personId, $participationsPersonsIds);
-
-        // check removing the participation
-        $this->client->request(
-            Request::METHOD_DELETE,
-            sprintf('/api/1.0/person/accompanying-course/%d/participation.json', $periodId),
-            [], // parameters
-            [], // files
-            [], // server parameters
-            \json_encode([ 'type' => 'person', 'id' => $personId ])
-        );
-        $response = $this->client->getResponse();
-        $data = \json_decode($response->getContent(), true);
-
-        $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)");
-        $this->assertArrayHasKey('id', $data);
-        $this->assertArrayHasKey('startDate', $data);
-        $this->assertNotNull($data['startDate']);
-        $this->assertArrayHasKey('endDate', $data);
-        $this->assertNotNull($data['endDate']);
-    }
-
-    public function dataGenerateRandomAccompanyingCourseWithSocialIssue()
-    {
-        // note about max result for person query, and maxGenerated:
-        //
-        // in the final loop, an id is popped out of the personIds array twice:
-        //
-        // * one for getting the person, which will in turn provide his accompanying period;
-        // * one for getting the personId to populate to the data manager
-        //
-        // Ensure to keep always $maxGenerated to the double of $maxResults. x8 is a good compromize :)
-        $maxGenerated = 3;
-        $maxResults = $maxGenerated * 8;
-
-        static::bootKernel();
-        $em = static::$container->get(EntityManagerInterface::class);
-        $center = $em->getRepository(Center::class)
-            ->findOneBy(array('name' => 'Center A'));
-        $qb = $em->createQueryBuilder();
-
-        $personIds = $qb
-            ->select('p.id')
-            ->distinct(true)
-            ->from(Person::class, 'p')
-            ->join('p.accompanyingPeriodParticipations', 'participation')
-            ->join('participation.accompanyingPeriod', 'ap')
-            ->where(
-                $qb->expr()->eq(
-                    'p.center',
-                    ':center'
-                )
-            )
-            ->andWhere(
-                $qb->expr()->gt(
-                    'SIZE(p.accompanyingPeriodParticipations)',
-                    0)
-            )
-            ->andWhere(
-                $qb->expr()->eq('ap.step', ':step')
-            )
-            ->setParameter('center', $center)
-            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
-            ->setMaxResults($maxResults)
-            ->getQuery()
-            ->getScalarResult();
-
-        // create a random order
-        shuffle($personIds);
-
-        $socialIssues = $em->createQuery("SELECT s FROM ".
-            SocialIssue::class." s ")
-            ->setMaxResults(10)
-            ->getResult();
-
-        $nbGenerated = 0;
-        while ($nbGenerated < $maxGenerated) {
-            $id = \array_pop($personIds)["id"];
-
-            $person = $em->getRepository(Person::class)
-                ->find($id);
-            $periods = $person->getAccompanyingPeriods();
-
-            yield [$periods[\array_rand($periods)], $socialIssues[\array_rand($socialIssues)] ];
-
-            $nbGenerated++;
-        }
-    }
-
-    public function dataGenerateRandomAccompanyingCourse()
-    {
-        // note about max result for person query, and maxGenerated:
-        //
-        // in the final loop, an id is popped out of the personIds array twice:
-        //
-        // * one for getting the person, which will in turn provide his accompanying period;
-        // * one for getting the personId to populate to the data manager
-        //
-        // Ensure to keep always $maxGenerated to the double of $maxResults. x8 is a good compromize :)
-        $maxGenerated = 3;
-        $maxResults = $maxGenerated * 8;
-
-        static::bootKernel();
-        $em = static::$container->get(EntityManagerInterface::class);
-        $center = $em->getRepository(Center::class)
-            ->findOneBy(array('name' => 'Center A'));
-
-        $qb = $em->createQueryBuilder();
-        $personIds = $qb
-            ->select('p.id')
-            ->distinct(true)
-            ->from(Person::class, 'p')
-            ->join('p.accompanyingPeriodParticipations', 'participation')
-            ->join('participation.accompanyingPeriod', 'ap')
-            ->where(
-                $qb->expr()->eq(
-                    'p.center',
-                    ':center'
-                )
-            )
-            ->andWhere(
-                $qb->expr()->gt(
-                    'SIZE(p.accompanyingPeriodParticipations)',
-                    0)
-                )
-            ->andWhere(
-                $qb->expr()->eq('ap.step', ':step')
-            )
-            ->setParameter('center', $center)
-            ->setParameter('step', AccompanyingPeriod::STEP_CONFIRMED)
-            ->setMaxResults($maxResults)
-            ->getQuery()
-            ->getScalarResult();
-
-        // create a random order
-        shuffle($personIds);
-
-        $nbGenerated = 0;
-        while ($nbGenerated < $maxGenerated) {
-            $id = \array_pop($personIds)["id"];
-
-            $person = $em->getRepository(Person::class)
-                ->find($id);
-            $periods = $person->getAccompanyingPeriods();
-
-            yield [\array_pop($personIds)["id"], $periods[\array_rand($periods)]->getId() ];
-
-            $nbGenerated++;
-        }
-    }
-
-    public function dataGenerateNewAccompanyingCourse()
-    {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $period = new AccompanyingPeriod(new \DateTime('1 week ago'));
-        $user = $em->getRepository(User::class)
-            ->findOneByUsernameCanonical('center a_social');
-        $period->setCreatedBy($user);
-        //$period->setCreatedAt(new \DateTime('yesterday'));
-
-        $center = $em->getRepository(Center::class)
-            ->findOneBy(array('name' => 'Center A'));
-
-        $personIds = $em->createQuery("SELECT p.id FROM ".
-            Person::class." p ".
-            " WHERE p.center = :center")
-            ->setParameter('center', $center)
-            ->setMaxResults(100)
-            ->getScalarResult();
-
-        // create a random order
-        shuffle($personIds);
-
-        for ($i = 0; $i<2; $i++) {
-            $person = $em->getRepository(Person::class)->find(\array_pop($personIds));
-            $period->addPerson($person);
-        }
-
-        $em->persist($period);
-        $em->flush();
-
-        yield [ $period ];
+        $this->assertEquals(404, $response->getStatusCode(), "Test that the response of rest api has a status code 'not found' (404)");
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
index 38f65ce45..7f8175a2b 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Center;
@@ -7,10 +16,19 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function array_pop;
+use function count;
+use function preg_match;
 
-class AccompanyingCourseControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingCourseControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
@@ -21,34 +39,60 @@ class AccompanyingCourseControllerTest extends WebTestCase
         $this->client = $this->getClientAuthenticated();
     }
 
+    public function dataGenerateRandomUsers(): Iterator
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $period = new AccompanyingPeriod(new DateTime('1 week ago'));
+        $user = $em->getRepository(User::class)
+            ->findOneByUsernameCanonical('center a_social');
+        $period->setCreatedBy($user);
+        //$period->setCreatedAt(new \DateTime('yesterday'));
+
+        $center = $em->getRepository(Center::class)
+            ->findOneBy(['name' => 'Center A']);
+
+        $personIds = $em->createQuery('SELECT p.id FROM ' .
+            Person::class . ' p ' .
+            ' WHERE p.center = :center')
+            ->setParameter('center', $center)
+            ->setMaxResults(100)
+            ->getScalarResult();
+
+        yield [array_pop($personIds), array_pop($personIds)];
+    }
+
     public function testNewWithoutUsers()
     {
-        $this->client->request('GET', '/fr/person/parcours/new'); 
+        $this->client->request('GET', '/fr/person/parcours/new');
 
         $this->assertResponseRedirects();
         $location = $this->client->getResponse()->headers->get('Location');
 
-        $this->assertEquals(1, \preg_match("|^\/[^\/]+\/parcours/([\d]+)/edit$|", $location));
-         
+        $this->assertEquals(1, preg_match('|^\\/[^\\/]+\\/parcours/([\\d]+)/edit$|', $location));
     }
 
     /**
      * @dataProvider dataGenerateRandomUsers
+     *
+     * @param mixed $personId0
+     * @param mixed $personId1
      */
     public function testWithNewUsers($personId0, $personId1)
     {
         $this->client->request('GET', '/fr/person/parcours/new', [
             'person_id' => [
-                $personId0, 
-                $personId1
-            ]
-        ]); 
+                $personId0,
+                $personId1,
+            ],
+        ]);
 
         $this->assertResponseRedirects();
         $location = $this->client->getResponse()->headers->get('Location');
         $matches = [];
 
-        $this->assertEquals(1, \preg_match("|^\/[^\/]+\/parcours/([\d]+)/edit$|", $location, $matches));
+        $this->assertEquals(1, preg_match('|^\\/[^\\/]+\\/parcours/([\\d]+)/edit$|', $location, $matches));
         $id = $matches[1];
 
         $period = self::$container->get(EntityManagerInterface::class)
@@ -59,30 +103,4 @@ class AccompanyingCourseControllerTest extends WebTestCase
 
         $this->assertEquals(2, count($period->getParticipations()));
     }
-
-    public function dataGenerateRandomUsers(): \Iterator
-    {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $period = new AccompanyingPeriod(new \DateTime('1 week ago'));
-        $user = $em->getRepository(User::class)
-            ->findOneByUsernameCanonical('center a_social');
-        $period->setCreatedBy($user);
-        //$period->setCreatedAt(new \DateTime('yesterday'));
-
-        $center = $em->getRepository(Center::class)
-            ->findOneBy(array('name' => 'Center A'));
-
-        $personIds = $em->createQuery("SELECT p.id FROM ".
-            Person::class." p ".
-            " WHERE p.center = :center")
-            ->setParameter('center', $center)
-            ->setMaxResults(100)
-            ->getScalarResult();
-
-        yield [ \array_pop($personIds), \array_pop($personIds) ];
-    }
-
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
index e841f2615..f8b671f85 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php
@@ -1,219 +1,103 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use DateTime;
 use Doctrine\Common\Collections\Criteria;
+use LogicalException;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function array_key_exists;
 
 /**
- * Test the creation or deletion of accompanying periods
- * 
- * The person on which the test is done has a (current) period opened (and not 
+ * Test the creation or deletion of accompanying periods.
+ *
+ * The person on which the test is done has a (current) period opened (and not
  * closed) starting the 2015-01-05.
+ *
+ * @internal
+ * @coversNothing
  */
-class AccompanyingPeriodControllerTest extends WebTestCase
+final class AccompanyingPeriodControllerTest extends WebTestCase
 {
-    /** @var \Symfony\Component\BrowserKit\Client */
-    protected $client;
-    
-    /** @var Person The person on which the form is applied*/
-    protected $person;
-    
-    /**  @var \Doctrine\ORM\EntityManagerInterface */
-    protected static $em;
-    
-    const OPENING_INPUT = 'chill_personbundle_accompanyingperiod[openingDate]';
-    const CLOSING_INPUT = 'chill_personbundle_accompanyingperiod[closingDate]';
-    const CLOSING_MOTIVE_INPUT = 'chill_personbundle_accompanyingperiod[closingMotive]';
-    
+    public const CLOSING_INPUT = 'chill_personbundle_accompanyingperiod[closingDate]';
+
+    public const CLOSING_MOTIVE_INPUT = 'chill_personbundle_accompanyingperiod[closingMotive]';
+
+    public const OPENING_INPUT = 'chill_personbundle_accompanyingperiod[openingDate]';
+
     /**
-     * Setup before the first test of this class (see phpunit doc)
+     * @var \Symfony\Component\BrowserKit\Client
+     */
+    protected $client;
+
+    /**
+     * @var \Doctrine\ORM\EntityManagerInterface
+     */
+    protected static $em;
+
+    /**
+     * @var Person The person on which the form is applied
+     */
+    protected $person;
+
+    /**
+     * Setup before the first test of this class (see phpunit doc).
      */
     public static function setUpBeforeClass()
     {
-        static::bootKernel();
-        static::$em = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager');
+        self::bootKernel();
+        self::$em = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager');
     }
-    
+
     /**
-     * Setup before each test method (see phpunit doc)
+     * Setup before each test method (see phpunit doc).
      */
     public function setUp()
     {
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
-        
-        $center = static::$em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
-        
-        $this->person = (new Person(new \DateTime('2015-01-05')))
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
+
+        $center = self::$em->getRepository('ChillMainBundle:Center')
+            ->findOneBy(['name' => 'Center A']);
+
+        $this->person = (new Person(new DateTime('2015-01-05')))
             ->setFirstName('Roland')
             ->setLastName('Gallorime')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
 
-        static::$em->persist($this->person);
-        static::$em->flush();
+        self::$em->persist($this->person);
+        self::$em->flush();
     }
-    
-     /**
-     * TearDown after each test method (see phpunit doc)
+
+    /**
+     * TearDown after each test method (see phpunit doc).
      */
     public function tearDown()
     {
-       static::$em->refresh($this->person);
-       static::$em->remove($this->person);
-       
-       static::$em->flush();
-    }
-    
-    /**
-     * Given an array of periods (key openingDate, closingDate (optioal),
-     * closingMotive) generate the periods in the db.
-     */ 
-    protected function generatePeriods(array $periods)
-    {
-        foreach ($periods as $periodDef) {
-            $period = new AccompanyingPeriod(new \DateTime($periodDef['openingDate']));
-            
-            if (array_key_exists('closingDate', $periodDef)) {
-                if (!array_key_exists('closingMotive', $periodDef)) {
-                    throw new \LogicalException('you must define a closing '
-                          . 'motive into your periods fixtures');
-                }
-                
-                $period->setClosingDate(new \DateTime($periodDef['closingDate']))
-                      ->setClosingMotive($periodDef['closingMotive']);
-            }
-             
-            $this->person->addAccompanyingPeriod($period);
-            static::$em->persist($period);
-        }
-        
-        static::$em->flush();
-    }
-    
-    /**
-     * Get the last value of a closing motive
-     * @var \Symfony\Component\DomCrawler\Form The form
-     * @return Chill\PersonBundle\Entity\AccompanyingPeriod The last value of closing
-     * motive
-     */
-    protected function getLastValueOnClosingMotive(\Symfony\Component\DomCrawler\Form $form)
-    {
-        $values = $form->get(self::CLOSING_MOTIVE_INPUT)
-            ->availableOptionValues();
-        return end($values);
-    }
-    
-    /**
-     * Get a random closing motive
-     * @return Chill\PersonBundle\Entity\AccompanyingPeriod The last closing motive
-     */
-    protected function getRandomClosingMotive()
-    {
-        $motives = static::$em
-            ->getRepository('ChillPersonBundle:AccompanyingPeriod\ClosingMotive')
-            ->findAll();
-        return end($motives);
-    }
-    
-    /**
-     * Test the closing of a periods
-     * 
-     * Given that a person as an accompanying period opened since 2015-01-05
-     * and we fill the close form (at /fr/person/[id]/accompanying-period/close
-     *      with : dateClosing: 2015-02-01
-     *      with : the last closing motive in list
-     * Then the response should redirect to period view
-     * And the next page should have a `.alert-danger` element present in page
-     * 
-     * @todo
-     */
-    public function testClosingCurrentPeriod()
-    {   
-        $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/close');
+        self::$em->refresh($this->person);
+        self::$em->remove($this->person);
 
-        $form = $crawler->selectButton('Clôre la période')->form();
-
-        $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
-        $form->get(self::CLOSING_INPUT)
-              ->setValue((new \DateTime('2015-02-01'))->format('d-m-Y'));
-        
-        $cr = $this->client->submit($form);
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect(
-              '/fr/person/'.$this->person->getId().'/accompanying-period'),
-              'the server redirects to /accompanying-period page');
-        $this->assertGreaterThan(0, $this->client->followRedirect()
-                ->filter('.alert-success')->count(),
-              "a 'success' element is shown");
+        self::$em->flush();
     }
-    
-    /**
-     * Test the closing of a periods
-     * 
-     * Given that a person as an accompanying period opened since 2015-01-05
-     * and we fill the close form (at /fr/person/[id]/accompanying-period/close
-     *      with : dateClosing: 2014-01-01
-     *      with : the last closing motive in list
-     * Then the response should redirect to period view
-     * And the next page should have a `.alert-danger` element present in page
-     * 
-     * @todo
-     */
-    public function testClosingCurrentPeriodWithDateClosingBeforeOpeningFails()
-    {
-        $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/close');
-        
-        $form = $crawler->selectButton('Clôre la période')->form();
 
-        $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
-        $form->get(self::CLOSING_INPUT)
-              ->setValue((new \DateTime('2014-01-01'))->format('d-m-Y'));
-        
-        $crawlerResponse = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stays on the /close page');
-        $this->assertGreaterThan(0, $crawlerResponse
-              ->filter('.alert-danger')->count(),
-              "an '.alert-danger' element is shown");
-    }
-    
     /**
-     * Test the creation of a new period 
-     * 
+     * Test the creation of a new period.
+     *
      * Given that a person as an accompanying period opened since 2015-01-05
      * and we create a new period
      *      with : dateClosing: 2014-12-31
@@ -224,29 +108,160 @@ class AccompanyingPeriodControllerTest extends WebTestCase
     public function testAddNewPeriodBeforeActual()
     {
         $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
+              . $this->person->getId() . '/accompanying-period/create');
+
         $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
+            ->setValue($this->getLastValueOnClosingMotive($form));
         $form->get(self::CLOSING_INPUT)
-              ->setValue('31-12-2014');
+            ->setValue('31-12-2014');
         $form->get(self::OPENING_INPUT)
-              ->setValue('01-01-2014');
-        
+            ->setValue('01-01-2014');
+
         $this->client->submit($form);
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect(
-              '/fr/person/'.$this->person->getId().'/accompanying-period'),
-              'the server redirects to /accompanying-period page');
-        $this->assertGreaterThan(0, $this->client->followRedirect()
-              ->filter('.alert-success')->count(),
-              "a 'success' element is shown");
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect(
+                '/fr/person/' . $this->person->getId() . '/accompanying-period'
+            ),
+            'the server redirects to /accompanying-period page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $this->client->followRedirect()
+                ->filter('.alert-success')->count(),
+            "a 'success' element is shown"
+        );
     }
-    
+
     /**
-     * Create a period with closing after current fails
-     * 
+     * Test the closing of a periods.
+     *
+     * Given that a person as an accompanying period opened since 2015-01-05
+     * and we fill the close form (at /fr/person/[id]/accompanying-period/close
+     *      with : dateClosing: 2015-02-01
+     *      with : the last closing motive in list
+     * Then the response should redirect to period view
+     * And the next page should have a `.alert-danger` element present in page
+     *
+     * @todo
+     */
+    public function testClosingCurrentPeriod()
+    {
+        $crawler = $this->client->request('GET', '/fr/person/'
+              . $this->person->getId() . '/accompanying-period/close');
+
+        $form = $crawler->selectButton('Clôre la période')->form();
+
+        $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->setValue($this->getLastValueOnClosingMotive($form));
+        $form->get(self::CLOSING_INPUT)
+            ->setValue((new DateTime('2015-02-01'))->format('d-m-Y'));
+
+        $cr = $this->client->submit($form);
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect(
+                '/fr/person/' . $this->person->getId() . '/accompanying-period'
+            ),
+            'the server redirects to /accompanying-period page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $this->client->followRedirect()
+                ->filter('.alert-success')->count(),
+            "a 'success' element is shown"
+        );
+    }
+
+    /**
+     * Test the closing of a periods.
+     *
+     * Given that a person as an accompanying period opened since 2015-01-05
+     * and we fill the close form (at /fr/person/[id]/accompanying-period/close
+     *      with : dateClosing: 2014-01-01
+     *      with : the last closing motive in list
+     * Then the response should redirect to period view
+     * And the next page should have a `.alert-danger` element present in page
+     *
+     * @todo
+     */
+    public function testClosingCurrentPeriodWithDateClosingBeforeOpeningFails()
+    {
+        $crawler = $this->client->request('GET', '/fr/person/'
+              . $this->person->getId() . '/accompanying-period/close');
+
+        $form = $crawler->selectButton('Clôre la période')->form();
+
+        $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->setValue($this->getLastValueOnClosingMotive($form));
+        $form->get(self::CLOSING_INPUT)
+            ->setValue((new DateTime('2014-01-01'))->format('d-m-Y'));
+
+        $crawlerResponse = $this->client->submit($form);
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stays on the /close page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawlerResponse
+                ->filter('.alert-danger')->count(),
+            "an '.alert-danger' element is shown"
+        );
+    }
+
+    /**
+     * create a period with date closing and date opening inside another period
+     * fails.
+     *
+     * Given that a person as an accompanying period opened since 2015-01-05
+     * and that this person has another accompanying period between 2014-01-01 and 2014-12-31
+     * and we create a new period
+     *      with : dateClosing: 2014-02-01
+     *      with : dateOpening: 2014-03-01
+     *      with : the last closing motive in list
+     * Then the response should not redirect
+     * and a error element is shown on the response page
+     */
+    public function testCreatePeriodAfterOpeningFails()
+    {
+        $this->generatePeriods([
+            [
+                'openingDate' => '2014-01-01',
+                'closingDate' => '2014-12-31',
+                'closingMotive' => $this->getRandomClosingMotive(),
+            ],
+        ]);
+
+        $crawler = $this->client->request('GET', '/fr/person/'
+              . $this->person->getId() . '/accompanying-period/create');
+
+        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
+        $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->setValue($this->getLastValueOnClosingMotive($form));
+        $form->get(self::CLOSING_INPUT)
+            ->setValue('2014-02-01');
+        $form->get(self::OPENING_INPUT)
+            ->setValue('01-03-2014');
+
+        $crawlerResponse = $this->client->submit($form);
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stay on form page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawlerResponse->filter('.alert-danger')->count(),
+            "an 'error' element is shown"
+        );
+    }
+
+    /**
+     * Create a period with closing after current fails.
+     *
      * Given that a person as an accompanying period opened since 2015-01-05
      * and we create a new period
      *      with : dateClosing: 2015-02-01 (after 2015-01-05)
@@ -257,31 +272,164 @@ class AccompanyingPeriodControllerTest extends WebTestCase
      */
     public function testCreatePeriodWithClosingAfterCurrentFails()
     {
-        $this->markTestSkipped("Multiple period may now cover. This test is kept ".
-            "in case of a configuration may add this feature again");
+        $this->markTestSkipped('Multiple period may now cover. This test is kept ' .
+            'in case of a configuration may add this feature again');
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
+              . $this->person->getId() . '/accompanying-period/create');
+
         $form = $crawler->selectButton("Créer une période d'accompagnement")->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
+            ->setValue($this->getLastValueOnClosingMotive($form));
         $form->get(self::CLOSING_INPUT)
-              ->setValue('01-02-2015');
+            ->setValue('01-02-2015');
         $form->get(self::OPENING_INPUT)
-              ->setValue('31-12-2014');
-        
+            ->setValue('31-12-2014');
+
         $crawler = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stay on form page');
-        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
-              "an 'error' element is shown");
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stay on form page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.alert-danger')->count(),
+            "an 'error' element is shown"
+        );
     }
-    
+
     /**
-     * Create a period after a current opened period fails
-     * 
+     * create a period with date closing after opening fails.
+     *
+     * Given that a person as an accompanying period opened since 2015-01-05
+     * and we create a new period
+     *      with : dateClosing: 2014-01-01 (before opening)
+     *      with : dateOpening: 2015-01-01
+     *      with : the last closing motive in list
+     * Then the response should redirect to period view
+     */
+    public function testCreatePeriodWithClosingBeforeOpeningFails()
+    {
+        $crawler = $this->client->request('GET', '/fr/person/'
+              . $this->person->getId() . '/accompanying-period/create');
+
+        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
+        $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->setValue($this->getLastValueOnClosingMotive($form));
+        $form->get(self::CLOSING_INPUT)
+            ->setValue('01-01-2014');
+        $form->get(self::OPENING_INPUT)
+            ->setValue('01-01-2015');
+
+        $crawler = $this->client->submit($form);
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stay on form page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.alert-danger')->count(),
+            "an 'error' element is shown"
+        );
+    }
+
+    /**
+     * create a period with date end between another period must fails.
+     *
+     * Given that a person as an accompanying period opened since 2015-01-05
+     * and that this person has another accompanying period between 2014-01-01 and 2014-12-31
+     * and we create a new period
+     *      with : dateClosing: 2014-16-01
+     *      with : dateOpening: 2013-01-01
+     *      with : the last closing motive in list
+     * Then the response should not redirect
+     * and a error element is shown on the response page
+     */
+    public function testCreatePeriodWithDateEndBetweenAnotherPeriodFails()
+    {
+        $this->generatePeriods([
+            [
+                'openingDate' => '2014-01-01',
+                'closingDate' => '2014-12-31',
+                'closingMotive' => $this->getRandomClosingMotive(),
+            ],
+        ]);
+
+        $crawler = $this->client->request('GET', '/fr/person/'
+              . $this->person->getId() . '/accompanying-period/create');
+
+        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
+        $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->setValue($this->getLastValueOnClosingMotive($form));
+        $form->get(self::CLOSING_INPUT)
+            ->setValue('31-12-2014');
+        $form->get(self::OPENING_INPUT)
+            ->setValue('01-02-2015');
+
+        $crawlerResponse = $this->client->submit($form);
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stay on form page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawlerResponse->filter('.alert-danger')->count(),
+            "an 'error' element is shown"
+        );
+    }
+
+    /**
+     * Create a period with dateOpening between another period must fails.
+     *
+     * Given that a person as an accompanying period opened since 2015-01-05
+     * and that this person has another accompanying period between 2014-01-01 and 2014-12-31
+     * and we create a new period
+     *      with : dateClosing: 2015-01-01
+     *      with : dateOpening: 2014-06-01
+     *      with : the last closing motive in list
+     * Then the response should not redirect
+     * and a error element is shown on the response page
+     */
+    public function testCreatePeriodWithDateOpeningBetweenAnotherPeriodFails()
+    {
+        $this->generatePeriods([
+            [
+                'openingDate' => '2014-01-01',
+                'closingDate' => '2014-12-31',
+                'closingMotive' => $this->getRandomClosingMotive(),
+            ],
+        ]);
+
+        $crawler = $this->client->request('GET', '/fr/person/'
+              . $this->person->getId() . '/accompanying-period/create');
+
+        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
+        $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->setValue($this->getLastValueOnClosingMotive($form));
+        $form->get(self::CLOSING_INPUT)
+            ->setValue('2015-01-01');
+        $form->get(self::OPENING_INPUT)
+            ->setValue('01-06-2014');
+
+        $crawlerResponse = $this->client->submit($form);
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stay on form page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawlerResponse->filter('.alert-danger')->count(),
+            "an 'error' element is shown"
+        );
+    }
+
+    /**
+     * Create a period after a current opened period fails.
+     *
      * Given that a person as an accompanying period opened since 2015-01-05
      * and we create a new period
      *      with : dateClosing: 2015-03-01
@@ -292,242 +440,158 @@ class AccompanyingPeriodControllerTest extends WebTestCase
      */
     public function testCreatePeriodWithOpeningAndClosingAfterCurrentFails()
     {
-        $this->markTestSkipped("Multiple period may now cover. This test is kept ".
-            "in case of a configuration may add this feature again");
+        $this->markTestSkipped('Multiple period may now cover. This test is kept ' .
+            'in case of a configuration may add this feature again');
 
         $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
+              . $this->person->getId() . '/accompanying-period/create');
+
         $form = $crawler->selectButton("Créer une période d'accompagnement")->form();
         $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
+            ->setValue($this->getLastValueOnClosingMotive($form));
         $form->get(self::CLOSING_INPUT)
-              ->setValue('01-03-2015');
+            ->setValue('01-03-2015');
         $form->get(self::OPENING_INPUT)
-              ->setValue('01-02-2015');
-        
+            ->setValue('01-02-2015');
+
         $crawler = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stay on form page');
-        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
-              "an 'error' element is shown");
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the server stay on form page'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.alert-danger')->count(),
+            "an 'error' element is shown"
+        );
     }
-    
-    /**
-     * create a period with date end between another period must fails
-     * 
-     * Given that a person as an accompanying period opened since 2015-01-05
-     * and that this person has another accompanying period between 2014-01-01 and 2014-12-31
-     * and we create a new period
-     *      with : dateClosing: 2014-16-01
-     *      with : dateOpening: 2013-01-01
-     *      with : the last closing motive in list
-     * Then the response should not redirect 
-     * and a error element is shown on the response page
-     */
-    public function testCreatePeriodWithDateEndBetweenAnotherPeriodFails()
-    {
-        $this->generatePeriods(array(
-            [
-                'openingDate' => '2014-01-01',
-                'closingDate' => '2014-12-31',
-                'closingMotive' => $this->getRandomClosingMotive()
-            ]
-        ));
-        
-        $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
-        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();;
-        $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
-        $form->get(self::CLOSING_INPUT)
-              ->setValue('31-12-2014');
-        $form->get(self::OPENING_INPUT)
-              ->setValue('01-02-2015');
-        
-        $crawlerResponse = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stay on form page');
-        $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(),
-              "an 'error' element is shown");
-    }
-    
-    /**
-     * create a period with date closing after opening fails
-     * 
-     * Given that a person as an accompanying period opened since 2015-01-05
-     * and we create a new period 
-     *      with : dateClosing: 2014-01-01 (before opening)
-     *      with : dateOpening: 2015-01-01
-     *      with : the last closing motive in list
-     * Then the response should redirect to period view
-     */
-    public function testCreatePeriodWithClosingBeforeOpeningFails()
-    {
-        $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
-        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
-        $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
-        $form->get(self::CLOSING_INPUT)
-              ->setValue('01-01-2014');
-        $form->get(self::OPENING_INPUT)
-              ->setValue('01-01-2015');
-        
-        $crawler = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stay on form page');
-        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
-              "an 'error' element is shown");
-    }
-    
-     /**
-     * create a period with date closing and date opening inside another period 
-     * fails
-     * 
-     * Given that a person as an accompanying period opened since 2015-01-05
-     * and that this person has another accompanying period between 2014-01-01 and 2014-12-31
-     * and we create a new period
-     *      with : dateClosing: 2014-02-01
-     *      with : dateOpening: 2014-03-01
-     *      with : the last closing motive in list
-     * Then the response should not redirect 
-     * and a error element is shown on the response page
-     */
-    public function testCreatePeriodAfterOpeningFails()
-    {
-        $this->generatePeriods(array(
-            [
-                'openingDate' => '2014-01-01',
-                'closingDate' => '2014-12-31',
-                'closingMotive' => $this->getRandomClosingMotive()
-            ]
-        ));
-        
-        $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
-        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
-        $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
-        $form->get(self::CLOSING_INPUT)
-              ->setValue('2014-02-01');
-        $form->get(self::OPENING_INPUT)
-              ->setValue('01-03-2014');
-        
-        $crawlerResponse = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stay on form page');
-        $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(),
-              "an 'error' element is shown");
-    }
-    
-    /**
-     * Create a period with dateOpening between another period must fails
-     * 
-     * Given that a person as an accompanying period opened since 2015-01-05
-     * and that this person has another accompanying period between 2014-01-01 and 2014-12-31
-     * and we create a new period
-     *      with : dateClosing: 2015-01-01
-     *      with : dateOpening: 2014-06-01
-     *      with : the last closing motive in list
-     * Then the response should not redirect 
-     * and a error element is shown on the response page
-     */
-    public function testCreatePeriodWithDateOpeningBetweenAnotherPeriodFails()
-    {
-        $this->generatePeriods(array(
-            [
-                'openingDate' => '2014-01-01',
-                'closingDate' => '2014-12-31',
-                'closingMotive' => $this->getRandomClosingMotive()
-            ]
-        ));
-        
-        $crawler = $this->client->request('GET', '/fr/person/'
-              .$this->person->getId().'/accompanying-period/create');
-        
-        $form = $crawler->selectButton('Créer une période d\'accompagnement')->form();
-        $form->get(self::CLOSING_MOTIVE_INPUT)
-              ->setValue($this->getLastValueOnClosingMotive($form));
-        $form->get(self::CLOSING_INPUT)
-              ->setValue('2015-01-01');
-        $form->get(self::OPENING_INPUT)
-              ->setValue('01-06-2014');
-        
-        $crawlerResponse = $this->client->submit($form);
-        
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-              'the server stay on form page');
-        $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(),
-              "an 'error' element is shown");
-    }
-    
+
     /**
      * @group reopening
      */
     public function testReOpeningPeriod()
     {
         // test that re-opening a period which is opened does not work
-        $this->client->request('GET', 
-                sprintf(
-                        '/fr/person/%d/accompanying-period/%d/re-open', 
-                        $this->person->getId(), 
-                        $this->person->getOpenedAccompanyingPeriod()->getId()
-                        )
-                );
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test an error is returned on a period which cannot be reopened");
-        
+        $this->client->request(
+            'GET',
+            sprintf(
+                '/fr/person/%d/accompanying-period/%d/re-open',
+                $this->person->getId(),
+                $this->person->getOpenedAccompanyingPeriod()->getId()
+            )
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test an error is returned on a period which cannot be reopened'
+        );
+
         // close the current period
         $period = $this->person->getOpenedAccompanyingPeriod();
-        $period->setClosingDate(new \DateTime('2015-02-05'));
+        $period->setClosingDate(new DateTime('2015-02-05'));
         $this->person->close($period);
-        
-        $this->generatePeriods(array(
+
+        $this->generatePeriods([
             [
                 'openingDate' => '2014-01-01',
                 'closingDate' => '2014-12-31',
-                'closingMotive' => $this->getRandomClosingMotive()
-            ]
-        ));
-        
+                'closingMotive' => $this->getRandomClosingMotive(),
+            ],
+        ]);
+
         $periods = $this->person->getAccompanyingPeriodsOrdered();
-        /* @var $criteria Criteria */
+        /** @var Criteria $criteria */
         $criteria = Criteria::create();
         //$criteria->where(Criteria::expr()->eq('openingDate', \DateTime::createFromFormat()))
         $firstPeriod = reset($periods);
         $lastPeriod = end($periods);
 
-        $this->markTestSkipped("From here, the test should be rewritten"); 
+        $this->markTestSkipped('From here, the test should be rewritten');
         // test that it is not possible to open the first period in the list
-        $this->client->request('GET', 
-                sprintf('/fr/person/%d/accompanying-period/%d/re-open', $this->person->getId(), reset($periods)->getId())
-                );
-        $this->assertEquals(400, $this->client->getResponse()->getStatusCode(),
-                "Test an error is returned on the first period in the list");
+        $this->client->request(
+            'GET',
+            sprintf('/fr/person/%d/accompanying-period/%d/re-open', $this->person->getId(), reset($periods)->getId())
+        );
+        $this->assertEquals(
+            400,
+            $this->client->getResponse()->getStatusCode(),
+            'Test an error is returned on the first period in the list'
+        );
 
         // test that re-opening the last closed period works
-        $crawler = $this->client->request('GET', 
-                sprintf('/fr/person/%d/accompanying-period/%d/re-open', $this->person->getId(), end($periods)->getId())
-                );
-        
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-        
-        $links = $crawler->selectLink('Confirmer');
-        
-        $this->assertEquals(1, $links->count(), "test the link 'confirmer' is present");
-        
-        $this->client->click($links->link());
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect(),
-                "Test the response is a redirection => the period is re-opened");
+        $crawler = $this->client->request(
+            'GET',
+            sprintf('/fr/person/%d/accompanying-period/%d/re-open', $this->person->getId(), end($periods)->getId())
+        );
 
+        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
+
+        $links = $crawler->selectLink('Confirmer');
+
+        $this->assertEquals(1, $links->count(), "test the link 'confirmer' is present");
+
+        $this->client->click($links->link());
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect(),
+            'Test the response is a redirection => the period is re-opened'
+        );
+    }
+
+    /**
+     * Given an array of periods (key openingDate, closingDate (optioal),
+     * closingMotive) generate the periods in the db.
+     */
+    protected function generatePeriods(array $periods)
+    {
+        foreach ($periods as $periodDef) {
+            $period = new AccompanyingPeriod(new DateTime($periodDef['openingDate']));
+
+            if (array_key_exists('closingDate', $periodDef)) {
+                if (!array_key_exists('closingMotive', $periodDef)) {
+                    throw new LogicalException('you must define a closing '
+                          . 'motive into your periods fixtures');
+                }
+
+                $period->setClosingDate(new DateTime($periodDef['closingDate']))
+                    ->setClosingMotive($periodDef['closingMotive']);
+            }
+
+            $this->person->addAccompanyingPeriod($period);
+            self::$em->persist($period);
+        }
+
+        self::$em->flush();
+    }
+
+    /**
+     * Get the last value of a closing motive.
+     *
+     * @var \Symfony\Component\DomCrawler\Form The form
+     *
+     * @return Chill\PersonBundle\Entity\AccompanyingPeriod The last value of closing
+     * motive
+     */
+    protected function getLastValueOnClosingMotive(\Symfony\Component\DomCrawler\Form $form)
+    {
+        $values = $form->get(self::CLOSING_MOTIVE_INPUT)
+            ->availableOptionValues();
+
+        return end($values);
+    }
+
+    /**
+     * Get a random closing motive.
+     *
+     * @return Chill\PersonBundle\Entity\AccompanyingPeriod The last closing motive
+     */
+    protected function getRandomClosingMotive()
+    {
+        $motives = self::$em
+            ->getRepository('ChillPersonBundle:AccompanyingPeriod\ClosingMotive')
+            ->findAll();
+
+        return end($motives);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index c6c935306..1c686b6b2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -1,79 +1,54 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\AddressReference;
 use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Test\PrepareClientTrait;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use function array_map;
+use function array_pop;
+use function random_int;
+use function shuffle;
 
-
-class HouseholdApiControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class HouseholdApiControllerTest extends WebTestCase
 {
-
     use PrepareClientTrait;
 
     private array $toDelete = [];
 
-    /**
-     * @dataProvider generatePersonId
-     */
-    public function testSuggestByAccompanyingPeriodParticipation(int $personId)
+    protected function tearDown()
     {
-        $client = $this->getClientAuthenticated();
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
 
-        $client->request(
-            Request::METHOD_GET,
-            "/api/1.0/person/household/suggest/by-person/{$personId}/through-accompanying-period-participation.json"
-        );
+        foreach ($this->toDelete as [$class, $id]) {
+            $obj = $em->getRepository($class)->find($id);
+            $em->remove($obj);
+        }
 
-        $this->assertResponseIsSuccessful();
-    }
-
-    /**
-     * @dataProvider generateHouseholdId
-     */
-    public function testSuggestAddressByHousehold(int $householdId)
-    {
-        $client = $this->getClientAuthenticated();
-
-        $client->request(
-            Request::METHOD_GET,
-            "/api/1.0/person/address/suggest/by-household/{$householdId}.json"
-        );
-
-        $this->assertResponseIsSuccessful();
-    }
-
-    /**
-     * @dataProvider generateHouseholdAssociatedWithAddressReference
-     */
-    public function testFindHouseholdByAddressReference(int $addressReferenceId, int $expectedHouseholdId)
-    {
-        $client = $this->getClientAuthenticated();
-
-        $client->request(
-            Request::METHOD_GET,
-            "/api/1.0/person/household/by-address-reference/$addressReferenceId.json"
-        );
-
-        $this->assertResponseIsSuccessful();
-        $data = json_decode($client->getResponse()->getContent(), true);
-        $this->assertArrayHasKey('count', $data);
-        $this->assertArrayHasKey('results', $data);
-
-        $householdIds = \array_map(function($r) {
-            return $r['id'];
-        }, $data['results']);
-
-        $this->assertContains($expectedHouseholdId, $householdIds);
+        $em->flush();
     }
 
     public function generateHouseholdAssociatedWithAddressReference()
@@ -84,18 +59,17 @@ class HouseholdApiControllerTest extends WebTestCase
         $nbReference = $em->createQueryBuilder()->select('count(ar)')->from(AddressReference::class, 'ar')
             ->getQuery()->getSingleScalarResult();
         $reference = $em->createQueryBuilder()->select('ar')->from(AddressReference::class, 'ar')
-            ->setFirstResult(\random_int(0, $nbReference))
+            ->setFirstResult(random_int(0, $nbReference))
             ->setMaxResults(1)
             ->getQuery()->getSingleResult();
         $p = new Person();
         $p->setFirstname('test')->setLastName('test lastname')
             ->setGender(Person::BOTH_GENDER)
-            ->setCenter($centerA)
-            ;
+            ->setCenter($centerA);
         $em->persist($p);
         $h = new Household();
         $h->addMember($m = (new HouseholdMember())->setPerson($p));
-        $h->addAddress(Address::createFromAddressReference($reference)->setValidFrom(new \DateTime('today')));
+        $h->addAddress(Address::createFromAddressReference($reference)->setValidFrom(new DateTime('today')));
         $em->persist($m);
         $em->persist($h);
 
@@ -104,49 +78,12 @@ class HouseholdApiControllerTest extends WebTestCase
         $this->toDelete = $this->toDelete + [
             [HouseholdMember::class, $m->getId()],
             [User::class, $p->getId()],
-            [Household::class, $h->getId()]
+            [Household::class, $h->getId()],
         ];
 
         yield [$reference->getId(), $h->getId()];
     }
 
-    protected function tearDown()
-    {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        foreach ($this->toDelete as list($class, $id)) {
-            $obj = $em->getRepository($class)->find($id);
-            $em->remove($obj);
-        }
-
-        $em->flush();
-    }
-
-    public function generatePersonId()
-    {
-        self::bootKernel();
-
-        $qb = self::$container->get(EntityManagerInterface::class)
-            ->createQueryBuilder();
-
-        $period = $qb
-            ->select('ap')
-            ->from(AccompanyingPeriod::class, 'ap')
-            ->where(
-                $qb->expr()->gte('SIZE(ap.participations)', 2)
-            )
-            ->getQuery()
-            ->setMaxResults(1)
-            ->getSingleResult()
-            ;
-
-        $person = $period->getParticipations()
-            ->first()->getPerson();
-
-        yield [ $person->getId() ];
-    }
-
     public function generateHouseholdId()
     {
         self::bootKernel();
@@ -165,13 +102,91 @@ class HouseholdApiControllerTest extends WebTestCase
             ->setParameter('center_name', 'Center A')
             ->setMaxResults(100)
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
 
-        \shuffle($householdIds);
+        shuffle($householdIds);
 
-        yield [ \array_pop($householdIds)['id'] ];
-        yield [ \array_pop($householdIds)['id'] ];
-        yield [ \array_pop($householdIds)['id'] ];
+        yield [array_pop($householdIds)['id']];
+
+        yield [array_pop($householdIds)['id']];
+
+        yield [array_pop($householdIds)['id']];
+    }
+
+    public function generatePersonId()
+    {
+        self::bootKernel();
+
+        $qb = self::$container->get(EntityManagerInterface::class)
+            ->createQueryBuilder();
+
+        $period = $qb
+            ->select('ap')
+            ->from(AccompanyingPeriod::class, 'ap')
+            ->where(
+                $qb->expr()->gte('SIZE(ap.participations)', 2)
+            )
+            ->getQuery()
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        $person = $period->getParticipations()
+            ->first()->getPerson();
+
+        yield [$person->getId()];
+    }
+
+    /**
+     * @dataProvider generateHouseholdAssociatedWithAddressReference
+     */
+    public function testFindHouseholdByAddressReference(int $addressReferenceId, int $expectedHouseholdId)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            Request::METHOD_GET,
+            "/api/1.0/person/household/by-address-reference/{$addressReferenceId}.json"
+        );
+
+        $this->assertResponseIsSuccessful();
+        $data = json_decode($client->getResponse()->getContent(), true);
+        $this->assertArrayHasKey('count', $data);
+        $this->assertArrayHasKey('results', $data);
+
+        $householdIds = array_map(static function ($r) {
+            return $r['id'];
+        }, $data['results']);
+
+        $this->assertContains($expectedHouseholdId, $householdIds);
+    }
+
+    /**
+     * @dataProvider generateHouseholdId
+     */
+    public function testSuggestAddressByHousehold(int $householdId)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            Request::METHOD_GET,
+            "/api/1.0/person/address/suggest/by-household/{$householdId}.json"
+        );
+
+        $this->assertResponseIsSuccessful();
+    }
+
+    /**
+     * @dataProvider generatePersonId
+     */
+    public function testSuggestByAccompanyingPeriodParticipation(int $personId)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            Request::METHOD_GET,
+            "/api/1.0/person/household/suggest/by-person/{$personId}/through-accompanying-period-participation.json"
+        );
+
+        $this->assertResponseIsSuccessful();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
index d76a2df0c..95d595a10 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
@@ -1,15 +1,32 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-use Chill\PersonBundle\Entity\Household\Household;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Chill\PersonBundle\Entity\Household\Household;
+use DateInterval;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use function array_pop;
+use function shuffle;
 
-class HouseholdControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class HouseholdControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
@@ -20,50 +37,35 @@ class HouseholdControllerTest extends WebTestCase
         $this->client = $this->getClientAuthenticated();
     }
 
-    /**
-     * @dataProvider generateValidHouseholdIds
-     */
-    public function testSummary($householdId)
+    public function generateValidHouseholdIds()
     {
-        $this->client->request(
-            Request::METHOD_GET,
-            "/fr/person/household/{$householdId}/summary"
-        );
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
 
-        $this->assertResponseIsSuccessful();
-    }
-
-    /**
-     * @dataProvider generateValidHouseholdIds
-     */
-    public function testEditMetadata($householdId)
-    {
-
-        $crawler = $this->client->request(
-            Request::METHOD_GET,
-            "/fr/person/household/{$householdId}/summary",
-            [
-                'edit' => true
-            ]
-        );
-
-        $this->assertResponseIsSuccessful();
-
-        $form = $crawler->filter('#form_household_comment_confirm')
-            ->form();
-
-        $form['household[commentMembers][comment]'] = "This is a text **generated** by automatic tests";
-        $form['household[waitingForBirth]']->tick();
-        $form['household[waitingForBirthDate]'] = (new \DateTime('today'))
-            ->add(new \DateInterval('P1M'))->format('Y-m-d');
-
-        $this->client->submit($form);
-
-        $this->assertResponseRedirects("/fr/person/household/{$householdId}/summary");
+        $ids = $em->createQuery(
+            'SELECT DISTINCT h.id FROM ' . Household::class . ' h ' .
+            'JOIN h.members m ' .
+            'JOIN m.person p ' .
+            'JOIN p.center c ' .
+            'WHERE c.name = :center'
+        )
+            ->setParameter('center', 'Center A')
+            ->setMaxResults(100)
+            ->getScalarResult();
+
+        shuffle($ids);
+
+        yield [array_pop($ids)['id']];
+
+        yield [array_pop($ids)['id']];
+
+        yield [array_pop($ids)['id']];
     }
 
     /**
      * @dataProvider generateValidHouseholdIds
+     *
+     * @param mixed $householdId
      */
     public function testAddresses($householdId)
     {
@@ -73,11 +75,12 @@ class HouseholdControllerTest extends WebTestCase
         );
 
         $this->assertResponseIsSuccessful();
-
     }
 
     /**
      * @dataProvider generateValidHouseholdIds
+     *
+     * @param mixed $householdId
      */
     public function testAddressMove($householdId)
     {
@@ -91,26 +94,48 @@ class HouseholdControllerTest extends WebTestCase
         // ici, il faudrait tester la requête POST
     }
 
-    public function generateValidHouseholdIds()
+    /**
+     * @dataProvider generateValidHouseholdIds
+     *
+     * @param mixed $householdId
+     */
+    public function testEditMetadata($householdId)
     {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
+        $crawler = $this->client->request(
+            Request::METHOD_GET,
+            "/fr/person/household/{$householdId}/summary",
+            [
+                'edit' => true,
+            ]
+        );
 
-        $ids = $em->createQuery("SELECT DISTINCT h.id FROM ".Household::class." h ".
-            "JOIN h.members m ".
-            "JOIN m.person p ".
-            "JOIN p.center c ".
-            "WHERE c.name = :center"
-        )
-            ->setParameter('center', "Center A")
-            ->setMaxResults(100)
-            ->getScalarResult()
-            ;
+        $this->assertResponseIsSuccessful();
 
-        \shuffle($ids);
+        $form = $crawler->filter('#form_household_comment_confirm')
+            ->form();
 
-        yield [ \array_pop($ids)['id'] ];
-        yield [ \array_pop($ids)['id'] ];
-        yield [ \array_pop($ids)['id'] ];
+        $form['household[commentMembers][comment]'] = 'This is a text **generated** by automatic tests';
+        $form['household[waitingForBirth]']->tick();
+        $form['household[waitingForBirthDate]'] = (new DateTime('today'))
+            ->add(new DateInterval('P1M'))->format('Y-m-d');
+
+        $this->client->submit($form);
+
+        $this->assertResponseRedirects("/fr/person/household/{$householdId}/summary");
+    }
+
+    /**
+     * @dataProvider generateValidHouseholdIds
+     *
+     * @param mixed $householdId
+     */
+    public function testSummary($householdId)
+    {
+        $this->client->request(
+            Request::METHOD_GET,
+            "/fr/person/household/{$householdId}/summary"
+        );
+
+        $this->assertResponseIsSuccessful();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
index 3da325a9e..f2427bfe8 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
@@ -1,184 +1,117 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Bundle\ChillPersonBundle\Tests\Controller;
 
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
+use Iterator;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use function array_pop;
+use function count;
+use function json_decode;
+use function json_encode;
+use function random_int;
+use function shuffle;
 
-
-class HouseholdMemberControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class HouseholdMemberControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    /**
-     * @dataProvider provideValidDataMove
-     */
-    public function testMoveMember($personId, $householdId, $positionId, \DateTimeInterface $date)
+    public function provideValidDataEditMember(): Iterator
     {
-        $client = $this->getClientAuthenticated();
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
 
-        $client->request(
-            Request::METHOD_POST,
-            '/api/1.0/person/household/members/move.json',
-            [], // parameters
-            [], // files
-            [], // server
-            \json_encode(
-                [
-                    'concerned' => 
-                    [
-                        [ 
-                            'person' => 
-                            [ 
-                                'type' => 'person',
-                                'id' => $personId
-                            ],
-                            'start_date' => 
-                            [
-                                'datetime' => $date->format(\DateTimeInterface::RFC3339)
-                            ],
-                            'position' =>
-                            [
-                                'type' => 'household_position',
-                                'id' => $positionId
-                            ],
-                            'holder' => false,
-                            'comment' => "Introduced by automated test",
-                        ],
-                    ],
-                    'destination' => 
-                    [
-                        'type' => 'household',
-                        'id' => $householdId
-                    ]
-                ],
-            true)
-        );
+        $membershipIds = $em->createQuery('SELECT m.id FROM ' . HouseholdMember::class . ' m ' .
+            'JOIN m.person p ' .
+            'JOIN p.center c ' .
+            'WHERE c.name = :center AND m.endDate IS NULL')
+            ->setParameter('center', 'Center A')
+            ->getScalarResult();
 
-        $this->assertEquals(Response::HTTP_OK, 
-            $client->getResponse()->getStatusCode()
-        );
+        shuffle($membershipIds);
+
+        yield [array_pop($membershipIds)['id']];
     }
 
-    /**
-     * @dataProvider provideValidDataMove
-     */
-    public function testMoveMemberToNewHousehold($personId, $householdId, $positionId, \DateTimeInterface $date)
+    public function provideValidDataMove(): Iterator
     {
-        $client = $this->getClientAuthenticated();
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $yesterday = new DateTimeImmutable('yesterday');
 
-        $client->request(
-            Request::METHOD_POST,
-            '/api/1.0/person/household/members/move.json',
-            [], // parameters
-            [], // files
-            [], // server
-            \json_encode(
-                [
-                    'concerned' => 
-                    [
-                        [ 
-                            'person' => 
-                            [ 
-                                'type' => 'person',
-                                'id' => $personId
-                            ],
-                            'start_date' => 
-                            [
-                                'datetime' => $date->format(\DateTimeInterface::RFC3339)
-                            ],
-                            'position' =>
-                            [
-                                'type' => 'household_position',
-                                'id' => $positionId
-                            ],
-                            'holder' => false,
-                            'comment' => "Introduced by automated test",
-                        ],
-                    ],
-                    'destination' => 
-                    [
-                        'type' => 'household',
-                    ]
-                ],
-            true)
-        );
+        $personIds = $em->createQuery(
+            'SELECT p.id FROM ' . Person::class . ' p ' .
+            'JOIN p.center c ' .
+            'WHERE ' .
+            'c.name = :center '
+        )
+            ->setParameter('center', 'Center A')
+            ->setMaxResults(100)
+            ->getScalarResult();
 
-        $this->assertEquals(Response::HTTP_OK, 
-            $client->getResponse()->getStatusCode()
-        );
+        shuffle($personIds);
 
-        $data = \json_decode($client->getResponse()->getContent(), true);
+        $household = new Household();
+        $em->persist($household);
+        $em->flush();
 
-        $this->assertIsArray($data);
-        $this->assertArrayHasKey('members', $data);
-        $this->assertIsArray($data['members']);
-        $this->assertEquals(1, count($data['members']),
-            "assert new household count one member");
-        $this->assertArrayHasKey('person', $data['members'][0]);
-        $this->assertArrayHasKey('id', $data['members'][0]['person']);
-        $this->assertEquals($personId, $data['members'][0]['person']['id']);
-    }
+        $positions = $em->createQuery('SELECT pos.id FROM ' . Position::class . ' pos ' .
+            'WHERE pos.shareHouseHold = TRUE')
+            ->getResult();
 
-    /**
-     * @dataProvider provideValidDataMove
-     */
-    public function testLeaveWithoutHousehold($personId, $householdId, $positionId, \DateTimeInterface $date)
-    {
-        $client = $this->getClientAuthenticated();
+        $i = 0;
 
-        $client->request(
-            Request::METHOD_POST,
-            '/api/1.0/person/household/members/move.json',
-            [], // parameters
-            [], // files
-            [], // server
-            \json_encode(
-                [
-                    'concerned' => 
-                    [
-                        [ 
-                            'person' => 
-                            [ 
-                                'type' => 'person',
-                                'id' => $personId
-                            ],
-                            'start_date' => 
-                            [
-                                'datetime' => $date->format(\DateTimeInterface::RFC3339)
-                            ],
-                            'position' =>
-                            [
-                                'type' => 'household_position',
-                                'id' => $positionId
-                            ],
-                            'holder' => false,
-                            'comment' => "Introduced by automated test",
-                        ],
-                    ],
-                    'destination' =>  null
-                ],
-            true)
-        );
+        do {
+            $id = array_pop($personIds)['id'];
+            $person = self::$container->get(EntityManagerInterface::class)
+                ->getRepository(Person::class)
+                ->find($id);
 
-        $this->assertEquals(Response::HTTP_OK, 
-            $client->getResponse()->getStatusCode()
-        );
+            $participation = $person->getCurrentHouseholdParticipationShareHousehold();
 
-        $data = \json_decode($client->getResponse()->getContent(), true);
+            if (null === $participation
+                || (
+                    null === $participation->getEndDate()
+                    && $participation->getStartDate() <= $yesterday
+                )) {
+                ++$i;
 
-        $this->assertEquals(null, $data);
+                yield [
+                    $id,
+                    $household->getId(),
+                    $positions[random_int(0, count($positions) - 1)]['id'],
+                    new DateTimeImmutable('tomorrow'),
+                ];
+            }
+        } while (1 >= $i);
     }
 
     /**
      * @dataProvider provideValidDataEditMember
+     *
+     * @param mixed $memberId
      */
     public function testEditMember($memberId)
     {
@@ -193,83 +126,173 @@ class HouseholdMemberControllerTest extends WebTestCase
 
         $form = $crawler->selectButton('Enregistrer')
             ->form();
-        $form['household_member[endDate]'] = (new \DateTime('tomorrow'))
-            ->format('Y-m-d');
 
         $crawler = $client->submit($form);
 
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
     }
 
-    public function provideValidDataMove(): \Iterator
+    /**
+     * @dataProvider provideValidDataMove
+     *
+     * @param mixed $personId
+     * @param mixed $householdId
+     * @param mixed $positionId
+     */
+    public function testLeaveWithoutHousehold($personId, $householdId, $positionId, DateTimeInterface $date)
     {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
-        $yesterday = new \DateTimeImmutable('yesterday');
+        $client = $this->getClientAuthenticated();
 
-        $personIds = $em->createQuery("SELECT p.id FROM ".Person::class." p ".
-            "JOIN p.center c ".
-            "WHERE ".
-            "c.name = :center "
+        $client->request(
+            Request::METHOD_POST,
+            '/api/1.0/person/household/members/move.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode(
+                [
+                    'concerned' => [
+                        [
+                            'person' => [
+                                'type' => 'person',
+                                'id' => $personId,
+                            ],
+                            'start_date' => [
+                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                            ],
+                            'position' => [
+                                'type' => 'household_position',
+                                'id' => $positionId,
+                            ],
+                            'holder' => false,
+                            'comment' => 'Introduced by automated test',
+                        ],
+                    ],
+                    'destination' => null,
+                ]
             )
-            ->setParameter('center', "Center A")
-            ->setMaxResults(100)
-            ->getScalarResult()
-            ;
+        );
 
-        \shuffle($personIds);
+        $this->assertEquals(
+            Response::HTTP_OK,
+            $client->getResponse()->getStatusCode()
+        );
 
-        $household = new Household();
-        $em->persist($household);
-        $em->flush();
+        $data = json_decode($client->getResponse()->getContent(), true);
 
-        $positions = $em->createQuery("SELECT pos.id FROM ".Position::class." pos ".
-            "WHERE pos.shareHouseHold = TRUE")
-            ->getResult()
-            ;
-
-        $i = 0;
-        do {
-            $id = \array_pop($personIds)['id'];
-            $person = self::$container->get(EntityManagerInterface::class)
-                ->getRepository(Person::Class)
-                ->find($id);
-
-            $participation = $person->getCurrentHouseholdParticipationShareHousehold();
-
-            if (NULL == $participation || 
-                (
-                    NULL === $participation->getEndDate()
-                    && $participation->getStartDate() <= $yesterday
-                )) {
-            
-                $i++;
-                yield [ 
-                    $id,
-                    $household->getId(), 
-                    $positions[\random_int(0, count($positions) - 1)]['id'],
-                    new \DateTimeImmutable('tomorrow')
-                ];
-            }
-
-        } while ($i <= 1);
+        $this->assertEquals(null, $data);
     }
 
-    public function provideValidDataEditMember(): \Iterator
+    /**
+     * @dataProvider provideValidDataMove
+     *
+     * @param mixed $personId
+     * @param mixed $householdId
+     * @param mixed $positionId
+     */
+    public function testMoveMember($personId, $householdId, $positionId, DateTimeInterface $date)
     {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
+        $client = $this->getClientAuthenticated();
 
-        $membershipIds = $em->createQuery("SELECT m.id FROM ".HouseholdMember::class." m ".
-            "JOIN m.person p ".
-            "JOIN p.center c ".
-            "WHERE c.name = :center AND m.endDate IS NULL")
-            ->setParameter('center', 'Center A')
-            ->getScalarResult()
-            ;
+        $client->request(
+            Request::METHOD_POST,
+            '/api/1.0/person/household/members/move.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode(
+                [
+                    'concerned' => [
+                        [
+                            'person' => [
+                                'type' => 'person',
+                                'id' => $personId,
+                            ],
+                            'start_date' => [
+                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                            ],
+                            'position' => [
+                                'type' => 'household_position',
+                                'id' => $positionId,
+                            ],
+                            'holder' => false,
+                            'comment' => 'Introduced by automated test',
+                        ],
+                    ],
+                    'destination' => [
+                        'type' => 'household',
+                        'id' => $householdId,
+                    ],
+                ]
+            )
+        );
 
-        \shuffle($membershipIds);
+        $this->assertEquals(
+            Response::HTTP_OK,
+            $client->getResponse()->getStatusCode()
+        );
+    }
 
-        yield [ \array_pop($membershipIds)['id'] ];
+    /**
+     * @dataProvider provideValidDataMove
+     *
+     * @param mixed $personId
+     * @param mixed $householdId
+     * @param mixed $positionId
+     */
+    public function testMoveMemberToNewHousehold($personId, $householdId, $positionId, DateTimeInterface $date)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request(
+            Request::METHOD_POST,
+            '/api/1.0/person/household/members/move.json',
+            [], // parameters
+            [], // files
+            [], // server
+            json_encode(
+                [
+                    'concerned' => [
+                        [
+                            'person' => [
+                                'type' => 'person',
+                                'id' => $personId,
+                            ],
+                            'start_date' => [
+                                'datetime' => $date->format(DateTimeInterface::RFC3339),
+                            ],
+                            'position' => [
+                                'type' => 'household_position',
+                                'id' => $positionId,
+                            ],
+                            'holder' => false,
+                            'comment' => 'Introduced by automated test',
+                        ],
+                    ],
+                    'destination' => [
+                        'type' => 'household',
+                    ],
+                ]
+            )
+        );
+
+        $this->assertEquals(
+            Response::HTTP_OK,
+            $client->getResponse()->getStatusCode()
+        );
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+
+        $this->assertIsArray($data);
+        $this->assertArrayHasKey('members', $data);
+        $this->assertIsArray($data['members']);
+        $this->assertEquals(
+            1,
+            count($data['members']),
+            'assert new household count one member'
+        );
+        $this->assertArrayHasKey('person', $data['members'][0]);
+        $this->assertArrayHasKey('id', $data['members'][0]['person']);
+        $this->assertEquals($personId, $data['members'][0]['person']['id']);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
index 83fd540fb..43a689a5f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php
@@ -1,159 +1,152 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PersonAddressControllerTest extends WebTestCase
+final class PersonAddressControllerTest extends WebTestCase
 {
-    /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
-    protected $em;
-    
-    /** @var Person The person on which the test is executed */
-    protected static $person;
-    
     /**
-     *
-     * @var \Chill\MainBundle\Entity\PostalCode
-     */
-    protected $postalCode;
-    
-    /**
-     *
      * @var \Symfony\Component\BrowserKit\Client
      */
     protected $client;
-    
+
+    /**
+     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
+     */
+    protected $em;
+
+    /**
+     * @var Person The person on which the test is executed
+     */
+    protected static $person;
+
+    /**
+     * @var \Chill\MainBundle\Entity\PostalCode
+     */
+    protected $postalCode;
+
     public static function setUpBeforeClass()
     {
-        static::bootKernel();
-        
-        $em = static::$kernel->getContainer()
+        self::bootKernel();
+
+        $em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
+
         $center = $em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
-       
+            ->findOneBy(['name' => 'Center A']);
+
         self::$person = (new Person())
-            ->setLastName("Tested person")
-            ->setFirstName("Test")
+            ->setLastName('Tested person')
+            ->setFirstName('Test')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
-        
+
         $em->persist(self::$person);
         $em->flush();
     }
-    
+
     /**
-     * Prepare client and create a random person
+     * Prepare client and create a random person.
      */
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->em = static::$kernel->getContainer()
+        self::bootKernel();
+
+        $this->em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
+
         $this->postalCode = $this->em->getRepository('ChillMainBundle:PostalCode')
-                ->findOneBy(array('code' => 1000));
-        
-        $this->client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+            ->findOneBy(['code' => 1000]);
+
+        $this->client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
-    
+
     public static function tearDownAfter()
     {
         $this->refreshPerson();
         $this->em->remove(self::$person);
         $this->em->flush();
     }
-    
-    /**
-     * Reload the person from the db
-     */
-    protected function refreshPerson() 
-    {
-        self::$person = $this->em->getRepository('ChillPersonBundle:Person')
-            ->find(self::$person->getId());
-    }
-    
-    public function testEmptyList()
-    {
-        $crawler = $this->client->request('GET', '/fr/person/'.
-                self::$person->getId().'/address/list');
-        
-        $this->assertTrue($this->client->getResponse()->isSuccessful());
-        
-        $this->assertEquals(1, $crawler->filter('td:contains("Pas d\'adresse renseignée")')
-                ->count(),
-                "assert that a message say 'no address given'");
-        
-    }
-    
+
     /**
      * @depends testEmptyList
      */
     public function testCreateAddress()
     {
-        $crawler = $this->client->request('GET', '/fr/person/'.
-                self::$person->getId().'/address/new');
-        
+        $crawler = $this->client->request('GET', '/fr/person/' .
+                self::$person->getId() . '/address/new');
+
         $this->assertTrue($this->client->getResponse()->isSuccessful());
-        
+
         // get the form and populate the most obvious fields (postcode will come later)
-        $form = $crawler->filter('.bt-create')->form(array(
+        $form = $crawler->filter('.bt-create')->form([
             'address[streetAddress1]' => 'Rue de la Paix, 50',
-            'address[streetAddress2]' =>  $this->postalCode->getId(),
-            'address[validFrom]'      => '15-01-2016'
-        ));
-                
-        // select a random postal code        
+            'address[streetAddress2]' => $this->postalCode->getId(),
+            'address[validFrom]' => '15-01-2016',
+        ]);
+
+        // select a random postal code
         $values = $form['address[postCode]']->availableOptionValues();
         $form['address[postCode]']->setValue($values[array_rand($values)]);
-        
+
         $this->client->submit($form);
-                
+
         $crawler = $this->client->followRedirect();
-        
-        $this->assertRegexp('|/fr/person/[0-9]{1,}/address/list|', 
-                $this->client->getHistory()->current()->getUri(),
-                "assert that the current page is on |/fr/person/[0-9]{1,}/address/list|");
-        $this->assertEquals(1, $crawler
+
+        $this->assertRegexp(
+            '|/fr/person/[0-9]{1,}/address/list|',
+            $this->client->getHistory()->current()->getUri(),
+            'assert that the current page is on |/fr/person/[0-9]{1,}/address/list|'
+        );
+        $this->assertEquals(
+            1,
+            $crawler
                 ->filter('div.flash_message.success')
                 ->count(),
-                "Asserting that the response page contains a success flash message");
-        $this->assertEquals(1, $crawler
+            'Asserting that the response page contains a success flash message'
+        );
+        $this->assertEquals(
+            1,
+            $crawler
                 ->filter('td:contains("Rue de la Paix, 50")')
                 ->count(),
-                "Asserting that the page contains the new address");
-        
+            'Asserting that the page contains the new address'
+        );
     }
-    
+
+    public function testEmptyList()
+    {
+        $crawler = $this->client->request('GET', '/fr/person/' .
+                self::$person->getId() . '/address/list');
+
+        $this->assertTrue($this->client->getResponse()->isSuccessful());
+
+        $this->assertEquals(
+            1,
+            $crawler->filter('td:contains("Pas d\'adresse renseignée")')
+                ->count(),
+            "assert that a message say 'no address given'"
+        );
+    }
+
     /**
      * @depends testCreateAddress
      */
@@ -161,34 +154,48 @@ class PersonAddressControllerTest extends WebTestCase
     {
         $this->refreshPerson();
         $address = self::$person->getLastAddress();
-        
-        $crawler = $this->client->request('GET', '/fr/person/'.self::$person->getId()
-                .'/address/'.$address->getId().'/edit');
-        
+
+        $crawler = $this->client->request('GET', '/fr/person/' . self::$person->getId()
+                . '/address/' . $address->getId() . '/edit');
+
         $this->assertTrue($this->client->getResponse()->isSuccessful());
-        
-        $form = $crawler->filter('.bt-save')->form(array(
+
+        $form = $crawler->filter('.bt-save')->form([
             'address[streetAddress1]' => 'Rue du Trou Normand, 15',
-            'address[validFrom]'      => '15-01-2015'
-        ));
-        
+            'address[validFrom]' => '15-01-2015',
+        ]);
+
         $this->client->submit($form);
-        
+
         $crawler = $this->client->followRedirect();
-        
-        $this->assertRegexp('|/fr/person/[0-9]{1,}/address/list|', 
-                $this->client->getHistory()->current()->getUri(),
-                "assert that the current page is on |/fr/person/[0-9]{1,}/address/list|");
-        $this->assertGreaterThan(0, $crawler
+
+        $this->assertRegexp(
+            '|/fr/person/[0-9]{1,}/address/list|',
+            $this->client->getHistory()->current()->getUri(),
+            'assert that the current page is on |/fr/person/[0-9]{1,}/address/list|'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler
                 ->filter('div.flash_message.success')
                 ->count(),
-                "Asserting that the response page contains a success flash message");
-        $this->assertEquals(1, $crawler
+            'Asserting that the response page contains a success flash message'
+        );
+        $this->assertEquals(
+            1,
+            $crawler
                 ->filter('td:contains("Rue du Trou Normand")')
                 ->count(),
-                "Asserting that the page contains the new address");
+            'Asserting that the page contains the new address'
+        );
+    }
+
+    /**
+     * Reload the person from the db.
+     */
+    protected function refreshPerson()
+    {
+        self::$person = $this->em->getRepository('ChillPersonBundle:Person')
+            ->find(self::$person->getId());
     }
-    
-    
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
index 23890cdb9..3d675ec16 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonApiControllerTest.php
@@ -1,52 +1,78 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Iterator;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use function array_pop;
+use function json_decode;
+use function shuffle;
 
-class PersonApiControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    /**
-     * @dataProvider dataGetPersonFromCenterB
-     */
-    public function testPersonGetUnauthorized($personId): void
+    public function dataGetPersonFromCenterA(): Iterator
     {
-        $client = $this->getClientAuthenticated();
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $personIds = $em->createQuery('SELECT p.id FROM ' . Person::class . ' p ' .
+            'JOIN p.center c ' .
+            'WHERE c.name = :center')
+            ->setParameter('center', 'Center A')
+            ->setMaxResults(100)
+            ->getScalarResult();
 
-        $client->request(Request::METHOD_GET, "/api/1.0/person/person/{$personId}.json");
-        $response = $client->getResponse();
+        shuffle($personIds);
 
-        $this->assertEquals(403, $response->getStatusCode());
-    }
-
-    /**
-     * @dataProvider dataGetPersonFromCenterA
-     */
-    public function testPersonGet($personId): void
-    {
-        $client = $this->getClientAuthenticated();
-
-        $client->request(Request::METHOD_GET, "/api/1.0/person/person/{$personId}.json");
-        $response = $client->getResponse();
-
-        $this->assertResponseIsSuccessful();
-
-        $data = \json_decode($client->getResponse()->getContent(), true);
-
-        $this->assertArrayHasKey('type', $data);
-        $this->assertArrayHasKey('id', $data);
-        $this->assertEquals('person', $data['type']);
-        $this->assertEquals($personId, $data['id']);
+        yield array_pop($personIds);
+
+        yield array_pop($personIds);
+
+        yield array_pop($personIds);
+
+        yield array_pop($personIds);
+    }
+
+    public function dataGetPersonFromCenterB(): Iterator
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $personIds = $em->createQuery('SELECT p.id FROM ' . Person::class . ' p ' .
+            'JOIN p.center c ' .
+            'WHERE c.name = :center')
+            ->setParameter('center', 'Center B')
+            ->setMaxResults(100)
+            ->getScalarResult();
+
+        shuffle($personIds);
+
+        yield array_pop($personIds);
+
+        yield array_pop($personIds);
     }
 
     /**
      * @dataProvider dataGetPersonFromCenterA
+     *
+     * @param mixed $personId
      */
     public function testPersonAddressSuggestion($personId): void
     {
@@ -59,6 +85,8 @@ class PersonApiControllerTest extends WebTestCase
 
     /**
      * @dataProvider dataGetPersonFromCenterB
+     *
+     * @param mixed $personId
      */
     public function testPersonAddressSuggestionUnauthorized($personId): void
     {
@@ -70,41 +98,40 @@ class PersonApiControllerTest extends WebTestCase
         $this->assertEquals(403, $response->getStatusCode());
     }
 
-    public function dataGetPersonFromCenterA(): \Iterator
+    /**
+     * @dataProvider dataGetPersonFromCenterA
+     *
+     * @param mixed $personId
+     */
+    public function testPersonGet($personId): void
     {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
-        $personIds= $em->createQuery("SELECT p.id FROM ".Person::class." p ".
-            "JOIN p.center c ".
-            "WHERE c.name = :center")
-            ->setParameter('center', 'Center A')
-            ->setMaxResults(100)
-            ->getScalarResult()
-            ;
+        $client = $this->getClientAuthenticated();
 
-        \shuffle($personIds);
+        $client->request(Request::METHOD_GET, "/api/1.0/person/person/{$personId}.json");
+        $response = $client->getResponse();
 
-        yield \array_pop($personIds);
-        yield \array_pop($personIds);
-        yield \array_pop($personIds);
-        yield \array_pop($personIds);
-    } 
+        $this->assertResponseIsSuccessful();
 
-    public function dataGetPersonFromCenterB(): \Iterator
+        $data = json_decode($client->getResponse()->getContent(), true);
+
+        $this->assertArrayHasKey('type', $data);
+        $this->assertArrayHasKey('id', $data);
+        $this->assertEquals('person', $data['type']);
+        $this->assertEquals($personId, $data['id']);
+    }
+
+    /**
+     * @dataProvider dataGetPersonFromCenterB
+     *
+     * @param mixed $personId
+     */
+    public function testPersonGetUnauthorized($personId): void
     {
-        self::bootKernel();
-        $em = self::$container->get(EntityManagerInterface::class);
-        $personIds= $em->createQuery("SELECT p.id FROM ".Person::class." p ".
-            "JOIN p.center c ".
-            "WHERE c.name = :center")
-            ->setParameter('center', 'Center B')
-            ->setMaxResults(100)
-            ->getScalarResult()
-            ;
+        $client = $this->getClientAuthenticated();
 
-        \shuffle($personIds);
+        $client->request(Request::METHOD_GET, "/api/1.0/person/person/{$personId}.json");
+        $response = $client->getResponse();
 
-        yield \array_pop($personIds);
-        yield \array_pop($personIds);
-    } 
+        $this->assertEquals(403, $response->getStatusCode());
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
index 6eabc6658..fd990943a 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php
@@ -1,49 +1,71 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
+use Chill\MainBundle\Test\PrepareClientTrait;
+use DateTime;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Form;
-use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use function count;
+use function in_array;
 
 /**
- * Test creation and deletion for persons
+ * Test creation and deletion for persons.
+ *
+ * @internal
+ * @coversNothing
  */
-class PersonControllerCreateTest extends WebTestCase
+final class PersonControllerCreateTest extends WebTestCase
 {
     use PrepareClientTrait;
 
+    public const BIRTHDATE_INPUT = 'chill_personbundle_person_creation[birthdate]';
+
+    public const CENTER_INPUT = 'chill_personbundle_person_creation[center]';
+
+    public const CREATEDATE_INPUT = 'chill_personbundle_person_creation[creation_date]';
+
+    public const FIRSTNAME_INPUT = 'chill_personbundle_person_creation[firstName]';
+
+    public const GENDER_INPUT = 'chill_personbundle_person_creation[gender]';
+
+    public const LASTNAME_INPUT = 'chill_personbundle_person_creation[lastName]';
+
+    public const LONG_TEXT = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosq. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta.Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosq.';
+
     private KernelBrowser $client;
 
-    const FIRSTNAME_INPUT = 'chill_personbundle_person_creation[firstName]';
-    const LASTNAME_INPUT = "chill_personbundle_person_creation[lastName]";
-    const GENDER_INPUT = "chill_personbundle_person_creation[gender]";
-    const BIRTHDATE_INPUT = "chill_personbundle_person_creation[birthdate]";
-    const CREATEDATE_INPUT = "chill_personbundle_person_creation[creation_date]";
-    const CENTER_INPUT = "chill_personbundle_person_creation[center]";
+    public static function tearDownAfterClass()
+    {
+        self::bootKernel();
+        $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
 
-    const LONG_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosq. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta.Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosq.";
+        //remove two people created during test
+        $jesus = $em->getRepository('ChillPersonBundle:Person')
+            ->findOneBy(['firstName' => 'God']);
+
+        if (null !== $jesus) {
+            $em->remove($jesus);
+        }
+
+        $jesus2 = $em->getRepository('ChillPersonBundle:Person')
+            ->findOneBy(['firstName' => 'roger']);
+
+        if (null !== $jesus2) {
+            $em->remove($jesus2);
+        }
+        $em->flush();
+    }
 
     public function setUp(): void
     {
@@ -51,147 +73,84 @@ class PersonControllerCreateTest extends WebTestCase
     }
 
     /**
-     *
-     * @param Form $creationForm
-     */
-    private function fillAValidCreationForm(
-        Form &$creationForm,
-        string $firstname = 'God',
-        string $lastname = 'Jesus'
-    ) {
-        $creationForm->get(self::FIRSTNAME_INPUT)->setValue($firstname.'_'.uniqid());
-        $creationForm->get(self::LASTNAME_INPUT)->setValue($lastname.'_'.uniqid());
-        $creationForm->get(self::GENDER_INPUT)->select("man");
-        $date = new \DateTime('1947-02-01');
-        $creationForm->get(self::BIRTHDATE_INPUT)->setValue($date->format('Y-m-d'));
-
-        return $creationForm;
-    }
-
-    /**
-     * Test the "add a person" page : test that required elements are present
+     * Test the "add a person" page : test that required elements are present.
      *
      * see https://redmine.champs-libres.coop/projects/chillperson/wiki/Test_plan_for_page_%22add_a_person%22
      */
     public function testAddAPersonPage()
     {
-
         $client = $this->client;
         $crawler = $client->request('GET', '/fr/person/new');
 
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-              "The page is accessible at the URL /{_locale}/person/new");
-        $form = $crawler->selectButton("Ajouter la personne")->form();
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The page is accessible at the URL /{_locale}/person/new'
+        );
+        $form = $crawler->selectButton('Ajouter la personne')->form();
 
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Form', $form,
-              'The page contains a butto ');
-        $this->assertTrue($form->has(self::FIRSTNAME_INPUT),
-              'The page contains a "firstname" input');
-        $this->assertTrue($form->has(self::LASTNAME_INPUT),
-              'The page contains a "lastname" input');
-        $this->assertTrue($form->has(self::GENDER_INPUT),
-              'The page contains a "gender" input');
-        $this->assertTrue($form->has(self::BIRTHDATE_INPUT),
-              'The page has a "date of birth" input');
+        $this->assertInstanceOf(
+            'Symfony\Component\DomCrawler\Form',
+            $form,
+            'The page contains a butto '
+        );
+        $this->assertTrue(
+            $form->has(self::FIRSTNAME_INPUT),
+            'The page contains a "firstname" input'
+        );
+        $this->assertTrue(
+            $form->has(self::LASTNAME_INPUT),
+            'The page contains a "lastname" input'
+        );
+        $this->assertTrue(
+            $form->has(self::GENDER_INPUT),
+            'The page contains a "gender" input'
+        );
+        $this->assertTrue(
+            $form->has(self::BIRTHDATE_INPUT),
+            'The page has a "date of birth" input'
+        );
 
         $genderType = $form->get(self::GENDER_INPUT);
-        $this->assertEquals('radio', $genderType->getType(),
-              'The gender input has radio buttons');
-        $this->assertEquals(3, count($genderType->availableOptionValues()),
-              'The gender input has three options: man, women and undefined');
-        $this->assertTrue(in_array('man', $genderType->availableOptionValues()),
-              'gender has "homme" option');
-        $this->assertTrue(in_array('woman', $genderType->availableOptionValues()),
-              'gender has "femme" option');
+        $this->assertEquals(
+            'radio',
+            $genderType->getType(),
+            'The gender input has radio buttons'
+        );
+        $this->assertEquals(
+            3,
+            count($genderType->availableOptionValues()),
+            'The gender input has three options: man, women and undefined'
+        );
+        $this->assertTrue(
+            in_array('man', $genderType->availableOptionValues(), true),
+            'gender has "homme" option'
+        );
+        $this->assertTrue(
+            in_array('woman', $genderType->availableOptionValues(), true),
+            'gender has "femme" option'
+        );
         $this->assertFalse($genderType->hasValue(), 'The gender input is not checked');
 
         return $form;
     }
 
-
-    /**
-     * Test the creation of a valid person.
-     *
-     * @param Form $form
-     * @return string The id of the created person
-     */
-    public function testValidForm()
-    {
-        $client = $this->client;
-        $crawler = $client->request('GET', '/fr/person/new');
-
-        $form = $crawler->selectButton("Ajouter la personne")->form();
-        $this->fillAValidCreationForm($form);
-        $client = $this->client;
-        $client->submit($form);
-
-        $this->assertTrue($client->getResponse()->isRedirect(),
-            "a valid form redirect to url /{_locale}/person/{personId}/general/edit");
-        $client->followRedirect();
-
-        // visualize regexp here : http://jex.im/regulex/#!embed=false&flags=&re=%2Ffr%2Fperson%2F[1-9][0-9]*%2Fgeneral%2Fedit%24
-        $this->assertRegExp('|/fr/person/[1-9][0-9]*/general/edit$|',
-            $client->getHistory()->current()->getUri(),
-            "a valid form redirect to url /{_locale}/person/{personId}/general/edit");
-
-        $regexPersonId = null;
-        preg_match("/person\/([1-9][0-9]*)\/general\/edit$/",
-            $client->getHistory()->current()->getUri(), $regexPersonId);
-        return $regexPersonId[1];
-    }
-
     /**
      * Test if, for a given person if its person view page (at the url
-     * fr/person/$personID/general) is accessible
+     * fr/person/$personID/general) is accessible.
      *
-     * @param string|int $personId The is of the person
+     * @param int|string $personId The is of the person
      * @depends testValidForm
      */
     public function testPersonViewAccessible($personId)
     {
         $client = $this->client;
-        $client->request('GET', '/fr/person/'.$personId.'/general');
-
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-            "The person view page is accessible at the URL"
-            . "/{_locale}/person/{personID}/general");
-    }
-
-    /**
-     * test adding a person with a user with multi center
-     * is valid
-     */
-    public function testValidFormWithMultiCenterUser()
-    {
-        $client = $this->getClientAuthenticated('multi_center');
-
-        $crawler = $client->request('GET', '/fr/person/new');
-
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-              "The page is accessible at the URL /{_locale}/person/new");
-        $form = $crawler->selectButton("Ajouter la personne")->form();
-
-        // 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');
-        $centerInput = $form->get(self::CENTER_INPUT);
-        /*
-        $availableValues = $centerInput->availableOptionValues();
-        $lastCenterInputValue = end($availableValues);
-        $centerInput->setValue($lastCenterInputValue);
-        */
-
-        $client->submit($form);
-
-        $this->assertTrue($client->getResponse()->isRedirect(),
-              "a valid form redirect to url /{_locale}/person/{personId}/general/edit");
-        $client->followRedirect();
-        $this->assertRegExp('|/fr/person/[1-9][0-9]*/general/edit$|',
-              $client->getHistory()->current()->getUri(),
-              "a valid form redirect to url /{_locale}/person/{personId}/general/edit");
+        $client->request('GET', '/fr/person/' . $personId . '/general');
 
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The person view page is accessible at the URL'
+            . '/{_locale}/person/{personID}/general'
+        );
     }
 
     public function testReviewExistingDetectionInversedLastNameWithFirstName()
@@ -203,39 +162,121 @@ class PersonControllerCreateTest extends WebTestCase
         //test the page is loaded before continuing
         $this->assertTrue($client->getResponse()->isSuccessful());
 
-        $form = $crawler->selectButton("Ajouter la personne")->form();
+        $form = $crawler->selectButton('Ajouter la personne')->form();
         $form = $this->fillAValidCreationForm($form, 'Charline', 'dd');
         $client->submit($form);
 
-        $this->assertContains('DEPARDIEU', $client->getCrawler()->text(),
-                "check that the page has detected the lastname of a person existing in database");
+        $this->assertContains(
+            'DEPARDIEU',
+            $client->getCrawler()->text(),
+            'check that the page has detected the lastname of a person existing in database'
+        );
 
         //inversion
-        $form = $crawler->selectButton("Ajouter la personne")->form();
+        $form = $crawler->selectButton('Ajouter la personne')->form();
         $form = $this->fillAValidCreationForm($form, 'dd', 'Charline');
         $client->submit($form);
 
-        $this->assertContains('DEPARDIEU', $client->getCrawler()->text(),
-                "check that the page has detected the lastname of a person existing in database");
+        $this->assertContains(
+            'DEPARDIEU',
+            $client->getCrawler()->text(),
+            'check that the page has detected the lastname of a person existing in database'
+        );
     }
 
-    public static function tearDownAfterClass()
+    /**
+     * Test the creation of a valid person.
+     *
+     * @return string The id of the created person
+     */
+    public function testValidForm()
     {
-        static::bootKernel();
-        $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+        $client = $this->client;
+        $crawler = $client->request('GET', '/fr/person/new');
 
-        //remove two people created during test
-        $jesus = $em->getRepository('ChillPersonBundle:Person')
-              ->findOneBy(array('firstName' => 'God'));
-        if ($jesus !== NULL) {
-            $em->remove($jesus);
-        }
+        $form = $crawler->selectButton('Ajouter la personne')->form();
+        $this->fillAValidCreationForm($form);
+        $client = $this->client;
+        $client->submit($form);
 
-        $jesus2 = $em->getRepository('ChillPersonBundle:Person')
-              ->findOneBy(array('firstName' => 'roger'));
-        if ($jesus2 !== NULL) {
-            $em->remove($jesus2);
-        }
-        $em->flush();
+        $this->assertTrue(
+            $client->getResponse()->isRedirect(),
+            'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
+        );
+        $client->followRedirect();
+
+        // visualize regexp here : http://jex.im/regulex/#!embed=false&flags=&re=%2Ffr%2Fperson%2F[1-9][0-9]*%2Fgeneral%2Fedit%24
+        $this->assertRegExp(
+            '|/fr/person/[1-9][0-9]*/general/edit$|',
+            $client->getHistory()->current()->getUri(),
+            'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
+        );
+
+        $regexPersonId = null;
+        preg_match(
+            '/person\\/([1-9][0-9]*)\\/general\\/edit$/',
+            $client->getHistory()->current()->getUri(),
+            $regexPersonId
+        );
+
+        return $regexPersonId[1];
+    }
+
+    /**
+     * test adding a person with a user with multi center
+     * is valid.
+     */
+    public function testValidFormWithMultiCenterUser()
+    {
+        $client = $this->getClientAuthenticated('multi_center');
+
+        $crawler = $client->request('GET', '/fr/person/new');
+
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The page is accessible at the URL /{_locale}/person/new'
+        );
+        $form = $crawler->selectButton('Ajouter la personne')->form();
+
+        // 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'
+        );
+        $centerInput = $form->get(self::CENTER_INPUT);
+        /*
+        $availableValues = $centerInput->availableOptionValues();
+        $lastCenterInputValue = end($availableValues);
+        $centerInput->setValue($lastCenterInputValue);
+         */
+
+        $client->submit($form);
+
+        $this->assertTrue(
+            $client->getResponse()->isRedirect(),
+            'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
+        );
+        $client->followRedirect();
+        $this->assertRegExp(
+            '|/fr/person/[1-9][0-9]*/general/edit$|',
+            $client->getHistory()->current()->getUri(),
+            'a valid form redirect to url /{_locale}/person/{personId}/general/edit'
+        );
+    }
+
+    private function fillAValidCreationForm(
+        Form &$creationForm,
+        string $firstname = 'God',
+        string $lastname = 'Jesus'
+    ) {
+        $creationForm->get(self::FIRSTNAME_INPUT)->setValue($firstname . '_' . uniqid());
+        $creationForm->get(self::LASTNAME_INPUT)->setValue($lastname . '_' . uniqid());
+        $creationForm->get(self::GENDER_INPUT)->select('man');
+        $date = new DateTime('1947-02-01');
+        $creationForm->get(self::BIRTHDATE_INPUT)->setValue($date->format('Y-m-d'));
+
+        return $creationForm;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
index 8a8c04538..8064a8290 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php
@@ -1,291 +1,81 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\MainBundle\Test\PrepareClientTrait;
-
+use Chill\PersonBundle\Entity\Person;
+use Closure;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Test the edition of persons
+ * Test the edition of persons.
  *
  * As I am logged in as "center a_social"
  *
+ * @internal
+ * @coversNothing
  */
-class PersonControllerUpdateTest extends WebTestCase
+final class PersonControllerUpdateTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
-    private $em;
-
-    /** @var Person The person on which the test is executed */
-    private $person;
-
-    /** @var string The url using for editing the person's information */
+    /**
+     * @var string The url using for editing the person's information
+     */
     private $editUrl;
 
-    /** @var string The url using for seeing the person's information */
+    /**
+     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
+     */
+    private $em;
+
+    /**
+     * @var Person The person on which the test is executed
+     */
+    private $person;
+
+    /**
+     * @var string The url using for seeing the person's information
+     */
     private $viewUrl;
 
     /**
-     * Prepare client and create a random person
+     * Prepare client and create a random person.
      */
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $this->em = static::$kernel->getContainer()
+        $this->em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         $center = $this->em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
+            ->findOneBy(['name' => 'Center A']);
 
         $this->person = (new Person())
-            ->setLastName("My Beloved")
-            ->setFirstName("Jesus")
+            ->setLastName('My Beloved')
+            ->setFirstName('Jesus')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
 
         $this->em->persist($this->person);
         $this->em->flush();
 
-        $this->editUrl = '/fr/person/'.$this->person->getId().'/general/edit';
-        $this->viewUrl  = '/fr/person/'.$this->person->getId().'/general';
+        $this->editUrl = '/fr/person/' . $this->person->getId() . '/general/edit';
+        $this->viewUrl = '/fr/person/' . $this->person->getId() . '/general';
 
         $this->client = $this->getClientAuthenticated();
     }
 
-    /**
-     * Reload the person from the db
-     */
-    protected function refreshPerson()
-    {
-        $this->person = $this->em->getRepository('ChillPersonBundle:Person')
-            ->find($this->person->getId());
-    }
-
-    /**
-     * Test the edit page are accessible
-     */
-    public function testEditPageIsSuccessful()
-    {
-        $this->client->request('GET', $this->editUrl);
-        $this->assertTrue($this->client->getResponse()->isSuccessful(),
-            "The person edit form is accessible");
-    }
-
-    /**
-     * Test the configurable fields are present
-     *
-     * @group configurable_fields
-     */
-    public function testHiddenFielsArePresent()
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-        $configurables = array('placeOfBirth', 'phonenumber', 'email',
-            'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus');
-        $form = $crawler->selectButton('Enregistrer')->form(); //;
-
-        foreach($configurables as $key) {
-            $this->assertTrue($form->has('chill_personbundle_person['.$key.']'));
-        }
-    }
-
-    /**
-     * Test if the edit page of a given person is not accessible for a user
-     * of another center of the person
-     */
-    public function testEditPageDeniedForUnauthorized_OutsideCenter()
-    {
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center b_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
-
-        $client->request('GET', $this->editUrl);
-        $this->assertEquals(403, $client->getResponse()->getStatusCode(),
-            "The edit page of a person of a center A must not be accessible for user of center B");
-    }
-
-    /**
-     * Test the edit page of a given person are not accessible for an
-     * administrative user
-     */
-    public function testEditPageDeniedForUnauthorized_InsideCenter()
-    {
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_administrative',
-           'PHP_AUTH_PW'   => 'password',
-        ));
-
-        $client->request('GET', $this->editUrl);
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-    }
-
-    /**
-     * Test the edition of a field
-     *
-     * Given I fill the field with $value
-     * And I submit the form
-     * Then I am redirected to the 'general' page
-     * And the person is updated in the db
-     *
-     * @dataProvider validTextFieldsProvider
-     * @param string $field
-     * @param string $value
-     * @param \Closure $callback
-     */
-    public function testEditTextField($field, $value, \Closure $callback)
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-
-        $form = $crawler->selectButton('Enregistrer')
-            ->form();
-        //transform countries into value if needed
-        switch ($field) {
-            case 'nationality':
-            case 'countryOfBirth':
-                if (FALSE === empty($value)) {
-                    $country = $this->em->getRepository('ChillMainBundle:Country')
-                        ->findOneByCountryCode($value);
-                    $transformedValue = $country->getId();
-                } else {
-                    $transformedValue = '';
-                }
-                break;
-            default:
-                $transformedValue = $value;
-        }
-
-        $form->get('chill_personbundle_person['.$field. ']')
-            ->setValue($transformedValue);
-
-        $this->client->submit($form);
-        $this->refreshPerson();
-
-        $this->assertTrue($this->client->getResponse()->isRedirect($this->viewUrl),
-            'the page is redirected to general view');
-        $this->assertEquals($value, $callback($this->person),
-            'the value '.$field.' is updated in db');
-
-        $crawler = $this->client->followRedirect();
-        $this->assertGreaterThan(0, $crawler->filter('.alert-success')->count(),
-            'a element .success is shown');
-
-        if($field == 'birthdate' or $field == 'memo' or $field == 'countryOfBirth' or $field == 'nationality'
-                or $field == 'gender') {
-            // we do not perform test on the web page contents.
-        } else {
-            $this->assertGreaterThan(0, $crawler->filter('html:contains("'.$value.'")')->count());
-        }
-    }
-
-    public function testEditLanguages()
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-        $selectedLanguages = array('en', 'an', 'bbj');
-
-        $form = $crawler->selectButton('Enregistrer')
-            ->form();
-        $form->get('chill_personbundle_person[spokenLanguages]')
-            ->setValue($selectedLanguages);
-
-        $this->client->submit($form);
-        $this->refreshPerson();
-
-        $this->assertTrue($this->client->getResponse()->isRedirect($this->viewUrl),
-            'the page is redirected to /general view');
-        //retrieve languages codes present in person
-        foreach($this->person->getSpokenLanguages() as $lang){
-            $languagesCodesPresents[] = $lang->getId();
-        }
-        $this->assertEquals(asort($selectedLanguages), asort($languagesCodesPresents),
-            'the person speaks the expected languages');
-    }
-
-
-    /**
-     * Test tbe detection of invalid data during the update procedure
-     *
-     * @dataProvider providesInvalidFieldsValues
-     * @param string $field
-     * @param string $value
-     */
-    public function testInvalidFields($field, $value)
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-
-        $form = $crawler->selectButton('Enregistrer')
-            ->form();
-        $form->get('chill_personbundle_person['.$field.']')
-            ->setValue($value);
-
-        $crawler = $this->client->submit($form);
-
-        $this->assertFalse($this->client->getResponse()->isRedirect(),
-            'the page is not redirected to /general');
-        $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(),
-            'a element .error is shown');
-    }
-
-    /**
-     * provide valid values to test, with field name and
-     * a function to find the value back from person entity
-     *
-     * @return mixed[]
-     */
-    public function validTextFieldsProvider()
-    {
-        return array(
-            ['firstName', 'random Value', function(Person $person) { return $person->getFirstName(); } ],
-            ['lastName' , 'random Value', function(Person $person) { return $person->getLastName(); }  ],
-            ['placeOfBirth', 'none place', function(Person $person) { return $person->getPlaceOfBirth(); }],
-            ['birthdate', '1980-12-15', function(Person $person) { return $person->getBirthdate()->format('Y-m-d'); }],
-            ['phonenumber', '+32123456789', function(Person $person) { return $person->getPhonenumber(); }],
-            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', function(Person $person) { return $person->getMemo(); }],
-            ['countryOfBirth', 'BE', function(Person $person) { return $person->getCountryOfBirth()->getCountryCode(); }],
-            ['nationality', 'FR', function(Person $person) { return $person->getNationality()->getCountryCode(); }],
-            ['placeOfBirth', '', function(Person $person) { return $person->getPlaceOfBirth(); }],
-            ['birthdate', '', function(Person $person) { return $person->getBirthdate(); }],
-            ['phonenumber', '', function(Person $person) { return $person->getPhonenumber(); }],
-            ['memo', '', function(Person $person) { return $person->getMemo(); }],
-            ['countryOfBirth', NULL, function(Person $person) { return $person->getCountryOfBirth(); }],
-            ['nationality', NULL, function(Person $person) { return $person->getNationality(); }],
-            ['gender', Person::FEMALE_GENDER, function(Person $person) { return $person->getGender(); }],
-        );
-    }
-
-    public function providesInvalidFieldsValues()
-    {
-        return array(
-            ['firstName', $this->getVeryLongText()],
-            ['lastName', $this->getVeryLongText()],
-            ['firstName', ''],
-            ['lastName', ''],
-            ['birthdate', 'false date']
-        );
-    }
-
     public function tearDown()
     {
         $this->refreshPerson();
@@ -293,10 +83,247 @@ class PersonControllerUpdateTest extends WebTestCase
         $this->em->flush();
     }
 
+    public function providesInvalidFieldsValues()
+    {
+        return [
+            ['firstName', $this->getVeryLongText()],
+            ['lastName', $this->getVeryLongText()],
+            ['firstName', ''],
+            ['lastName', ''],
+            ['birthdate', 'false date'],
+        ];
+    }
+
+    public function testEditLanguages()
+    {
+        $crawler = $this->client->request('GET', $this->editUrl);
+        $selectedLanguages = ['en', 'an', 'bbj'];
+
+        $form = $crawler->selectButton('Enregistrer')
+            ->form();
+        $form->get('chill_personbundle_person[spokenLanguages]')
+            ->setValue($selectedLanguages);
+
+        $this->client->submit($form);
+        $this->refreshPerson();
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect($this->viewUrl),
+            'the page is redirected to /general view'
+        );
+        //retrieve languages codes present in person
+        foreach ($this->person->getSpokenLanguages() as $lang) {
+            $languagesCodesPresents[] = $lang->getId();
+        }
+        $this->assertEquals(
+            asort($selectedLanguages),
+            asort($languagesCodesPresents),
+            'the person speaks the expected languages'
+        );
+    }
+
+    /**
+     * Test the edit page of a given person are not accessible for an
+     * administrative user.
+     */
+    public function testEditPageDeniedForUnauthorizedInsideCenter()
+    {
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_administrative',
+            'PHP_AUTH_PW' => 'password',
+        ]);
+
+        $client->request('GET', $this->editUrl);
+        $this->assertEquals(403, $client->getResponse()->getStatusCode());
+    }
+
+    /**
+     * Test if the edit page of a given person is not accessible for a user
+     * of another center of the person.
+     */
+    public function testEditPageDeniedForUnauthorizedOutsideCenter()
+    {
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center b_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
+
+        $client->request('GET', $this->editUrl);
+        $this->assertEquals(
+            403,
+            $client->getResponse()->getStatusCode(),
+            'The edit page of a person of a center A must not be accessible for user of center B'
+        );
+    }
+
+    /**
+     * Test the edit page are accessible.
+     */
+    public function testEditPageIsSuccessful()
+    {
+        $this->client->request('GET', $this->editUrl);
+        $this->assertTrue(
+            $this->client->getResponse()->isSuccessful(),
+            'The person edit form is accessible'
+        );
+    }
+
+    /**
+     * Test the edition of a field.
+     *
+     * Given I fill the field with $value
+     * And I submit the form
+     * Then I am redirected to the 'general' page
+     * And the person is updated in the db
+     *
+     * @dataProvider validTextFieldsProvider
+     *
+     * @param string $field
+     * @param string $value
+     */
+    public function testEditTextField($field, $value, Closure $callback)
+    {
+        $crawler = $this->client->request('GET', $this->editUrl);
+
+        $form = $crawler->selectButton('Enregistrer')
+            ->form();
+        //transform countries into value if needed
+        switch ($field) {
+            case 'nationality':
+            case 'countryOfBirth':
+                if (false === empty($value)) {
+                    $country = $this->em->getRepository('ChillMainBundle:Country')
+                        ->findOneByCountryCode($value);
+                    $transformedValue = $country->getId();
+                } else {
+                    $transformedValue = '';
+                }
+
+                break;
+
+            default:
+                $transformedValue = $value;
+        }
+
+        $form->get('chill_personbundle_person[' . $field . ']')
+            ->setValue($transformedValue);
+
+        $this->client->submit($form);
+        $this->refreshPerson();
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect($this->viewUrl),
+            'the page is redirected to general view'
+        );
+        $this->assertEquals(
+            $value,
+            $callback($this->person),
+            'the value ' . $field . ' is updated in db'
+        );
+
+        $crawler = $this->client->followRedirect();
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.alert-success')->count(),
+            'a element .success is shown'
+        );
+
+        if ('birthdate' === $field || 'memo' === $field || 'countryOfBirth' === $field || 'nationality' === $field
+                || 'gender' === $field) {
+            // we do not perform test on the web page contents.
+        } else {
+            $this->assertGreaterThan(0, $crawler->filter('html:contains("' . $value . '")')->count());
+        }
+    }
+
+    /**
+     * Test the configurable fields are present.
+     *
+     * @group configurable_fields
+     */
+    public function testHiddenFielsArePresent()
+    {
+        $crawler = $this->client->request('GET', $this->editUrl);
+        $configurables = ['placeOfBirth', 'phonenumber', 'email',
+            'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus', ];
+        $form = $crawler->selectButton('Enregistrer')->form(); //;
+
+        foreach ($configurables as $key) {
+            $this->assertTrue($form->has('chill_personbundle_person[' . $key . ']'));
+        }
+    }
+
+    /**
+     * Test tbe detection of invalid data during the update procedure.
+     *
+     * @dataProvider providesInvalidFieldsValues
+     *
+     * @param string $field
+     * @param string $value
+     */
+    public function testInvalidFields($field, $value)
+    {
+        $crawler = $this->client->request('GET', $this->editUrl);
+
+        $form = $crawler->selectButton('Enregistrer')
+            ->form();
+        $form->get('chill_personbundle_person[' . $field . ']')
+            ->setValue($value);
+
+        $crawler = $this->client->submit($form);
+
+        $this->assertFalse(
+            $this->client->getResponse()->isRedirect(),
+            'the page is not redirected to /general'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.alert-danger')->count(),
+            'a element .error is shown'
+        );
+    }
+
+    /**
+     * provide valid values to test, with field name and
+     * a function to find the value back from person entity.
+     *
+     * @return mixed[]
+     */
+    public function validTextFieldsProvider()
+    {
+        return [
+            ['firstName', 'random Value', static function (Person $person) { return $person->getFirstName(); }],
+            ['lastName', 'random Value', static function (Person $person) { return $person->getLastName(); }],
+            // reminder: this value is capitalized
+            ['placeOfBirth', 'A PLACE', static function (Person $person) { return $person->getPlaceOfBirth(); }],
+            ['birthdate', '1980-12-15', static function (Person $person) { return $person->getBirthdate()->format('Y-m-d'); }],
+            ['phonenumber', '+32123456789', static function (Person $person) { return $person->getPhonenumber(); }],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) { return $person->getMemo(); }],
+            ['countryOfBirth', 'BE', static function (Person $person) { return $person->getCountryOfBirth()->getCountryCode(); }],
+            ['nationality', 'FR', static function (Person $person) { return $person->getNationality()->getCountryCode(); }],
+            ['placeOfBirth', '', static function (Person $person) { return $person->getPlaceOfBirth(); }],
+            ['birthdate', '', static function (Person $person) { return $person->getBirthdate(); }],
+            ['phonenumber', '', static function (Person $person) { return $person->getPhonenumber(); }],
+            ['memo', '', static function (Person $person) { return $person->getMemo(); }],
+            ['countryOfBirth', null, static function (Person $person) { return $person->getCountryOfBirth(); }],
+            ['nationality', null, static function (Person $person) { return $person->getNationality(); }],
+            ['gender', Person::FEMALE_GENDER, static function (Person $person) { return $person->getGender(); }],
+        ];
+    }
+
+    /**
+     * Reload the person from the db.
+     */
+    protected function refreshPerson()
+    {
+        $this->person = $this->em->getRepository('ChillPersonBundle:Person')
+            ->find($this->person->getId());
+    }
+
     private function getVeryLongText()
     {
-        return <<<EOT
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse molestie at enim id auctor. Vivamus malesuada elit ipsum, ac mollis ex facilisis sit amet. Phasellus accumsan, quam ut aliquet accumsan, augue ligula consequat erat, condimentum iaculis orci magna egestas eros. In vel blandit sapien. Duis ut dui vitae tortor iaculis malesuada vitae vitae lorem. Morbi efficitur dolor orci, a rhoncus urna blandit quis. Aenean at placerat dui, ut tincidunt nulla. In ultricies tempus ligula ac rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce urna nibh, placerat vel auctor sed, maximus quis magna. Vivamus quam ante, consectetur vel feugiat quis, aliquet id ante. Integer gravida erat dignissim ante commodo mollis. Donec imperdiet mauris elit, nec blandit dolor feugiat ut. Proin iaculis enim ut tortor pretium commodo. Etiam aliquet hendrerit dolor sed fringilla. Vestibulum facilisis nibh tincidunt dui egestas, vitae congue mi imperdiet. Duis vulputate ultricies lectus id cursus. Fusce bibendum sem dignissim, bibendum purus quis, mollis ex. Cras ac est justo. Duis congue mattis ipsum, vitae sagittis justo dictum sit amet. Duis aliquam pharetra sem, non laoreet ante laoreet ac. Mauris ornare mi tempus rutrum consequat.
-EOT;
+        return <<<'EOT'
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse molestie at enim id auctor. Vivamus malesuada elit ipsum, ac mollis ex facilisis sit amet. Phasellus accumsan, quam ut aliquet accumsan, augue ligula consequat erat, condimentum iaculis orci magna egestas eros. In vel blandit sapien. Duis ut dui vitae tortor iaculis malesuada vitae vitae lorem. Morbi efficitur dolor orci, a rhoncus urna blandit quis. Aenean at placerat dui, ut tincidunt nulla. In ultricies tempus ligula ac rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce urna nibh, placerat vel auctor sed, maximus quis magna. Vivamus quam ante, consectetur vel feugiat quis, aliquet id ante. Integer gravida erat dignissim ante commodo mollis. Donec imperdiet mauris elit, nec blandit dolor feugiat ut. Proin iaculis enim ut tortor pretium commodo. Etiam aliquet hendrerit dolor sed fringilla. Vestibulum facilisis nibh tincidunt dui egestas, vitae congue mi imperdiet. Duis vulputate ultricies lectus id cursus. Fusce bibendum sem dignissim, bibendum purus quis, mollis ex. Cras ac est justo. Duis congue mattis ipsum, vitae sagittis justo dictum sit amet. Duis aliquam pharetra sem, non laoreet ante laoreet ac. Mauris ornare mi tempus rutrum consequat.
+            EOT;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
index 7d374a3a7..d8219f2f5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php
@@ -1,211 +1,224 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
 //ini_set('memory_limit', '-1');
 
 use Chill\PersonBundle\Entity\Person;
+use Closure;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Test the edition of persons
- * 
+ * Test the edition of persons.
+ *
  * As I am logged in as "center a_social"
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
+final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
 {
-    /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
-    private $em;
-    
-    /** @var Person The person on which the test is executed */
-    private $person;
-    
-    /** @var string The url using for editing the person's information */
+    /**
+     * @var string The url using for editing the person's information
+     */
     private $editUrl;
 
-    /** @var string The url using for seeing the person's information */
-    private $viewUrl;
-    
     /**
-     * Prepare client and create a random person
+     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
+     */
+    private $em;
+
+    /**
+     * @var Person The person on which the test is executed
+     */
+    private $person;
+
+    /**
+     * @var string The url using for seeing the person's information
+     */
+    private $viewUrl;
+
+    /**
+     * Prepare client and create a random person.
      */
     public function setUp()
     {
-        static::bootKernel(array('environment' => 'test_with_hidden_fields'));
-        
-        $this->em = static::$kernel->getContainer()
+        self::bootKernel(['environment' => 'test_with_hidden_fields']);
+
+        $this->em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
+
         $center = $this->em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
-       
+            ->findOneBy(['name' => 'Center A']);
+
         $this->person = (new Person())
-            ->setLastName("My Beloved")
-            ->setFirstName("Jesus")
+            ->setLastName('My Beloved')
+            ->setFirstName('Jesus')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
-        
+
         $this->em->persist($this->person);
         $this->em->flush();
-        
-        $this->editUrl = '/en/person/'.$this->person->getId().'/general/edit';
-        $this->viewUrl  = '/en/person/'.$this->person->getId().'/general';
-        
-        $this->client = static::createClient(
-                array(
-                    'environment' => 'test_with_hidden_fields'
-                ), 
-                array(
-                    'PHP_AUTH_USER' => 'center a_social',
-                    'PHP_AUTH_PW'   => 'password',
-                )
-            );
-    }
-    
-    /**
-     * Reload the person from the db
-     */
-    protected function refreshPerson() 
-    {
-        $this->person = $this->em->getRepository('ChillPersonBundle:Person')
-            ->find($this->person->getId());
-    }
-    
-    /**
-     * Test the edit page are accessible
-     */
-    public function testEditPageIsSuccessful()
-    {
-        $this->client->request('GET', $this->editUrl);
-        $this->assertTrue($this->client->getResponse()->isSuccessful(), 
-            "The person edit form is accessible");
-    }
-    
-    /**
-     * Test the configurable fields are absent
-     * 
-     * @group configurable_fields
-     */
-    public function testHiddenFielsAreAbsent()
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-        
-        $configurables = array('placeOfBirth', 'phonenumber', 'email',
-            'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus');
-        $form = $crawler->selectButton('Submit')->form(); //;
-        
-        foreach($configurables as $key) {
-            $this->assertFalse($form->has('chill_personbundle_person['.$key.']'));
-        }
-    }
-    
-    /**
-     * Test the edition of a field
-     * 
-     * Given I fill the field with $value
-     * And I submit the form
-     * Then I am redirected to the 'general' page
-     * And the person is updated in the db
-     * 
-     * @dataProvider validTextFieldsProvider
-     * @param string $field
-     * @param string $value
-     * @param \Closure $callback
-     */
-    public function testEditTextField($field, $value, \Closure $callback)
-    {
-        $crawler = $this->client->request('GET', $this->editUrl);
-        
-        $form = $crawler->selectButton('Submit')
-            ->form();
-        //transform countries into value if needed
-        switch ($field) {
-            case 'nationality':
-            case 'countryOfBirth':
-                if ($value !== NULL) {
-                    $country = $this->em->getRepository('ChillMainBundle:Country')
-                        ->findOneByCountryCode($value);
-                    $transformedValue = $country->getId();
-                } else {
-                    $transformedValue = NULL;
-                }
-                break;
-            default:
-                $transformedValue = $value;
-        }
-        
-        $form->get('chill_personbundle_person['.$field. ']')
-            ->setValue($transformedValue);
-        
-        $this->client->submit($form);
-        $this->refreshPerson();
-        
-        $this->assertTrue($this->client->getResponse()->isRedirect($this->viewUrl),
-            'the page is redirected to general view');
-        $this->assertEquals($value, $callback($this->person),
-            'the value '.$field.' is updated in db');
 
-        $crawler = $this->client->followRedirect();
-        $this->assertGreaterThan(0, $crawler->filter('.success')->count(),
-            'a element .success is shown');
+        $this->editUrl = '/en/person/' . $this->person->getId() . '/general/edit';
+        $this->viewUrl = '/en/person/' . $this->person->getId() . '/general';
 
-        if($field == 'birthdate' or $field == 'memo' or $field == 'countryOfBirth' or $field == 'nationality'
-                or $field == 'gender') {
-            // we do not perform test on the web page contents.
-        } else {
-            $this->assertGreaterThan(0, $crawler->filter('html:contains("'.$value.'")')->count());
-        }
-    }
-    
-    /**
-     * provide valid values to test, with field name and 
-     * a function to find the value back from person entity
-     * 
-     * @return mixed[]
-     */
-    public function validTextFieldsProvider()
-    { 
-        return array(
-            ['firstName', 'random Value', function(Person $person) { return $person->getFirstName(); } ],
-            ['lastName' , 'random Value', function(Person $person) { return $person->getLastName(); }  ],
-            ['birthdate', '15-12-1980', function(Person $person) { return $person->getBirthdate()->format('d-m-Y'); }],
-            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', function(Person $person) { return $person->getMemo(); }],
-            ['birthdate', '', function(Person $person) { return $person->getBirthdate(); }],
-            ['gender', Person::FEMALE_GENDER, function(Person $person) { return $person->getGender(); }],
+        $this->client = self::createClient(
+            [
+                'environment' => 'test_with_hidden_fields',
+            ],
+            [
+                'PHP_AUTH_USER' => 'center a_social',
+                'PHP_AUTH_PW' => 'password',
+            ]
         );
     }
-    
+
     public function tearDown()
     {
         $this->refreshPerson();
         $this->em->remove($this->person);
         $this->em->flush();
     }
-    
+
+    /**
+     * Test the edit page are accessible.
+     */
+    public function testEditPageIsSuccessful()
+    {
+        $this->client->request('GET', $this->editUrl);
+        $this->assertTrue(
+            $this->client->getResponse()->isSuccessful(),
+            'The person edit form is accessible'
+        );
+    }
+
+    /**
+     * Test the edition of a field.
+     *
+     * Given I fill the field with $value
+     * And I submit the form
+     * Then I am redirected to the 'general' page
+     * And the person is updated in the db
+     *
+     * @dataProvider validTextFieldsProvider
+     *
+     * @param string $field
+     * @param string $value
+     */
+    public function testEditTextField($field, $value, Closure $callback)
+    {
+        $crawler = $this->client->request('GET', $this->editUrl);
+
+        $form = $crawler->selectButton('Submit')
+            ->form();
+        //transform countries into value if needed
+        switch ($field) {
+            case 'nationality':
+            case 'countryOfBirth':
+                if (null !== $value) {
+                    $country = $this->em->getRepository('ChillMainBundle:Country')
+                        ->findOneByCountryCode($value);
+                    $transformedValue = $country->getId();
+                } else {
+                    $transformedValue = null;
+                }
+
+                break;
+
+            default:
+                $transformedValue = $value;
+        }
+
+        $form->get('chill_personbundle_person[' . $field . ']')
+            ->setValue($transformedValue);
+
+        $this->client->submit($form);
+        $this->refreshPerson();
+
+        $this->assertTrue(
+            $this->client->getResponse()->isRedirect($this->viewUrl),
+            'the page is redirected to general view'
+        );
+        $this->assertEquals(
+            $value,
+            $callback($this->person),
+            'the value ' . $field . ' is updated in db'
+        );
+
+        $crawler = $this->client->followRedirect();
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.success')->count(),
+            'a element .success is shown'
+        );
+
+        if ('birthdate' === $field || 'memo' === $field || 'countryOfBirth' === $field || 'nationality' === $field
+                || 'gender' === $field) {
+            // we do not perform test on the web page contents.
+        } else {
+            $this->assertGreaterThan(0, $crawler->filter('html:contains("' . $value . '")')->count());
+        }
+    }
+
+    /**
+     * Test the configurable fields are absent.
+     *
+     * @group configurable_fields
+     */
+    public function testHiddenFielsAreAbsent()
+    {
+        $crawler = $this->client->request('GET', $this->editUrl);
+
+        $configurables = ['placeOfBirth', 'phonenumber', 'email',
+            'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus', ];
+        $form = $crawler->selectButton('Submit')->form(); //;
+
+        foreach ($configurables as $key) {
+            $this->assertFalse($form->has('chill_personbundle_person[' . $key . ']'));
+        }
+    }
+
+    /**
+     * provide valid values to test, with field name and
+     * a function to find the value back from person entity.
+     *
+     * @return mixed[]
+     */
+    public function validTextFieldsProvider()
+    {
+        return [
+            ['firstName', 'random Value', static function (Person $person) { return $person->getFirstName(); }],
+            ['lastName', 'random Value', static function (Person $person) { return $person->getLastName(); }],
+            ['birthdate', '15-12-1980', static function (Person $person) { return $person->getBirthdate()->format('d-m-Y'); }],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) { return $person->getMemo(); }],
+            ['birthdate', '', static function (Person $person) { return $person->getBirthdate(); }],
+            ['gender', Person::FEMALE_GENDER, static function (Person $person) { return $person->getGender(); }],
+        ];
+    }
+
+    /**
+     * Reload the person from the db.
+     */
+    protected function refreshPerson()
+    {
+        $this->person = $this->em->getRepository('ChillPersonBundle:Person')
+            ->find($this->person->getId());
+    }
+
     private function getVeryLongText()
     {
-        return <<<EOT
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse molestie at enim id auctor. Vivamus malesuada elit ipsum, ac mollis ex facilisis sit amet. Phasellus accumsan, quam ut aliquet accumsan, augue ligula consequat erat, condimentum iaculis orci magna egestas eros. In vel blandit sapien. Duis ut dui vitae tortor iaculis malesuada vitae vitae lorem. Morbi efficitur dolor orci, a rhoncus urna blandit quis. Aenean at placerat dui, ut tincidunt nulla. In ultricies tempus ligula ac rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce urna nibh, placerat vel auctor sed, maximus quis magna. Vivamus quam ante, consectetur vel feugiat quis, aliquet id ante. Integer gravida erat dignissim ante commodo mollis. Donec imperdiet mauris elit, nec blandit dolor feugiat ut. Proin iaculis enim ut tortor pretium commodo. Etiam aliquet hendrerit dolor sed fringilla. Vestibulum facilisis nibh tincidunt dui egestas, vitae congue mi imperdiet. Duis vulputate ultricies lectus id cursus. Fusce bibendum sem dignissim, bibendum purus quis, mollis ex. Cras ac est justo. Duis congue mattis ipsum, vitae sagittis justo dictum sit amet. Duis aliquam pharetra sem, non laoreet ante laoreet ac. Mauris ornare mi tempus rutrum consequat. 
-EOT;
+        return <<<'EOT'
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse molestie at enim id auctor. Vivamus malesuada elit ipsum, ac mollis ex facilisis sit amet. Phasellus accumsan, quam ut aliquet accumsan, augue ligula consequat erat, condimentum iaculis orci magna egestas eros. In vel blandit sapien. Duis ut dui vitae tortor iaculis malesuada vitae vitae lorem. Morbi efficitur dolor orci, a rhoncus urna blandit quis. Aenean at placerat dui, ut tincidunt nulla. In ultricies tempus ligula ac rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce urna nibh, placerat vel auctor sed, maximus quis magna. Vivamus quam ante, consectetur vel feugiat quis, aliquet id ante. Integer gravida erat dignissim ante commodo mollis. Donec imperdiet mauris elit, nec blandit dolor feugiat ut. Proin iaculis enim ut tortor pretium commodo. Etiam aliquet hendrerit dolor sed fringilla. Vestibulum facilisis nibh tincidunt dui egestas, vitae congue mi imperdiet. Duis vulputate ultricies lectus id cursus. Fusce bibendum sem dignissim, bibendum purus quis, mollis ex. Cras ac est justo. Duis congue mattis ipsum, vitae sagittis justo dictum sit amet. Duis aliquam pharetra sem, non laoreet ante laoreet ac. Mauris ornare mi tempus rutrum consequat.
+            EOT;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
index e05c777be..2db234c13 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php
@@ -1,75 +1,80 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Marc Ducobu <marc.ducobu@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PersonControllerViewTest extends WebTestCase
+final class PersonControllerViewTest extends WebTestCase
 {
-    /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
+    /**
+     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
+     */
     private $em;
 
-    /** @var Person A person used on which to run the test */
+    /**
+     * @var Person A person used on which to run the test
+     */
     private $person;
 
-    /** @var String The url to view the person details */
+    /**
+     * @var string The url to view the person details
+     */
     private $viewUrl;
 
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $this->em = static::$kernel->getContainer()
+        $this->em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         $center = $this->em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
+            ->findOneBy(['name' => 'Center A']);
 
         $this->person = (new Person())
-            ->setLastName("Tested Person")
-            ->setFirstName("Réginald")
+            ->setLastName('Tested Person')
+            ->setFirstName('Réginald')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
 
         $this->em->persist($this->person);
         $this->em->flush();
 
-        $this->viewUrl  = '/en/person/'.$this->person->getId().'/general';
+        $this->viewUrl = '/en/person/' . $this->person->getId() . '/general';
+    }
+
+    public function tearDown()
+    {
+        $this->refreshPerson();
+        $this->em->remove($this->person);
+        $this->em->flush();
     }
 
     /**
-     * Test if the  view page is accessible
+     * Test if the  view page is accessible.
      *
      * @group configurable_fields
      */
     public function testViewPerson()
     {
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
 
         $crawler = $client->request('GET', $this->viewUrl);
         $response = $client->getResponse();
@@ -86,34 +91,29 @@ class PersonControllerViewTest extends WebTestCase
 
     /**
      * Test if the view page of a given person is not accessible for a user
-     * of another center of the person
+     * of another center of the person.
      */
     public function testViewPersonAccessDeniedForUnauthorized()
     {
-        $client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center b_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        $client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center b_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
 
         $client->request('GET', $this->viewUrl);
-        $this->assertEquals(403, $client->getResponse()->getStatusCode(),
-            "The view page of a person of a center A must not be accessible for user of center B");
+        $this->assertEquals(
+            403,
+            $client->getResponse()->getStatusCode(),
+            'The view page of a person of a center A must not be accessible for user of center B'
+        );
     }
 
     /**
-     * Reload the person from the db
+     * Reload the person from the db.
      */
     protected function refreshPerson()
     {
         $this->person = $this->em->getRepository('ChillPersonBundle:Person')
             ->find($this->person->getId());
     }
-
-    public function tearDown()
-    {
-        $this->refreshPerson();
-        $this->em->remove($this->person);
-        $this->em->flush();
-    }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
index 533d4a683..a74cdebb2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php
@@ -1,80 +1,89 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class PersonControllerViewTestWithHiddenFields extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase
 {
-    /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */
+    /**
+     * @var \Doctrine\ORM\EntityManagerInterface The entity manager
+     */
     private $em;
-    
-    /** @var Person A person used on which to run the test */
+
+    /**
+     * @var Person A person used on which to run the test
+     */
     private $person;
 
-    /** @var String The url to view the person details */
+    /**
+     * @var string The url to view the person details
+     */
     private $viewUrl;
-    
+
     public function setUp()
     {
-        static::bootKernel(array('environment' => 'test_with_hidden_fields'));
-        
-        $this->em = static::$kernel->getContainer()
+        self::bootKernel(['environment' => 'test_with_hidden_fields']);
+
+        $this->em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
-        
+
         $center = $this->em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
-       
+            ->findOneBy(['name' => 'Center A']);
+
         $this->person = (new Person())
-            ->setLastName("Tested Person")
-            ->setFirstName("Réginald")
+            ->setLastName('Tested Person')
+            ->setFirstName('Réginald')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
-        
+
         $this->em->persist($this->person);
         $this->em->flush();
-        
-        $this->viewUrl  = '/en/person/'.$this->person->getId().'/general';
+
+        $this->viewUrl = '/en/person/' . $this->person->getId() . '/general';
     }
-    
+
+    public function tearDown()
+    {
+        $this->refreshPerson();
+        $this->em->remove($this->person);
+        $this->em->flush();
+    }
+
     /**
-     * Test if the  view page is accessible
-     * 
+     * Test if the  view page is accessible.
+     *
      * @group configurable_fields
      */
     public function testViewPerson()
     {
-        $this->markTestSkipped("This configuration does not allow multiple environnements");
-        $client = static::createClient(
-                array('environment' => 'test_with_hidden_fields'), 
-                array(
-                    'PHP_AUTH_USER' => 'center a_social',
-                    'PHP_AUTH_PW'   => 'password',
-                    'HTTP_ACCEPT_LANGUAGE' => 'fr'
-                )
-            );
-        
+        $this->markTestSkipped('This configuration does not allow multiple environnements');
+        $client = self::createClient(
+            ['environment' => 'test_with_hidden_fields'],
+            [
+                'PHP_AUTH_USER' => 'center a_social',
+                'PHP_AUTH_PW' => 'password',
+                'HTTP_ACCEPT_LANGUAGE' => 'fr',
+            ]
+        );
+
         $crawler = $client->request('GET', $this->viewUrl);
         $response = $client->getResponse();
-        
+
         $this->assertTrue($response->isSuccessful());
 
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Tested Person")')->count());
@@ -84,21 +93,13 @@ class PersonControllerViewTestWithHiddenFields extends WebTestCase
         $this->assertNotContains('Langues parlées', $crawler->text());
         $this->assertNotContains(/* Etat */ 'civil', $crawler->text());
     }
-    
+
     /**
-     * Reload the person from the db
+     * Reload the person from the db.
      */
-    protected function refreshPerson() 
+    protected function refreshPerson()
     {
         $this->person = $this->em->getRepository('ChillPersonBundle:Person')
             ->find($this->person->getId());
     }
-    
-    public function tearDown()
-    {
-        $this->refreshPerson();
-        $this->em->remove($this->person);
-        $this->em->flush();
-    }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
index e6d0c207f..c993d15c4 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
@@ -1,32 +1,45 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class PersonDuplicateControllerViewTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonDuplicateControllerViewTest extends WebTestCase
 {
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
 
-        $this->em = static::$container
+        $this->em = self::$container
             ->get('doctrine.orm.entity_manager');
 
         $center = $this->em->getRepository('ChillMainBundle:Center')
-            ->findOneBy(array('name' => 'Center A'));
+            ->findOneBy(['name' => 'Center A']);
 
         $this->person = (new Person())
-            ->setLastName("Tested Persan")
-            ->setFirstName("Réginal")
+            ->setLastName('Tested Persan')
+            ->setFirstName('Réginal')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
         $this->em->persist($this->person);
 
         $this->person2 = (new Person())
-            ->setLastName("Tested Person")
-            ->setFirstName("Réginald")
+            ->setLastName('Tested Person')
+            ->setFirstName('Réginald')
             ->setCenter($center)
             ->setGender(Person::MALE_GENDER);
         $this->em->persist($this->person2);
@@ -36,12 +49,12 @@ class PersonDuplicateControllerViewTest extends WebTestCase
 
     public function testViewDuplicatePerson()
     {
-        $client = static::createClient(array(), array(
+        $client = self::createClient([], [
             'PHP_AUTH_USER' => 'center a_social',
-            'PHP_AUTH_PW'   => 'password',
-        ));
+            'PHP_AUTH_PW' => 'password',
+        ]);
 
-        $crawler = $client->request('GET', '/en/person/'.$this->person->getId().'/duplicate/view');
+        $crawler = $client->request('GET', '/en/person/' . $this->person->getId() . '/duplicate/view');
         $response = $client->getResponse();
         $this->assertTrue($response->isSuccessful());
 
@@ -49,15 +62,15 @@ class PersonDuplicateControllerViewTest extends WebTestCase
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Réginal")')->count());
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Réginald")')->count());
 
-        $crawler = $client->request('GET', '/en/person/'.$this->person->getId().'/duplicate/'.$this->person2->getId().'/confirm');
+        $crawler = $client->request('GET', '/en/person/' . $this->person->getId() . '/duplicate/' . $this->person2->getId() . '/confirm');
         $response = $client->getResponse();
         $this->assertTrue($response->isSuccessful());
 
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Old person")')->count());
         $this->assertGreaterThan(0, $crawler->filter('html:contains("New person")')->count());
 
-        $crawler = $client->request('POST', '/en/person/'.$this->person->getId().'/duplicate/'.$this->person2->getId().'/confirm', [
-            'chill_personbundle_person_confirm_duplicate[confirm]' => 1
+        $crawler = $client->request('POST', '/en/person/' . $this->person->getId() . '/duplicate/' . $this->person2->getId() . '/confirm', [
+            'chill_personbundle_person_confirm_duplicate[confirm]' => 1,
         ]);
         $response = $client->getResponse();
         $this->assertTrue($response->isSuccessful());
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
new file mode 100644
index 000000000..3ccc5dcbc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use function array_rand;
+use function json_encode;
+use function random_int;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class RelationshipApiControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    private KernelBrowser $client;
+
+    /**
+     * A cache for all relations.
+     *
+     * @var array|Relation[]|null
+     */
+    private ?array $relations = null;
+
+    public function setUp()
+    {
+        self::bootKernel();
+        $this->client = $this->getClientAuthenticated();
+    }
+
+    public function personProvider(): array
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $countPersons = $em->createQueryBuilder()
+            ->select('count(p)')
+            ->from(Person::class, 'p')
+            ->join('p.center', 'c')
+            ->where('c.name LIKE :name')
+            ->setParameter('name', 'Center A')
+            ->getQuery()
+            ->getSingleScalarResult();
+        $person = $em->createQueryBuilder()
+            ->select('p')
+            ->from(Person::class, 'p')
+            ->join('p.center', 'c')
+            ->where('c.name LIKE :name')
+            ->setParameter('name', 'Center A')
+            ->getQuery()
+            ->setMaxResults(1)
+            ->setFirstResult(random_int(0, $countPersons - 1))
+            ->getSingleResult();
+
+        return [
+            [$person->getId()],
+        ];
+    }
+
+    public function relationProvider(): array
+    {
+        self::bootKernel();
+        $em = self::$container->get(EntityManagerInterface::class);
+        $countPersons = $em->createQueryBuilder()
+            ->select('count(p)')
+            ->from(Person::class, 'p')
+            ->join('p.center', 'c')
+            ->where('c.name LIKE :name')
+            ->setParameter('name', 'Center A')
+            ->getQuery()
+            ->getSingleScalarResult();
+        $persons = $em->createQueryBuilder()
+            ->select('p')
+            ->from(Person::class, 'p')
+            ->join('p.center', 'c')
+            ->where('c.name LIKE :name')
+            ->setParameter('name', 'Center A')
+            ->getQuery()
+            ->setMaxResults(2)
+            ->setFirstResult(random_int(0, $countPersons - 1))
+            ->getResult();
+
+        return [
+            [$persons[0]->getId(), $persons[1]->getId(), $this->getRandomRelation($em)->getId(), true],
+        ];
+    }
+
+    /**
+     * @dataProvider personProvider
+     *
+     * @param mixed $personId
+     */
+    public function testGetRelationshipByPerson($personId)
+    {
+        $this->client->request(Request::METHOD_GET, sprintf('/api/1.0/relations/relationship/by-person/%d.json', $personId));
+
+        $response = $this->client->getResponse();
+        $this->assertEquals(200, $response->getStatusCode(), 'Test to see that API response returns a status code 200');
+    }
+
+    /**
+     * @dataProvider relationProvider
+     *
+     * @param mixed $fromPersonId
+     * @param mixed $toPersonId
+     * @param mixed $relationId
+     * @param mixed $isReverse
+     */
+    public function testPostRelationship($fromPersonId, $toPersonId, $relationId, $isReverse): void
+    {
+        $this->client->request(
+            Request::METHOD_POST,
+            '/api/1.0/relations/relationship.json',
+            [],
+            [],
+            [],
+            json_encode([
+                'type' => 'relationship',
+                'fromPerson' => ['id' => $fromPersonId, 'type' => 'person'],
+                'toPerson' => ['id' => $toPersonId, 'type' => 'person'],
+                'relation' => ['id' => $relationId, 'type' => 'relation'],
+                'reverse' => $isReverse,
+            ])
+        );
+
+        $response = $this->client->getResponse();
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    private function getRandomRelation(EntityManagerInterface $em): Relation
+    {
+        if (null === $this->relations) {
+            $this->relations = $em->getRepository(Relation::class)
+                ->findAll();
+        }
+
+        return $this->relations[array_rand($this->relations)];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
index 36d5dca37..1a71e2844 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php
@@ -1,12 +1,28 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Controller;
 
+use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use Chill\MainBundle\Test\PrepareClientTrait;
+use function array_pop;
+use function count;
+use function json_decode;
 
-class SocialIssueApiControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SocialIssueApiControllerTest extends WebTestCase
 {
     use PrepareClientTrait;
 
@@ -17,21 +33,6 @@ class SocialIssueApiControllerTest extends WebTestCase
         self::bootKernel();
     }
 
-    public function testList(): array
-    {
-        $client = $this->getClientAuthenticated();
-        $client->request(Request::METHOD_GET, '/api/1.0/person/social-work/social-issue.json');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $data = \json_decode($client->getResponse()->getContent(), true);
-
-        $this->assertGreaterThan(0, $data['count']);
-        $this->assertGreaterThan(0, count($data['results']));
-
-        return $data;
-    }
-
     /**
      * @depends testList
      */
@@ -39,17 +40,31 @@ class SocialIssueApiControllerTest extends WebTestCase
     {
         $socialIssues = $data['results'];
         shuffle($socialIssues);
-        $socialIssue = \array_pop($socialIssues);
-
+        $socialIssue = array_pop($socialIssues);
 
         $client = $this->getClientAuthenticated();
         $client->request(Request::METHOD_GET, sprintf('/api/1.0/person/social-work/social-issue/%d.json', $socialIssue['id']));
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $data = \json_decode($client->getResponse()->getContent(), true);
+        $data = json_decode($client->getResponse()->getContent(), true);
 
         $this->assertArrayHasKey('id', $data);
         $this->assertArrayHasKey('type', $data);
     }
+
+    public function testList(): array
+    {
+        $client = $this->getClientAuthenticated();
+        $client->request(Request::METHOD_GET, '/api/1.0/person/social-work/social-issue.json');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $data = json_decode($client->getResponse()->getContent(), true);
+
+        $this->assertGreaterThan(0, $data['count']);
+        $this->assertGreaterThan(0, count($data['results']));
+
+        return $data;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
index 2fef00ec6..b67e38e87 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriod/ResourceTest.php
@@ -1,13 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Entity\AccompanyingPeriod;
 
-use PHPUnit\Framework\TestCase;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use PHPUnit\Framework\TestCase;
 
-class ResourceTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ResourceTest extends TestCase
 {
     public function testSetResource()
     {
@@ -22,7 +35,7 @@ class ResourceTest extends TestCase
         $this->assertNull($resource->getThirdParty());
 
         $resource->setResource($thirdParty);
-        
+
         $this->assertSame($thirdParty, $resource->getResource());
         $this->assertNull($resource->getPerson());
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
index 744cc76dc..9bbea0f1c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php
@@ -1,39 +1,45 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Entity;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
+use DateTime;
+use DateTimeInterface;
+use function count;
 
-class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 {
+    public function testClosingEqualOpening()
+    {
+        $datetime = new DateTime('now');
+
+        $period = new AccompanyingPeriod($datetime);
+        $period->setClosingDate($datetime);
+
+        $this->assertTrue($period->isClosingAfterOpening());
+    }
+
     public function testClosingIsAfterOpeningConsistency()
     {
-        $datetime1 = new \DateTime('now');
-        $datetime2 = new \DateTime('tomorrow');
+        $datetime1 = new DateTime('now');
+        $datetime2 = new DateTime('tomorrow');
 
         $period = new AccompanyingPeriod($datetime1);
         $period->setClosingDate($datetime2);
@@ -45,8 +51,8 @@ class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testClosingIsBeforeOpeningConsistency()
     {
-        $datetime1 = new \DateTime('tomorrow');
-        $datetime2 = new \DateTime('now');
+        $datetime1 = new DateTime('tomorrow');
+        $datetime2 = new DateTime('now');
 
         $period = new AccompanyingPeriod($datetime1);
         $period->setClosingDate($datetime2);
@@ -54,37 +60,53 @@ class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($period->isClosingAfterOpening());
     }
 
-    public function testClosingEqualOpening()
+    public function testInitialComment()
     {
-        $datetime = new \DateTime('now');
+        $period = new AccompanyingPeriod(new DateTime());
+        $comment = new Comment();
+        $replacingComment = new Comment();
 
-        $period = new AccompanyingPeriod($datetime);
-        $period->setClosingDate($datetime);
+        $period->setInitialComment(null);
+        $this->assertNull($period->getInitialComment());
 
-        $this->assertTrue($period->isClosingAfterOpening());
-    }
+        $period->setInitialComment($comment);
+        $this->assertSame($period->getInitialComment(), $comment);
+        $this->assertSame($period, $comment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
 
-    public function testIsOpen()
-    {
-        $period = new AccompanyingPeriod(new \DateTime());
+        $period->setInitialComment($replacingComment);
+        $this->assertSame($period->getInitialComment(), $replacingComment);
+        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
+        $this->assertNull($comment->getAccompanyingPeriod());
 
-        $this->assertTrue($period->isOpen());
+        $period->setInitialComment(null);
+        $this->assertNull($period->getInitialComment());
+        $this->assertNull($replacingComment->getAccompanyingPeriod());
+        $this->assertEquals(0, count($period->getComments()), 'The initial comment should not appears in the list of comments');
     }
 
     public function testIsClosed()
     {
-        $period = new AccompanyingPeriod(new \DateTime());
-        $period->setClosingDate(new \DateTime('tomorrow'));
+        $period = new AccompanyingPeriod(new DateTime());
+        $period->setClosingDate(new DateTime('tomorrow'));
 
         $this->assertFalse($period->isOpen());
     }
 
+    public function testIsOpen()
+    {
+        $period = new AccompanyingPeriod(new DateTime());
+
+        $this->assertTrue($period->isOpen());
+    }
+
     public function testPersonPeriod()
     {
         $person = new Person();
         $person2 = new Person();
         $person3 = new Person();
-        $period = new AccompanyingPeriod(new \DateTime());
+        $period = new AccompanyingPeriod(new DateTime());
 
         $participation0 = $period->createParticipationFor($person);
         $period->createParticipationFor($person2);
@@ -104,7 +126,7 @@ class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
         $participationL = $period->closeParticipationFor($person);
         $this->assertSame($participationL, $participation);
-        $this->assertTrue($participation->getEndDate() instanceof \DateTimeInterface);
+        $this->assertTrue($participation->getEndDate() instanceof DateTimeInterface);
 
         $participation = $period->getOpenParticipationContainsPerson($person);
         $this->assertNull($participation);
@@ -125,7 +147,7 @@ class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
 
     public function testRequestor()
     {
-        $period = new AccompanyingPeriod(new \DateTime());
+        $period = new AccompanyingPeriod(new DateTime());
         $person = new Person();
         $thirdParty = new ThirdParty();
 
@@ -143,35 +165,9 @@ class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase
         $this->assertSame($thirdParty, $period->getRequestorThirdParty());
         $this->assertSame($thirdParty, $period->getRequestor());
 
-        $period->setRequestor(NULL);
+        $period->setRequestor(null);
         $this->assertNull($period->getRequestorThirdParty());
         $this->assertNull($period->getRequestorPerson());
         $this->assertNull($period->getRequestor());
     }
-
-    public function testInitialComment()
-    {
-        $period = new AccompanyingPeriod(new \DateTime());
-        $comment = new Comment();
-        $replacingComment = new Comment();
-
-        $period->setInitialComment(NULL);
-        $this->assertNull($period->getInitialComment());
-
-        $period->setInitialComment($comment);
-        $this->assertSame($period->getInitialComment(), $comment);
-        $this->assertSame($period, $comment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), "The initial comment should not appears in the list of comments");
-
-        $period->setInitialComment($replacingComment);
-        $this->assertSame($period->getInitialComment(), $replacingComment);
-        $this->assertSame($period, $replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), "The initial comment should not appears in the list of comments");
-        $this->assertNull($comment->getAccompanyingPeriod());
-
-        $period->setInitialComment(NULL);
-        $this->assertNull($period->getInitialComment());
-        $this->assertNull($replacingComment->getAccompanyingPeriod());
-        $this->assertEquals(0, count($period->getComments()), "The initial comment should not appears in the list of comments");
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
index f18a62781..eb696cf93 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdMemberTest.php
@@ -1,34 +1,43 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Bundle\ChillPersonBundle\Tests\Entity\Household;
 
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
 use PHPUnit\Framework\TestCase;
 
-class HouseholdMemberTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class HouseholdMemberTest extends TestCase
 {
-    public function testPositionSharehousehold()
-    {
-        $position = (new Position())
-            ->setShareHousehold(true)
-            ;
-        $membership = (new HouseholdMember())
-            ->setPosition($position)
-            ;
-
-        $this->assertTrue($membership->getShareHousehold());
-    }
-
     public function testPositionDoNotSharehousehold()
     {
         $position = (new Position())
-            ->setShareHousehold(false)
-            ;
+            ->setShareHousehold(false);
         $membership = (new HouseholdMember())
-            ->setPosition($position)
-            ;
+            ->setPosition($position);
 
         $this->assertFalse($membership->getShareHousehold());
     }
+
+    public function testPositionSharehousehold()
+    {
+        $position = (new Position())
+            ->setShareHousehold(true);
+        $membership = (new HouseholdMember())
+            ->setPosition($position);
+
+        $this->assertTrue($membership->getShareHousehold());
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
index dbef739d1..18149c824 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
@@ -1,216 +1,137 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Entity;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
-use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\MainBundle\Entity\Address;
-use DateInterval;
 use DateTime;
-use Generator;
+use DateTimeImmutable;
 
 /**
- * Unit tests for the person Entity
+ * Unit tests for the person Entity.
+ *
+ * @internal
+ * @coversNothing
  */
-class PersonTest extends \PHPUnit\Framework\TestCase
+final class PersonTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Test the creation of an accompanying, its closure and the access to 
-     * the current accompaniying period via the getCurrentAccompanyingPeriod
-     * function.
+     * Test if the getAccompanyingPeriodsOrdered function, for periods
+     * starting at the same time order regarding to the closing date.
      */
-    public function testGetCurrentAccompanyingPeriod()
+    public function testAccompanyingPeriodOrderSameDateOpening()
     {
-        $d = new \DateTime('yesterday'); 
+        $d = new DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
-        
-        $period = $p->getCurrentAccompanyingPeriod();
-        
-        $this->assertInstanceOf(AccompanyingPeriod::class, $period);
-        $this->assertTrue($period->isOpen());
-        $this->assertEquals($d, $period->getOpeningDate());
-        
-        //close and test
-        $period->setClosingDate(new \DateTime('tomorrow'));
-        
-        $shouldBeNull = $p->getCurrentAccompanyingPeriod();
-        $this->assertNull($shouldBeNull);
+
+        $g = new DateTime('2013/4/1');
+        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
+        $p->close($period);
+
+        $f = new DateTime('2013/2/1');
+        $p->open(new AccompanyingPeriod($f));
+
+        $e = new DateTime('2013/3/1');
+        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
+        $p->close($period);
+
+        $r = $p->getAccompanyingPeriodsOrdered();
+
+        $date = $r[0]->getClosingDate()->format('Y-m-d');
+
+        $this->assertEquals($date, '2013-03-01');
     }
-    
+
     /**
      * Test if the getAccompanyingPeriodsOrdered function return a list of
      * periods ordered ascendency.
      */
     public function testAccompanyingPeriodOrderWithUnorderedAccompanyingPeriod()
-    {       
-        $d = new \DateTime("2013/2/1");
+    {
+        $d = new DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
-        
-        $e = new \DateTime("2013/3/1");
-        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
-        $p->close($period);
-        
-        $f = new \DateTime("2013/1/1");
-        $p->open(new AccompanyingPeriod($f));
-        
-        $g = new \DateTime("2013/4/1"); 
-        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
-        $p->close($period);
-        
-        $r = $p->getAccompanyingPeriodsOrdered();
-        
-        $date = $r[0]->getOpeningDate()->format('Y-m-d');
-        
-        $this->assertEquals($date, '2013-01-01');
-    }
-    
-    /**
-     * Test if the getAccompanyingPeriodsOrdered function, for periods
-     * starting at the same time order regarding to the closing date.
-     */
-    public function testAccompanyingPeriodOrderSameDateOpening() {
-        $d = new \DateTime("2013/2/1");
-        $p = new Person();
-        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
-        
-        $g = new \DateTime("2013/4/1"); 
-        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
-        $p->close($period);
-        
-        $f = new \DateTime("2013/2/1");
-        $p->open(new AccompanyingPeriod($f));
-        
-        $e = new \DateTime("2013/3/1");
+
+        $e = new DateTime('2013/3/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
         $p->close($period);
 
+        $f = new DateTime('2013/1/1');
+        $p->open(new AccompanyingPeriod($f));
+
+        $g = new DateTime('2013/4/1');
+        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
+        $p->close($period);
+
         $r = $p->getAccompanyingPeriodsOrdered();
-        
-        $date = $r[0]->getClosingDate()->format('Y-m-d');
-        
-        $this->assertEquals($date, '2013-03-01');
+
+        $date = $r[0]->getOpeningDate()->format('Y-m-d');
+
+        $this->assertEquals($date, '2013-01-01');
     }
-    
+
     /**
      * Test if the function checkAccompanyingPeriodIsNotCovering returns
      * the good constant when two periods are collapsing : a period
-     * is covering another one : start_1 < start_2 & end_2 < end_1
+     * is covering another one : start_1 < start_2 & end_2 < end_1.
      */
-    public function testDateCoveringWithCoveringAccompanyingPeriod() {
-        $d = new \DateTime("2013/2/1");
+    public function testDateCoveringWithCoveringAccompanyingPeriod()
+    {
+        $d = new DateTime('2013/2/1');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
-        
-        $e = new \DateTime("2013/3/1");
+
+        $e = new DateTime('2013/3/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
         $p->close($period);
-        
-        $f = new \DateTime("2013/1/1");
+
+        $f = new DateTime('2013/1/1');
         $p->open(new AccompanyingPeriod($f));
-        
-        $g = new \DateTime("2013/4/1"); 
+
+        $g = new DateTime('2013/4/1');
         $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g);
         $p->close($period);
-        
+
         $r = $p->checkAccompanyingPeriodsAreNotCollapsing();
-        
+
         $this->assertEquals($r['result'], Person::ERROR_PERIODS_ARE_COLLAPSING);
     }
-    
+
     /**
-     * Test if the function checkAccompanyingPeriodIsNotCovering returns
-     * the good constant when two periods are collapsing : a period is open
-     * before an existing period
+     * Test the creation of an accompanying, its closure and the access to
+     * the current accompaniying period via the getCurrentAccompanyingPeriod
+     * function.
      */
-    public function testNotOpenAFileReOpenedLater() {
-        $d = new \DateTime("2013/2/1");
+    public function testGetCurrentAccompanyingPeriod()
+    {
+        $d = new DateTime('yesterday');
         $p = new Person();
         $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
-        
-        $e = new \DateTime("2013/3/1");
-        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
-        $p->close($period);
-        
-        $f = new \DateTime("2013/1/1");
-        $p->open(new AccompanyingPeriod($f));
-        
-        $r = $p->checkAccompanyingPeriodsAreNotCollapsing();
-        
-        $this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD);
-    }
 
-    public function dateProvider(): Generator
-    {
-        yield [(DateTime::createFromFormat('Y-m-d', '2021-01-05'))->settime(0, 0)];
-        yield [(DateTime::createFromFormat('Y-m-d', '2021-02-05'))->settime(0, 0)];
-        yield [(DateTime::createFromFormat('Y-m-d', '2021-03-05'))->settime(0, 0)];
-    }
+        $period = $p->getCurrentAccompanyingPeriod();
 
-    /**
-     * @dataProvider dateProvider
-     */
-    public function testGetLastAddress(DateTime $date)
-    {
-        $p = new Person($date);
+        $this->assertInstanceOf(AccompanyingPeriod::class, $period);
+        $this->assertTrue($period->isOpen());
+        $this->assertEquals($d, $period->getOpeningDate());
 
-        // Make sure that there is no last address.
-        $this::assertNull($p->getLastAddress());
+        //close and test
+        $period->setClosingDate(new DateTime('tomorrow'));
 
-        // Take an arbitrary date before the $date in parameter.
-        $addressDate = clone $date;
-
-        // 1. Smoke test: Test that the first address added is the last one.
-        $address1 = (new Address())->setValidFrom($addressDate->sub(new DateInterval('PT180M')));
-        $p->addAddress($address1);
-
-        $this::assertCount(1, $p->getAddresses());
-        $this::assertSame($address1, $p->getLastAddress());
-
-        // 2. Add an older address, which should not be the last address.
-        $addressDate2 = clone $addressDate;
-        $address2 = (new Address())->setValidFrom($addressDate2->sub(new DateInterval('PT30M')));
-        $p->addAddress($address2);
-
-        $this::assertCount(2, $p->getAddresses());
-        $this::assertSame($address1, $p->getLastAddress());
-
-        // 3. Add a newer address, which should be the last address.
-        $addressDate3 = clone $addressDate;
-        $address3 = (new Address())->setValidFrom($addressDate3->add(new DateInterval('PT30M')));
-        $p->addAddress($address3);
-
-        $this::assertCount(3, $p->getAddresses());
-        $this::assertSame($address3, $p->getLastAddress());
-
-        // 4. Get the last address from a specific date.
-        $this::assertEquals($address1, $p->getLastAddress($addressDate));
-        $this::assertEquals($address2, $p->getLastAddress($addressDate2));
-        $this::assertEquals($address3, $p->getLastAddress($addressDate3));
+        $shouldBeNull = $p->getCurrentAccompanyingPeriod();
+        $this->assertNull($shouldBeNull);
     }
 
     public function testIsSharingHousehold()
@@ -223,19 +144,17 @@ class PersonTest extends \PHPUnit\Framework\TestCase
             ->setShareHousehold(false);
 
         $membership1 = (new HouseholdMember())
-            ->setStartDate(new \DateTimeImmutable('10 years ago'))
-            ->setEndDate(new \DateTimeImmutable('5 years ago'))
+            ->setStartDate(new DateTimeImmutable('10 years ago'))
+            ->setEndDate(new DateTimeImmutable('5 years ago'))
             ->setPerson($person)
-            ->setPosition($positionShare)
-            ;
+            ->setPosition($positionShare);
         $household->addMember($membership1);
 
         $membership2 = (new HouseholdMember())
-            ->setStartDate(new \DateTimeImmutable('4 years ago'))
-            ->setEndDate(new \DateTimeImmutable('2 years ago'))
+            ->setStartDate(new DateTimeImmutable('4 years ago'))
+            ->setEndDate(new DateTimeImmutable('2 years ago'))
             ->setPerson($person)
-            ->setPosition($positionNotShare)
-            ;
+            ->setPosition($positionNotShare);
         $household->addMember($membership2);
 
         $this->assertEquals(2, $person->getHouseholdParticipations()
@@ -243,9 +162,33 @@ class PersonTest extends \PHPUnit\Framework\TestCase
 
         $this->assertFalse($person->isSharingHousehold());
         $this->assertTrue($person->isSharingHousehold(
-            new \DateTimeImmutable('6 years ago')));
+            new DateTimeImmutable('6 years ago')
+        ));
         $this->assertFalse($person->isSharingHousehold(
-            new \DateTimeImmutable('3 years ago')));
+            new DateTimeImmutable('3 years ago')
+        ));
     }
 
+    /**
+     * Test if the function checkAccompanyingPeriodIsNotCovering returns
+     * the good constant when two periods are collapsing : a period is open
+     * before an existing period.
+     */
+    public function testNotOpenAFileReOpenedLater()
+    {
+        $d = new DateTime('2013/2/1');
+        $p = new Person();
+        $p->addAccompanyingPeriod(new AccompanyingPeriod($d));
+
+        $e = new DateTime('2013/3/1');
+        $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e);
+        $p->close($period);
+
+        $f = new DateTime('2013/1/1');
+        $p->open(new AccompanyingPeriod($f));
+
+        $r = $p->checkAccompanyingPeriodsAreNotCollapsing();
+
+        $this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
index 16bff1199..a3b49b596 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/SocialWork/SocialIssueTest.php
@@ -1,13 +1,60 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Entity\SocialWork;
 
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\Common\Collections\ArrayCollection;
 use PHPUnit\Framework\TestCase;
 
-class SocialIssueTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SocialIssueTest extends TestCase
 {
+    public function testFindSocialIssuesAncestors()
+    {
+        $socialIssues = new ArrayCollection([
+            $parent = new SocialIssue(),
+            $child = (new SocialIssue())->setParent($parent),
+            $grandChild = (new SocialIssue())->setParent($child),
+            $grandGrandChild = (new SocialIssue())->setParent($grandChild),
+            $unrelated = new SocialIssue(),
+        ]);
+
+        $ancestors = SocialIssue::findAncestorSocialIssues($socialIssues);
+
+        $this->assertCount(3, $ancestors);
+        $this->assertContains($parent, $ancestors);
+        $this->assertContains($child, $ancestors);
+        $this->assertContains($grandChild, $ancestors);
+    }
+
+    public function testGetAncestors()
+    {
+        $parent = new SocialIssue();
+        $child = (new SocialIssue())->setParent($parent);
+        $grandChild = (new SocialIssue())->setParent($child);
+        $grandGrandChild = (new SocialIssue())->setParent($grandChild);
+        $unrelated = new SocialIssue();
+
+        $this->assertContains($parent, $grandGrandChild->getAncestors(true));
+        $this->assertContains($child, $grandGrandChild->getAncestors(true));
+        $this->assertContains($grandChild, $grandGrandChild->getAncestors(true));
+        $this->assertContains($grandGrandChild, $grandGrandChild->getAncestors(true));
+        $this->assertNotContains($grandGrandChild, $grandGrandChild->getAncestors(false));
+        $this->assertCount(0, $unrelated->getAncestors(false));
+    }
+
     public function testIsDescendantOf()
     {
         $parent = new SocialIssue();
@@ -30,22 +77,4 @@ class SocialIssueTest extends TestCase
 
         $this->assertFalse($child->isDescendantOf($grandChild));
     }
-
-    public function testFindSocialIssuesAncestors()
-    {
-        $socialIssues = new ArrayCollection([
-            $parent = new SocialIssue(),
-            $child = (new SocialIssue())->setParent($parent),
-            $grandChild = (new SocialIssue())->setParent($child),
-            $grandGrandChild = (new SocialIssue())->setParent($grandChild),
-            $unrelated = new SocialIssue(),
-        ]);
-
-        $ancestors = SocialIssue::findAncestorSocialIssues($socialIssues);
-
-        $this->assertCount(3, $ancestors);
-        $this->assertContains($parent, $ancestors);
-        $this->assertContains($child, $ancestors);
-        $this->assertContains($grandChild, $ancestors);
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
index fb878053f..5ea140d0e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/EventListener/PersonCreateEventTest.php
@@ -1,16 +1,76 @@
 <?php
 
-use PHPUnit\Framework\TestCase;
-use Chill\PersonBundle\EventListener\PersonEventListener;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
-use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Chill\PersonBundle\EventListener\PersonEventListener;
+use PHPUnit\Framework\TestCase;
 
-class PersonCreateEventTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonCreateEventTest extends TestCase
 {
+    public function generateAltNames(): iterator
+    {
+        yield ['vinCENT', 'VINCENT'];
+
+        yield ['jean-marie', 'JEAN-MARIE'];
+
+        yield ['fastré', 'FASTRÉ'];
+
+        yield ['émile', 'ÉMILE'];
+    }
+
+    public function generateNames(): iterator
+    {
+        yield ['émelie-marie', 'Émelie-Marie', 'lenaerts', 'LENAERTS'];
+
+        yield ['jean-marie', 'Jean-Marie', 'lenaerts', 'LENAERTS'];
+
+        yield ['vinCENT', 'Vincent', 'fastré', 'FASTRÉ'];
+
+        yield ['Vincent', 'Vincent', 'van Gogh', 'VAN GOGH'];
+
+        yield ['André marie', 'André Marie', 'Bah', 'BAH'];
+    }
+
     /**
-    * @dataProvider generateNames
-    */
+     * @dataProvider generateAltNames
+     *
+     * @param mixed $altname
+     * @param mixed $altnameExpected
+     */
+    public function testAltNamesOnPrePersist($altname, $altnameExpected)
+    {
+        $listener = new PersonEventListener();
+
+        $personAltname = new PersonAltName();
+
+        $personAltname->setLabel($altname);
+
+        $listener->prePersistAltName($personAltname);
+
+        $this->assertEquals($altnameExpected, $personAltname->getLabel());
+    }
+
+    /**
+     * @dataProvider generateNames
+     *
+     * @param mixed $firstname
+     * @param mixed $firstnameExpected
+     * @param mixed $lastname
+     * @param mixed $lastnameExpected
+     */
     public function testOnPrePersist($firstname, $firstnameExpected, $lastname, $lastnameExpected)
     {
         $listener = new PersonEventListener();
@@ -25,37 +85,4 @@ class PersonCreateEventTest extends TestCase
         $this->assertEquals($firstnameExpected, $person->getFirstName());
         $this->assertEquals($lastnameExpected, $person->getLastName());
     }
-
-    /**
-    * @dataProvider generateAltNames
-    */
-    public function testAltNamesOnPrePersist($altname, $altnameExpected)
-    {
-        $listener = new PersonEventListener();
-
-        $personAltname = new PersonAltName();
-
-        $personAltname->setLabel($altname);
-
-        $listener->prePersistAltName($personAltname);
-
-        $this->assertEquals($altnameExpected, $personAltname->getLabel());
-    }
-
-    public function generateNames(): iterator
-    {
-        yield ['émelie-marie', 'Émelie-Marie', 'lenaerts', 'LENAERTS'];
-        yield ['jean-marie', 'Jean-Marie', 'lenaerts', 'LENAERTS'];
-        yield ['vinCENT', 'Vincent', 'fastré', 'FASTRÉ'];
-        yield ['Vincent', 'Vincent', 'van Gogh', 'VAN GOGH'];
-        yield ['André marie', 'André Marie', 'Bah', 'BAH'];
-    }
-
-    public function generateAltNames(): iterator
-    {
-        yield ['vinCENT', 'VINCENT'];
-        yield ['jean-marie', 'JEAN-MARIE'];
-        yield ['fastré', 'FASTRÉ'];
-        yield ['émile', 'ÉMILE'];
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php
index 299cc62d5..28f2d124c 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php
@@ -1,74 +1,64 @@
 <?php
 
-/*
- * Copyright (C) 2017 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use DateTime;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class AgeAggregatorTest extends AbstractAggregatorTest
+final class AgeAggregatorTest extends AbstractAggregatorTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Aggregator\AgeAggregator
      */
     private $aggregator;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->aggregator = static::$container->get('chill.person.export.aggregator_age');   
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_age');
     }
-    
+
     public function getAggregator()
     {
         return $this->aggregator;
     }
-    
+
     public function getFormData()
     {
-        return array(
-            array(
-                'date_age_calculation' => \DateTime::createFromFormat('Y-m-d','2016-06-16')
-                )
-        );
-    }
-    
-    public function getQueryBuilders()
-    {
-        if (static::$kernel === null) {
-            static::bootKernel();
-        }
-        
-        $em = static::$container
-            ->get('doctrine.orm.entity_manager');
-        
-        return array(
-            $em->createQueryBuilder()
-                ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person')
-        );
+        return [
+            [
+                'date_age_calculation' => DateTime::createFromFormat('Y-m-d', '2016-06-16'),
+            ],
+        ];
     }
 
+    public function getQueryBuilders()
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container
+            ->get('doctrine.orm.entity_manager');
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(person.id)')
+                ->from('ChillPersonBundle:Person', 'person'),
+        ];
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php
index 724a793e3..588bc0630 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php
@@ -1,70 +1,61 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
-
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class GenderAggregatorTest extends AbstractAggregatorTest
+final class GenderAggregatorTest extends AbstractAggregatorTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Aggregator\GenderAggregator
      */
     private $aggregator;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->aggregator = static::$container->get('chill.person.export.aggregator_gender');   
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_gender');
     }
-    
+
     public function getAggregator()
     {
         return $this->aggregator;
     }
-    
+
     public function getFormData()
     {
-        return array(
-            array()
-        );
+        return [
+            [],
+        ];
     }
-    
+
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$container
+
+        $em = self::$container
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person')
-        );
+                ->from('ChillPersonBundle:Person', 'person'),
+        ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php
index 1c358530c..47ba1ff4d 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php
@@ -1,70 +1,62 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class NationalityAggregatorTest extends AbstractAggregatorTest
+final class NationalityAggregatorTest extends AbstractAggregatorTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Aggregator\NationalityAggregator
      */
     private $aggregator;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->aggregator = static::$container->get('chill.person.export.aggregator_nationality');   
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_nationality');
     }
-    
+
     public function getAggregator()
     {
         return $this->aggregator;
     }
-    
+
     public function getFormData()
     {
-        return array(
-            array('group_by_level' => 'country'),
-            array('group_by_level' => 'continent')
-        );
+        return [
+            ['group_by_level' => 'country'],
+            ['group_by_level' => 'continent'],
+        ];
     }
-    
+
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$container
+
+        $em = self::$container
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('count(person.id)')
-                ->from('ChillPersonBundle:Person', 'person')
-        );
+                ->from('ChillPersonBundle:Person', 'person'),
+        ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
index 8edc6e59d..abe0f19b6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php
@@ -1,45 +1,38 @@
 <?php
-/*
- * Copyright (C) 2016 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 
 /**
- * Test CountPerson export
+ * Test CountPerson export.
  *
- * @author julien.fastre@champs-libres.coop
+ * @internal
+ * @coversNothing
  */
-class CountPersonTest extends AbstractExportTest
+final class CountPersonTest extends AbstractExportTest
 {
     /**
-     *
-     * @var 
+     * @var
      */
     private $export;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->export = static::$container->get('chill.person.export.export_count_person');
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.person.export.export_count_person');
     }
-    
-    
+
     public function getExport()
     {
         return $this->export;
@@ -47,13 +40,13 @@ class CountPersonTest extends AbstractExportTest
 
     public function getFormData()
     {
-        return array(
-            array()
-        );
+        return [
+            [],
+        ];
     }
 
     public function getModifiersCombination()
     {
-        return array( [ 'person' ] );
+        return [['person']];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
index 2ca369a24..27b2e0176 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php
@@ -1,61 +1,49 @@
 <?php
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Export;
 
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Export\ListPerson;
-
+use DateTime;
 
 /**
- * Test the export "ListPerson"
+ * Test the export "ListPerson".
  *
- * @author julien.fastre@champs-libres.coop
+ * @internal
+ * @coversNothing
  */
-class ListPersonTest extends AbstractExportTest
+final class ListPersonTest extends AbstractExportTest
 {
     /**
-     *
-     * @var ListPerson 
+     * @var ListPerson
      */
     private $export;
-    
-    
+
     public function setUp()
     {
-            static::bootKernel();
-        
-        $this->export = static::$container->get('chill.person.export.list_person');
-        
+        self::bootKernel();
+
+        $this->export = self::$container->get('chill.person.export.list_person');
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
-        static::$container->get('request_stack')
-                ->push($request->reveal());
+
+        self::$container->get('request_stack')
+            ->push($request->reveal());
     }
-    
-    /**
-     * 
-     * {@inheritDoc}
-     */
+
     public function getExport()
     {
         return $this->export;
@@ -63,26 +51,24 @@ class ListPersonTest extends AbstractExportTest
 
     public function getFormData()
     {
-        return array(
-            array('fields' => ['id', 'firstName', 'lastName']),
-            array('fields' => ['id', 'birthdate', 'gender', 'memo', 'email', 'phonenumber']),
-            array('fields' => ['firstName', 'lastName', 'phonenumber']),
-            array('fields' => ['id', 'nationality']),
-            array('fields' => ['id', 'countryOfBirth']),
-            array('fields' => ['id', 'address_street_address_1',
-                'address_street_address_2', 'address_valid_from', 
-                'address_postcode_label', 'address_postcode_code', 
-                'address_country_name', 'address_country_code'],
-                  'address_date' => \DateTime::createFromFormat('Y-m-d', '2016-06-12'))
-        );
+        return [
+            ['fields' => ['id', 'firstName', 'lastName']],
+            ['fields' => ['id', 'birthdate', 'gender', 'memo', 'email', 'phonenumber']],
+            ['fields' => ['firstName', 'lastName', 'phonenumber']],
+            ['fields' => ['id', 'nationality']],
+            ['fields' => ['id', 'countryOfBirth']],
+            ['fields' => ['id', 'address_street_address_1',
+                'address_street_address_2', 'address_valid_from',
+                'address_postcode_label', 'address_postcode_code',
+                'address_country_name', 'address_country_code', ],
+                'address_date' => DateTime::createFromFormat('Y-m-d', '2016-06-12'), ],
+        ];
     }
-    
+
     public function getModifiersCombination()
     {
-        return array(
-            array('person')
-        );
+        return [
+            ['person'],
+        ];
     }
-    
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php
index bf040619c..4bcae110e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php
@@ -1,49 +1,42 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use DateTime;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
- * 
- *
+ * @internal
+ * @coversNothing
  */
-class AccompanyingPeriodFilterTest extends AbstractFilterTest
+final class AccompanyingPeriodFilterTest extends AbstractFilterTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Filter\BirthdateFilter
      */
     private $filter;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
+        self::bootKernel();
+
         try {
-            $this->filter = static::$container->get('chill.person.export.filter_accompanying_period');
-        } catch  (ServiceNotFoundException $e) {
-            $this->markTestSkipped("The current configuration does not use accompanying_periods");
+            $this->filter = self::$container->get('chill.person.export.filter_accompanying_period');
+        } catch (ServiceNotFoundException $e) {
+            $this->markTestSkipped('The current configuration does not use accompanying_periods');
         }
     }
-    
-    
+
     public function getFilter()
     {
         return $this->filter;
@@ -51,24 +44,24 @@ class AccompanyingPeriodFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        return array(
-            array(
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2000-01-01'),
-                'date_to'   => \DateTime::createFromFormat('Y-m-d', '2010-01-01')
-            )
-        );
+        return [
+            [
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2000-01-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2010-01-01'),
+            ],
+        ];
     }
 
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$container
+
+        $em = self::$container
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('person.firstName')
                 ->from('ChillPersonBundle:Person', 'person'),
@@ -91,9 +84,9 @@ class AccompanyingPeriodFilterTest extends AbstractFilterTest
             $em->createQueryBuilder()
                 ->select('activity.date AS date')
                 ->select('activity.attendee as attendee')
-                ->from("ChillActivityBundle:Activity", 'activity')
+                ->from('ChillActivityBundle:Activity', 'activity')
                 ->join('activity.person', 'person')
-                ->join('person.center', 'center')
-        );
+                ->join('person.center', 'center'),
+        ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php
index e580c0f20..65eedcfbc 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php
@@ -1,45 +1,37 @@
 <?php
-/*
- * Copyright (C) 2017 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use DateTime;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class BirthdayFilterTest extends AbstractFilterTest
+final class BirthdayFilterTest extends AbstractFilterTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Filter\BirthdateFilter
      */
     private $filter;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
-        $this->filter = static::$container->get('chill.person.export.filter_birthdate');   
+        self::bootKernel();
+
+        $this->filter = self::$container->get('chill.person.export.filter_birthdate');
     }
-    
-    
+
     public function getFilter()
     {
         return $this->filter;
@@ -47,24 +39,24 @@ class BirthdayFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        return array(
-            array(
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2000-01-01'),
-                'date_to'   => \DateTime::createFromFormat('Y-m-d', '2010-01-01')
-            )
-        );
+        return [
+            [
+                'date_from' => DateTime::createFromFormat('Y-m-d', '2000-01-01'),
+                'date_to' => DateTime::createFromFormat('Y-m-d', '2010-01-01'),
+            ],
+        ];
     }
 
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$container
+
+        $em = self::$container
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('p.firstName')
                 ->from('ChillPersonBundle:Person', 'p'),
@@ -77,7 +69,7 @@ class BirthdayFilterTest extends AbstractFilterTest
                 ->select('count(IDENTITY(p))')
                 ->from('ChillPersonBundle:Person', 'p')
                 // add a dummy where clause
-                ->where('p.firstname IS NOT NULL')
-        );
+                ->where('p.firstname IS NOT NULL'),
+        ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php
index 2d6d7e309..7380349ed 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php
@@ -1,52 +1,43 @@
 <?php
-/*
- * Copyright (C) 2016 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Export\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Chill\PersonBundle\Entity\Person;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class GenderFilterTest extends AbstractFilterTest
+final class GenderFilterTest extends AbstractFilterTest
 {
     /**
-     *
      * @var \Chill\PersonBundle\Export\Filter\GenderFilter
      */
     private $filter;
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        
+        self::bootKernel();
+
         // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet;
+        $prophet = new \Prophecy\Prophet();
         $request = $prophet->prophesize();
         $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
-        
-        $this->filter = static::$container->get('chill.person.export.filter_gender');   
+
+        $this->filter = self::$container->get('chill.person.export.filter_gender');
     }
-    
-    
+
     public function getFilter()
     {
         return $this->filter;
@@ -54,32 +45,32 @@ class GenderFilterTest extends AbstractFilterTest
 
     public function getFormData()
     {
-        return array(
-            array(
-                'accepted_genders' => [ Person::FEMALE_GENDER ]
-            ),
-            array(
-                'accepted_genders' => [ Person::MALE_GENDER ]
-            ),
-            array(
-                'accepted_genders' => [ Person::MALE_GENDER, Person::BOTH_GENDER ]
-            )
-        );
+        return [
+            [
+                'accepted_genders' => [Person::FEMALE_GENDER],
+            ],
+            [
+                'accepted_genders' => [Person::MALE_GENDER],
+            ],
+            [
+                'accepted_genders' => [Person::MALE_GENDER, Person::BOTH_GENDER],
+            ],
+        ];
     }
 
     public function getQueryBuilders()
     {
-        if (static::$kernel === null) {
-            static::bootKernel();
+        if (null === self::$kernel) {
+            self::bootKernel();
         }
-        
-        $em = static::$container
+
+        $em = self::$container
             ->get('doctrine.orm.entity_manager');
-        
-        return array(
+
+        return [
             $em->createQueryBuilder()
                 ->select('p.firstName')
-                ->from('ChillPersonBundle:Person', 'p')
-        );
+                ->from('ChillPersonBundle:Person', 'p'),
+        ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
index 6ca28bf2b..1b0c5f3b6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php
@@ -1,178 +1,174 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Form\Type;
 
+use Chill\PersonBundle\Form\Type\PickPersonType;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Chill\PersonBundle\Form\Type\PickPersonType;
+use function count;
 
 /**
- * 
- *
+ * @internal
+ * @coversNothing
  */
-class PickPersonTypeTest extends KernelTestCase
+final class PickPersonTypeTest extends KernelTestCase
 {
     /**
-     *
-     * @var \Chill\MainBundle\Entity\User
-     */
-    protected $user;
-    
-    /**
-     *
      * @var \Symfony\Component\Form\FormFactoryInterface
      */
     protected $formFactory;
-    
+
+    /**
+     * @var \Chill\MainBundle\Entity\User
+     */
+    protected $user;
+
     public function setUp()
     {
         self::bootKernel();
-        
+
         $this->user = self::$container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:User')
-                ->findOneBy(array('username' => 'multi_center'));
-        
+            ->getRepository('ChillMainBundle:User')
+            ->findOneBy(['username' => 'multi_center']);
+
         $this->formFactory = self::$container->get('form.factory');
-        
+
         $token = (new UsernamePasswordToken($this->user, 'password', 'firewall'));
         self::$container->get('security.token_storage')
-                ->setToken($token);
+            ->setToken($token);
     }
-    
-    public function testWithoutOption()
-    {
-        $this->markTestSkipped("need to inject locale into url generator without request");
 
-        $form = $this->formFactory
-                ->createBuilder(PickPersonType::class, null, array())
-                ->getForm();
-        
-        $this->assertInstanceOf(\Symfony\Component\Form\FormInterface::class,
-                $form);
-        
-        // transform into a view to have data-center attr
-        $view = $form->createView();
-        
-        $centerIds = array();
-        
-        /* @var $centerIds \Symfony\Component\Form\ChoiceList\View\ChoiceView */
-        foreach($view->vars['choices'] as $choice) {
-            $centerIds[] = $choice->attr['data-center'];
-        }
-        
-        $this->assertEquals(2, count(array_unique($centerIds)),
-                "test that the form contains people from 2 centers");
-    }
-    
     /**
-     * Test the form with an option 'centers' with an unique center 
-     * entity (not in an array)
-     */
-    public function testWithOptionCenter()
-    {
-        $this->markTestSkipped("need to inject locale into url generator without request");
-        $center = self::$container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:Center')
-                ->findOneBy(array('name' => 'Center A'))
-                ;
-        
-        $form = $this->formFactory
-                ->createBuilder(PickPersonType::class, null, array(
-                    'centers' => $center
-                ))
-                ->getForm();
-        
-        // transform into a view to have data-center attr
-        $view = $form->createView();
-        
-        /* @var $centerIds \Symfony\Component\Form\ChoiceList\View\ChoiceView */
-        foreach($view->vars['choices'] as $choice) {
-            $centerIds[] = $choice->attr['data-center'];
-        }
-        
-        $this->assertEquals(1, count(array_unique($centerIds)),
-                "test that the form contains people from only one centers");
-        
-        $this->assertEquals($center->getId(), array_unique($centerIds)[0]);
-        
-    }
-    
-    /**
-     * Test the form with multiple centers
-     */
-    public function testWithOptionCenters()
-    {
-        $this->markTestSkipped("need to inject locale into url generator without request");
-        $centers = self::$container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillMainBundle:Center')
-                ->findAll()
-                ;
-        
-        $form = $this->formFactory
-                ->createBuilder(PickPersonType::class, null, array(
-                    'centers' => $centers
-                ))
-                ->getForm();
-        
-        // transform into a view to have data-center attr
-        $view = $form->createView();
-        
-        /* @var $centerIds \Symfony\Component\Form\ChoiceList\View\ChoiceView */
-        foreach($view->vars['choices'] as $choice) {
-            $centerIds[] = $choice->attr['data-center'];
-        }
-        
-        $this->assertEquals(2, count(array_unique($centerIds)),
-                "test that the form contains people from only one centers");
-        
-    }
-    
-    /**
-     * test with an invalid center type in the option 'centers' (in an array)
-     * 
+     * test with an invalid center type in the option 'centers' (in an array).
+     *
      * @expectedException \RuntimeException
      */
     public function testWithInvalidOptionCenters()
     {
-        
-        $this->markTestSkipped("need to inject locale into url generator without request");
+        $this->markTestSkipped('need to inject locale into url generator without request');
         $form = $this->formFactory
-                ->createBuilder(PickPersonType::class, null, array(
-                    'centers' => array('string')
-                ))
-                ->getForm();
+            ->createBuilder(PickPersonType::class, null, [
+                'centers' => ['string'],
+            ])
+            ->getForm();
     }
-    
-    public function testWithOptionRoleInvalid()
+
+    /**
+     * Test the form with an option 'centers' with an unique center
+     * entity (not in an array).
+     */
+    public function testWithOptionCenter()
     {
-        $this->markTestSkipped("need to inject locale into url generator without request");
+        $this->markTestSkipped('need to inject locale into url generator without request');
+        $center = self::$container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:Center')
+            ->findOneBy(['name' => 'Center A']);
+
         $form = $this->formFactory
-                ->createBuilder(PickPersonType::class, null, array(
-                    'role' => new \Symfony\Component\Security\Core\Role\Role('INVALID')
-                ))
-                ->getForm();
-        
+            ->createBuilder(PickPersonType::class, null, [
+                'centers' => $center,
+            ])
+            ->getForm();
+
         // transform into a view to have data-center attr
         $view = $form->createView();
-        
+
+        /* @var $centerIds \Symfony\Component\Form\ChoiceList\View\ChoiceView */
+        foreach ($view->vars['choices'] as $choice) {
+            $centerIds[] = $choice->attr['data-center'];
+        }
+
+        $this->assertEquals(
+            1,
+            count(array_unique($centerIds)),
+            'test that the form contains people from only one centers'
+        );
+
+        $this->assertEquals($center->getId(), array_unique($centerIds)[0]);
+    }
+
+    /**
+     * Test the form with multiple centers.
+     */
+    public function testWithOptionCenters()
+    {
+        $this->markTestSkipped('need to inject locale into url generator without request');
+        $centers = self::$container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:Center')
+            ->findAll();
+
+        $form = $this->formFactory
+            ->createBuilder(PickPersonType::class, null, [
+                'centers' => $centers,
+            ])
+            ->getForm();
+
+        // transform into a view to have data-center attr
+        $view = $form->createView();
+
+        /* @var $centerIds \Symfony\Component\Form\ChoiceList\View\ChoiceView */
+        foreach ($view->vars['choices'] as $choice) {
+            $centerIds[] = $choice->attr['data-center'];
+        }
+
+        $this->assertEquals(
+            2,
+            count(array_unique($centerIds)),
+            'test that the form contains people from only one centers'
+        );
+    }
+
+    public function testWithOptionRoleInvalid()
+    {
+        $this->markTestSkipped('need to inject locale into url generator without request');
+        $form = $this->formFactory
+            ->createBuilder(PickPersonType::class, null, [
+                'role' => new \Symfony\Component\Security\Core\Role\Role('INVALID'),
+            ])
+            ->getForm();
+
+        // transform into a view to have data-center attr
+        $view = $form->createView();
+
         $this->assertEquals(0, count($view->vars['choices']));
     }
-    
+
+    public function testWithoutOption()
+    {
+        $this->markTestSkipped('need to inject locale into url generator without request');
+
+        $form = $this->formFactory
+            ->createBuilder(PickPersonType::class, null, [])
+            ->getForm();
+
+        $this->assertInstanceOf(
+            \Symfony\Component\Form\FormInterface::class,
+            $form
+        );
+
+        // transform into a view to have data-center attr
+        $view = $form->createView();
+
+        $centerIds = [];
+
+        /* @var $centerIds \Symfony\Component\Form\ChoiceList\View\ChoiceView */
+        foreach ($view->vars['choices'] as $choice) {
+            $centerIds[] = $choice->attr['data-center'];
+        }
+
+        $this->assertEquals(
+            2,
+            count(array_unique($centerIds)),
+            'test that the form contains people from 2 centers'
+        );
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
index 8ef409296..f34342433 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
@@ -1,17 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Household;
 
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Household\MembersEditorFactory;
-use Doctrine\Common\Collections\Collection;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
+use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use function count;
 
-
-class MembersEditorTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class MembersEditorTest extends TestCase
 {
     private MembersEditorFactory $factory;
 
@@ -22,61 +35,20 @@ class MembersEditorTest extends TestCase
         $this->factory = new MembersEditorFactory($validator);
     }
 
-    public function testMovePersonWithSharedHousehold()
-    {
-        $person = new Person();
-        $position = (new Position())
-            ->setShareHousehold(true)
-            ;
-        $household1 = new Household();
-        $household2 = new Household();
-        $editor = $this->factory->createEditor($household1);
-
-        $editor->addMovement(
-            \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
-            $person,
-            $position);
-
-        $persistables = $editor->getPersistable();
-        $this->assertEquals(\count($persistables), 1);
-
-        $membership1 = $persistables[0];
-        $this->assertSame($household1, $membership1->getHousehold());
-        $this->assertNull($membership1->getEndDate());
-
-        // move to another household
-        $date = \DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
-        $editor = $this->factory->createEditor($household2);
-        $editor->addMovement(
-            $date,
-            $person,
-            $position);
-
-        $persistables = $editor->getPersistable();
-        $this->assertEquals(1, count($persistables));
-
-        $membership2 = $persistables[0];
-        $this->assertSame($household2, $membership2->getHousehold());
-        $this->assertNull($membership2->getEndDate());
-        $this->assertNotNull($membership1->getEndDate(),
-            "assert that the membership1 is closed");
-        $this->assertEquals($date, $membership1->getEndDate());
-    }
-
     public function testMovePersonWithoutSharedHousehold()
     {
         $person = new Person();
         $position = (new Position())
-            ->setShareHousehold(false)
-            ;
+            ->setShareHousehold(false);
         $household1 = new Household();
         $household2 = new Household();
         $editor = $this->factory->createEditor($household1);
 
         $editor->addMovement(
-            \DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
+            DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
             $person,
-            $position);
+            $position
+        );
 
         $persistables = $editor->getPersistable();
         $this->assertEquals(1, count($persistables));
@@ -86,12 +58,13 @@ class MembersEditorTest extends TestCase
         $this->assertNull($membership1->getEndDate());
 
         // move to another household
-        $date = \DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
+        $date = DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
         $editor = $this->factory->createEditor($household2);
         $editor->addMovement(
             $date,
             $person,
-            $position);
+            $position
+        );
 
         $persistables = $editor->getPersistable();
         $this->assertEquals(1, count($persistables));
@@ -99,7 +72,53 @@ class MembersEditorTest extends TestCase
         $membership2 = $person->getHouseholdParticipations()->last();
         $this->assertNull($membership2->getEndDate());
         $this->assertSame($household2, $membership2->getHousehold());
-        $this->assertNull($membership1->getEndDate(),
-            "assert that the membership1 is not closed");
+        $this->assertNull(
+            $membership1->getEndDate(),
+            'assert that the membership1 is not closed'
+        );
+    }
+
+    public function testMovePersonWithSharedHousehold()
+    {
+        $person = new Person();
+        $position = (new Position())
+            ->setShareHousehold(true);
+        $household1 = new Household();
+        $household2 = new Household();
+        $editor = $this->factory->createEditor($household1);
+
+        $editor->addMovement(
+            DateTimeImmutable::createFromFormat('Y-m-d', '2020-01-01'),
+            $person,
+            $position
+        );
+
+        $persistables = $editor->getPersistable();
+        $this->assertEquals(count($persistables), 1);
+
+        $membership1 = $persistables[0];
+        $this->assertSame($household1, $membership1->getHousehold());
+        $this->assertNull($membership1->getEndDate());
+
+        // move to another household
+        $date = DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-01');
+        $editor = $this->factory->createEditor($household2);
+        $editor->addMovement(
+            $date,
+            $person,
+            $position
+        );
+
+        $persistables = $editor->getPersistable();
+        $this->assertEquals(1, count($persistables));
+
+        $membership2 = $persistables[0];
+        $this->assertSame($household2, $membership2->getHousehold());
+        $this->assertNull($membership2->getEndDate());
+        $this->assertNotNull(
+            $membership1->getEndDate(),
+            'assert that the membership1 is closed'
+        );
+        $this->assertEquals($date, $membership1->getEndDate());
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
index 023a67231..592360a4f 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php
@@ -1,41 +1,53 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Search;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-
 /**
- * Test Person search
+ * Test Person search.
  *
+ * @internal
+ * @coversNothing
  */
-class PersonSearchTest extends WebTestCase
+final class PersonSearchTest extends WebTestCase
 {
+    public function testDefaultAccented()
+    {
+        $this->markTestSkipped('skipped until adapted to new fixtures');
+        $crawlerSpecial = $this->generateCrawlerForSearch('@person manço');
+
+        $this->assertRegExp('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
+
+        $crawlerNoSpecial = $this->generateCrawlerForSearch('@person manco');
+
+        $this->assertRegExp('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
+
+        $crawlerSpecial = $this->generateCrawlerForSearch('@person Étienne');
+
+        $this->assertRegExp('/Étienne/', $crawlerSpecial->filter('.list-with-period')->text());
+
+        $crawlerNoSpecial = $this->generateCrawlerForSearch('@person etienne');
+
+        $this->assertRegExp('/Étienne/', $crawlerNoSpecial->filter('.list-with-period')->text());
+    }
+
     public function testExpected()
     {
         $client = $this->getAuthenticatedClient();
 
-        $crawler = $client->request('GET', '/fr/search', array(
-           'q' => '@person Depardieu'
-        ));
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@person Depardieu',
+        ]);
 
         $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
@@ -44,30 +56,9 @@ class PersonSearchTest extends WebTestCase
     {
         $client = $this->getAuthenticatedClient();
 
-        $crawler = $client->request('GET', '/fr/search', array(
-           'q' => '@person Depardieu', 'name' => 'person_regular'
-        ));
-
-        $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
-    }
-
-    public function testSearchByLastName()
-    {
-        $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu');
-
-        $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
-    }
-
-    public function testSearchByFirstNameLower()
-    {
-        $crawler = $this->generateCrawlerForSearch('@person firstname:Gérard');
-
-        $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
-    }
-
-    public function testSearchByFirstNamePartim()
-    {
-        $crawler = $this->generateCrawlerForSearch('@person firstname:Ger');
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@person Depardieu', 'name' => 'person_regular',
+        ]);
 
         $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
@@ -78,12 +69,19 @@ class PersonSearchTest extends WebTestCase
 
         $this->assertRegExp('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
 
-
         $crawlerNoSpecial = $this->generateCrawlerForSearch('@person lastname:manco');
 
         $this->assertRegExp('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
     }
 
+    public function testSearchBirthdate()
+    {
+        $crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27');
+
+        $this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
+        $this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text());
+    }
+
     public function testSearchByFirstName()
     {
         $crawler = $this->generateCrawlerForSearch('@person firstname:Jean');
@@ -91,6 +89,24 @@ class PersonSearchTest extends WebTestCase
         $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
 
+    public function testSearchByFirstNameAccented()
+    {
+        $crawlerSpecial = $this->generateCrawlerForSearch('@person firstname:Gérard');
+
+        $this->assertRegExp('/Gérard/', $crawlerSpecial->filter('.list-with-period')->text());
+
+        $crawlerNoSpecial = $this->generateCrawlerForSearch('@person firstname:Gerard');
+
+        $this->assertRegExp('/Gérard/', $crawlerNoSpecial->filter('.list-with-period')->text());
+    }
+
+    public function testSearchByFirstNameLower()
+    {
+        $crawler = $this->generateCrawlerForSearch('@person firstname:Gérard');
+
+        $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
+    }
+
     public function testSearchByFirstNameLower2()
     {
         $crawler = $this->generateCrawlerForSearch('@person firstname:jean');
@@ -98,6 +114,13 @@ class PersonSearchTest extends WebTestCase
         $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
 
+    public function testSearchByFirstNamePartim()
+    {
+        $crawler = $this->generateCrawlerForSearch('@person firstname:Ger');
+
+        $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
+    }
+
     public function testSearchByFirstNamePartim2()
     {
         $crawler = $this->generateCrawlerForSearch('@person firstname:ean');
@@ -105,51 +128,16 @@ class PersonSearchTest extends WebTestCase
         $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
 
-    public function testSearchByFirstNameAccented()
+    public function testSearchByLastName()
     {
-        $crawlerSpecial = $this->generateCrawlerForSearch('@person firstname:Gérard');
+        $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu');
 
-        $this->assertRegExp('/Gérard/', $crawlerSpecial->filter('.list-with-period')->text());
-
-
-        $crawlerNoSpecial = $this->generateCrawlerForSearch('@person firstname:Gerard');
-
-        $this->assertRegExp('/Gérard/', $crawlerNoSpecial->filter('.list-with-period')->text());
-    }
-
-    public function testSearchCombineLastnameAndNationality()
-    {
-        $this->markTestSkipped("skipped until adapted to new fixtures");
-        $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu nationality:RU');
-
-        $this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
-        //if this is a AND clause, Jean Depardieu should not appears
-        $this->assertNotRegExp('/Jean/', $crawler->filter('.list-with-period')->text(),
-              "assert clause firstname and nationality are AND");
-    }
-
-    public function testSearchCombineLastnameAndFirstName()
-    {
-        $this->markTestSkipped("skipped until adapted to new fixtures");
-        $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu firstname:Jean');
-
-        $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text());
-        //if this is a AND clause, Jean Depardieu should not appears
-        $this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text(),
-              "assert clause firstname and nationality are AND");
-    }
-
-    public function testSearchBirthdate()
-    {
-        $crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27');
-
-        $this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
-        $this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text());
+        $this->assertRegExp('/DEPARDIEU/', $crawler->filter('.list-with-period')->text());
     }
 
     public function testSearchCombineBirthdateAndLastName()
     {
-        $this->markTestSkipped("skipped until adapted to new fixtures");
+        $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27 lastname:(Van Snick)');
 
         $this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text());
@@ -158,16 +146,44 @@ class PersonSearchTest extends WebTestCase
 
     public function testSearchCombineGenderAndLastName()
     {
-        $this->markTestSkipped("skipped until adapted to new fixtures");
+        $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person gender:woman lastname:(Depardieu)');
 
         $this->assertRegExp('/Charline/', $crawler->filter('.list-with-period')->text());
         $this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
     }
 
+    public function testSearchCombineLastnameAndFirstName()
+    {
+        $this->markTestSkipped('skipped until adapted to new fixtures');
+        $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu firstname:Jean');
+
+        $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text());
+        //if this is a AND clause, Jean Depardieu should not appears
+        $this->assertNotRegExp(
+            '/Gérard/',
+            $crawler->filter('.list-with-period')->text(),
+            'assert clause firstname and nationality are AND'
+        );
+    }
+
+    public function testSearchCombineLastnameAndNationality()
+    {
+        $this->markTestSkipped('skipped until adapted to new fixtures');
+        $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu nationality:RU');
+
+        $this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text());
+        //if this is a AND clause, Jean Depardieu should not appears
+        $this->assertNotRegExp(
+            '/Jean/',
+            $crawler->filter('.list-with-period')->text(),
+            'assert clause firstname and nationality are AND'
+        );
+    }
+
     public function testSearchMultipleTrigramUseAndClauseInDefault()
     {
-        $this->markTestSkipped("skipped until adapted to new fixtures");
+        $this->markTestSkipped('skipped until adapted to new fixtures');
         $crawler = $this->generateCrawlerForSearch('@person cha dep');
 
         $this->assertRegExp('/Charline/', $crawler->filter('.list-with-period')->text());
@@ -175,50 +191,33 @@ class PersonSearchTest extends WebTestCase
         $this->assertNotRegExp('/Jean/', $crawler->filter('.list-with-period')->text());
     }
 
-    public function testDefaultAccented()
-    {
-        $this->markTestSkipped("skipped until adapted to new fixtures");
-        $crawlerSpecial = $this->generateCrawlerForSearch('@person manço');
-
-        $this->assertRegExp('/MANÇO/', $crawlerSpecial->filter('.list-with-period')->text());
-
-
-        $crawlerNoSpecial = $this->generateCrawlerForSearch('@person manco');
-
-        $this->assertRegExp('/MANÇO/', $crawlerNoSpecial->filter('.list-with-period')->text());
-
-        $crawlerSpecial = $this->generateCrawlerForSearch('@person Étienne');
-
-        $this->assertRegExp('/Étienne/', $crawlerSpecial->filter('.list-with-period')->text());
-
-
-        $crawlerNoSpecial = $this->generateCrawlerForSearch('@person etienne');
-
-        $this->assertRegExp('/Étienne/', $crawlerNoSpecial->filter('.list-with-period')->text());
-    }
-
     /**
-     * test that person which a user cannot see are not displayed in results
+     * test that person which a user cannot see are not displayed in results.
      */
     public function testSearchWithAuthorization()
     {
         $crawlerCanSee = $this->generateCrawlerForSearch('Gérard', 'center a_social');
         $crawlerCannotSee = $this->generateCrawlerForSearch('Gérard', 'center b_social');
 
-        $this->assertRegExp('/DEPARDIEU/', $crawlerCanSee->text(),
-                'center a_social may see "Depardieu" in center a');
-        $this->assertNotRegExp('/DEPARDIEU/', $crawlerCannotSee->text(),
-            'center b_social may not see "Depardieu" in center b');
-
+        $this->assertRegExp(
+            '/DEPARDIEU/',
+            $crawlerCanSee->text(),
+            'center a_social may see "Depardieu" in center a'
+        );
+        $this->assertNotRegExp(
+            '/DEPARDIEU/',
+            $crawlerCannotSee->text(),
+            'center b_social may not see "Depardieu" in center b'
+        );
     }
 
     private function generateCrawlerForSearch($pattern, $username = 'center a_social')
     {
         $client = $this->getAuthenticatedClient($username);
 
-        $crawler = $client->request('GET', '/fr/search', array(
-           'q' => $pattern,
-        ));
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => $pattern,
+        ]);
 
         $this->assertTrue($client->getResponse()->isSuccessful());
 
@@ -226,14 +225,15 @@ class PersonSearchTest extends WebTestCase
     }
 
     /**
+     * @param mixed $username
      *
      * @return \Symfony\Component\BrowserKit\Client
      */
     private function getAuthenticatedClient($username = 'center a_social')
     {
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        return self::createClient([], [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
index 09f6cc2ba..da929a1b2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php
@@ -1,184 +1,169 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Security\Authorization;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\PermissionsGroup;
-use Chill\MainBundle\Entity\GroupCenter;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\MainBundle\Test\PrepareCenterTrait;
 use Chill\MainBundle\Test\PrepareScopeTrait;
-use Chill\MainBundle\Test\ProphecyTrait;
+use Chill\MainBundle\Test\PrepareUserTrait;
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
- * Test PersonVoter
+ * Test PersonVoter.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class PersonVoterTest extends KernelTestCase
+final class PersonVoterTest extends KernelTestCase
 {
-    
-    use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait;
-    
+    use PrepareCenterTrait;
+    use PrepareScopeTrait;
+    use PrepareUserTrait;
+
     /**
-     *
-     * @var \Chill\PersonBundle\Security\Authorization\PersonVoter
-     */
-    protected $voter;
-    
-    /**
-     *
      * @var \Prophecy\Prophet
      */
     protected $prophet;
-    
+
+    /**
+     * @var \Chill\PersonBundle\Security\Authorization\PersonVoter
+     */
+    protected $voter;
+
     public function setUp()
     {
-        static::bootKernel();
-        $this->voter = static::$container
-              ->get('chill.person.security.authorization.person');
+        self::bootKernel();
+        $this->voter = self::$container
+            ->get('chill.person.security.authorization.person');
         $this->prophet = new \Prophecy\Prophet();
     }
-    
+
     public function testNullUser()
     {
         $token = $this->prepareToken();
         $center = $this->prepareCenter(1, 'center');
         $person = $this->preparePerson($center);
-        
+
         $this->assertEquals(
-                VoterInterface::ACCESS_DENIED,
-                $this->voter->vote($token, $person, array('CHILL_PERSON_SEE')), 
-                "assert that a null user is not allowed to see"
-                );
+            VoterInterface::ACCESS_DENIED,
+            $this->voter->vote($token, $person, ['CHILL_PERSON_SEE']),
+            'assert that a null user is not allowed to see'
+        );
     }
-    
-    public function testUserCanNotReachCenter()
-    {
-        $centerA = $this->prepareCenter(1, 'centera');
-        $centerB = $this->prepareCenter(2, 'centerb');
-        $scope = $this->prepareScope(1, 'default');
-        $token = $this->prepareToken(array(
-            array(
-                'center' => $centerA, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_PERSON_UPDATE']
-                )
-            )
-        ));
-        $person = $this->preparePerson($centerB);
-        
-        $this->assertEquals(
-                VoterInterface::ACCESS_DENIED,
-                $this->voter->vote($token, $person, array('CHILL_PERSON_UPDATE')),
-                'assert that a user with right not in the good center has access denied'
-                );
-    }
-    
+
     /**
-     * test a user with sufficient right may see the person
+     * test a user with sufficient right may see the person.
      */
     public function testUserAllowed()
     {
         $center = $this->prepareCenter(1, 'center');
         $scope = $this->prepareScope(1, 'default');
-        $token = $this->prepareToken(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_PERSON_SEE']
-                )
-            )
-        ));
+        $token = $this->prepareToken([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_PERSON_SEE'],
+                ],
+            ],
+        ]);
         $person = $this->preparePerson($center);
-        
+
         $this->assertEquals(
-                VoterInterface::ACCESS_GRANTED,
-                $this->voter->vote($token, $person, array('CHILL_PERSON_SEE')),
-                'assert that a user with correct rights may is granted access'
-                );
+            VoterInterface::ACCESS_GRANTED,
+            $this->voter->vote($token, $person, ['CHILL_PERSON_SEE']),
+            'assert that a user with correct rights may is granted access'
+        );
     }
-    
+
     /**
      * test a user with sufficient right may see the person.
-     * hierarchy between role is required
+     * hierarchy between role is required.
      */
     public function testUserAllowedWithInheritance()
     {
         $center = $this->prepareCenter(1, 'center');
         $scope = $this->prepareScope(1, 'default');
-        $token = $this->prepareToken(array(
-            array(
-                'center' => $center, 'permissionsGroup' => array(
-                    ['scope' => $scope, 'role' => 'CHILL_PERSON_UPDATE']
-                )
-            )
-        ));
+        $token = $this->prepareToken([
+            [
+                'center' => $center, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_PERSON_UPDATE'],
+                ],
+            ],
+        ]);
         $person = $this->preparePerson($center);
         $this->assertEquals(
-                VoterInterface::ACCESS_GRANTED,
-                $this->voter->vote($token, $person, array('CHILL_PERSON_SEE')),
-                'assert that a user with correct role is granted on inherited roles'
-                );
-    }    
-    
+            VoterInterface::ACCESS_GRANTED,
+            $this->voter->vote($token, $person, ['CHILL_PERSON_SEE']),
+            'assert that a user with correct role is granted on inherited roles'
+        );
+    }
+
+    public function testUserCanNotReachCenter()
+    {
+        $centerA = $this->prepareCenter(1, 'centera');
+        $centerB = $this->prepareCenter(2, 'centerb');
+        $scope = $this->prepareScope(1, 'default');
+        $token = $this->prepareToken([
+            [
+                'center' => $centerA, 'permissionsGroup' => [
+                    ['scope' => $scope, 'role' => 'CHILL_PERSON_UPDATE'],
+                ],
+            ],
+        ]);
+        $person = $this->preparePerson($centerB);
+
+        $this->assertEquals(
+            VoterInterface::ACCESS_DENIED,
+            $this->voter->vote($token, $person, ['CHILL_PERSON_UPDATE']),
+            'assert that a user with right not in the good center has access denied'
+        );
+    }
+
     /**
-     * prepare a person
-     * 
+     * prepare a person.
+     *
      * The only properties set is the center, others properties are ignored.
-     * 
-     * @param Center $center
+     *
      * @return Person
      */
     protected function preparePerson(Center $center)
     {
         return (new Person())
-              ->setCenter($center)
-              ;
+            ->setCenter($center);
     }
-    
+
     /**
-     * prepare a token interface with correct rights
-     * 
+     * prepare a token interface with correct rights.
+     *
      * if $permissions = null, user will be null (no user associated with token
-     * 
+     *
      * @param array $permissions an array of permissions, with key 'center' for the center and 'permissions' for an array of permissions
+     *
      * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
      */
-    protected function prepareToken(array $permissions = null)
-    {        
+    protected function prepareToken(?array $permissions = null)
+    {
         $token = $this->prophet->prophesize();
         $token
             ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
-        if ($permissions === NULL) {
+
+        if (null === $permissions) {
             $token->getUser()->willReturn(null);
         } else {
             $token->getUser()->willReturn($this->prepareUser($permissions));
         }
-        
+
         return $token->reveal();
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
new file mode 100644
index 000000000..1ad289b60
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizerTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Scope;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingPeriodDocGenNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalizationNullOrNotNullHaveSameKeys()
+    {
+        $period = new AccompanyingPeriod();
+        $notNullData = $this->normalizer->normalize($period, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]);
+        $nullData = $this->normalizer->normalize(null, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]);
+
+        $this->assertEqualsCanonicalizing(
+            array_keys($notNullData),
+            array_keys($nullData),
+            'test that the data returned by null value and an accompanying period have the same keys'
+        );
+    }
+
+    public function testNormalize()
+    {
+        $period = new AccompanyingPeriod();
+        $period->setConfidential(true);
+        $period->setEmergency(true);
+        $period->setOrigin((new AccompanyingPeriod\Origin())->setLabel(['fr' => 'origin']));
+        $period->setClosingMotive((new AccompanyingPeriod\ClosingMotive())->setName(['closing']));
+        $period->addScope((new Scope())->setName(['fr' => 'scope1']));
+        $period->addScope((new Scope())->setName(['fr' => 'scope2']));
+        $period->addSocialIssue((new SocialIssue())->setTitle(['fr' => 'issue1']));
+        $period->addSocialIssue((new SocialIssue())->setTitle(['fr' => 'issue2']));
+        $period->addPerson(new Person());
+        $period->addPerson(new Person());
+        $data = $this->normalizer->normalize($period, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]);
+
+        $expected = [
+            'id' => null,
+            'type' => 'accompanying_period',
+            'isNull' => false,
+            'closingDate' => '@ignored',
+            'confidential' => true,
+            'confidentialText' => 'confidentiel',
+            'createdAt' => '@ignored',
+            'createdBy' => '@ignored',
+            'emergency' => true,
+            'emergencyText' => 'Urgent',
+            'openingDate' => '@ignored',
+            'originText' => 'origin',
+            'origin' => '@ignored',
+            'requestorAnonymous' => false,
+            'resources' => [],
+            'socialIssues' => '@ignored',
+            'intensity' => 'ponctuel',
+            'step' => 'Brouillon',
+            'closingMotiveText' => 'closing',
+            'socialIssuesText' => 'issue1, issue2',
+            'scopes' => '@ignored',
+            'scopesText' => 'scope1, scope2',
+            'ref' => '@ignored',
+            'participations' => '@ignored',
+            'currentParticipations' => '@ignored',
+            'isClosed' => false,
+            'hasRef' => false,
+            'hasRequestor' => false,
+            'requestorKind' => 'none',
+            'hasRequestorPerson' => false,
+            'hasRequestorThirdParty' => false,
+            'requestorPerson' => '@ignored',
+            'requestorThirdParty' => '@ignored',
+        ];
+
+        $this->assertIsArray($data);
+        $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($data));
+
+        foreach ($expected as $key => $item) {
+            if ('@ignored' === $item) {
+                continue;
+            }
+
+            $this->assertEquals($item, $data[$key], "test key {$key}");
+        }
+
+        $this->assertCount(2, $data['participations']);
+    }
+
+    public function testNormalizeNull()
+    {
+        $data = $this->normalizer->normalize(null, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]);
+
+        $expected = [
+            'id' => '',
+            'type' => 'accompanying_period',
+            'closingDate' => '@ignored',
+            'confidential' => false,
+            'confidentialText' => '',
+            'createdAt' => '@ignored',
+            'createdBy' => '@ignored',
+            'emergency' => false,
+            'emergencyText' => '',
+            'openingDate' => '@ignored',
+            'originText' => '',
+            'origin' => '@ignored',
+            'requestorAnonymous' => false,
+            'resources' => [],
+            'socialIssues' => '@ignored',
+            'intensity' => '',
+            'step' => '',
+            'closingMotiveText' => '',
+            'socialIssuesText' => '',
+            'scopes' => '@ignored',
+            'scopesText' => '',
+            'ref' => '@ignored',
+            'participations' => '@ignored',
+            'currentParticipations' => '@ignored',
+            'isClosed' => false,
+            'hasRef' => false,
+            'hasRequestor' => false,
+            'requestorKind' => 'none',
+            'hasRequestorPerson' => false,
+            'hasRequestorThirdParty' => false,
+            'requestorPerson' => '@ignored',
+            'requestorThirdParty' => '@ignored',
+            'isNull' => true,
+        ];
+
+        $this->assertIsArray($data);
+        $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($data));
+
+        foreach ($expected as $key => $item) {
+            if ('@ignored' === $item) {
+                continue;
+            }
+
+            $this->assertEquals($item, $data[$key], "test the key {$key}");
+        }
+    }
+
+    public function testNormalizeParticipations()
+    {
+        $period = new AccompanyingPeriod();
+        $period->addPerson($person = new Person());
+        $person->setFirstName('test');
+
+        $data = $this->normalizer->normalize($period, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]);
+
+        $this->assertIsArray($data);
+        $this->assertArrayHasKey('participations', $data);
+        $this->assertCount(1, $data['participations']);
+
+        $this->assertArrayHasKey('currentParticipations', $data);
+        $this->assertCount(1, $data['currentParticipations']);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
new file mode 100644
index 000000000..82464cd7b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
+use DateTimeImmutable;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingPeriodWorkDocGenNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp()
+    {
+        parent::bootKernel();
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalizationNull()
+    {
+        $actual = $this->normalizer->normalize(null, 'docgen', [
+            'docgen:expects' => AccompanyingPeriodWork::class,
+            AbstractNormalizer::GROUPS => ['docgen:read'],
+        ]);
+
+        $expected = [
+            'id' => '',
+        ];
+
+        $this->assertIsArray($actual);
+        $this->markTestSkipped('specification still not finalized');
+        $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
+
+        foreach ($expected as $key => $item) {
+            if ('@ignored' === $item) {
+                continue;
+            }
+
+            $this->assertEquals($item, $actual[$key]);
+        }
+    }
+
+    public function testNormlalize()
+    {
+        $work = new AccompanyingPeriodWork();
+        $work
+            ->addPerson((new Person())->setFirstName('hello')->setLastName('name'))
+            ->addGoal($g = new AccompanyingPeriodWorkGoal())
+            ->addResult($r = new Result())
+            ->setCreatedAt(new DateTimeImmutable())
+            ->setUpdatedAt(new DateTimeImmutable())
+            ->setCreatedBy($user = new User())
+            ->setUpdatedBy($user);
+        $g->addResult($r)->setGoal($goal = new Goal());
+        $goal->addResult($r);
+
+        $actual = $this->normalizer->normalize($work, 'docgen', [
+            'docgen:expects' => AccompanyingPeriodWork::class,
+            AbstractNormalizer::GROUPS => ['docgen:read'],
+        ]);
+
+        $expected = [
+            'id' => 0,
+        ];
+
+        $this->assertIsArray($actual);
+        $this->markTestSkipped('specification still not finalized');
+        $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
+
+        foreach ($expected as $key => $item) {
+            if ('@ignored' === $item) {
+                continue;
+            }
+
+            $this->assertEquals($item, $actual[$key]);
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
index 9dd348c82..6b973fdc9 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php
@@ -1,24 +1,36 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Serializer\Normalizer;
 
-use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Serializer\SerializerInterface;
+use DateTimeImmutable;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-
-class HouseholdNormalizerTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class HouseholdNormalizerTest extends KernelTestCase
 {
     private ?NormalizerInterface $normalizer;
 
     protected function setUp()
     {
         self::bootKernel();
-        $this->normalizer= self::$container->get(NormalizerInterface::class);
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
     }
 
     public function testNormalizationRecursive()
@@ -28,21 +40,22 @@ class HouseholdNormalizerTest extends KernelTestCase
         $household = new Household();
         $position = (new Position())
             ->setShareHousehold(true)
-            ->setAllowHolder(true)
-            ;
+            ->setAllowHolder(true);
 
         $member->setPerson($person)
-            ->setStartDate(new \DateTimeImmutable('1 year ago'))
-            ->setEndDate(new \DateTimeImmutable('1 month ago'));
+            ->setStartDate(new DateTimeImmutable('1 year ago'))
+            ->setEndDate(new DateTimeImmutable('1 month ago'));
 
         $household->addMember($member);
 
-        $normalized = $this->normalizer->normalize($household,
-            'json', [ 'groups' => [ 'read' ]]);
+        $normalized = $this->normalizer->normalize(
+            $household,
+            'json',
+            ['groups' => ['read']]
+        );
 
         $this->assertIsArray($normalized);
         $this->assertArrayHasKey('type', $normalized);
         $this->assertEquals('household', $normalized['type']);
     }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
new file mode 100644
index 000000000..6c9d8de5c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -0,0 +1,238 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Serializer\Normalizer;
+
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
+use Chill\PersonBundle\Serializer\Normalizer\PersonDocGenNormalizer;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Prophecy\Argument;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_merge;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonDocGenNormalizerTest extends KernelTestCase
+{
+    private const BLANK = [
+        'firstname' => '',
+        'lastname' => '',
+        'altNames' => '',
+        'text' => '',
+        'isNull' => true,
+        'type' => 'person',
+        'birthdate' => ['short' => '', 'long' => ''],
+        'deathdate' => ['short' => '', 'long' => ''],
+        'gender' => '',
+        'civility' => '@ignored',
+        'address' => '@ignored',
+        'maritalStatus' => '',
+        'maritalStatusDate' => ['short' => '', 'long' => ''],
+        'email' => '',
+        'firstPhoneNumber' => '',
+        'fixPhoneNumber' => '',
+        'mobilePhoneNumber' => '',
+        'nationality' => '',
+        'placeOfBirth' => '',
+        'memo' => '',
+        'numberOfChildren' => '',
+    ];
+
+    private NormalizerInterface $normalizer;
+
+    protected function setUp()
+    {
+        self::bootKernel();
+
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function generateData()
+    {
+        $person = new Person();
+        $person
+            ->setFirstName('Renaud')
+            ->setLastName('Mégane');
+
+        $expected = array_merge(
+            self::BLANK,
+            ['firstname' => 'Renaud', 'lastname' => 'Mégane',
+                'text' => 'Renaud Mégane', ]
+        );
+
+        yield [$person, $expected, 'partial normalization for a person'];
+
+        yield [null, self::BLANK, 'normalization for a null person'];
+    }
+
+    public function testNormalizationNullOrNotNullHaveSameKeys()
+    {
+        $period = new Person();
+        $notNullData = $this->buildPersonNormalizer()->normalize($period, 'docgen', ['docgen:expects' => Person::class]);
+        $nullData = $this->buildPersonNormalizer()->normalize(null, 'docgen', ['docgen:expects' => Person::class]);
+
+        $this->assertEqualsCanonicalizing(
+            array_keys($notNullData),
+            array_keys($nullData),
+            'test that the data returned by null value and a Person have the same keys'
+        );
+    }
+
+    /**
+     * @dataProvider generateData
+     *
+     * @param mixed $expected
+     * @param mixed $msg
+     */
+    public function testNormalize(?Person $person, $expected, $msg)
+    {
+        $normalized = $this->normalizer->normalize($person, 'docgen', [
+            'docgen:expects' => Person::class,
+            'groups' => 'docgen:read',
+        ]);
+
+        $this->assertIsArray($normalized);
+
+        foreach ($normalized as $key => $value) {
+            if ('@ignored' === $value) {
+                continue;
+            }
+
+            $this->assertEquals($value, $normalized[$key]);
+        }
+        $this->assertEqualsCanonicalizing(array_keys($expected), array_keys($normalized), $msg);
+    }
+
+    public function testNormalizePersonWithHousehold()
+    {
+        $household = new Household();
+        $person = new Person();
+        $person
+            ->setFirstName('Renaud')
+            ->setLastName('Mégane');
+        $householdMember = new HouseholdMember();
+        $householdMember
+            ->setPosition((new Position())->setAllowHolder(true)->setLabel(['fr' => 'position'])
+            ->setShareHousehold(true))
+            ->setHolder(true);
+        $person->addHouseholdParticipation($householdMember);
+        $household->addMember($householdMember);
+
+        $person = new Person();
+        $person
+            ->setFirstName('Citroen')
+            ->setLastName('Xsara');
+        $householdMember = new HouseholdMember();
+        $householdMember
+            ->setPosition((new Position())->setAllowHolder(true)->setLabel(['fr' => 'position2'])
+            ->setShareHousehold(true))
+            ->setHolder(false);
+        $person->addHouseholdParticipation($householdMember);
+        $household->addMember($householdMember);
+
+        $actual = $this->normalizer->normalize($person, 'docgen', [
+            'groups' => 'docgen:read',
+            'docgen:expects' => Person::class,
+            'docgen:person:with-household' => true,
+        ]);
+
+        $this->assertCount(2, $household->getMembers());
+        $this->assertIsArray($actual);
+        $this->assertArrayHasKey('household', $actual);
+        $this->assertCount(2, $actual['household']['currentMembers']);
+        $this->assertCount(2, $actual['household']['members']);
+    }
+
+    public function testNormalizePersonWithRelationships()
+    {
+        $person = (new Person())->setFirstName('Renaud')->setLastName('megane');
+        $father = (new Person())->setFirstName('Clément')->setLastName('megane');
+        $mother = (new Person())->setFirstName('Mireille')->setLastName('Mathieu');
+        $sister = (new Person())->setFirstName('Callie')->setLastName('megane');
+
+        $relations = [
+            (new Relationship())->setFromPerson($person)->setToPerson($father)
+                ->setReverse(false)->setRelation((new Relation())->setTitle(['fr' => 'Père'])
+                ->setReverseTitle(['fr' => 'Fils'])),
+            (new Relationship())->setFromPerson($person)->setToPerson($mother)
+                ->setReverse(false)->setRelation((new Relation())->setTitle(['fr' => 'Mère'])
+                ->setReverseTitle(['fr' => 'Fils'])),
+            (new Relationship())->setFromPerson($person)->setToPerson($sister)
+                ->setReverse(true)->setRelation((new Relation())->setTitle(['fr' => 'Frère'])
+                ->setReverseTitle(['fr' => 'Soeur'])),
+        ];
+
+        $repository = $this->prophesize(RelationshipRepository::class);
+        $repository->findByPerson($person)->willReturn($relations);
+
+        $normalizer = $this->buildPersonNormalizer(null, $repository->reveal(), null, null);
+
+        $actual = $normalizer->normalize($person, 'docgen', [
+            'groups' => 'docgen:read',
+            'docgen:expects' => Person::class,
+            'docgen:person:with-relations' => true,
+        ]);
+
+        $this->assertIsArray($actual);
+        $this->assertArrayHasKey('relations', $actual);
+        $this->assertCount(3, $actual['relations']);
+    }
+
+    private function buildPersonNormalizer(
+        ?PersonRender $personRender = null,
+        ?RelationshipRepository $relationshipRepository = null,
+        ?TranslatorInterface $translator = null,
+        ?TranslatableStringHelper $translatableStringHelper = null
+    ): PersonDocGenNormalizer {
+        $normalizer = new PersonDocGenNormalizer(
+            $personRender ?? self::$container->get(PersonRender::class),
+            $relationshipRepository ?? self::$container->get(RelationshipRepository::class),
+            $translator ?? self::$container->get(TranslatorInterface::class),
+            $translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class)
+        );
+        $normalizerManager = $this->prophesize(NormalizerInterface::class);
+        $normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
+        $normalizerManager->normalize(Argument::type(Person::class), 'docgen', Argument::any())
+            ->will(static function ($args) use ($normalizer) {
+                return $normalizer->normalize($args[0], $args[1], $args[2]);
+            });
+        $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
+            static function ($args) {
+                if (is_iterable($args[0])) {
+                    $r = [];
+
+                    foreach ($args[0] as $i) {
+                        $r[] = ['fake' => true, 'hash' => spl_object_hash($i)];
+                    }
+
+                    return $r;
+                }
+
+                return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null];
+            }
+        );
+        $normalizer->setNormalizer($normalizerManager->reveal());
+
+        return $normalizer;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
new file mode 100644
index 000000000..1cc51b278
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonJsonNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp()
+    {
+        self::bootKernel();
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalization()
+    {
+        $person = new Person();
+        $result = $this->normalizer->normalize($person, 'json', [AbstractNormalizer::GROUPS => ['read']]);
+
+        $this->assertIsArray($result);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
new file mode 100644
index 000000000..a8b7502d9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Serializer\Normalizer;
+
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Chill\PersonBundle\Entity\Relationships\Relationship;
+use Chill\PersonBundle\Serializer\Normalizer\RelationshipDocGenNormalizer;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use function is_object;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class RelationshipDocGenNormalizerTest extends TestCase
+{
+    public function testNormalizeRelationshipNull()
+    {
+        $relationship = null;
+
+        $normalizer = $this->buildNormalizer();
+
+        $this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', [
+            'docgen:expects' => Relationship::class,
+        ]));
+        $this->assertFalse($normalizer->supportsNormalization($relationship, 'docgen', [
+            'docgen:expects' => Person::class,
+        ]));
+
+        $actual = $normalizer->normalize($relationship, 'docgen', [
+            'docgen:expects' => Relationship::class,
+        ]);
+        $this->assertIsArray($actual);
+        $this->assertEqualsCanonicalizing(
+            ['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'],
+            array_keys($actual),
+            'check that the expected keys are present'
+        );
+    }
+
+    public function testNormalizeRelationshipWithCounterPart()
+    {
+        $relationship = new Relationship();
+        $relationship
+            ->setFromPerson($person1 = new Person())
+            ->setToPerson($person2 = new Person())
+            ->setRelation(
+                (new Relation())->setTitle(['fr' => 'title'])
+                    ->setReverseTitle(['fr' => 'reverse title'])
+            )
+            ->setReverse(false);
+
+        $normalizer = $this->buildNormalizer();
+
+        $this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', []));
+        $this->assertFalse($normalizer->supportsNormalization($person1, 'docgen', []));
+
+        $actual = $normalizer->normalize($relationship, 'docgen', [
+            'docgen:expects' => Relationship::class,
+            'docgen:relationship:counterpart' => $person1,
+        ]);
+
+        $this->assertIsArray($actual);
+        $this->assertEqualsCanonicalizing(
+            ['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'],
+            array_keys($actual),
+            'check that the expected keys are present'
+        );
+        $this->assertEquals(spl_object_hash($person2), $actual['opposite']['hash']);
+    }
+
+    public function testNormalizeRelationshipWithoutCounterPart()
+    {
+        $relationship = new Relationship();
+        $relationship
+            ->setFromPerson($person1 = new Person())
+            ->setToPerson($person2 = new Person())
+            ->setRelation(
+                (new Relation())->setTitle(['fr' => 'title'])
+                    ->setReverseTitle(['fr' => 'reverse title'])
+            )
+            ->setReverse(false);
+
+        $normalizer = $this->buildNormalizer();
+
+        $this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', []));
+        $this->assertFalse($normalizer->supportsNormalization($person1, 'docgen', []));
+
+        $actual = $normalizer->normalize($relationship, 'docgen', [
+            'docgen:expects' => Relationship::class,
+        ]);
+        $this->assertIsArray($actual);
+        $this->assertEqualsCanonicalizing(
+            ['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'],
+            array_keys($actual),
+            'check that the expected keys are present'
+        );
+        $this->assertEquals(null, $actual['opposite']);
+    }
+
+    private function buildNormalizer(): RelationshipDocGenNormalizer
+    {
+        $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
+        $translatableStringHelper->localize(Argument::type('array'))->will(
+            static function ($args) { return $args[0][array_keys($args[0])[0]]; }
+        );
+
+        $normalizer = new RelationshipDocGenNormalizer(
+            $translatableStringHelper->reveal()
+        );
+
+        $normalizerManager = $this->prophesize(NormalizerInterface::class);
+        $normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
+        $normalizerManager->normalize(Argument::type(Relationship::class), 'docgen', Argument::any())
+            ->will(static function ($args) use ($normalizer) {
+                return $normalizer->normalize($args[0], $args[1], $args[2]);
+            });
+        $normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
+            static function ($args) {
+                if (null === $args[0]) {
+                    return null;
+                }
+
+                if (is_iterable($args[0])) {
+                    $r = [];
+
+                    foreach ($args[0] as $i) {
+                        $r[] = ['fake' => true, 'hash' => spl_object_hash($i)];
+                    }
+
+                    return $r;
+                }
+
+                if (is_object($args[0])) {
+                    return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null];
+                }
+
+                return $args[0];
+            }
+        );
+        $normalizer->setNormalizer($normalizerManager->reveal());
+
+        return $normalizer;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
index 92be039be..6d9926323 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php
@@ -1,67 +1,40 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Timeline;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\EntityManagerInterface;
 use Chill\MainBundle\Test\PrepareClientTrait;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function array_pop;
+use function shuffle;
 
 /**
  * This class tests entries are shown for closing and opening
  * periods in timeline.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class TimelineAccompanyingPeriodTest extends WebTestCase
+final class TimelineAccompanyingPeriodTest extends WebTestCase
 {
     use PrepareClientTrait;
 
-    /**
-     * @dataProvider provideDataPersonWithAccompanyingPeriod
-     */
-    public function testEntriesAreShown($personId)
-    {
-        $client = $this->getClientAuthenticated();
-
-        $crawler = $client->request('GET', "/en/person/{$personId}/timeline");
-
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-              "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("est ouvert",
-              $crawler->filter('.timeline')->text(),
-              "the text 'est ouvert' is present");
-    }
-
     public function provideDataPersonWithAccompanyingPeriod()
     {
         self::bootKernel();
 
         $qb = self::$container->get(EntityManagerInterface::class)
-                              ->createQueryBuilder()
-                          ;
+            ->createQueryBuilder();
         $personIds = $qb
             ->from(Person::class, 'p')
             ->join('p.accompanyingPeriodParticipations', 'part')
@@ -72,15 +45,41 @@ class TimelineAccompanyingPeriodTest extends WebTestCase
             ->setParameter('center', 'Center A')
             ->setMaxResults(1000)
             ->getQuery()
-            ->getResult()
-        ;
+            ->getResult();
 
-        \shuffle($personIds);
+        shuffle($personIds);
 
-        yield [ \array_pop($personIds)['id'] ];
-        yield [ \array_pop($personIds)['id'] ];
-        yield [ \array_pop($personIds)['id'] ];
+        yield [array_pop($personIds)['id']];
 
+        yield [array_pop($personIds)['id']];
+
+        yield [array_pop($personIds)['id']];
     }
 
+    /**
+     * @dataProvider provideDataPersonWithAccompanyingPeriod
+     *
+     * @param mixed $personId
+     */
+    public function testEntriesAreShown($personId)
+    {
+        $client = $this->getClientAuthenticated();
+
+        $crawler = $client->request('GET', "/en/person/{$personId}/timeline");
+
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            '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(
+            'est ouvert',
+            $crawler->filter('.timeline')->text(),
+            "the text 'est ouvert' is present"
+        );
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
index b70a8146b..954c74826 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php
@@ -1,29 +1,64 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Validator\AccompanyingPeriod;
 
-use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidityValidator;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidityValidator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class LocationValidityValidatorTest extends ConstraintValidatorTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class LocationValidityValidatorTest extends ConstraintValidatorTestCase
 {
-    public function testValidAddress()
+    public function testPeriodDoesNotContainsPersonOnAnyPerson()
     {
         $constraint = $this->getConstraint();
 
         $period = new AccompanyingPeriod();
-        $person = new Person();
-        $period->addPerson($person);
-
-        $period->setPersonLocation($person);
+        $person1 = new Person();
+        $period->setPersonLocation($person1);
 
         $this->validator->validate($period, $constraint);
 
-        $this->assertNoViolation();
+        $this->buildViolation('messagePersonLocatedMustBeAssociated')
+            ->setParameters([
+                '{{ person_name }}' => 'name',
+            ])
+            ->assertRaised();
+    }
+
+    public function testPeriodDoesNotContainsPersonOnOtherPerson()
+    {
+        $constraint = $this->getConstraint();
+
+        $period = new AccompanyingPeriod();
+        $person1 = new Person();
+        $person2 = new Person();
+        $period->addPerson($person1);
+
+        $period->setPersonLocation($person2);
+
+        $this->validator->validate($period, $constraint);
+
+        $this->buildViolation('messagePersonLocatedMustBeAssociated')
+            ->setParameters([
+                '{{ person_name }}' => 'name',
+            ])
+            ->assertRaised();
     }
 
     public function testPeriodDoesNotContainsPersonOnRemovedPerson()
@@ -41,50 +76,10 @@ class LocationValidityValidatorTest extends ConstraintValidatorTestCase
         $this->validator->validate($period, $constraint);
 
         $this->buildViolation('messagePersonLocatedMustBeAssociated')
-             ->setParameters([
-                 '{{ person_name }}' => 'name'
-             ])
-             ->assertRaised()
-         ;
-    }
-
-    public function testPeriodDoesNotContainsPersonOnOtherPerson()
-    {
-        $constraint = $this->getConstraint();
-
-        $period = new AccompanyingPeriod();
-        $person1 = new Person();
-        $person2 = new Person();
-        $period->addPerson($person1);
-
-        $period->setPersonLocation($person2);
-
-        $this->validator->validate($period, $constraint);
-
-        $this->buildViolation('messagePersonLocatedMustBeAssociated')
-             ->setParameters([
-                 '{{ person_name }}' => 'name'
-             ])
-             ->assertRaised()
-         ;
-    }
-
-    public function testPeriodDoesNotContainsPersonOnAnyPerson()
-    {
-        $constraint = $this->getConstraint();
-
-        $period = new AccompanyingPeriod();
-        $person1 = new Person();
-        $period->setPersonLocation($person1);
-
-        $this->validator->validate($period, $constraint);
-
-        $this->buildViolation('messagePersonLocatedMustBeAssociated')
-             ->setParameters([
-                 '{{ person_name }}' => 'name'
-             ])
-             ->assertRaised()
-         ;
+            ->setParameters([
+                '{{ person_name }}' => 'name',
+            ])
+            ->assertRaised();
     }
 
     public function testRemoveLocationOnPeriodValidated()
@@ -97,26 +92,38 @@ class LocationValidityValidatorTest extends ConstraintValidatorTestCase
         $this->validator->validate($period, $constraint);
 
         $this->buildViolation('messagePeriodMustRemainsLocated')
-             ->assertRaised()
-         ;
+            ->assertRaised();
+    }
+
+    public function testValidAddress()
+    {
+        $constraint = $this->getConstraint();
+
+        $period = new AccompanyingPeriod();
+        $person = new Person();
+        $period->addPerson($person);
+
+        $period->setPersonLocation($person);
+
+        $this->validator->validate($period, $constraint);
+
+        $this->assertNoViolation();
+    }
+
+    protected function createValidator()
+    {
+        $render = $this->createMock(PersonRender::class);
+        $render->method('renderString')
+            ->willReturn('name');
+
+        return new LocationValidityValidator($render);
     }
 
     protected function getConstraint()
     {
         return new LocationValidity([
             'messagePersonLocatedMustBeAssociated' => 'messagePersonLocatedMustBeAssociated',
-            'messagePeriodMustRemainsLocated' => 'messagePeriodMustRemainsLocated'
+            'messagePeriodMustRemainsLocated' => 'messagePeriodMustRemainsLocated',
         ]);
     }
-
-    protected function createValidator()
-    {
-        $render= $this->createMock(PersonRender::class);
-        $render->method('renderString')
-            ->willReturn('name')
-        ;
-
-        return new LocationValidityValidator($render); 
-    }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
index fad902e73..85f973ab0 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php
@@ -1,17 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Validator\Household;
 
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
-use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
-use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequentialValidator;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
+use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequentialValidator;
+use DateTimeImmutable;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTestCase
 {
     public function testEmptyPerson()
     {
@@ -20,7 +34,7 @@ class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTest
         $person = new Person();
 
         $this->validator->validate($person, $constraint);
-    
+
         $this->assertNoViolation();
     }
 
@@ -31,18 +45,15 @@ class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTest
         $person = new Person();
         $household = new Household();
         $position = (new Position())
-            ->setShareHousehold(true)
-            ;
+            ->setShareHousehold(true);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new \DateTimeImmutable('2010-01-01'))
-            ->setPerson($person)
-            ;
+            ->setStartDate(new DateTimeImmutable('2010-01-01'))
+            ->setPerson($person);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new \DateTimeImmutable('2011-01-01'))
-            ->setPerson($person)
-            ;
+            ->setStartDate(new DateTimeImmutable('2011-01-01'))
+            ->setPerson($person);
 
         $this->validator->validate($person, $constraint);
 
@@ -50,10 +61,9 @@ class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTest
             ->setParameters([
                 '%person_name%' => 'name',
                 '%from%' => '01-01-2011',
-                '%nbHousehold%' => 2
+                '%nbHousehold%' => 2,
             ])
-            ->assertRaised()
-            ;
+            ->assertRaised();
     }
 
     public function testMembershipCoveringNoShareHousehold()
@@ -63,38 +73,34 @@ class HouseholdMembershipSequentialValidatorTest extends ConstraintValidatorTest
         $person = new Person();
         $household = new Household();
         $position = (new Position())
-            ->setShareHousehold(false)
-            ;
+            ->setShareHousehold(false);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new \DateTimeImmutable('2010-01-01'))
-            ->setPerson($person)
-            ;
+            ->setStartDate(new DateTimeImmutable('2010-01-01'))
+            ->setPerson($person);
         $membership = (new HouseholdMember())
             ->setPosition($position)
-            ->setStartDate(new \DateTimeImmutable('2011-01-01'))
-            ->setPerson($person)
-            ;
+            ->setStartDate(new DateTimeImmutable('2011-01-01'))
+            ->setPerson($person);
 
         $this->validator->validate($person, $constraint);
 
         $this->assertNoViolation();
     }
 
-    protected function getConstraint()
-    {
-        return new HouseholdMembershipSequential([
-            'message' => 'msg'
-        ]);
-    }
-
     protected function createValidator()
     {
         $render = $this->createMock(PersonRender::class);
         $render->method('renderString')
-            ->willReturn('name')
-            ;
+            ->willReturn('name');
 
         return new HouseholdMembershipSequentialValidator($render);
-    }  
+    }
+
+    protected function getConstraint()
+    {
+        return new HouseholdMembershipSequential([
+            'message' => 'msg',
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
index 02b03eb33..3b534d713 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php
@@ -1,39 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Validator\Household;
 
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\Position;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Validator\Constraints\Household\MaxHolderValidator;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
+use Chill\PersonBundle\Validator\Constraints\Household\MaxHolderValidator;
+use DateTimeImmutable;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class MaxHolderValidatorTest extends ConstraintValidatorTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class MaxHolderValidatorTest extends ConstraintValidatorTestCase
 {
-    /**
-     * @dataProvider provideInvalidHousehold
-     */
-    public function testHouseholdInvalid(Household $household, $parameters)
-    {
-        $constraint = $this->getConstraint();
-
-        $this->validator->validate($household, $constraint);
-
-        $this->buildViolation('msg')
-            ->setParameters($parameters)
-            ->assertRaised()
-            ;
-    }
-
-    protected function getConstraint()
-    {
-        return new MaxHolder([
-            'message' => 'msg',
-            'messageInfinity' => 'msgInfinity' 
-        ]);
-    }
-
     public function provideInvalidHousehold()
     {
         $household = new Household();
@@ -43,34 +34,57 @@ class MaxHolderValidatorTest extends ConstraintValidatorTestCase
             ->addMember(
                 (new HouseholdMember())
                     ->setHolder(true)
-                    ->setStartDate(new \DateTimeImmutable('2010-01-01'))
-                    ->setEndDate(new \DateTimeImmutable('2010-12-01'))
-                )
+                    ->setStartDate(new DateTimeImmutable('2010-01-01'))
+                    ->setEndDate(new DateTimeImmutable('2010-12-01'))
+            )
             ->addMember(
                 (new HouseholdMember())
                     ->setHolder(true)
-                    ->setStartDate(new \DateTimeImmutable('2010-06-01'))
-                    ->setEndDate(new \DateTimeImmutable('2010-07-01'))
-                )
+                    ->setStartDate(new DateTimeImmutable('2010-06-01'))
+                    ->setEndDate(new DateTimeImmutable('2010-07-01'))
+            )
             ->addMember(
                 (new HouseholdMember())
                     ->setHolder(true)
-                    ->setStartDate(new \DateTimeImmutable('2010-01-01'))
-                    ->setEndDate(new \DateTimeImmutable('2010-12-01'))
-                )
-                ;
+                    ->setStartDate(new DateTimeImmutable('2010-01-01'))
+                    ->setEndDate(new DateTimeImmutable('2010-12-01'))
+            );
 
         yield [
-            $household, 
+            $household,
             [
-                '{{ start }}' => '01-06-2010', 
-                '{{ end }}' => '01-07-2010'
-            ]
+                '{{ start }}' => '01-06-2010',
+                '{{ end }}' => '01-07-2010',
+            ],
         ];
     }
 
+    /**
+     * @dataProvider provideInvalidHousehold
+     *
+     * @param mixed $parameters
+     */
+    public function testHouseholdInvalid(Household $household, $parameters)
+    {
+        $constraint = $this->getConstraint();
+
+        $this->validator->validate($household, $constraint);
+
+        $this->buildViolation('msg')
+            ->setParameters($parameters)
+            ->assertRaised();
+    }
+
     protected function createValidator()
     {
         return new MaxHolderValidator();
     }
+
+    protected function getConstraint()
+    {
+        return new MaxHolder([
+            'message' => 'msg',
+            'messageInfinity' => 'msgInfinity',
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
index 6c726dd1c..e08e05cd6 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php
@@ -1,74 +1,65 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Validator\Person;
 
-use Chill\PersonBundle\Validator\Constraints\Person\BirthdateValidator;
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Chill\PersonBundle\Validator\Constraints\Person\BirthdateValidator;
+use DateTime;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
-use Chill\PersonBundle\Entity\Person;
 
 /**
- * Test the behaviour of BirthdayValidator
+ * Test the behaviour of BirthdayValidator.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class BirthdateValidatorTest extends ConstraintValidatorTestCase
+final class BirthdateValidatorTest extends ConstraintValidatorTestCase
 {
+    public function testTomorrowInvalid()
+    {
+        $bornAfter = new DateTime('+2 days');
+        $this->validator->validate($bornAfter, $this->createConstraint());
+        $this->buildViolation('msg')
+            ->setParameter('%date%', (new DateTime('yesterday'))->format('d-m-Y'))
+            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
+            ->assertRaised();
+    }
 
     public function testValidateTodayInvalid()
     {
-        $bornToday = new \DateTime('now');
+        $bornToday = new DateTime('now');
         $this->validator->validate($bornToday, $this->createConstraint());
         $this->buildViolation('msg')
-            ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
+            ->setParameter('%date%', (new DateTime('yesterday'))->format('d-m-Y'))
             ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
             ->assertRaised();
     }
 
     public function testValidateYesterdayValid()
     {
-        $bornYesterday = new \DateTime('yesterday');
+        $bornYesterday = new DateTime('yesterday');
         $this->validator->validate($bornYesterday, $this->createConstraint());
         $this->assertNoViolation();
     }
 
-    public function testTomorrowInvalid()
-    {
-        $bornAfter = new \DateTime('+2 days');
-        $this->validator->validate($bornAfter, $this->createConstraint());
-        $this->buildViolation('msg')
-            ->setParameter('%date%', (new \DateTime('yesterday'))->format('d-m-Y'))
-            ->setCode('3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4')
-            ->assertRaised();
-    }
-
-    private function createConstraint()
-    {
-        return new Birthdate([
-            'message' => 'msg'
-        ]);
-    }
-
-
     protected function createValidator()
     {
         return new BirthdateValidator('P1D');
     }
+
+    private function createConstraint()
+    {
+        return new Birthdate([
+            'message' => 'msg',
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
index 8cd0e6b83..cf727ebec 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
@@ -1,14 +1,30 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Validator\Person;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenterValidator;
+use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
-class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\ConstraintValidatorTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase
 {
     public function testValidateRequired()
     {
@@ -25,13 +41,6 @@ class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\Con
             ->assertRaised();
     }
 
-    protected function getConstraint()
-    {
-        return new PersonHasCenter([
-            'message' => 'msg'
-        ]);
-    }
-
     protected function createValidator()
     {
         $parameterBag = $this->createMock(ParameterBagInterface::class);
@@ -40,11 +49,29 @@ class PersonHasCenterValidatorTest extends \Symfony\Component\Validator\Test\Con
             ->with($this->equalTo('chill_person'))
             ->willReturn([
                 'validation' => [
-                    'center_required' => true
-                ]
-            ])
-            ;
+                    'center_required' => true,
+                ],
+            ]);
 
-        return new PersonHasCenterValidator($parameterBag);
+        $prophecy = $this->prophesize(CenterResolverManagerInterface::class);
+
+        $prophecy->resolveCenters(Argument::type(Person::class), Argument::any())->will(static function ($args) {
+            $center = $args[0]->getCenter();
+
+            if ($center instanceof Center) {
+                return [$center];
+            }
+
+            return [];
+        });
+
+        return new PersonHasCenterValidator($parameterBag, $prophecy->reveal());
+    }
+
+    protected function getConstraint()
+    {
+        return new PersonHasCenter([
+            'message' => 'msg',
+        ]);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
index 8d6c930d9..0f5be9779 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php
@@ -1,14 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Validator\Person;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Datetime;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use function str_repeat;
 
-class PersonValidationTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonValidationTest extends KernelTestCase
 {
     private ValidatorInterface $validator;
 
@@ -18,38 +33,47 @@ class PersonValidationTest extends KernelTestCase
         $this->validator = self::$container->get(ValidatorInterface::class);
     }
 
-    public function testFirstnameValidation()
-    {
-        $person = (new Person())
-            ->setFirstname(\str_repeat('a', 500));
-        $errors = $this->validator->validate($person, null, ["creation"]);
-        foreach ($errors->getIterator() as $error) {
-            if (Length::TOO_LONG_ERROR === $error->getCode()) {
-                $this->assertTrue(true,
-                "error code for firstname too long is present");
-                return;
-            }
-        }
-        $this->assertTrue(false,
-        "error code for fistname too long is present");
-
-    }
-
     public function testBirthdateInFuture()
     {
         $person = (new Person())
-            ->setBirthdate(new \Datetime('+2 months'));
-        $errors = $this->validator->validate($person, null, ["creation"]);
+            ->setBirthdate(new Datetime('+2 months'));
+        $errors = $this->validator->validate($person, null, ['creation']);
+
         foreach ($errors->getIterator() as $error) {
             if (Birthdate::BIRTHDATE_INVALID_CODE === $error->getCode()) {
-                $this->assertTrue(true,
-                    "error code for birthdate invalid is present");
+                $this->assertTrue(
+                    true,
+                    'error code for birthdate invalid is present'
+                );
+
                 return;
             }
         }
-        $this->assertTrue(false,
-            "error code for birthdate invalid is present");
-
+        $this->assertTrue(
+            false,
+            'error code for birthdate invalid is present'
+        );
     }
 
+    public function testFirstnameValidation()
+    {
+        $person = (new Person())
+            ->setFirstname(str_repeat('a', 500));
+        $errors = $this->validator->validate($person, null, ['creation']);
+
+        foreach ($errors->getIterator() as $error) {
+            if (Length::TOO_LONG_ERROR === $error->getCode()) {
+                $this->assertTrue(
+                    true,
+                    'error code for firstname too long is present'
+                );
+
+                return;
+            }
+        }
+        $this->assertTrue(
+            false,
+            'error code for fistname too long is present'
+        );
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
index df86d79a6..ee81d3bf2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php
@@ -1,14 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Tests\Workflows;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Workflow\Registry;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-class AccompanyingPeriodLifecycle extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AccompanyingPeriodLifecycle extends KernelTestCase
 {
-
     protected function setUp()
     {
         self::bootKernel();
@@ -17,11 +30,10 @@ class AccompanyingPeriodLifecycle extends KernelTestCase
     public function testConfirm()
     {
         $registry = self::$container->get(Registry::class);
-        $period = new AccompanyingPeriod(new \DateTime('now'));
+        $period = new AccompanyingPeriod(new DateTime('now'));
         $workflow = $registry->get($period);
 
         $this->assertArrayHasKey('DRAFT', $workflow->getMarking($period)->getPlaces());
         $this->assertTrue($workflow->can($period, 'confirm'));
     }
-    
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/bootstrap.php b/src/Bundle/ChillPersonBundle/Tests/bootstrap.php
index 9211155e5..d4e1e46fa 100644
--- a/src/Bundle/ChillPersonBundle/Tests/bootstrap.php
+++ b/src/Bundle/ChillPersonBundle/Tests/bootstrap.php
@@ -1,8 +1,16 @@
 <?php
 
-if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
     throw new \LogicException('Could not find autoload.php in vendor/. Did you run "composer install --dev"?');
 }
 
 require $autoloadFile;
-
diff --git a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
index d5778280a..a391efe34 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
@@ -1,52 +1,45 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Timeline;
 
-use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Doctrine\ORM\EntityManager;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Security;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Chill\MainBundle\Timeline\TimelineSingleQuery;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Doctrine\ORM\EntityManager;
+use LogicException;
+use Symfony\Component\Security\Core\Security;
+use function implode;
+use function in_array;
 
 /**
- * Provide method to build timeline for accompanying periods
- * 
+ * Provide method to build timeline for accompanying periods.
+ *
  * This class is resued by TimelineAccompanyingPeriodOpening (for opening)
  * and TimelineAccompanyingPeriodClosing (for closing)
- *
  */
 abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInterface
 {
-    protected EntityManager $em;
+    private const SUPPORTED_CONTEXTS = ['person', 'center'];
 
-    private Security $security;
+    protected EntityManager $em;
 
     private AuthorizationHelper $authorizationHelper;
 
-    private const SUPPORTED_CONTEXTS = [ 'person', 'center' ];
-    
+    private Security $security;
+
     public function __construct(EntityManager $em, Security $security, AuthorizationHelper $authorizationHelper)
     {
         $this->em = $em;
@@ -54,53 +47,96 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
         $this->authorizationHelper = $authorizationHelper;
     }
 
-    /**
-     * 
-     * {@inheritDoc}
-     */
     public function getEntities(array $ids)
     {
         $periods = $this->em
-                ->getRepository('ChillPersonBundle:AccompanyingPeriod')
-                ->findBy(array('id' => $ids));
-        
+            ->getRepository('ChillPersonBundle:AccompanyingPeriod')
+            ->findBy(['id' => $ids]);
+
         //set results in an associative array with id as indexes
-        $results = array();
-        foreach($periods as $period) {
+        $results = [];
+
+        foreach ($periods as $period) {
             $results[$period->getId()] = $period;
         }
-        
+
         return $results;
     }
 
     /**
-     * prepare fetchQuery without `WHERE` and `TYPE` clause
-     * 
+     * prepare fetchQuery without `WHERE` and `TYPE` clause.
+     *
      * @param string $context
-     * @param array $args
+     *
+     * @throws LogicException
+     *
      * @return array
-     * @throws \LogicException
      */
     protected function basicFetchQuery($context, array $args)
     {
-        if (FALSE === \in_array($context, self::SUPPORTED_CONTEXTS)) {
-            throw new \LogicException('TimelineAccompanyingPeriod is not able '
-                    . 'to render context '.$context);
+        if (false === in_array($context, self::SUPPORTED_CONTEXTS, true)) {
+            throw new LogicException('TimelineAccompanyingPeriod is not able '
+                    . 'to render context ' . $context);
         }
-        
+
         $metadata = $this->em
-                ->getClassMetadata(AccompanyingPeriod::class)
-                ;
+            ->getClassMetadata(AccompanyingPeriod::class);
         [$where, $parameters] = $this->buildWhereClause($context, $args);
 
         return TimelineSingleQuery::fromArray([
             'id' => "{$metadata->getTableName()}.{$metadata->getColumnName('id')}",
             'FROM' => $this->buildFromClause($context),
             'WHERE' => $where,
-            'parameters' => $parameters
+            'parameters' => $parameters,
         ]);
     }
 
+    protected function buildWhereClause($context, array $args): array
+    {
+        $participation = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
+        $join = $participation->getAssociationMapping('person')['joinColumns'][0];
+        $person = $this->em->getClassMetadata(Person::class);
+        $joinCenter = $person->getAssociationMapping('center')['joinColumns'][0];
+
+        if ('center' === $context) {
+            $allowedCenters = $this->authorizationHelper->filterReachableCenters($this->security->getUser(), $args['centers'], PersonVoter::SEE);
+            $params = [];
+            $questionMarks = [];
+            $query = "{$person->getTableName()}.{$joinCenter['name']} IN (";
+
+            foreach ($allowedCenters as $c) {
+                $questionMarks[] = '?';
+                $params[] = $c->getId();
+            }
+            $query .= implode(', ', $questionMarks) . ')';
+
+            return [$query, $params];
+        }
+
+        if ('person' === $context) {
+            return ["{$participation->getTableName()}.{$join['name']} = ?", [$args['person']->getId()]];
+        }
+
+        throw new LogicException("this context is not supported: {$context}");
+    }
+
+    /**
+     * return the expected response for TimelineProviderInterface::getEntityTemplate.
+     *
+     * @param string $template the template for rendering
+     * @param mixed $entity
+     * @param string $context
+     *
+     * @return array
+     */
+    protected function getBasicEntityTemplate($template, $entity, $context, array $args)
+    {
+        return [
+            'template' => $template,
+            'template_data' => ['period' => $entity, 'context' => $context],
+        ];
+    }
+
     private function buildFromClause($context)
     {
         $period = $this->em->getClassMetadata(AccompanyingPeriod::class);
@@ -109,64 +145,19 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
         $join = $participation->getAssociationMapping('accompanyingPeriod')['joinColumns'][0];
         $joinPerson = $participation->getAssociationMapping('person')['joinColumns'][0];
 
-        if ($context === 'person') {
-            return "{$period->getTableName()} ".
-                "JOIN {$participation->getTableName()} ".
-                "ON {$participation->getTableName()}.{$join['name']} = ".
+        if ('person' === $context) {
+            return "{$period->getTableName()} " .
+                "JOIN {$participation->getTableName()} " .
+                "ON {$participation->getTableName()}.{$join['name']} = " .
                 "{$period->getTableName()}.{$join['referencedColumnName']}";
-        } else {
-            return "{$period->getTableName()} ".
-                "JOIN {$participation->getTableName()} ".
-                "ON {$participation->getTableName()}.{$join['name']} = ".
-                "{$period->getTableName()}.{$join['referencedColumnName']} ".
-                "JOIN {$person->getTableName()} ".
-                "ON {$participation->getTableName()}.{$joinPerson['name']} = ".
-                "{$person->getTableName()}.{$joinPerson['referencedColumnName']}"
-                ;
         }
 
-    }
-
-    protected function buildWhereClause($context, array $args): array
-    {
-        $participation = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
-        $join = $participation->getAssociationMapping('person')['joinColumns'][0];
-        $person = $this->em->getClassMetadata(Person::class);
-        $joinCenter = $person->getAssociationMapping('center')['joinColumns'][0];
-
-        if ($context === 'center') {
-            $allowedCenters = $this->authorizationHelper->filterReachableCenters($this->security->getUser(), $args['centers'], PersonVoter::SEE);
-            $params = [];
-            $questionMarks = [];
-            $query = "{$person->getTableName()}.{$joinCenter['name']} IN (";
-            foreach ($allowedCenters as $c) {
-                $questionMarks[] = '?';
-                $params[] = $c->getId();
-            }
-            $query .= \implode(", ", $questionMarks).")";
-
-            return [$query, $params];
-        } elseif ($context === 'person') {
-            return [ "{$participation->getTableName()}.{$join['name']} = ?", [ $args['person']->getId() ]];
-        }
-
-        throw new \LogicException("this context is not supported: $context");
-    }
-
-    /**
-     * return the expected response for TimelineProviderInterface::getEntityTemplate
-     * 
-     * @param string $template the template for rendering
-     * @param mixed $entity
-     * @param string $context
-     * @param array $args
-     * @return array
-     */
-    protected function getBasicEntityTemplate($template, $entity, $context, array $args)
-    {
-        return array(
-            'template' => $template,
-            'template_data' => ['period' => $entity, 'context' => $context]
-        );
+        return "{$period->getTableName()} " .
+                "JOIN {$participation->getTableName()} " .
+                "ON {$participation->getTableName()}.{$join['name']} = " .
+                "{$period->getTableName()}.{$join['referencedColumnName']} " .
+                "JOIN {$person->getTableName()} " .
+                "ON {$participation->getTableName()}.{$joinPerson['name']} = " .
+                "{$person->getTableName()}.{$joinPerson['referencedColumnName']}";
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
index c873b6405..8017586e7 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
@@ -1,84 +1,60 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Timeline;
 
-use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Doctrine\ORM\EntityManager;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
- * Provide information for opening periods to timeline
+ * Provide information for opening periods to timeline.
  */
 class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeriod
 {
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
-    public function supportsType($type)
-    {
-        return $type === 'accompanying_period_closing';
-    }
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
     public function fetchQuery($context, array $args)
     {
         $metadata = $this->em
-                    ->getClassMetadata(AccompanyingPeriod::class);
-        
+            ->getClassMetadata(AccompanyingPeriod::class);
+
         $query = $this->basicFetchQuery($context, $args);
         [$where, $parameters] = $this->buildWhereClause($context, $args);
         $query->setKey('accompanying_period_closing')
             ->setDate($metadata->getColumnName('closingDate'))
             ->setWhere($where)
-            ->setParameters($parameters)
-            ;
-            
+            ->setParameters($parameters);
+
         return $query;
     }
 
+    public function getEntityTemplate($entity, $context, array $args)
+    {
+        return $this->getBasicEntityTemplate(
+            'ChillPersonBundle:Timeline:closing_period.html.twig',
+            $entity,
+            $context,
+            $args
+        );
+    }
+
+    public function supportsType($type)
+    {
+        return 'accompanying_period_closing' === $type;
+    }
+
     protected function buildWhereClause($context, array $args): array
     {
-        list($query, $params) = parent::buildWhereClause($context, $args);
+        [$query, $params] = parent::buildWhereClause($context, $args);
         $period = $this->em->getClassMetadata(AccompanyingPeriod::class);
 
         $query .= " AND {$period->getColumnName('closingDate')} IS NOT NULL ";
 
-        return [ $query, $params ];
-    }
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
-    public function getEntityTemplate($entity, $context, array $args)
-    {
-        return $this->getBasicEntityTemplate(
-                'ChillPersonBundle:Timeline:closing_period.html.twig', 
-                $entity, 
-                $context, 
-                $args
-                );
+        return [$query, $params];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
index 04b3df5b8..9b15da6bc 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
@@ -1,71 +1,48 @@
 <?php
 
-/*
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Timeline;
 
-use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Doctrine\ORM\EntityManager;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
- * Provide information for opening periods to timeline
+ * Provide information for opening periods to timeline.
  */
 class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeriod
 {
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
-    public function supportsType($type)
-    {
-        return $type === 'accompanying_period_opening';
-    }
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
     public function fetchQuery($context, array $args)
     {
         $metadata = $this->em
-                    ->getClassMetadata(AccompanyingPeriod::class);
-        
+            ->getClassMetadata(AccompanyingPeriod::class);
+
         $query = $this->basicFetchQuery($context, $args);
-        
+
         $query->setKey('accompanying_period_opening')
             ->setDate($metadata->getColumnName('openingDate'));
-        
+
         return $query;
     }
 
-    /**
-     * 
-     * {@inheritDoc}
-     */
     public function getEntityTemplate($entity, $context, array $args)
     {
         return $this->getBasicEntityTemplate(
-                'ChillPersonBundle:Timeline:opening_period.html.twig', 
-                $entity, 
-                $context, 
-                $args
-                );
+            'ChillPersonBundle:Timeline:opening_period.html.twig',
+            $entity,
+            $context,
+            $args
+        );
+    }
+
+    public function supportsType($type)
+    {
+        return 'accompanying_period_opening' === $type;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php
new file mode 100644
index 000000000..c4bd30ed3
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidity.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * @Annotation
+ */
+class AccompanyingPeriodValidity extends Constraint
+{
+    public $messageSocialIssueCannotBeDeleted = 'The social %name% issue cannot be deleted because it is associated with an activity or an action';
+
+    public function getTargets()
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
new file mode 100644
index 000000000..11e001988
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use function in_array;
+
+class AccompanyingPeriodValidityValidator extends ConstraintValidator
+{
+    private ActivityRepository $activityRepository;
+
+    private SocialIssueRender $socialIssueRender;
+
+    public function __construct(ActivityRepository $activityRepository, SocialIssueRender $socialIssueRender)
+    {
+        $this->activityRepository = $activityRepository;
+        $this->socialIssueRender = $socialIssueRender;
+    }
+
+    public function validate($period, Constraint $constraint)
+    {
+        if (!$constraint instanceof AccompanyingPeriodValidity) {
+            throw new UnexpectedTypeException($constraint, AccompanyingPeriodValidity::class);
+        }
+
+        if (!$period instanceof AccompanyingPeriod) {
+            throw new UnexpectedValueException($period, AccompanyingPeriod::class);
+        }
+
+        $socialIssues = [];
+
+        $activities = $this->activityRepository->findBy(['accompanyingPeriod' => $period]);
+
+        foreach ($activities as $activity) {
+            $socialIssues = $activity->getSocialIssues()->toArray();
+        }
+
+        foreach ($period->getWorks() as $work) {
+            $socialIssues[] = $work->getSocialAction()->getIssue();
+        }
+
+        $socialIssuesByKey = [];
+
+        foreach ($socialIssues as $si) {
+            $socialIssuesByKey[$si->getId()] = $si;
+        }
+
+        $periodIssuesWithAncestors = [];
+
+        foreach ($period->getSocialIssues() as $si) {
+            /** @var SocialIssue $si */
+            $periodIssuesWithAncestors = array_merge(
+                $periodIssuesWithAncestors,
+                array_map(
+                    static function (SocialIssue $si) { return $si->getId(); },
+                    $si->getAncestors(true)
+                )
+            );
+        }
+
+        foreach ($socialIssuesByKey as $key => $si) {
+            if (!in_array($key, $periodIssuesWithAncestors, true)) {
+                $this->context
+                    ->buildViolation(
+                        $constraint->messageSocialIssueCannotBeDeleted
+                    )
+                    ->setParameter('%name%', $this->socialIssueRender->renderString($si, []))
+                    ->addViolation();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php
index 75c10ca75..58f595da9 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidity.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
 use Symfony\Component\Validator\Constraint;
@@ -9,9 +18,9 @@ use Symfony\Component\Validator\Constraint;
  */
 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 remain located';
 
-    public $messagePeriodMustRemainsLocated = "The period must remains located";
+    public $messagePersonLocatedMustBeAssociated = "The person where the course is located must be associated to the course. Change course's location before removing the person.";
 
     public function getTargets()
     {
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
index a92120f2d..8fe511694 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
@@ -1,13 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
 
 class LocationValidityValidator extends ConstraintValidator
 {
@@ -25,30 +34,29 @@ class LocationValidityValidator extends ConstraintValidator
         }
 
         if (!$period instanceof AccompanyingPeriod) {
-            throw new UnexpectedValueException($value, AccompanyingPeriod::class);
+            throw new UnexpectedValueException($period, AccompanyingPeriod::class);
         }
 
         if ($period->getLocationStatus() === 'person') {
             if (null === $period->getOpenParticipationContainsPerson(
-                $period->getPersonLocation())) {
+                $period->getPersonLocation()
+            )) {
                 $this->context->buildViolation($constraint->messagePersonLocatedMustBeAssociated)
-                              ->setParameter('{{ person_name }}', $this->render->renderString(
-                                  $period->getPersonLocation(), []
-                              ))
-                              ->addViolation()
-                          ;
+                    ->setParameter('{{ person_name }}', $this->render->renderString(
+                        $period->getPersonLocation(),
+                        []
+                    ))
+                    ->addViolation();
             }
         }
 
         if ($period->getStep() !== AccompanyingPeriod::STEP_DRAFT
             && $period->getLocationStatus() === 'none') {
             $this->context
-                 ->buildViolation(
-                     $constraint->messagePeriodMustRemainsLocated
-                 )
-                 ->addViolation()
-                 ;
+                ->buildViolation(
+                    $constraint->messagePeriodMustRemainsLocated
+                )
+                ->addViolation();
         }
-
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php
new file mode 100644
index 000000000..7ad44ff15
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlap.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * @Annotation
+ */
+class ParticipationOverlap extends Constraint
+{
+    public $message = '{{ name }} is already associated to this accompanying course.';
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
new file mode 100644
index 000000000..51014d16b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Chill\MainBundle\Util\DateRangeCovering;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use function count;
+
+class ParticipationOverlapValidator extends ConstraintValidator
+{
+    private const MAX_PARTICIPATION = 1;
+
+    private PersonRender $personRender;
+
+    private ThirdPartyRender $thirdpartyRender;
+
+    public function __construct(PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
+    {
+        $this->personRender = $personRender;
+        $this->thirdpartyRender = $thirdPartyRender;
+    }
+
+    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;
+        }
+
+        if (0 === count($participations)) {
+            return;
+        }
+
+        $participationList = [];
+
+        foreach ($participations as $participation) {
+            if (!$participation instanceof AccompanyingPeriodParticipation) {
+                throw new UnexpectedTypeException($participation, AccompanyingPeriodParticipation::class);
+            }
+
+            $personId = $participation->getPerson()->getId();
+
+            $participationList[$personId][] = $participation;
+        }
+
+        foreach ($participationList as $group) {
+            if (count($group) > 1) {
+                $overlaps = new DateRangeCovering(self::MAX_PARTICIPATION, $participations[0]->getStartDate()->getTimezone());
+
+                foreach ($group as $p) {
+                    $overlaps->add($p->getStartDate(), $p->getEndDate(), $p->getId());
+                }
+
+                $overlaps->compute();
+
+                if ($overlaps->hasIntersections()) {
+                    foreach ($overlaps->getIntersections() as [$start, $end, $ids]) {
+                        $msg = null === $end ? $constraint->message :
+                            $constraint->message;
+
+                        $this->context->buildViolation($msg)
+                            ->setParameters([
+                                '{{ start }}' => $start->format('d-m-Y'),
+                                '{{ end }}' => null === $end ? null : $end->format('d-m-Y'),
+                                '{{ ids }}' => $ids,
+                                '{{ name }}' => $this->personRender->renderString($participation->getPerson(), []),
+                            ])
+                            ->addViolation();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php
new file mode 100644
index 000000000..4619b37f9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheck.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+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.';
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
new file mode 100644
index 000000000..6c56c2f3d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use function count;
+use function in_array;
+
+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);
+        }
+
+        if (0 === count($resources)) {
+            return;
+        }
+
+        $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;
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php
index 00d9e3306..924a0c868 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequential.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Household;
 
 use Symfony\Component\Validator\Constraint;
@@ -13,6 +22,6 @@ class HouseholdMembershipSequential extends Constraint
 
     public function getTargets()
     {
-        return [ self::CLASS_CONSTRAINT ];
+        return [self::CLASS_CONSTRAINT];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
index d1566d05b..e7ee4cad4 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
@@ -1,18 +1,27 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Household;
 
-use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Util\DateRangeCovering;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use function count;
 
 /**
- * Validate that a person does not belong to two household at 
- * the same time
+ * Validate that a person does not belong to two household at
+ * the same time.
  */
 class HouseholdMembershipSequentialValidator extends ConstraintValidator
 {
@@ -45,7 +54,7 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
         $covers->compute();
 
         if ($covers->hasIntersections()) {
-            foreach ($covers->getIntersections() as list($start, $end, $metadata)) {
+            foreach ($covers->getIntersections() as [$start, $end, $metadata]) {
                 $participation = $participations[$metadata[0]];
                 $nbHousehold = count($metadata);
 
@@ -53,15 +62,14 @@ class HouseholdMembershipSequentialValidator extends ConstraintValidator
                     ->buildViolation($constraint->message)
                     ->setParameters([
                         '%person_name%' => $this->render->renderString(
-                            $participation->getPerson(), []
+                            $participation->getPerson(),
+                            []
                         ),
                         // TODO when date is correctly i18n, fix this
                         '%from%' => $start->format('d-m-Y'),
                         '%nbHousehold%' => $nbHousehold,
-
                     ])
-                    ->addViolation()
-                    ;
+                    ->addViolation();
             }
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php
index 62ddc2420..f2f6c96d3 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolder.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Household;
 
 use Symfony\Component\Validator\Constraint;
@@ -10,6 +19,7 @@ use Symfony\Component\Validator\Constraint;
 class MaxHolder extends Constraint
 {
     public $message = 'household.max_holder_overflowed';
+
     public $messageInfinity = 'household.max_holder_overflowed_infinity';
 
     public function getTargets()
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
index 41d7a5557..c4fad7e41 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
@@ -1,12 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Household;
 
 use Chill\MainBundle\Util\DateRangeCovering;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 class MaxHolderValidator extends ConstraintValidator
 {
@@ -20,8 +27,10 @@ class MaxHolderValidator extends ConstraintValidator
             return;
         }
 
-        $covers = new DateRangeCovering(self::MAX_HOLDERS,
-            $holders[0]->getStartDate()->getTimezone());
+        $covers = new DateRangeCovering(
+            self::MAX_HOLDERS,
+            $holders[0]->getStartDate()->getTimezone()
+        );
 
         foreach ($holders as $key => $member) {
             $covers->add($member->getStartDate(), $member->getEndDate(), $key);
@@ -30,18 +39,17 @@ class MaxHolderValidator extends ConstraintValidator
         $covers->compute();
 
         if ($covers->hasIntersections()) {
-            foreach ($covers->getIntersections() as list($start, $end, $ids)) {
-                $msg = $end === null ? $constraint->messageInfinity :
+            foreach ($covers->getIntersections() as [$start, $end, $ids]) {
+                $msg = null === $end ? $constraint->messageInfinity :
                     $constraint->message;
 
                 $this->context->buildViolation($msg)
                     ->setParameters([
                         '{{ start }}' => $start->format('d-m-Y'), // TODO fix when MessageParameter works with timezone
-                        '{{ end }}' => $end === null ? null : $end->format('d-m-Y')
+                        '{{ end }}' => null === $end ? null : $end->format('d-m-Y'),
                     ])
                     ->addViolation();
             }
         }
-
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
index 20f3ed97b..fc21fd329 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/Birthdate.php
@@ -1,22 +1,14 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
 use Symfony\Component\Validator\Constraint;
@@ -35,5 +27,5 @@ class Birthdate extends Constraint
 {
     public const BIRTHDATE_INVALID_CODE = '3f42fd96-0b2d-11ec-8cf3-0f3b1b1ca1c4';
 
-    public $message = "The birthdate must be before %date%";
+    public $message = 'The birthdate must be before %date%';
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
index 238a3d160..2acc87371 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
@@ -1,35 +1,28 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
+use DateInterval;
+use DateTime;
+use LogicException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use function get_class;
+use function gettype;
+use function is_object;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class BirthdateValidator extends ConstraintValidator
 {
-    private $interval_spec = null;
+    private $interval_spec;
 
     public function __construct($interval_spec = null)
     {
@@ -38,13 +31,12 @@ class BirthdateValidator extends ConstraintValidator
 
     public function validate($value, Constraint $constraint)
     {
-        if ($value === NULL) {
-
+        if (null === $value) {
             return;
         }
 
-        if (!$value instanceof \DateTime) {
-            throw new \LogicException('The input should a be a \DateTime interface,'
+        if (!$value instanceof DateTime) {
+            throw new LogicException('The input should a be a \DateTime interface,'
                     . (is_object($value) ? get_class($value) : gettype($value)));
         }
 
@@ -56,21 +48,19 @@ class BirthdateValidator extends ConstraintValidator
                 ->setCode(Birthdate::BIRTHDATE_INVALID_CODE)
                 ->addViolation();
         }
-
     }
 
     /**
-     *
-     * @return \DateTime
+     * @return DateTime
      */
     private function getLimitDate()
     {
-        if ($this->interval_spec !== NULL) {
-            $interval = new \DateInterval($this->interval_spec);
-            return (new \DateTime('now'))->sub($interval);
-        } else {
-            return (new \DateTime('now'));
-        }
-    }
+        if (null !== $this->interval_spec) {
+            $interval = new DateInterval($this->interval_spec);
 
+            return (new DateTime('now'))->sub($interval);
+        }
+
+        return new DateTime('now');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
index 5cabd8838..45c172e1f 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenter.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
 /**
@@ -7,12 +16,12 @@ namespace Chill\PersonBundle\Validator\Constraints\Person;
  */
 class PersonHasCenter extends \Symfony\Component\Validator\Constraint
 {
-    public string $message = "A center is required";
+    public string $message = 'A center is required';
 
     public function getTargets()
     {
         return [
-            self::CLASS_CONSTRAINT
+            self::CLASS_CONSTRAINT,
         ];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
index 1738e6ddc..967b5672f 100644
--- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
+++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
@@ -1,24 +1,35 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Validator\Constraints\Person;
 
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
-class PersonHasCenterValidator extends \Symfony\Component\Validator\ConstraintValidator
+class PersonHasCenterValidator extends ConstraintValidator
 {
     private bool $centerRequired;
 
-    public function __construct(ParameterBagInterface $parameterBag)
+    private CenterResolverManagerInterface $centerResolverManager;
+
+    public function __construct(ParameterBagInterface $parameterBag, CenterResolverManagerInterface $centerResolverManager)
     {
         $this->centerRequired = $parameterBag->get('chill_person')['validation']['center_required'];
+        $this->centerResolverManager = $centerResolverManager;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function validate($person, Constraint $constraint)
     {
         if (!$person instanceof Person) {
@@ -29,13 +40,12 @@ class PersonHasCenterValidator extends \Symfony\Component\Validator\ConstraintVa
             return;
         }
 
-        if (NULL === $person->getCenter()) {
+        if ([] === $this->centerResolverManager->resolveCenters($person)) {
             $this
                 ->context
                 ->buildViolation($constraint->message)
                 ->atPath('center')
-                ->addViolation()
-                ;
+                ->addViolation();
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
index f886edee9..d0e021ed9 100644
--- a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
@@ -1,29 +1,30 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
 use Twig\Environment;
 
-
 /**
- * Add a button "add a person"
- *
- * @author julien
+ * Add a button "add a person".
  */
 class AddAPersonWidget implements WidgetInterface
 {
     public function render(
-            Environment $env,
-            $place, 
-            array $context, 
-            array $config) {
-        return $env->render("ChillPersonBundle:Widget:homepage_add_a_person.html.twig");
-   }
+        Environment $env,
+        $place,
+        array $context,
+        array $config
+    ) {
+        return $env->render('ChillPersonBundle:Widget:homepage_add_a_person.html.twig');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
index 2dcbb8230..34a0bc9e8 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
@@ -1,86 +1,59 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\DBAL\Types\Type;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr;
+use RuntimeException;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\EntityManager;
-use Chill\CustomFieldsBundle\Entity\CustomField;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Twig\Environment;
+use UnexpectedValueException;
+use function array_key_exists;
+use function count;
 
 /**
- * add a widget with person list. 
- * 
+ * add a widget with person list.
+ *
  * The configuration is defined by `PersonListWidgetFactory`
- * 
- * If the options 'custom_fields' is used, the custom fields entity will be 
+ *
+ * If the options 'custom_fields' is used, the custom fields entity will be
  * queried from the db and transmitted to the view under the `customFields` variable.
  */
 class PersonListWidget implements WidgetInterface
 {
-    /**
-     * Repository for persons
-     *
-     * @var PersonRepository
-     */
-    protected $personRepository;
-    
-    /**
-     * The entity manager
-     *
-     * @var EntityManager
-     */
-    protected $entityManager;
-    
-    /**
-     * the authorization helper
-     * 
-     * @var AuthorizationHelper;
-     */
-    protected $authorizationHelper;
-    
-    /**
-     *
-     * @var TokenStorage
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
-     * @var UserInterface
-     */
-    protected $user;
-    
+    protected AuthorizationHelperInterface $authorizationHelper;
+
+    protected EntityManagerInterface $entityManager;
+
+    protected PersonRepository $personRepository;
+
+    protected TokenStorageInterface $tokenStorage;
+
+    protected UserInterface $user;
+
     public function __construct(
-            PersonRepository $personRepostory,
-            EntityManager $em,
-            AuthorizationHelper $authorizationHelper,
-            TokenStorage $tokenStorage
-            ) {
+        PersonRepository $personRepostory,
+        EntityManagerInterface $em,
+        AuthorizationHelperInterface $authorizationHelper,
+        TokenStorageInterface $tokenStorage
+    ) {
         $this->personRepository = $personRepostory;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
@@ -88,29 +61,24 @@ class PersonListWidget implements WidgetInterface
     }
 
     /**
-     * 
-     * @param type $place
-     * @param array $context
-     * @param array $config
-     * @return string
+     * @param mixed $place
      */
     public function render(Environment $env, $place, array $context, array $config)
-    { 
+    {
         $numberOfItems = $config['number_of_items'] ?? 20;
-        
+
         $qb = $this->personRepository
-                ->createQueryBuilder('person');
-        
+            ->createQueryBuilder('person');
+
         // show only the person from the authorized centers
         $and = $qb->expr()->andX();
         $centers = $this->authorizationHelper
-                ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
+            ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
-        
 
         // add the "only active" query
-        if (\array_key_exists('only_active', $config) && $config['only_active'] === true) {
+        if (array_key_exists('only_active', $config) && true === $config['only_active']) {
             $qb->join('person.accompanyingPeriods', 'ap');
             $or = new Expr\Orx();
             // add the case where closingDate IS NULL
@@ -120,85 +88,84 @@ class PersonListWidget implements WidgetInterface
             $or->add($andWhenClosingDateIsNull);
             // add the case when closingDate is in the future
             $or->add(
-                    (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
-                );
+                (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
+            );
             $and->add($or);
-            $qb->setParameter('now', new \DateTime(), Type::DATE);
+            $qb->setParameter('now', new DateTime(), Types::DATE_MUTABLE);
         }
 
-        
-        if (\array_key_exists('filtering_class', $config) && $config['filtering_class'] !== NULL) {
-            $filteringClass = new $config['filtering_class'];
-            if ( ! $filteringClass instanceof PersonListWidget\PersonFilteringInterface) {
-                throw new \UnexpectedValueException(sprintf("the class %s does not "
-                        . "implements %s", $config['filtering_class'], 
-                        PersonListWidget\PersonFilteringInterface::class));
+        if (array_key_exists('filtering_class', $config) && null !== $config['filtering_class']) {
+            $filteringClass = new $config['filtering_class']();
+
+            if (!$filteringClass instanceof PersonListWidget\PersonFilteringInterface) {
+                throw new UnexpectedValueException(sprintf(
+                    'the class %s does not '
+                        . 'implements %s',
+                    $config['filtering_class'],
+                    PersonListWidget\PersonFilteringInterface::class
+                ));
             }
-            $ids = $filteringClass->getPersonIds($this->entityManager, 
-                    $this->getUser());
+            $ids = $filteringClass->getPersonIds(
+                $this->entityManager,
+                $this->getUser()
+            );
             $in = (new Expr())->in('person.id', ':ids');
             $and->add($in);
             $qb->setParameter('ids', $ids);
         }
-        
+
         // adding the where clause to the query
         $qb->where($and);
-        
+
         // ordering the query by lastname, firstname
         $qb->addOrderBy('person.lastName', 'ASC')
-                ->addOrderBy('person.firstName', 'ASC');
-        
-        
+            ->addOrderBy('person.firstName', 'ASC');
+
         $qb->setFirstResult(0)->setMaxResults($numberOfItems);
-        
+
         $persons = $qb->getQuery()->getResult();
-        
-        // get some custom field when the view is overriden and we want to 
+
+        // get some custom field when the view is overriden and we want to
         // show some custom field in the overriden view.
-        $cfields = array();
+        $cfields = [];
+
         if (isset($config['custom_fields'])) {
             if (count($config['custom_fields']) > 0) {
                 $cfs = $this->entityManager
-                        ->getRepository('ChillCustomFieldsBundle:CustomField')
-                        ->findBy(array('slug' => $config['custom_fields']));
+                    ->getRepository('ChillCustomFieldsBundle:CustomField')
+                    ->findBy(['slug' => $config['custom_fields']]);
                 // store the custom fields in a array
-                foreach($cfs as $cf) {
+                foreach ($cfs as $cf) {
                     $cfields[$cf->getSlug()] = $cf;
                 }
             }
-        } 
+        }
 
         return $env->render(
             'ChillPersonBundle:Widget:homepage_person_list.html.twig',
-            array(
+            [
                 'persons' => $persons,
-                'customFields' => $cfields
-                
-                )
-            );
-    }
-    
-    /**
-     * 
-     * @return UserInterface
-     * @throws \RuntimeException
-     */
-    private function getUser()
-    {
-        $token = $this->tokenStorage->getToken();
-        
-        if ($token === null) {
-            throw new \RuntimeException("the token should not be null");
-        }
-        
-        $user = $token->getUser();
-        
-        if (!$user instanceof UserInterface || $user == null) {
-            throw new \RuntimeException("the user should implement UserInterface. "
-                    . "Are you logged in ?");
-        }
-        
-        return $user;
+                'customFields' => $cfields,
+            ]
+        );
     }
 
-}
\ No newline at end of file
+    private function getUser(): UserInterface
+    {
+        $token = $this->tokenStorage->getToken();
+
+        if (null === $token) {
+            throw new RuntimeException('the token should not be null');
+        }
+
+        $user = $token->getUser();
+
+        if (null === $user) {
+            throw new RuntimeException(
+                'The user should implement UserInterface. Are you logged in ?'
+            );
+        }
+
+        return $user;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php
index 555884cc1..c882f96a8 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php
@@ -1,33 +1,25 @@
 <?php
 
-
-/*
- * Copyright (C) 2016 Champs-Libres Coopérative <info@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget\PersonListWidget;
 
-use Doctrine\ORM\EntityManager;
 use Chill\MainBundle\Entity\User;
-
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Interface to implement on classes called in configuration for
- * PersonListWidget (`person_list`), under the key `filtering_class` :
- * 
+ * PersonListWidget (`person_list`), under the key `filtering_class` :.
+ *
  * ```
  * widgets:
  *      homepage:
@@ -35,51 +27,49 @@ use Chill\MainBundle\Entity\User;
  *              # where \FQDN\To\Class implements PersonFiltering
  *              class_filtering: \FQDN\To\Class
  * ```
- * 
  */
-interface PersonFilteringInterface 
+interface PersonFilteringInterface
 {
     /**
      * Return an array of persons id to show.
-     * 
-     * Those ids are inserted into the query like this (where ids is the array 
+     *
+     * Those ids are inserted into the query like this (where ids is the array
      * returned by this class) :
-     * 
+     *
      * ```
-     * SELECT p FROM ChillPersonBundle:Persons p 
+     * SELECT p FROM ChillPersonBundle:Persons p
      * WHERE p.id IN (:ids)
-     * AND 
+     * AND
      * -- security/authorization statement: restraint person to authorized centers
      * p.center in :authorized_centers
      * ```
-     * 
+     *
      * Example of use : filtering based on custom field data :
      * ```
- 
-    class HomepagePersonFiltering implements PersonFilteringInterface {
-
-    public function getPersonIds(EntityManager $em, User $user)
-    {
-        $rsmBuilder = new ResultSetMappingBuilder($em);
-        $rsmBuilder->addScalarResult('id', 'id', Type::BIGINT);
-        
-        $personTable = $em->getClassMetadata('ChillPersonBundle:Person')
-                ->getTableName();
-        $personIdColumn = $em->getClassMetadata('ChillPersonBundle:Person')
-                ->getColumnName('id');
-        $personCfDataColumn = $em->getClassMetadata('ChillPersonBundle:Person')
-                ->getColumnName('cfData');
-        
-        return $em->createNativeQuery(sprintf("SELECT %s FROM %s WHERE "
-                . "jsonb_exists(%s, 'school-2fb5440e-192c-11e6-b2fd-74d02b0c9b55')",
-                $personIdColumn, $personTable, $personCfDataColumn), $rsmBuilder)
-                ->getScalarResult();
-    }
-}
+     *
+     * class HomepagePersonFiltering implements PersonFilteringInterface {
+     *
+     * public function getPersonIds(EntityManager $em, User $user)
+     * {
+     * $rsmBuilder = new ResultSetMappingBuilder($em);
+     * $rsmBuilder->addScalarResult('id', 'id', Types::BIGINT);
+     *
+     * $personTable = $em->getClassMetadata('ChillPersonBundle:Person')
+     * ->getTableName();
+     * $personIdColumn = $em->getClassMetadata('ChillPersonBundle:Person')
+     * ->getColumnName('id');
+     * $personCfDataColumn = $em->getClassMetadata('ChillPersonBundle:Person')
+     * ->getColumnName('cfData');
+     *
+     * return $em->createNativeQuery(sprintf("SELECT %s FROM %s WHERE "
+     * . "jsonb_exists(%s, 'school-2fb5440e-192c-11e6-b2fd-74d02b0c9b55')",
+     * $personIdColumn, $personTable, $personCfDataColumn), $rsmBuilder)
+     * ->getScalarResult();
+     * }
+     * }
      * ```
-     * 
-     * @param EntityManager $em
+     *
      * @return int[] an array of persons id to show
      */
-    public function getPersonIds(EntityManager $em, User $user);
+    public function getPersonIds(EntityManagerInterface $em, UserInterface $user);
 }
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
index 7913caa86..26e4a39da 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
@@ -1,27 +1,19 @@
 <?php
 
-/*
- * Copyright (C) 2016 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * add configuration for the person_list widget.
@@ -31,36 +23,35 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
     public function configureOptions($place, NodeBuilder $node)
     {
         $node->booleanNode('only_active')
-                ->defaultTrue()
-                ->end();
+            ->defaultTrue()
+            ->end();
         $node->integerNode('number_of_items')
             ->defaultValue(50)
             ->end();
         $node->scalarNode('filtering_class')
-                ->defaultNull()
-                ->end();
+            ->defaultNull()
+            ->end();
         $node->arrayNode('custom_fields')
-                ->prototype('scalar')->end()
-                ->info("Add some custom field to the view. Add the slug of some custom field"
-                        . " if you want to override the view and show their value in the list")
-                ->example(array("custom-field-slug-1", "custom-field-slug-2"))
-                ->requiresAtLeastOneElement()
-                ->end();
+            ->prototype('scalar')->end()
+            ->info('Add some custom field to the view. Add the slug of some custom field'
+                        . ' if you want to override the view and show their value in the list')
+            ->example(['custom-field-slug-1', 'custom-field-slug-2'])
+            ->requiresAtLeastOneElement()
+            ->end();
     }
-        
+
     public function getAllowedPlaces()
     {
-        return array('homepage');
+        return ['homepage'];
     }
-    
-    public function getWidgetAlias()
-    {
-        return 'person_list';
-    }
-    
+
     public function getServiceId(ContainerBuilder $containerBuilder, $place, $order, array $config)
     {
         return 'chill_person.widget.person_list';
     }
-    
+
+    public function getWidgetAlias()
+    {
+        return 'person_list';
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index a87711de2..3c49cc264 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -274,6 +274,41 @@ components:
           enum:
             - "social_work_goal"
 
+    RelationById:
+      type: object
+      properties:
+        id:
+          type: integer
+        type:
+          type: string
+          enum:
+            - "relation"
+      required:
+        - id
+        - type
+    Relationship:
+      type: object
+      properties:
+        type:
+          type: string
+          enum:
+            - "relationship"
+        id:
+          type: integer
+          readOnly: true
+        fromPerson:
+          anyOf:
+            - $ref: "#/components/schemas/PersonById"
+        toPerson:
+          anyOf:
+            - $ref: "#/components/schemas/PersonById"
+        relation:
+          anyOf:
+            - $ref: "#/components/schemas/RelationById"
+        reverse:
+          type: boolean
+
+
 paths:
   /1.0/person/person/{id}.json:
     get:
@@ -318,6 +353,19 @@ paths:
           application/json:
             schema:
               $ref: "#/components/schemas/Person"
+            examples:
+              Update a person:
+                value:
+                  type: "person"
+                  firstName: "string"
+                  lastName: "string"
+                  birthdate:
+                    datetime: "2016-06-01T00:00:00+02:00"
+                  deathdate:
+                    datetime: "2021-06-01T00:00:00+02:00"
+                  phonenumber: "string"
+                  mobilenumber: "string"
+                  gender: "male"
       responses:
         401:
           description: "Unauthorized"
@@ -340,6 +388,19 @@ paths:
           application/json:
             schema:
               $ref: "#/components/schemas/Person"
+            examples:
+              Create a new person:
+                value:
+                  type: "person"
+                  firstName: "string"
+                  lastName: "string"
+                  birthdate:
+                    datetime: "2016-06-01T00:00:00+02:00"
+                  deathdate:
+                    datetime: "2021-06-01T00:00:00+02:00"
+                  phonenumber: "string"
+                  mobilenumber: "string"
+                  gender: "male"
       responses:
         200:
           description: "OK"
@@ -1078,6 +1139,67 @@ paths:
           description: "OK"
         400:
           description: "transition cannot be applyed"
+  
+  /1.0/person/accompanying-course/{id}/confidential.json:
+    post:
+      tags:
+        - person
+      summary: "Toggle confidentiality of accompanying course"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The accompanying period's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      requestBody:
+        description: "Confidentiality toggle"
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                type:
+                  type: string
+                  enum:
+                    - "accompanying_period"
+                confidential:
+                  type: boolean
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "object with validation errors"
+
+  /1.0/person/accompanying-course/by-person/{person_id}.json:
+    get:
+      tags:
+        - accompanying period
+      summary: get a list of accompanying periods for a person
+      description: Returns a list of the current accompanying periods for a person
+      parameters:
+        - name: person_id
+          in: path
+          required: true
+          description: The person id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
 
   /1.0/person/accompanying-period/origin.json:
     get:
@@ -1586,3 +1708,115 @@ paths:
           description: "OK"
         400:
           description: "Bad Request"
+
+  /1.0/relations/relationship/by-person/{id}.json:
+    get:
+      tags:
+        - relationships
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The person's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        400:
+          description: "Bad Request"
+
+  /1.0/relations/relationship.json:
+    post:
+      tags:
+        - relationships
+      summary: Create a new relationship
+      requestBody:
+        description: "A relationship"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Relationship"
+      responses:
+        200:
+          description: "OK"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Relationship"
+        403:
+          description: "Unauthorized"
+        422:
+          description: "Invalid data: the data is a valid json, could be deserialized, but does not pass validation"
+
+  /1.0/relations/relationship/{id}.json:
+    patch:
+      tags:
+        - relationships
+      summary: "Alter a relationship"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The relationship's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      requestBody:
+        description: "A relationship"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Relationship"
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Object with validation errors"
+    delete:
+      tags:
+        - relationships
+      summary: "Remove the relationship"
+      parameters:
+        - name: id
+          in: path
+          required: true
+          description: The relationship's id
+          schema:
+            type: integer
+            format: integer
+            minimum: 1
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "object with validation errors"
+
+
+  /1.0/relations/relation.json:
+    get:
+      tags:
+        - relations
+      summary: get a list of relations
+      responses:
+        401:
+          description: "Unauthorized"
+        200:
+          description: "OK"
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index e8194b648..7a8b79c7c 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -12,9 +12,10 @@ module.exports = function(encore, entries)
     encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
     encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
     encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
+    encore.addEntry('vue_visgraph', __dirname + '/Resources/public/vuejs/VisGraph/index.js');
 
     encore.addEntry('page_household_edit_metadata', __dirname + '/Resources/public/page/household_edit_metadata/index.js');
     encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');
     encore.addEntry('page_accompanying_course_index_person_locate', __dirname + '/Resources/public/page/accompanying_course_index/person_locate.js');
-    //encore.addEntry('page_vis', __dirname + '/Resources/public/page/vis/index.js');
+    encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
 };
diff --git a/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriodConsistency.yaml b/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriodConsistency.yaml
new file mode 100644
index 000000000..c095bccbc
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/config/services/accompanyingPeriodConsistency.yaml
@@ -0,0 +1,14 @@
+services:
+  accompanying_period_social_issue_consistency_with_action:
+    class: 'Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener'
+    tags:
+      -
+        name: 'doctrine.orm.entity_listener'
+        event: 'prePersist'
+        entity: 'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'
+        lazy: true
+      -
+        name: 'doctrine.orm.entity_listener'
+        event: 'preUpdate'
+        entity: 'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'
+        lazy: true
diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
index 098313286..fb31e8ee9 100644
--- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml
@@ -8,7 +8,6 @@ services:
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
             $timelineBuilder: '@chill_main.timeline_builder'
             $paginatorFactory: '@chill_main.paginator_factory'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingPeriodController:
@@ -33,11 +32,8 @@ services:
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingCourseController:
-        arguments:
-            $serializer: '@Symfony\Component\Serializer\SerializerInterface'
-            $dispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
-            $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
-            $workRepository: '@Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository'
+        autoconfigure: true
+        autowire: true
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingCourseApiController:
@@ -65,3 +61,7 @@ services:
     Chill\PersonBundle\Controller\HouseholdApiController:
         autowire: true
         tags: ['controller.service_arguments']
+
+    Chill\PersonBundle\Controller\RelationshipApiController:
+        autowire: true
+        tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
index 72bf899f4..753521ad7 100644
--- a/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/fixtures.yaml
@@ -1,6 +1,7 @@
 services:
     Chill\PersonBundle\DataFixtures\ORM\:
         autowire: true
+        autoconfigure: true
         resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]
 
diff --git a/src/Bundle/ChillPersonBundle/config/services/form.yaml b/src/Bundle/ChillPersonBundle/config/services/form.yaml
index dacfa41de..2390005cf 100644
--- a/src/Bundle/ChillPersonBundle/config/services/form.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/form.yaml
@@ -7,8 +7,9 @@ services:
 
     Chill\PersonBundle\Form\PersonType:
         arguments:
-            - '%chill_person.person_fields%'
-            - '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
+            $personFieldsConfiguration: '%chill_person.person_fields%'
+            $configAltNamesHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
+            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
         tags:
             - { name: form.type, alias: '@chill.person.form.person_creation' }
 
diff --git a/src/Bundle/ChillPersonBundle/config/services/search.yaml b/src/Bundle/ChillPersonBundle/config/services/search.yaml
index 6a7cd4496..5428c8105 100644
--- a/src/Bundle/ChillPersonBundle/config/services/search.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/search.yaml
@@ -4,11 +4,6 @@ services:
         tags:
             - { name: chill.search, alias: 'person_regular' }
 
-    Chill\PersonBundle\Search\SimilarityPersonSearch:
-        autowire: true
-        tags:
-            - { name: chill.search, alias: 'person_similarity' }
-
     Chill\PersonBundle\Search\SimilarPersonMatcher:
         autowire: true
         autoconfigure: true
diff --git a/src/Bundle/ChillPersonBundle/config/services/search_by_phone.yaml b/src/Bundle/ChillPersonBundle/config/services/search_by_phone.yaml
deleted file mode 100644
index 4a20e898a..000000000
--- a/src/Bundle/ChillPersonBundle/config/services/search_by_phone.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-services:
-    Chill\PersonBundle\Search\PersonSearchByPhone:
-        arguments:
-            - '@Chill\PersonBundle\Repository\PersonRepository'
-            - '@security.token_storage'
-            - '@chill.main.security.authorization.helper'
-            - '@chill_main.paginator_factory'
-            - '@Symfony\Component\Templating\EngineInterface'
-            - '%chill_person.search.search_by_phone%'
-        tags:
-            - { name: chill.search, alias: 'person_by_phone' }
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/config/services/serializer.yaml b/src/Bundle/ChillPersonBundle/config/services/serializer.yaml
index f64b3121b..5a1e54400 100644
--- a/src/Bundle/ChillPersonBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/serializer.yaml
@@ -4,6 +4,7 @@ services:
 
     Chill\PersonBundle\Serializer\Normalizer\:
         autowire: true
+        autoconfigure: true
         resource: '../../Serializer/Normalizer'
         tags:
             - { name: 'serializer.normalizer', priority: 64 }
diff --git a/src/Bundle/ChillPersonBundle/config/services/validator.yaml b/src/Bundle/ChillPersonBundle/config/services/validator.yaml
new file mode 100644
index 000000000..435f2f5b5
--- /dev/null
+++ b/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']
+    
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php b/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php
index bb0ae1850..b64cb1c5e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20141129010948.php
@@ -1,44 +1,51 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20141129010948 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("CREATE SEQUENCE ClosingMotive_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE person_history_file_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE SEQUENCE Person_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE TABLE ClosingMotive (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE TABLE person_history_file (id INT NOT NULL, person_id INT DEFAULT NULL, date_opening DATE NOT NULL, date_closing DATE DEFAULT NULL, memo TEXT NOT NULL, closingMotive_id INT DEFAULT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_64A4A621217BBB47 ON person_history_file (person_id);");
-        $this->addSql("CREATE INDEX IDX_64A4A621504CB38D ON person_history_file (closingMotive_id);");
-        $this->addSql("CREATE TABLE Person (id INT NOT NULL, nationality_id INT DEFAULT NULL, firstName VARCHAR(255) NOT NULL, lastName VARCHAR(255) NOT NULL, date_of_birth DATE DEFAULT NULL, place_of_birth VARCHAR(255) NOT NULL, genre VARCHAR(9) NOT NULL, memo TEXT NOT NULL, email TEXT NOT NULL, proxyHistoryOpenState BOOLEAN NOT NULL, cFData TEXT NOT NULL, phonenumber TEXT DEFAULT NULL, countryOfBirth_id INT DEFAULT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_3370D4403818DA5 ON Person (countryOfBirth_id);");
-        $this->addSql("CREATE INDEX IDX_3370D4401C9DA55 ON Person (nationality_id);");
-        $this->addSql("CREATE INDEX person_names ON Person (firstName, lastName);");
-        $this->addSql("COMMENT ON COLUMN Person.cFData IS '(DC2Type:array)';");
-        $this->addSql("CREATE TABLE persons_spoken_languages (person_id INT NOT NULL, language_id VARCHAR(255) NOT NULL, PRIMARY KEY(person_id, language_id));");
-        $this->addSql("CREATE INDEX IDX_7201106F217BBB47 ON persons_spoken_languages (person_id);");
-        $this->addSql("CREATE INDEX IDX_7201106F82F1BAF4 ON persons_spoken_languages (language_id);");
-        $this->addSql("ALTER TABLE person_history_file ADD CONSTRAINT FK_64A4A621217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE person_history_file ADD CONSTRAINT FK_64A4A621504CB38D FOREIGN KEY (closingMotive_id) REFERENCES ClosingMotive (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE Person ADD CONSTRAINT FK_3370D4403818DA5 FOREIGN KEY (countryOfBirth_id) REFERENCES Country (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE Person ADD CONSTRAINT FK_3370D4401C9DA55 FOREIGN KEY (nationality_id) REFERENCES Country (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F82F1BAF4 FOREIGN KEY (language_id) REFERENCES Language (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;");
-
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
+    }
 
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE ClosingMotive_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE person_history_file_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE SEQUENCE Person_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE TABLE ClosingMotive (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE TABLE person_history_file (id INT NOT NULL, person_id INT DEFAULT NULL, date_opening DATE NOT NULL, date_closing DATE DEFAULT NULL, memo TEXT NOT NULL, closingMotive_id INT DEFAULT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_64A4A621217BBB47 ON person_history_file (person_id);');
+        $this->addSql('CREATE INDEX IDX_64A4A621504CB38D ON person_history_file (closingMotive_id);');
+        $this->addSql('CREATE TABLE Person (id INT NOT NULL, nationality_id INT DEFAULT NULL, firstName VARCHAR(255) NOT NULL, lastName VARCHAR(255) NOT NULL, date_of_birth DATE DEFAULT NULL, place_of_birth VARCHAR(255) NOT NULL, genre VARCHAR(9) NOT NULL, memo TEXT NOT NULL, email TEXT NOT NULL, proxyHistoryOpenState BOOLEAN NOT NULL, cFData TEXT NOT NULL, phonenumber TEXT DEFAULT NULL, countryOfBirth_id INT DEFAULT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_3370D4403818DA5 ON Person (countryOfBirth_id);');
+        $this->addSql('CREATE INDEX IDX_3370D4401C9DA55 ON Person (nationality_id);');
+        $this->addSql('CREATE INDEX person_names ON Person (firstName, lastName);');
+        $this->addSql("COMMENT ON COLUMN Person.cFData IS '(DC2Type:array)';");
+        $this->addSql('CREATE TABLE persons_spoken_languages (person_id INT NOT NULL, language_id VARCHAR(255) NOT NULL, PRIMARY KEY(person_id, language_id));');
+        $this->addSql('CREATE INDEX IDX_7201106F217BBB47 ON persons_spoken_languages (person_id);');
+        $this->addSql('CREATE INDEX IDX_7201106F82F1BAF4 ON persons_spoken_languages (language_id);');
+        $this->addSql('ALTER TABLE person_history_file ADD CONSTRAINT FK_64A4A621217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE person_history_file ADD CONSTRAINT FK_64A4A621504CB38D FOREIGN KEY (closingMotive_id) REFERENCES ClosingMotive (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE Person ADD CONSTRAINT FK_3370D4403818DA5 FOREIGN KEY (countryOfBirth_id) REFERENCES Country (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE Person ADD CONSTRAINT FK_3370D4401C9DA55 FOREIGN KEY (nationality_id) REFERENCES Country (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F82F1BAF4 FOREIGN KEY (language_id) REFERENCES Language (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE;');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php b/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php
index 94c3f038c..668e2c074 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150212173934.php
@@ -1,30 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20150212173934 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE accompanying_period RENAME TO person_history_file;');
+        $this->addSql('ALTER TABLE person RENAME proxyAccompanyingPeriodOpenState TO proxyHistoryOpenState;');
+        $this->addSql('ALTER SEQUENCE accompanying_period_id_seq RENAME TO person_history_file_id_seq;');
+    }
+
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
 
-        $this->addSql("ALTER TABLE person RENAME proxyHistoryOpenState TO proxyAccompanyingPeriodOpenState;");
-        $this->addSql("ALTER TABLE person_history_file RENAME TO accompanying_period;");
-        $this->addSql("ALTER SEQUENCE person_history_file_id_seq RENAME TO accompanying_period_id_seq;");
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-    	$this->addSql("ALTER TABLE accompanying_period RENAME TO person_history_file;");
-        $this->addSql("ALTER TABLE person RENAME proxyAccompanyingPeriodOpenState TO proxyHistoryOpenState;");
-        $this->addSql("ALTER SEQUENCE accompanying_period_id_seq RENAME TO person_history_file_id_seq;");
+        $this->addSql('ALTER TABLE person RENAME proxyHistoryOpenState TO proxyAccompanyingPeriodOpenState;');
+        $this->addSql('ALTER TABLE person_history_file RENAME TO accompanying_period;');
+        $this->addSql('ALTER SEQUENCE person_history_file_id_seq RENAME TO accompanying_period_id_seq;');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
index 71a603a2f..000f74899 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php
@@ -1,73 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
 use Chill\MainBundle\Entity\Center;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a center to class person
+ * Add a center to class person.
  */
 class Version20150607231010 extends AbstractMigration
 {
-    public function getDescription(): string
-    {
-        return 'Add a center on the person entity. The default center is the first '
-        . 'recorded.';
-    }
-
-
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.'
-        );
-
-        // retrieve center for setting a default center
-        $centers = $this->connection->fetchAll('SELECT id FROM centers');
-
-        if (count($centers) > 0) {
-            $defaultCenterId = $centers[0]['id'];
-        } else { // if no center, performs other checks
-            //check if there are data in person table
-            $nbPeople = $this->connection->fetchColumn('SELECT count(*) FROM person');
-
-            if ($nbPeople > 0) {
-                // we have data ! We have to create a center !
-                $newCenterId = $this->connection->fetchColumn('SELECT nextval(\'centers_id_seq\');');
-                $this->addSql(
-                    'INSERT INTO centers (id, name) VALUES (:id, :name)',
-                    ['id' => $newCenterId, 'name' => 'Auto-created center']
-                );
-                $defaultCenterId = $newCenterId;
-            }
-        }
-
-        $this->addSql('ALTER TABLE person ADD center_id INT');
-
-        if (isset($defaultCenterId)) {
-            $this->addSql('UPDATE person SET center_id = :id', array('id' => $defaultCenterId));
-        }
-
-        $this->addSql('ALTER TABLE person '
-                . 'ADD CONSTRAINT FK_person_center FOREIGN KEY (center_id) '
-                . 'REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE person ALTER center_id SET NOT NULL');
-        $this->addSql('CREATE INDEX IDX_person_center ON person (center_id)');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
@@ -75,4 +31,40 @@ class Version20150607231010 extends AbstractMigration
         $this->addSql('DROP INDEX IDX_person_center');
         $this->addSql('ALTER TABLE Person DROP center_id');
     }
+
+    public function getDescription(): string
+    {
+        return 'Add a center on the person entity. The default center is the first '
+        . 'recorded.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
+
+        $this->addSql('ALTER TABLE person ADD center_id INT');
+
+        // retrieve center for setting a default center
+        $stmt = $this->connection->executeQuery('SELECT id FROM centers ORDER BY id ASC LIMIT 1');
+        $center = $stmt->fetchOne();
+
+        if (false !== $center) {
+            $defaultCenterId = $center['id'];
+        }
+
+        if (isset($defaultCenterId)) {
+            $this->addSql('UPDATE person SET center_id = :id', ['id' => $defaultCenterId]);
+        }
+
+        // this will fail if a person is defined, which should not happen any more at this
+        // time of writing (2021-11-09)
+        $this->addSql('ALTER TABLE person ALTER center_id SET NOT NULL');
+        $this->addSql('ALTER TABLE person '
+                . 'ADD CONSTRAINT FK_person_center FOREIGN KEY (center_id) '
+                . 'REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_person_center ON person (center_id)');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
index c14ede4a5..fd846e7fb 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150811152608.php
@@ -1,66 +1,46 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Migration for adapting the Person Bundle to the 'cahier de charge' :
  * - RENAMING :
  * - - date_of_birth TO birthdate
- * - - genre to gender
- * 
+ * - - genre to gender.
  */
 class Version20150811152608 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.');
-        
-        $this->addSql('ALTER TABLE person RENAME COLUMN date_of_birth TO birthdate');
-        $this->addSql('ALTER TABLE person RENAME COLUMN genre TO gender');
-
-
-
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.');
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
 
         $this->addSql('ALTER TABLE person RENAME COLUMN birthdate TO date_of_birth');
         $this->addSql('ALTER TABLE person RENAME COLUMN gender TO genre');
+    }
 
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
+
+        $this->addSql('ALTER TABLE person RENAME COLUMN date_of_birth TO birthdate');
+        $this->addSql('ALTER TABLE person RENAME COLUMN genre TO gender');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
index efe46d436..6d80d97a6 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150812110708.php
@@ -1,43 +1,42 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Migration for adding maritalstatus to person
+ * Migration for adding maritalstatus to person.
  */
 class Version20150812110708 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
+
+        $this->addSql('ALTER TABLE person DROP CONSTRAINT fk_person_marital_status;');
+        $this->addSql('ALTER TABLE person DROP COLUMN maritalstatus_id;');
+        $this->addSql('DROP TABLE marital_status;');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.');
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
 
         $this->addSql('CREATE TABLE marital_status (
             id character varying(10) NOT NULL,
@@ -46,18 +45,4 @@ class Version20150812110708 extends AbstractMigration
         $this->addSql('ALTER TABLE person ADD COLUMN maritalstatus_id character varying(10)');
         $this->addSql('ALTER TABLE person ADD CONSTRAINT fk_person_marital_status FOREIGN KEY (maritalstatus_id) REFERENCES marital_status (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION');
     }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE person DROP CONSTRAINT fk_person_marital_status;');
-        $this->addSql('ALTER TABLE person DROP COLUMN maritalstatus_id;');
-        $this->addSql('DROP TABLE marital_status;');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
index 4e99cf185..41855c45c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20150820113409.php
@@ -1,61 +1,46 @@
 <?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/>.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Migration for adapting the Person Bundle to the 'cahier de charge' :
- *  - update of accompanyingPerid
+ *  - update of accompanyingPerid.
  */
 class Version20150820113409 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN date_opening TO openingdate;');
-        $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN date_closing TO closingdate;');
-        $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN memo TO remark;');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         $this->abortIf(
-            $this->connection->getDatabasePlatform()->getName() != 'postgresql',
-            'Migration can only be executed safely on \'postgresql\'.');
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
 
         $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN openingdate TO date_opening;');
         $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN closingdate TO date_closing;');
         $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN remark TO memo;');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
+
+        $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN date_opening TO openingdate;');
+        $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN date_closing TO closingdate;');
+        $this->addSql('ALTER TABLE accompanying_period RENAME COLUMN memo TO remark;');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
index 847802f94..68021abde 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160310161006.php
@@ -1,22 +1,35 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a many-to-many relationship between person and addresses
+ * Add a many-to-many relationship between person and addresses.
  */
 class Version20160310161006 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP TABLE chill_person_persons_to_addresses');
+    }
+
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('CREATE TABLE chill_person_persons_to_addresses ('
               . 'person_id INT NOT NULL, '
@@ -35,15 +48,4 @@ class Version20160310161006 extends AbstractMigration
               . 'FOREIGN KEY (address_id) '
               . 'REFERENCES chill_main_address (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP TABLE chill_person_persons_to_addresses');
-       
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
index 3bfba03d9..12d870c7f 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160422000000.php
@@ -1,18 +1,29 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use function count;
 
 /**
- * Check if each person do not have multiple addresses with the same valideFrom
+ * Check if each person do not have multiple addresses with the same valideFrom.
  */
 class Version20160422000000 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+    }
+
     public function up(Schema $schema): void
     {
         $stmt = $this->connection->query('SELECT COUNT(*), pe.id, ad.validfrom FROM person AS pe
@@ -20,23 +31,16 @@ class Version20160422000000 extends AbstractMigration
 	        INNER JOIN chill_main_address AS ad ON ad.id = pe_ad.address_id
 	        GROUP BY pe.id, ad.validfrom
 	        HAVING COUNT(*) > 1');
-            
+
         $personWithTwoAddressWithSameValidFrom = $stmt->fetchAll();
-        
+
         foreach ($personWithTwoAddressWithSameValidFrom as $p) {
-            $this->warnIf(true, 'The person with id '.$p['id'].' has two adresses with the same validFrom date');
+            $this->warnIf(true, 'The person with id ' . $p['id'] . ' has two adresses with the same validFrom date');
         }
-        
+
         $this->abortIf(
-            sizeof($personWithTwoAddressWithSameValidFrom) != 0,
+            count($personWithTwoAddressWithSameValidFrom) !== 0,
             'There exists some person with multiple adress with the same validFrom'
         );
     }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php b/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
index b8ca9d8db..cad37ac43 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160818113633.php
@@ -1,21 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * This migration store the cfdata using the postgresql jsonb type instead
- * of the result of the sterialization
+ * of the result of the sterialization.
  */
 class Version20160818113633 extends AbstractMigration
 {
+    /**
+     * Inverse of up.
+     */
+    public function down(Schema $schema): void
+    {
+        $this->addSQL('ALTER TABLE person DROP COLUMN cfdata');
+        $this->addSQL('ALTER TABLE person RENAME COLUMN cfdata_old TO cfdata');
+        $this->addSql('ALTER TABLE person ALTER COLUMN cfdata SET NOT NULL');
+    }
+
     /**
      * Make a copy of the column cfdata into the column cfdata_old. Then
      * remplace the sterialized data into a json data.
-     *
-     * @param Schema $schema
      */
     public function up(Schema $schema): void
     {
@@ -35,16 +52,4 @@ class Version20160818113633 extends AbstractMigration
             );
         }
     }
-
-    /**
-     * Inverse of up
-     *
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->addSQL('ALTER TABLE person DROP COLUMN cfdata');
-        $this->addSQL('ALTER TABLE person RENAME COLUMN cfdata_old TO cfdata');
-        $this->addSql('ALTER TABLE person ALTER COLUMN cfdata SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php b/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php
index ea58ce5c3..43d2281f7 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20160818151130.php
@@ -1,35 +1,24 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add the prefix 'chill_person' to all the (db) table name of this bundle
+ * Add the prefix 'chill_person' to all the (db) table name of this bundle.
  */
 class Version20160818151130 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE person RENAME TO chill_person_person');
-        $this->addSql('ALTER TABLE person_id_seq RENAME TO chill_person_person_id_seq');
-
-        $this->addSql('ALTER TABLE marital_status RENAME TO chill_person_marital_status');
-
-        $this->addSql('ALTER TABLE accompanying_period RENAME TO chill_person_accompanying_period');
-        $this->addSql('ALTER TABLE accompanying_period_id_seq RENAME TO chill_person_accompanying_period_id_seq');
-
-        $this->addSql('ALTER TABLE closingmotive RENAME TO chill_person_closingmotive');
-        $this->addSql('ALTER TABLE closingmotive_id_seq RENAME TO chill_person_closingmotive_id_seq');
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         $this->addSQL('ALTER TABLE chill_person_person RENAME TO person');
@@ -43,4 +32,18 @@ class Version20160818151130 extends AbstractMigration
         $this->addSQL('ALTER TABLE chill_person_closingmotive RENAME TO closingmotive');
         $this->addSql('ALTER TABLE chill_person_closingmotive_id_seq RENAME TO closingmotive_id_seq');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE person RENAME TO chill_person_person');
+        $this->addSql('ALTER TABLE person_id_seq RENAME TO chill_person_person_id_seq');
+
+        $this->addSql('ALTER TABLE marital_status RENAME TO chill_person_marital_status');
+
+        $this->addSql('ALTER TABLE accompanying_period RENAME TO chill_person_accompanying_period');
+        $this->addSql('ALTER TABLE accompanying_period_id_seq RENAME TO chill_person_accompanying_period_id_seq');
+
+        $this->addSql('ALTER TABLE closingmotive RENAME TO chill_person_closingmotive');
+        $this->addSql('ALTER TABLE closingmotive_id_seq RENAME TO chill_person_closingmotive_id_seq');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php b/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php
index 0b9988760..aa2c36fe3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20170117131924.php
@@ -1,123 +1,127 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Add postgresql functions to compute last address on person.
  */
 class Version20170117131924 extends AbstractMigration
 {
-    
-    public $fields = array(
-            'address_id' => 'integer', 
-            'streetaddress1' => 'varchar(255)', 
-            'streetaddress2' => 'varchar(255)',
-            'validfrom' => 'date', 
-            'postcode_label' => 'varchar(255)', 
-            'postcode_code' => 'varchar(100)', 
-            'postcode_id' => 'integer', 
-            'country_name' => 'json', 
-            'country_code' => 'varchar(3)', 
-            'country_id' => 'integer'
-        );
-    
-    /**
-     * @param Schema $schema
-     */
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-CREATE OR REPLACE FUNCTION public.get_last_address (
-        pid integer,
-        before_date date)
-RETURNS TABLE(
-        person_id integer,
-	address_id integer, 
-	streetaddress1 varchar(255), 
-	streetaddress2 varchar(255),
-	validfrom date, 
-	postcode_label varchar(255), 
-	postcode_code varchar(100), 
-	postcode_id integer, 
-	country_name json, 
-	country_code varchar(3), 
-	country_id integer)
-        AS
-$BODY$
-SELECT 
-    pid AS person_id,
-	chill_main_address.id AS address_id,
-	chill_main_address.streetaddress1,
-	chill_main_address.streetaddress2,
-	chill_main_address.validfrom,
-	chill_main_postal_code.label,
-	chill_main_postal_code.code,
-    chill_main_postal_code.id AS postal_code_id,
-	country.name,
-	country.countrycode,
-	country.id AS country_id
-FROM chill_main_address
-JOIN (
-	SELECT 
-	chill_main_address.id AS address_id,
-	validfrom,
-	rank() OVER (PARTITION BY person_id ORDER BY validfrom DESC) as pos
-	FROM chill_person_persons_to_addresses 
-	JOIN chill_main_address ON chill_person_persons_to_addresses.address_id = chill_main_address.id
-	WHERE person_id = pid
-	AND chill_main_address.validfrom <= before_date
-) AS ranking ON ranking.address_id = chill_main_address.id
-JOIN chill_main_postal_code ON chill_main_address.postcode_id = chill_main_postal_code.id
-JOIN country ON chill_main_postal_code.country_id = country.id
-WHERE ranking.pos = 1
-$BODY$
-LANGUAGE sql VOLATILE
-COST 100;
-SQL
-        );
-        
-        // create function to get part of address
-        foreach ($this->fields as $var => $type) {
-            $this->addSql(sprintf(<<<'SQL'
-CREATE OR REPLACE FUNCTION get_last_address_%s (
-	pid integer,
-	before_date date)
-RETURNS %s AS
-$BODY$
-SELECT %s FROM get_last_address(pid, before_date)
-$BODY$
-LANGUAGE sql volatile
-COST 100;
-SQL
-                , $var, $type, $var));
-        }
-    }
+    public $fields = [
+        'address_id' => 'integer',
+        'streetaddress1' => 'varchar(255)',
+        'streetaddress2' => 'varchar(255)',
+        'validfrom' => 'date',
+        'postcode_label' => 'varchar(255)',
+        'postcode_code' => 'varchar(100)',
+        'postcode_id' => 'integer',
+        'country_name' => 'json',
+        'country_code' => 'varchar(3)',
+        'country_id' => 'integer',
+    ];
 
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema): void
     {
         // drop function to get parts of address
         foreach ($this->fields as $var => $type) {
-            $this->addSql(<<<SQL
+            $this->addSql(
+                <<<SQL
 
-DROP FUNCTION get_last_address_$var (
-	pid integer,
-	before_date date)
-SQL
-                );
-        }
-        
-        $this->addSQL(<<<SQL
-DROP FUNCTION public.get_last_address (
-        pid integer,
-        before_date date)
-SQL
+                    DROP FUNCTION get_last_address_{$var} (
+                    	pid integer,
+                    	before_date date)
+                    SQL
             );
+        }
 
+        $this->addSQL(
+            <<<'SQL'
+                DROP FUNCTION public.get_last_address (
+                        pid integer,
+                        before_date date)
+                SQL
+        );
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(
+            <<<'SQL'
+                CREATE OR REPLACE FUNCTION public.get_last_address (
+                        pid integer,
+                        before_date date)
+                RETURNS TABLE(
+                        person_id integer,
+                	address_id integer,
+                	streetaddress1 varchar(255),
+                	streetaddress2 varchar(255),
+                	validfrom date,
+                	postcode_label varchar(255),
+                	postcode_code varchar(100),
+                	postcode_id integer,
+                	country_name json,
+                	country_code varchar(3),
+                	country_id integer)
+                        AS
+                $BODY$
+                SELECT
+                    pid AS person_id,
+                	chill_main_address.id AS address_id,
+                	chill_main_address.streetaddress1,
+                	chill_main_address.streetaddress2,
+                	chill_main_address.validfrom,
+                	chill_main_postal_code.label,
+                	chill_main_postal_code.code,
+                    chill_main_postal_code.id AS postal_code_id,
+                	country.name,
+                	country.countrycode,
+                	country.id AS country_id
+                FROM chill_main_address
+                JOIN (
+                	SELECT
+                	chill_main_address.id AS address_id,
+                	validfrom,
+                	rank() OVER (PARTITION BY person_id ORDER BY validfrom DESC) as pos
+                	FROM chill_person_persons_to_addresses
+                	JOIN chill_main_address ON chill_person_persons_to_addresses.address_id = chill_main_address.id
+                	WHERE person_id = pid
+                	AND chill_main_address.validfrom <= before_date
+                ) AS ranking ON ranking.address_id = chill_main_address.id
+                JOIN chill_main_postal_code ON chill_main_address.postcode_id = chill_main_postal_code.id
+                JOIN country ON chill_main_postal_code.country_id = country.id
+                WHERE ranking.pos = 1
+                $BODY$
+                LANGUAGE sql VOLATILE
+                COST 100;
+                SQL
+        );
+
+        // create function to get part of address
+        foreach ($this->fields as $var => $type) {
+            $this->addSql(sprintf(<<<'SQL'
+                CREATE OR REPLACE FUNCTION get_last_address_%s (
+                	pid integer,
+                	before_date date)
+                RETURNS %s AS
+                $BODY$
+                SELECT %s FROM get_last_address(pid, before_date)
+                $BODY$
+                LANGUAGE sql volatile
+                COST 100;
+                SQL
+                , $var, $type, $var));
+        }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
index 99309e6a5..18d86b90c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180518144221.php
@@ -1,24 +1,24 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Add a contactInfo and a mobilenumber columns on person. Change the email column.
  */
 final class Version20180518144221 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_person_person ADD contactInfo TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_person ADD mobilenumber TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_person ALTER email DROP NOT NULL');
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -27,4 +27,13 @@ final class Version20180518144221 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_person DROP mobilenumber');
         $this->addSql('ALTER TABLE chill_person_person ALTER email SET NOT NULL');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_person_person ADD contactInfo TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ADD mobilenumber TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER email DROP NOT NULL');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
index aee4226f1..84a251fd4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20180820120000.php
@@ -1,26 +1,26 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Correction: copie les infos de email vers contactInfo.
- * 
+ *
  * Previously, data from contact where stored in 'email' column
  */
 final class Version20180820120000 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('UPDATE chill_person_person SET contactInfo=email');
-        $this->addSql('UPDATE chill_person_person SET email=\'\'');
-
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -28,4 +28,12 @@ final class Version20180820120000 extends AbstractMigration
         $this->addSql('UPDATE chill_person_person SET email=contactInfo');
         $this->addSql('UPDATE chill_person_person SET contactInfo=\'\'');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('UPDATE chill_person_person SET contactInfo=email');
+        $this->addSql('UPDATE chill_person_person SET email=\'\'');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
index 21a155fb5..2c570b9a0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181005140249.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,21 +15,21 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Set person gender not null
+ * Set person gender not null.
  */
 final class Version20181005140249 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_person_person ALTER gender DROP NOT NULL');
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_person ALTER gender SET NOT NULL');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_person_person ALTER gender DROP NOT NULL');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
index 287c7bd7e..51a3492de 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20181023101621.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,65 +15,10 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add fullnameCanonical column for trigram matching (fast searching)
+ * Add fullnameCanonical column for trigram matching (fast searching).
  */
 final class Version20181023101621 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql("ALTER TABLE chill_person_person ADD fullnameCanonical VARCHAR(255) DEFAULT '' ");
-        $this->addSql("UPDATE chill_person_person SET fullnameCanonical=LOWER(UNACCENT(CONCAT(firstname, ' ', lastname)))");
-        $this->addSql("CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIN (fullnameCanonical gin_trgm_ops)");
-        
-        $this->addSql(<<<'SQL'
-            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
-            $BODY$
-            BEGIN
-                IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
-                THEN
-                   UPDATE chill_person_person
-                   SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
-                   WHERE id=NEW.id;
-                END IF;
-                RETURN NEW;
-            END;
-            $BODY$ LANGUAGE PLPGSQL;
-SQL
-        );
-        $this->addSql(<<<SQL
-            CREATE TRIGGER canonicalize_fullname_on_update
-            AFTER UPDATE
-            ON chill_person_person
-            FOR EACH ROW
-            WHEN (pg_trigger_depth() = 0)
-            EXECUTE PROCEDURE canonicalize_fullname_on_update();
-SQL
-        );
-    
-        $this->addSql(<<<'SQL'
-            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_insert() RETURNS TRIGGER AS
-            $BODY$
-            BEGIN
-                UPDATE chill_person_person
-                SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
-                WHERE id=NEW.id;
-                RETURN NEW;
-            END;
-            $BODY$ LANGUAGE PLPGSQL;
-SQL
-        );
-        $this->addSql(<<<SQL
-            CREATE TRIGGER canonicalize_fullname_on_insert
-            AFTER INSERT
-            ON chill_person_person
-            FOR EACH ROW
-            EXECUTE PROCEDURE canonicalize_fullname_on_insert();
-SQL
-        );
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -76,4 +30,63 @@ SQL
         $this->addSql('DROP TRIGGER canonicalize_fullname_on_insert ON chill_person_person');
         $this->addSql('DROP FUNCTION canonicalize_fullname_on_insert()');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql("ALTER TABLE chill_person_person ADD fullnameCanonical VARCHAR(255) DEFAULT '' ");
+        $this->addSql("UPDATE chill_person_person SET fullnameCanonical=LOWER(UNACCENT(CONCAT(firstname, ' ', lastname)))");
+        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIN (fullnameCanonical gin_trgm_ops)');
+
+        $this->addSql(
+            <<<'SQL'
+                            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
+                            $BODY$
+                            BEGIN
+                                IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
+                                THEN
+                                   UPDATE chill_person_person
+                                   SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
+                                   WHERE id=NEW.id;
+                                END IF;
+                                RETURN NEW;
+                            END;
+                            $BODY$ LANGUAGE PLPGSQL;
+                SQL
+        );
+        $this->addSql(
+            <<<'SQL'
+                            CREATE TRIGGER canonicalize_fullname_on_update
+                            AFTER UPDATE
+                            ON chill_person_person
+                            FOR EACH ROW
+                            WHEN (pg_trigger_depth() = 0)
+                            EXECUTE PROCEDURE canonicalize_fullname_on_update();
+                SQL
+        );
+
+        $this->addSql(
+            <<<'SQL'
+                            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_insert() RETURNS TRIGGER AS
+                            $BODY$
+                            BEGIN
+                                UPDATE chill_person_person
+                                SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
+                                WHERE id=NEW.id;
+                                RETURN NEW;
+                            END;
+                            $BODY$ LANGUAGE PLPGSQL;
+                SQL
+        );
+        $this->addSql(
+            <<<'SQL'
+                            CREATE TRIGGER canonicalize_fullname_on_insert
+                            AFTER INSERT
+                            ON chill_person_person
+                            FOR EACH ROW
+                            EXECUTE PROCEDURE canonicalize_fullname_on_insert();
+                SQL
+        );
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php b/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php
index abe3a11f2..75ed5aa9c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20190701124238.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,19 +15,19 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a link between accompanying periods and users
+ * Add a link between accompanying periods and users.
  */
 final class Version20190701124238 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-				$this->addSql('ALTER TABLE chill_person_accompanying_period ADD user_id INT DEFAULT NULL;');
-				$this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
-				$this->addSql('CREATE INDEX IDX_E260A868A76ED395 ON chill_person_accompanying_period (user_id);');
-    }
-
     public function down(Schema $schema): void
     {
-				$this->addSql('ALTER TABLE chill_person_accompanying_period DROP user_id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP user_id');
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD user_id INT DEFAULT NULL;');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('CREATE INDEX IDX_E260A868A76ED395 ON chill_person_accompanying_period (user_id);');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php b/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php
index 43a1da1b3..3d03f61ae 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20191106103452.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,25 +15,24 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add an index for phonenumber and mobile number
+ * Add an index for phonenumber and mobile number.
  */
 final class Version20191106103452 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("CREATE INDEX phonenumber_trgm_idx
-            ON public.chill_person_person USING gin
-            (phonenumber gin_trgm_ops)");
-        
-        $this->addSql("CREATE INDEX mobilenumber_trgm_idx
-            ON public.chill_person_person USING gin
-            (mobilenumber gin_trgm_ops)");
-
-    }
-
     public function down(Schema $schema): void
     {
-        $this->addSql("DROP INDEX phonenumber_trgm_idx");
-        $this->addSql("DROP INDEX mobilenumber_trgm_idx");
+        $this->addSql('DROP INDEX phonenumber_trgm_idx');
+        $this->addSql('DROP INDEX mobilenumber_trgm_idx');
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE INDEX phonenumber_trgm_idx
+            ON public.chill_person_person USING gin
+            (phonenumber gin_trgm_ops)');
+
+        $this->addSql('CREATE INDEX mobilenumber_trgm_idx
+            ON public.chill_person_person USING gin
+            (mobilenumber gin_trgm_ops)');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
index 26f5f4683..1b06528af 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200128084445.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,26 +15,26 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add person alt name table
+ * Add person alt name table.
  */
 final class Version20200128084445 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql("CREATE SEQUENCE chill_person_alt_name_id_seq INCREMENT BY 1 MINVALUE 1 START 1");
-        $this->addSql("CREATE TABLE chill_person_alt_name (id INT NOT NULL, person_id INT DEFAULT NULL, key VARCHAR(255) NOT NULL, label TEXT NOT NULL, PRIMARY KEY(id))");
-        $this->addSql("CREATE INDEX IDX_2628668E217BBB47 ON chill_person_alt_name (person_id)");
-        $this->addSql("ALTER TABLE chill_person_alt_name ADD CONSTRAINT FK_2628668E217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE");
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
-        $this->addSql("DROP INDEX IDX_2628668E217BBB47");
-        $this->addSql("DROP TABLE chill_person_alt_name");
-        $this->addSql("DROP SEQUENCE chill_person_alt_name_id_seq");
+        $this->addSql('DROP INDEX IDX_2628668E217BBB47');
+        $this->addSql('DROP TABLE chill_person_alt_name');
+        $this->addSql('DROP SEQUENCE chill_person_alt_name_id_seq');
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('CREATE SEQUENCE chill_person_alt_name_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_alt_name (id INT NOT NULL, person_id INT DEFAULT NULL, key VARCHAR(255) NOT NULL, label TEXT NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_2628668E217BBB47 ON chill_person_alt_name (person_id)');
+        $this->addSql('ALTER TABLE chill_person_alt_name ADD CONSTRAINT FK_2628668E217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php b/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
index 538f3fb86..42c4a553b 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200130213446.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,149 +15,148 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add triggers for canicalizing alt names
+ * Add triggers for canicalizing alt names.
  */
 final class Version20200130213446 extends AbstractMigration
 {
-    const CANONICALIZE_FULLNAME_ON_UPDATE = <<<'SQL'
-CREATE OR REPLACE FUNCTION public.canonicalize_fullname_on_update()
-    RETURNS trigger
-    LANGUAGE 'plpgsql'
-    COST 100
-    VOLATILE NOT LEAKPROOF
-AS $BODY$
-DECLARE
-    cur_alt_names CURSOR(pid INTEGER) FOR SELECT label FROM chill_person_alt_name WHERE person_id = pid;
-    alt_name RECORD;
-    fullname_canonicalized TEXT;
-BEGIN
-    fullname_canonicalized := LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)));
-    OPEN cur_alt_names(pid:=NEW.id);
-    LOOP
-        FETCH cur_alt_names INTO alt_name;
+    public const CANONICALIZE_FULLNAME_ON_ALT_NAME_ALTER = <<<'SQL'
+        CREATE OR REPLACE FUNCTION public.canonicalize_fullname_on_alt_name_alter()
+            RETURNS trigger
+            LANGUAGE 'plpgsql'
+            COST 100
+            VOLATILE NOT LEAKPROOF
+        AS $BODY$
+        DECLARE
+            target_person_id INTEGER;
+            cur_person CURSOR(pid INTEGER) FOR SELECT firstname, lastname FROM chill_person_person WHERE id = pid;
+            person RECORD;
+            cur_alt_names CURSOR(pid INTEGER) FOR SELECT label FROM chill_person_alt_name WHERE person_id = pid;
+            alt_name RECORD;
+            fullname_canonicalized TEXT;
+        BEGIN
+            IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE'
+                THEN target_person_id := NEW.person_id;
+            ELSE target_person_id := OLD.person_id;
+            END IF;
 
-        EXIT WHEN NOT FOUND;
+            OPEN cur_person(pid:=target_person_id);
+            FETCH cur_person INTO person;
+            fullname_canonicalized := LOWER(UNACCENT(CONCAT(person.firstname, ' ', person.lastname)));
+            -- loop over alt names
+            OPEN cur_alt_names(pid:=target_person_id);
+            LOOP
+                FETCH cur_alt_names INTO alt_name;
 
-        fullname_canonicalized := CONCAT(fullname_canonicalized, ' ',
-            LOWER(UNACCENT(alt_name.label)));
-    END LOOP;
-    CLOSE cur_alt_names;
+                EXIT WHEN NOT FOUND;
 
-    IF fullname_canonicalized <> OLD.fullnameCanonical
-    THEN
-       UPDATE chill_person_person
-       SET fullnameCanonical=fullname_canonicalized
-       WHERE id=NEW.id;
-    END IF;
-    RETURN NEW;
-END;
-$BODY$;
-SQL;
-    
-    const CANONICALIZE_FULLNAME_ON_ALT_NAME_ALTER = <<<'SQL'
-CREATE OR REPLACE FUNCTION public.canonicalize_fullname_on_alt_name_alter()
-    RETURNS trigger
-    LANGUAGE 'plpgsql'
-    COST 100
-    VOLATILE NOT LEAKPROOF
-AS $BODY$
-DECLARE
-    target_person_id INTEGER;
-    cur_person CURSOR(pid INTEGER) FOR SELECT firstname, lastname FROM chill_person_person WHERE id = pid;
-    person RECORD;
-    cur_alt_names CURSOR(pid INTEGER) FOR SELECT label FROM chill_person_alt_name WHERE person_id = pid;
-    alt_name RECORD;
-    fullname_canonicalized TEXT;
-BEGIN
-    IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE'
-        THEN target_person_id := NEW.person_id;
-    ELSE target_person_id := OLD.person_id;
-    END IF;
+                fullname_canonicalized := CONCAT(fullname_canonicalized, ' ',
+                    LOWER(UNACCENT(alt_name.label)));
+            END LOOP;
+            CLOSE cur_alt_names;
+            CLOSE cur_person;
 
-    OPEN cur_person(pid:=target_person_id);
-    FETCH cur_person INTO person;
-    fullname_canonicalized := LOWER(UNACCENT(CONCAT(person.firstname, ' ', person.lastname)));
-    -- loop over alt names
-    OPEN cur_alt_names(pid:=target_person_id);
-    LOOP
-        FETCH cur_alt_names INTO alt_name;
+            UPDATE chill_person_person
+            SET fullnameCanonical=fullname_canonicalized
+            WHERE id=target_person_id;
 
-        EXIT WHEN NOT FOUND;
+            RETURN NEW;
+        END;
+        $BODY$;
+        SQL;
 
-        fullname_canonicalized := CONCAT(fullname_canonicalized, ' ',
-            LOWER(UNACCENT(alt_name.label)));
-    END LOOP;
-    CLOSE cur_alt_names;
-    CLOSE cur_person;
+    public const CANONICALIZE_FULLNAME_ON_ALT_NAME_DELETE = <<<'SQL'
+        CREATE TRIGGER canonicalize_fullname_on_alt_name_delete
+            AFTER DELETE
+            ON chill_person_alt_name
+            FOR EACH ROW
+            EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
+        SQL;
 
-    UPDATE chill_person_person
-    SET fullnameCanonical=fullname_canonicalized
-    WHERE id=target_person_id;
+    public const CANONICALIZE_FULLNAME_ON_ALT_NAME_INSERT = <<<'SQL'
+        CREATE TRIGGER canonicalize_fullname_on_alt_name_insert
+            AFTER INSERT
+            ON chill_person_alt_name
+            FOR EACH ROW
+            EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
+        SQL;
 
-    RETURN NEW;
-END;
-$BODY$;
-SQL;
-    
-    const CANONICALIZE_FULLNAME_ON_ALT_NAME_INSERT = <<<SQL
-CREATE TRIGGER canonicalize_fullname_on_alt_name_insert
-    AFTER INSERT
-    ON chill_person_alt_name
-    FOR EACH ROW
-    EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
-SQL;
-    
-    const CANONICALIZE_FULLNAME_ON_ALT_NAME_DELETE = <<<SQL
-CREATE TRIGGER canonicalize_fullname_on_alt_name_delete
-    AFTER DELETE
-    ON chill_person_alt_name
-    FOR EACH ROW
-    EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
-SQL;
+    public const CANONICALIZE_FULLNAME_ON_ALT_NAME_UPDATE = <<<'SQL'
+        CREATE TRIGGER canonicalize_fullname_on_alt_name_update
+            AFTER UPDATE
+            ON chill_person_alt_name
+            FOR EACH ROW
+            EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
+        SQL;
+
+    public const CANONICALIZE_FULLNAME_ON_UPDATE = <<<'SQL'
+        CREATE OR REPLACE FUNCTION public.canonicalize_fullname_on_update()
+            RETURNS trigger
+            LANGUAGE 'plpgsql'
+            COST 100
+            VOLATILE NOT LEAKPROOF
+        AS $BODY$
+        DECLARE
+            cur_alt_names CURSOR(pid INTEGER) FOR SELECT label FROM chill_person_alt_name WHERE person_id = pid;
+            alt_name RECORD;
+            fullname_canonicalized TEXT;
+        BEGIN
+            fullname_canonicalized := LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)));
+            OPEN cur_alt_names(pid:=NEW.id);
+            LOOP
+                FETCH cur_alt_names INTO alt_name;
+
+                EXIT WHEN NOT FOUND;
+
+                fullname_canonicalized := CONCAT(fullname_canonicalized, ' ',
+                    LOWER(UNACCENT(alt_name.label)));
+            END LOOP;
+            CLOSE cur_alt_names;
+
+            IF fullname_canonicalized <> OLD.fullnameCanonical
+            THEN
+               UPDATE chill_person_person
+               SET fullnameCanonical=fullname_canonicalized
+               WHERE id=NEW.id;
+            END IF;
+            RETURN NEW;
+        END;
+        $BODY$;
+        SQL;
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TRIGGER canonicalize_fullname_on_alt_name_update ON chill_person_alt_name;');
+        $this->addSql('DROP TRIGGER canonicalize_fullname_on_alt_name_insert ON chill_person_alt_name;');
+        $this->addSql('DROP TRIGGER canonicalize_fullname_on_alt_name_delete ON chill_person_alt_name;');
+        $this->addSql('DROP FUNCTION canonicalize_fullname_on_alt_name_alter();');
+        $this->addSql(
+            <<<'SQL'
+                            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
+                            $BODY$
+                            BEGIN
+                                IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
+                                THEN
+                                   UPDATE chill_person_person
+                                   SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
+                                   WHERE id=NEW.id;
+                                END IF;
+                                RETURN NEW;
+                            END;
+                            $BODY$ LANGUAGE PLPGSQL;
+                SQL
+        );
+    }
 
-    const CANONICALIZE_FULLNAME_ON_ALT_NAME_UPDATE = <<<SQL
-CREATE TRIGGER canonicalize_fullname_on_alt_name_update
-    AFTER UPDATE
-    ON chill_person_alt_name
-    FOR EACH ROW
-    EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
-SQL;
-    
     public function up(Schema $schema): void
     {
         // update fullname
-        $this->addSql("ALTER TABLE chill_person_person ALTER fullnamecanonical TYPE TEXT;");
-        $this->addSql("ALTER TABLE chill_person_person ALTER fullnamecanonical DROP DEFAULT;");
+        $this->addSql('ALTER TABLE chill_person_person ALTER fullnamecanonical TYPE TEXT;');
+        $this->addSql('ALTER TABLE chill_person_person ALTER fullnamecanonical DROP DEFAULT;');
         // insert function and triggers
         $this->addSql(self::CANONICALIZE_FULLNAME_ON_UPDATE);
         $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_ALTER);
         $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_INSERT);
         $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_DELETE);
         $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_UPDATE);
-        
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql("DROP TRIGGER canonicalize_fullname_on_alt_name_update ON chill_person_alt_name;");
-        $this->addSql("DROP TRIGGER canonicalize_fullname_on_alt_name_insert ON chill_person_alt_name;");
-        $this->addSql("DROP TRIGGER canonicalize_fullname_on_alt_name_delete ON chill_person_alt_name;");
-        $this->addSql("DROP FUNCTION canonicalize_fullname_on_alt_name_alter();");
-        $this->addSql(<<<'SQL'
-            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
-            $BODY$
-            BEGIN
-                IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
-                THEN
-                   UPDATE chill_person_person
-                   SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
-                   WHERE id=NEW.id;
-                END IF;
-                RETURN NEW;
-            END;
-            $BODY$ LANGUAGE PLPGSQL;
-SQL
-        );
-    }
-            
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
index 3a32f4bfc..7232a8dac 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -6,21 +15,10 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a relationship parent/child inside closing motives
+ * Add a relationship parent/child inside closing motives.
  */
 final class Version20200310090632 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_person_closingmotive ADD parent_id INT DEFAULT NULL');
-        $this->addSql('COMMENT ON COLUMN chill_person_closingmotive.name IS \'(DC2Type:json_array)\'');
-        $this->addSql('ALTER TABLE chill_person_closingmotive ADD CONSTRAINT FK_92351ECE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_person_closingmotive (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE INDEX IDX_92351ECE727ACA70 ON chill_person_closingmotive (parent_id)');
-        $this->addsql("ALTER TABLE chill_person_closingmotive ADD ordering DOUBLE PRECISION DEFAULT '0' NOT NULL;");
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -28,4 +26,14 @@ final class Version20200310090632 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_closingmotive DROP parent_id');
         $this->addSql('ALTER TABLE chill_person_closingmotive DROP ordering');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_person_closingmotive ADD parent_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_closingmotive ADD CONSTRAINT FK_92351ECE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_person_closingmotive (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_92351ECE727ACA70 ON chill_person_closingmotive (parent_id)');
+        $this->addsql("ALTER TABLE chill_person_closingmotive ADD ordering DOUBLE PRECISION DEFAULT '0' NOT NULL;");
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php b/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php
index 1921a0ddd..8d9da0e48 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20200422125935.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
 
@@ -10,129 +19,130 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20200422125935 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql('DROP FUNCTION get_last_address(integer, date)');
-        $this->addSql(<<<'SQL'
-CREATE OR REPLACE FUNCTION public.get_last_address (
-        pid integer,
-        before_date date)
-RETURNS TABLE(
-        person_id integer,
-	address_id integer, 
-	streetaddress1 varchar(255), 
-	streetaddress2 varchar(255),
-	validfrom date, 
-	postcode_label varchar(255), 
-	postcode_code varchar(100), 
-	postcode_id integer,
-    isnoaddress boolean,
-	country_name json, 
-	country_code varchar(3), 
-	country_id integer)
-        AS
-$BODY$
-SELECT 
-    pid AS person_id,
-	chill_main_address.id AS address_id,
-	chill_main_address.streetaddress1,
-	chill_main_address.streetaddress2,
-	chill_main_address.validfrom,
-	chill_main_postal_code.label,
-	chill_main_postal_code.code,
-    chill_main_postal_code.id AS postal_code_id,
-    chill_main_address.isnoaddress AS isnoaddress,
-	country.name,
-	country.countrycode,
-	country.id AS country_id
-FROM chill_main_address
-JOIN (
-	SELECT 
-	chill_main_address.id AS address_id,
-	validfrom,
-	rank() OVER (PARTITION BY person_id ORDER BY validfrom DESC) as pos
-	FROM chill_person_persons_to_addresses 
-	JOIN chill_main_address ON chill_person_persons_to_addresses.address_id = chill_main_address.id
-	WHERE person_id = pid
-	AND chill_main_address.validfrom <= before_date
-) AS ranking ON ranking.address_id = chill_main_address.id
-JOIN chill_main_postal_code ON chill_main_address.postcode_id = chill_main_postal_code.id
-JOIN country ON chill_main_postal_code.country_id = country.id
-WHERE ranking.pos = 1
-$BODY$
-LANGUAGE sql VOLATILE
-COST 100;
-SQL
-    );
-
-        $this->addSql(<<<'SQL'
-CREATE OR REPLACE FUNCTION get_last_address_isnoaddress (
-	pid integer,
-	before_date date)
-RETURNS BOOL AS
-$BODY$
-SELECT isnoaddress FROM get_last_address(pid, before_date)
-$BODY$
-LANGUAGE sql volatile
-COST 100;
-SQL
-                );
-
-    }
-
     public function down(Schema $schema): void
     {
         $this->addSql('DROP FUNCTION public.get_last_address_isnoaddress(integer, date);');
         $this->addSql('DROP FUNCTION get_last_address(integer, date)');
-        $this->addSql(<<<'SQL'
-CREATE OR REPLACE FUNCTION public.get_last_address (
-        pid integer,
-        before_date date)
-RETURNS TABLE(
-        person_id integer,
-	address_id integer, 
-	streetaddress1 varchar(255), 
-	streetaddress2 varchar(255),
-	validfrom date, 
-	postcode_label varchar(255), 
-	postcode_code varchar(100), 
-	postcode_id integer, 
-	country_name json, 
-	country_code varchar(3), 
-	country_id integer)
-        AS
-$BODY$
-SELECT 
-    pid AS person_id,
-	chill_main_address.id AS address_id,
-	chill_main_address.streetaddress1,
-	chill_main_address.streetaddress2,
-	chill_main_address.validfrom,
-	chill_main_postal_code.label,
-	chill_main_postal_code.code,
-    chill_main_postal_code.id AS postal_code_id,
-	country.name,
-	country.countrycode,
-	country.id AS country_id
-FROM chill_main_address
-JOIN (
-	SELECT 
-	chill_main_address.id AS address_id,
-	validfrom,
-	rank() OVER (PARTITION BY person_id ORDER BY validfrom DESC) as pos
-	FROM chill_person_persons_to_addresses 
-	JOIN chill_main_address ON chill_person_persons_to_addresses.address_id = chill_main_address.id
-	WHERE person_id = pid
-	AND chill_main_address.validfrom <= before_date
-) AS ranking ON ranking.address_id = chill_main_address.id
-JOIN chill_main_postal_code ON chill_main_address.postcode_id = chill_main_postal_code.id
-JOIN country ON chill_main_postal_code.country_id = country.id
-WHERE ranking.pos = 1
-$BODY$
-LANGUAGE sql VOLATILE
-COST 100;
-SQL
+        $this->addSql(
+            <<<'SQL'
+                CREATE OR REPLACE FUNCTION public.get_last_address (
+                        pid integer,
+                        before_date date)
+                RETURNS TABLE(
+                        person_id integer,
+                	address_id integer,
+                	streetaddress1 varchar(255),
+                	streetaddress2 varchar(255),
+                	validfrom date,
+                	postcode_label varchar(255),
+                	postcode_code varchar(100),
+                	postcode_id integer,
+                	country_name json,
+                	country_code varchar(3),
+                	country_id integer)
+                        AS
+                $BODY$
+                SELECT
+                    pid AS person_id,
+                	chill_main_address.id AS address_id,
+                	chill_main_address.streetaddress1,
+                	chill_main_address.streetaddress2,
+                	chill_main_address.validfrom,
+                	chill_main_postal_code.label,
+                	chill_main_postal_code.code,
+                    chill_main_postal_code.id AS postal_code_id,
+                	country.name,
+                	country.countrycode,
+                	country.id AS country_id
+                FROM chill_main_address
+                JOIN (
+                	SELECT
+                	chill_main_address.id AS address_id,
+                	validfrom,
+                	rank() OVER (PARTITION BY person_id ORDER BY validfrom DESC) as pos
+                	FROM chill_person_persons_to_addresses
+                	JOIN chill_main_address ON chill_person_persons_to_addresses.address_id = chill_main_address.id
+                	WHERE person_id = pid
+                	AND chill_main_address.validfrom <= before_date
+                ) AS ranking ON ranking.address_id = chill_main_address.id
+                JOIN chill_main_postal_code ON chill_main_address.postcode_id = chill_main_postal_code.id
+                JOIN country ON chill_main_postal_code.country_id = country.id
+                WHERE ranking.pos = 1
+                $BODY$
+                LANGUAGE sql VOLATILE
+                COST 100;
+                SQL
+        );
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP FUNCTION get_last_address(integer, date)');
+        $this->addSql(
+            <<<'SQL'
+                CREATE OR REPLACE FUNCTION public.get_last_address (
+                        pid integer,
+                        before_date date)
+                RETURNS TABLE(
+                        person_id integer,
+                	address_id integer,
+                	streetaddress1 varchar(255),
+                	streetaddress2 varchar(255),
+                	validfrom date,
+                	postcode_label varchar(255),
+                	postcode_code varchar(100),
+                	postcode_id integer,
+                    isnoaddress boolean,
+                	country_name json,
+                	country_code varchar(3),
+                	country_id integer)
+                        AS
+                $BODY$
+                SELECT
+                    pid AS person_id,
+                	chill_main_address.id AS address_id,
+                	chill_main_address.streetaddress1,
+                	chill_main_address.streetaddress2,
+                	chill_main_address.validfrom,
+                	chill_main_postal_code.label,
+                	chill_main_postal_code.code,
+                    chill_main_postal_code.id AS postal_code_id,
+                    chill_main_address.isnoaddress AS isnoaddress,
+                	country.name,
+                	country.countrycode,
+                	country.id AS country_id
+                FROM chill_main_address
+                JOIN (
+                	SELECT
+                	chill_main_address.id AS address_id,
+                	validfrom,
+                	rank() OVER (PARTITION BY person_id ORDER BY validfrom DESC) as pos
+                	FROM chill_person_persons_to_addresses
+                	JOIN chill_main_address ON chill_person_persons_to_addresses.address_id = chill_main_address.id
+                	WHERE person_id = pid
+                	AND chill_main_address.validfrom <= before_date
+                ) AS ranking ON ranking.address_id = chill_main_address.id
+                JOIN chill_main_postal_code ON chill_main_address.postcode_id = chill_main_postal_code.id
+                JOIN country ON chill_main_postal_code.country_id = country.id
+                WHERE ranking.pos = 1
+                $BODY$
+                LANGUAGE sql VOLATILE
+                COST 100;
+                SQL
         );
 
+        $this->addSql(
+            <<<'SQL'
+                CREATE OR REPLACE FUNCTION get_last_address_isnoaddress (
+                	pid integer,
+                	before_date date)
+                RETURNS BOOL AS
+                $BODY$
+                SELECT isnoaddress FROM get_last_address(pid, before_date)
+                $BODY$
+                LANGUAGE sql volatile
+                COST 100;
+                SQL
+        );
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php b/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php
index 120be0800..995625359 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210128152747.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -12,12 +19,19 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210128152747 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP SEQUENCE chill_person_not_duplicate_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_not_duplicate');
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SEQUENCE chill_person_not_duplicate_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -29,11 +43,4 @@ final class Version20210128152747 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_not_duplicate ADD CONSTRAINT FK_BD211EE22C402DF5 FOREIGN KEY (person2_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_not_duplicate ADD CONSTRAINT FK_BD211EE2A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP SEQUENCE chill_person_not_duplicate_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_not_duplicate');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php b/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php
index 3258bd351..2f52f9d00 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -12,12 +19,19 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210318095831 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP SEQUENCE chill_person_phone_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_phone');
+    }
+
+    public function getDescription(): string
     {
         return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
 
@@ -26,11 +40,4 @@ final class Version20210318095831 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_72C1F87217BBB47 ON chill_person_phone (person_id)');
         $this->addSql('ALTER TABLE chill_person_phone ADD CONSTRAINT FK_72C1F87217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP SEQUENCE chill_person_phone_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_phone');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php b/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php
index 6e2f105df..d0a14caa4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -12,20 +19,20 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210325141540 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_phone ADD type TEXT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your need
         $this->addSql('ALTER TABLE chill_person_phone DROP type');
     }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_phone ADD type TEXT DEFAULT NULL');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
index 8ae60b739..b947963f0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210326113045.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -9,46 +16,17 @@ use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Change model relation between Person and AccompagnyingPeriod
- * Migrate datas into new join table
- *
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Migrate datas into new join table.
  */
 final class Version20210326113045 extends AbstractMigration
 {
     private $datas = [];
-    
-    public function getDescription() : string
-    {
-        return 'Change model relation between Person and AccompagnyingPeriod, without losing datas when going up';
-    }
-    
-    /**
-     *  In these direction, there is no loss.
-     */
-    public function up(Schema $schema) : void
-    {
-        // create join table
-        $this->addSql('CREATE TABLE persons_accompanying_periods (person_id INT NOT NULL, accompanyingperiod_id INT NOT NULL, PRIMARY KEY(person_id, accompanyingperiod_id))');
-        $this->addSql('CREATE INDEX IDX_49A3871F217BBB47 ON persons_accompanying_periods (person_id)');
-        $this->addSql('CREATE INDEX IDX_49A3871F550B0C53 ON persons_accompanying_periods (accompanyingperiod_id)');
-        $this->addSql('ALTER TABLE persons_accompanying_periods ADD CONSTRAINT FK_49A3871F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE persons_accompanying_periods ADD CONSTRAINT FK_49A3871F550B0C53 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-    
-        // insert datas in new join table
-        $this->addSql('INSERT INTO persons_accompanying_periods (person_id, accompanyingperiod_id) '
-            . 'SELECT person_id, id as accompagnying_period_id FROM chill_person_accompanying_period WHERE person_id IS NOT NULL');
-        
-        // drop column
-        $this->addSql('DROP INDEX idx_64a4a621217bbb47');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT fk_64a4a621217bbb47');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP person_id');
-    }
-    
+
     /**
      *  The distinct clause makes that for each group of duplicates, it keeps only the first row in the returned result set.
-     *  Then we have only few lost datas. Lost datas: when many persons for one AccompanyingPeriod (keep only first person)
+     *  Then we have only few lost datas. Lost datas: when many persons for one AccompanyingPeriod (keep only first person).
      */
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // add column
         $this->addSql('ALTER TABLE chill_person_accompanying_period ADD person_id INT DEFAULT NULL');
@@ -59,12 +37,39 @@ final class Version20210326113045 extends AbstractMigration
         $this->addSql('UPDATE chill_person_accompanying_period AS ap '
             . 'SET person_id = jt.person_id '
             . 'FROM ( '
-            .   'SELECT DISTINCT ON (accompanyingperiod_id) accompanyingperiod_id AS id, person_id FROM persons_accompanying_periods '
-            .   'ORDER BY id, person_id ASC '
+            . 'SELECT DISTINCT ON (accompanyingperiod_id) accompanyingperiod_id AS id, person_id FROM persons_accompanying_periods '
+            . 'ORDER BY id, person_id ASC '
             . ') AS jt '
             . 'WHERE ap.id = jt.id');
-        
+
         // drop join table
         $this->addSql('DROP TABLE persons_accompanying_periods');
     }
+
+    public function getDescription(): string
+    {
+        return 'Change model relation between Person and AccompagnyingPeriod, without losing datas when going up';
+    }
+
+    /**
+     *  In these direction, there is no loss.
+     */
+    public function up(Schema $schema): void
+    {
+        // create join table
+        $this->addSql('CREATE TABLE persons_accompanying_periods (person_id INT NOT NULL, accompanyingperiod_id INT NOT NULL, PRIMARY KEY(person_id, accompanyingperiod_id))');
+        $this->addSql('CREATE INDEX IDX_49A3871F217BBB47 ON persons_accompanying_periods (person_id)');
+        $this->addSql('CREATE INDEX IDX_49A3871F550B0C53 ON persons_accompanying_periods (accompanyingperiod_id)');
+        $this->addSql('ALTER TABLE persons_accompanying_periods ADD CONSTRAINT FK_49A3871F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE persons_accompanying_periods ADD CONSTRAINT FK_49A3871F550B0C53 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        // insert datas in new join table
+        $this->addSql('INSERT INTO persons_accompanying_periods (person_id, accompanyingperiod_id) '
+            . 'SELECT person_id, id as accompagnying_period_id FROM chill_person_accompanying_period WHERE person_id IS NOT NULL');
+
+        // drop column
+        $this->addSql('DROP INDEX idx_64a4a621217bbb47');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT fk_64a4a621217bbb47');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP person_id');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php b/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php
index 1ccab6a50..7cc589e12 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210329090904.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,38 +15,34 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add AccompanyingPeriod Origin table
- *
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Add AccompanyingPeriod Origin table.
  */
 final class Version20210329090904 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A86856A273CC');
+
+        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_origin_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_origin');
+
+        $this->addSql('DROP INDEX IDX_E260A86856A273CC');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP origin_id');
+    }
+
+    public function getDescription(): string
     {
         return 'Add AccompanyingPeriod Origin table';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_origin_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_person_accompanying_period_origin (id INT NOT NULL, label VARCHAR(255) NOT NULL, noActiveAfter DATE DEFAULT NULL, PRIMARY KEY(id))');
         $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_origin.noActiveAfter IS \'(DC2Type:date_immutable)\'');
-        
+
         $this->addSql('ALTER TABLE chill_person_accompanying_period ADD origin_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A86856A273CC FOREIGN KEY (origin_id) REFERENCES chill_person_accompanying_period_origin (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_E260A86856A273CC ON chill_person_accompanying_period (origin_id)');
-        
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A86856A273CC');
-        
-        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_origin_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_origin');
-        
-        $this->addSql('DROP INDEX IDX_E260A86856A273CC');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP origin_id');
-        
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php b/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php
index 2cba2dd7e..062c7fd17 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210329113152.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,53 +15,48 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add AccompanyingPeriod Comment and Resource tables
- *
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Add AccompanyingPeriod Comment and Resource tables.
  */
 final class Version20210329113152 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return 'Add AccompanyingPeriod Comment and Resource tables';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_comment_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_person_accompanying_period_comment (id INT NOT NULL, creator_id INT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, content TEXT NOT NULL, accompanyingPeriod_id INT NOT NULL, updatedBy_id INT NOT NULL, PRIMARY KEY(id))');
-        
-        $this->addSql('CREATE INDEX IDX_CD960EF3D7FA8EF0 ON chill_person_accompanying_period_comment (accompanyingPeriod_id)');
-        $this->addSql('CREATE INDEX IDX_CD960EF361220EA6 ON chill_person_accompanying_period_comment (creator_id)');
-        $this->addSql('CREATE INDEX IDX_CD960EF365FF1AEC ON chill_person_accompanying_period_comment (updatedBy_id)');
-        
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF3D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF361220EA6 FOREIGN KEY (creator_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF365FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-        
-        $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_person_accompanying_period_resource (id INT NOT NULL, person_id INT DEFAULT NULL, comment_id INT DEFAULT NULL, accompanyingPeriod_id INT NOT NULL, thirdParty_id INT DEFAULT NULL, PRIMARY KEY(id))');
-        
-        $this->addSql('CREATE INDEX IDX_DC78989FD7FA8EF0 ON chill_person_accompanying_period_resource (accompanyingPeriod_id)');
-        $this->addSql('CREATE INDEX IDX_DC78989F3EA5CAB0 ON chill_person_accompanying_period_resource (thirdParty_id)');
-        $this->addSql('CREATE INDEX IDX_DC78989F217BBB47 ON chill_person_accompanying_period_resource (person_id)');
-        $this->addSql('CREATE INDEX IDX_DC78989FF8697D13 ON chill_person_accompanying_period_resource (comment_id)');
-        
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989FD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989F3EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989FF8697D13 FOREIGN KEY (comment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('DROP SEQUENCE chill_person_accompanying_period_resource_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_person_accompanying_period_resource');
 
         $this->addSql('DROP SEQUENCE chill_person_accompanying_period_comment_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_person_accompanying_period_comment');
-        
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add AccompanyingPeriod Comment and Resource tables';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_comment_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_accompanying_period_comment (id INT NOT NULL, creator_id INT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, content TEXT NOT NULL, accompanyingPeriod_id INT NOT NULL, updatedBy_id INT NOT NULL, PRIMARY KEY(id))');
+
+        $this->addSql('CREATE INDEX IDX_CD960EF3D7FA8EF0 ON chill_person_accompanying_period_comment (accompanyingPeriod_id)');
+        $this->addSql('CREATE INDEX IDX_CD960EF361220EA6 ON chill_person_accompanying_period_comment (creator_id)');
+        $this->addSql('CREATE INDEX IDX_CD960EF365FF1AEC ON chill_person_accompanying_period_comment (updatedBy_id)');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF3D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF361220EA6 FOREIGN KEY (creator_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF365FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_accompanying_period_resource (id INT NOT NULL, person_id INT DEFAULT NULL, comment_id INT DEFAULT NULL, accompanyingPeriod_id INT NOT NULL, thirdParty_id INT DEFAULT NULL, PRIMARY KEY(id))');
+
+        $this->addSql('CREATE INDEX IDX_DC78989FD7FA8EF0 ON chill_person_accompanying_period_resource (accompanyingPeriod_id)');
+        $this->addSql('CREATE INDEX IDX_DC78989F3EA5CAB0 ON chill_person_accompanying_period_resource (thirdParty_id)');
+        $this->addSql('CREATE INDEX IDX_DC78989F217BBB47 ON chill_person_accompanying_period_resource (person_id)');
+        $this->addSql('CREATE INDEX IDX_DC78989FF8697D13 ON chill_person_accompanying_period_resource (comment_id)');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989FD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989F3EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_resource ADD CONSTRAINT FK_DC78989FF8697D13 FOREIGN KEY (comment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php b/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php
index dc75997ab..34111e6c1 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210329144338.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,59 +15,22 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Complete accompanying period table
- *
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Complete accompanying period table.
  */
 final class Version20210329144338 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
     {
-        return 'Complete AccompanyingPeriod table';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('CREATE TABLE accompanying_periods_scopes (accompanying_period_id INT NOT NULL, scope_id INT NOT NULL, PRIMARY KEY(accompanying_period_id, scope_id))');
-        
-        $this->addSql('CREATE INDEX IDX_87C4EAB032A7A428 ON accompanying_periods_scopes (accompanying_period_id)');
-        $this->addSql('CREATE INDEX IDX_87C4EAB0682B5931 ON accompanying_periods_scopes (scope_id)');
-        
-        $this->addSql('ALTER TABLE accompanying_periods_scopes ADD CONSTRAINT FK_87C4EAB032A7A428 FOREIGN KEY (accompanying_period_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE accompanying_periods_scopes ADD CONSTRAINT FK_87C4EAB0682B5931 FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD step VARCHAR(32) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD intensity VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD createdBy_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD requestorPerson_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD requestorThirdParty_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD requestorAnonymous BOOLEAN NOT NULL DEFAULT \'false\'');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD emergency BOOLEAN NOT NULL DEFAULT \'false\'');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD confidential BOOLEAN NOT NULL DEFAULT \'false\'');
-    
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A8683174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A86834269C3F FOREIGN KEY (requestorPerson_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868CFE4D554 FOREIGN KEY (requestorThirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-        $this->addSql('CREATE INDEX IDX_E260A8683174800F ON chill_person_accompanying_period (createdBy_id)');
-        $this->addSql('CREATE INDEX IDX_E260A86834269C3F ON chill_person_accompanying_period (requestorPerson_id)');
-        $this->addSql('CREATE INDEX IDX_E260A868CFE4D554 ON chill_person_accompanying_period (requestorThirdParty_id)');
-
-    }
-
-    public function down(Schema $schema) : void
-    {
-        
         $this->addSql('DROP TABLE accompanying_periods_scopes');
-        
+
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A8683174800F');
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A86834269C3F');
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868CFE4D554');
-        
+
         $this->addSql('DROP INDEX IDX_E260A8683174800F');
         $this->addSql('DROP INDEX IDX_E260A86834269C3F');
         $this->addSql('DROP INDEX IDX_E260A868CFE4D554');
-        
+
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP step');
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP intensity');
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP createdBy_id');
@@ -69,6 +39,38 @@ final class Version20210329144338 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP requestorAnonymous');
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP emergency');
         $this->addSql('ALTER TABLE chill_person_accompanying_period DROP confidential');
-    
+    }
+
+    public function getDescription(): string
+    {
+        return 'Complete AccompanyingPeriod table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE accompanying_periods_scopes (accompanying_period_id INT NOT NULL, scope_id INT NOT NULL, PRIMARY KEY(accompanying_period_id, scope_id))');
+
+        $this->addSql('CREATE INDEX IDX_87C4EAB032A7A428 ON accompanying_periods_scopes (accompanying_period_id)');
+        $this->addSql('CREATE INDEX IDX_87C4EAB0682B5931 ON accompanying_periods_scopes (scope_id)');
+
+        $this->addSql('ALTER TABLE accompanying_periods_scopes ADD CONSTRAINT FK_87C4EAB032A7A428 FOREIGN KEY (accompanying_period_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE accompanying_periods_scopes ADD CONSTRAINT FK_87C4EAB0682B5931 FOREIGN KEY (scope_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD step VARCHAR(32) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD intensity VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD requestorPerson_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD requestorThirdParty_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD requestorAnonymous BOOLEAN NOT NULL DEFAULT \'false\'');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD emergency BOOLEAN NOT NULL DEFAULT \'false\'');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD confidential BOOLEAN NOT NULL DEFAULT \'false\'');
+
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A8683174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A86834269C3F FOREIGN KEY (requestorPerson_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A868CFE4D554 FOREIGN KEY (requestorThirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->addSql('CREATE INDEX IDX_E260A8683174800F ON chill_person_accompanying_period (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_E260A86834269C3F ON chill_person_accompanying_period (requestorPerson_id)');
+        $this->addSql('CREATE INDEX IDX_E260A868CFE4D554 ON chill_person_accompanying_period (requestorThirdParty_id)');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php b/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php
index 681132565..6e2c80107 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210330164922.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,28 +15,26 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Rename table closinmotive
- *
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Rename table closinmotive.
  */
 final class Version20210330164922 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return 'Rename table closinmotive';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_person_closingmotive RENAME TO chill_person_accompanying_period_closingmotive');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive RENAME CONSTRAINT fk_92351ece727aca70 TO FK_72D110E8727ACA70');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period RENAME CONSTRAINT fk_64a4a621504cb38d TO FK_E260A868504CB38D');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive RENAME TO chill_person_closingmotive');
         $this->addSql('ALTER TABLE chill_person_closingmotive RENAME CONSTRAINT FK_72D110E8727ACA70 TO fk_92351ece727aca70');
         $this->addSql('ALTER TABLE chill_person_accompanying_period RENAME CONSTRAINT FK_E260A868504CB38D TO fk_64a4a621504cb38d');
     }
+
+    public function getDescription(): string
+    {
+        return 'Rename table closinmotive';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_closingmotive RENAME TO chill_person_accompanying_period_closingmotive');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive RENAME CONSTRAINT fk_92351ece727aca70 TO FK_72D110E8727ACA70');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period RENAME CONSTRAINT fk_64a4a621504cb38d TO FK_E260A868504CB38D');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php b/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php
index 9c379c4b0..7ba75efa9 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210331084527.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,41 +15,11 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Transform join table between Person and AccompanyingPeriod in Doctrine entity
+ * Transform join table between Person and AccompanyingPeriod in Doctrine entity.
  */
 final class Version20210331084527 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return 'Transform join table between Person and AccompanyingPeriod in Doctrine entity';
-    }
-    
-    public function up(Schema $schema) : void
-    {
-        // 1
-        $this->addSql('ALTER TABLE persons_accompanying_periods DROP CONSTRAINT persons_accompanying_periods_pkey');
-        $this->addSql('ALTER TABLE persons_accompanying_periods RENAME TO chill_person_accompanying_period_participation');
-        
-        // 2
-        // SERIAL automatically create sequence with NEXTVAL()
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD COLUMN id SERIAL NOT NULL PRIMARY KEY');
-        // drop NEXTVAL() in column definition
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ALTER id DROP DEFAULT');
-        
-        // 3
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD startDate DATE NOT NULL DEFAULT \'1970-01-01\'');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD endDate DATE DEFAULT NULL');
-    
-        // 4
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP CONSTRAINT fk_49a3871f217bbb47');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP CONSTRAINT fk_49a3871f550b0c53');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT FK_A59DF89F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT FK_A59DF89F550B0C53 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER INDEX idx_49a3871f217bbb47 RENAME TO IDX_A59DF89F217BBB47');
-        $this->addSql('ALTER INDEX idx_49a3871f550b0c53 RENAME TO IDX_A59DF89F550B0C53');
-    }
-    
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // 4
         $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP CONSTRAINT FK_A59DF89F217BBB47');
@@ -51,17 +28,47 @@ final class Version20210331084527 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT fk_49a3871f550b0c53 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER INDEX idx_a59df89f550b0c53 RENAME TO idx_49a3871f550b0c53');
         $this->addSql('ALTER INDEX idx_a59df89f217bbb47 RENAME TO idx_49a3871f217bbb47');
-        
+
         // 3
         $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP startDate');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP endDate');
-        
+
         // 2
         $this->addSql('DROP SEQUENCE chill_person_accompanying_period_participation_id_seq CASCADE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP id');
-        
+
         // 1
         $this->addSql('ALTER TABLE chill_person_accompanying_period_participation RENAME TO persons_accompanying_periods');
         $this->addSql('ALTER TABLE persons_accompanying_periods ADD CONSTRAINT persons_accompanying_periods_pkey PRIMARY KEY (person_id, accompanyingperiod_id)');
     }
+
+    public function getDescription(): string
+    {
+        return 'Transform join table between Person and AccompanyingPeriod in Doctrine entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // 1
+        $this->addSql('ALTER TABLE persons_accompanying_periods DROP CONSTRAINT persons_accompanying_periods_pkey');
+        $this->addSql('ALTER TABLE persons_accompanying_periods RENAME TO chill_person_accompanying_period_participation');
+
+        // 2
+        // SERIAL automatically create sequence with NEXTVAL()
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD COLUMN id SERIAL NOT NULL PRIMARY KEY');
+        // drop NEXTVAL() in column definition
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ALTER id DROP DEFAULT');
+
+        // 3
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD startDate DATE NOT NULL DEFAULT \'1970-01-01\'');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD endDate DATE DEFAULT NULL');
+
+        // 4
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP CONSTRAINT fk_49a3871f217bbb47');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation DROP CONSTRAINT fk_49a3871f550b0c53');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT FK_A59DF89F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ADD CONSTRAINT FK_A59DF89F550B0C53 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER INDEX idx_49a3871f217bbb47 RENAME TO IDX_A59DF89F217BBB47');
+        $this->addSql('ALTER INDEX idx_49a3871f550b0c53 RENAME TO IDX_A59DF89F550B0C53');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
index c2b752822..c340ab989 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,25 +15,24 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Rename sequence "closing motive"
+ * Rename sequence "closing motive".
  */
 final class Version20210419105054 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return 'rename sequence "closing motive"';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_person_closingmotive_id_seq RENAME TO '
-            . 'chill_person_accompanying_period_closingmotive_id_seq');
-
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive_id_seq '
             . 'RENAME TO chill_person_closingmotive_id_seq');
     }
+
+    public function getDescription(): string
+    {
+        return 'rename sequence "closing motive"';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_closingmotive_id_seq RENAME TO '
+            . 'chill_person_accompanying_period_closingmotive_id_seq');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
index 4214c7069..2ef445f32 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,24 +15,11 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * set label for origin as json
+ * set label for origin as json.
  */
 final class Version20210419105940 extends AbstractMigration
 {
-    public function getDescription() : string
-    {
-        return 'set label for origin as json';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label TYPE JSON USING json_build_object(\'fr\', label)::jsonb');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
-            . 'ALTER label DROP DEFAULT');
-    }
-
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // this will keep the '"' at first and last character, but is acceptable
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
@@ -33,4 +27,17 @@ final class Version20210419105940 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
             . 'ALTER label DROP DEFAULT');
     }
+
+    public function getDescription(): string
+    {
+        return 'set label for origin as json';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
+            . 'ALTER label TYPE JSON USING json_build_object(\'fr\', label)::jsonb');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
+            . 'ALTER label DROP DEFAULT');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php b/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
index 919fe4cff..cdf9d3374 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,22 +15,21 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * fix deprecated json array
+ * fix deprecated json array.
  */
 final class Version20210419112619 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+    }
+
+    public function getDescription(): string
     {
         return 'fix deprecated json_array';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_closingmotive.name IS NULL');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_closingmotive.name IS \'(DC2Type:json_array)\'');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php
index 177633433..23dc6e9ec 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,16 +15,40 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create Social action, Social Issue, Work Goal and Work Result
+ * Create Social action, Social Issue, Work Goal and Work Result.
  */
 final class Version20210426145930 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB8727ACA70');
+        $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD3DC32179');
+        $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C3DC32179');
+        $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB85E7AA58C');
+        $this->addSql('ALTER TABLE chill_person_social_issue DROP CONSTRAINT FK_7A484DAE727ACA70');
+        $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD667D1AFE');
+        $this->addSql('ALTER TABLE chill_person_social_work_goal_result DROP CONSTRAINT FK_F3BAEEA9667D1AFE');
+        $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C7A7B643');
+        $this->addSql('ALTER TABLE chill_person_social_work_goal_result DROP CONSTRAINT FK_F3BAEEA97A7B643');
+        $this->addSql('DROP SEQUENCE chill_person_social_action_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_social_issue_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_social_work_goal_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_social_work_result_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_social_action');
+        $this->addSql('DROP TABLE chill_person_social_action_goal');
+        $this->addSql('DROP TABLE chill_person_social_action_result');
+        $this->addSql('DROP TABLE chill_person_social_issue');
+        $this->addSql('DROP TABLE chill_person_social_work_goal');
+        $this->addSql('DROP TABLE chill_person_social_work_goal_result');
+        $this->addSql('DROP TABLE chill_person_social_work_result');
+    }
+
+    public function getDescription(): string
     {
         return 'Create Social action, Social Issue, Work Goal and Work Result';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('CREATE SEQUENCE chill_person_social_action_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_person_social_issue_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -50,28 +81,4 @@ final class Version20210426145930 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_social_work_goal_result ADD CONSTRAINT FK_F3BAEEA9667D1AFE FOREIGN KEY (goal_id) REFERENCES chill_person_social_work_goal (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_social_work_goal_result ADD CONSTRAINT FK_F3BAEEA97A7B643 FOREIGN KEY (result_id) REFERENCES chill_person_social_work_result (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB8727ACA70');
-        $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD3DC32179');
-        $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C3DC32179');
-        $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB85E7AA58C');
-        $this->addSql('ALTER TABLE chill_person_social_issue DROP CONSTRAINT FK_7A484DAE727ACA70');
-        $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD667D1AFE');
-        $this->addSql('ALTER TABLE chill_person_social_work_goal_result DROP CONSTRAINT FK_F3BAEEA9667D1AFE');
-        $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C7A7B643');
-        $this->addSql('ALTER TABLE chill_person_social_work_goal_result DROP CONSTRAINT FK_F3BAEEA97A7B643');
-        $this->addSql('DROP SEQUENCE chill_person_social_action_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_social_issue_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_social_work_goal_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_social_work_result_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_social_action');
-        $this->addSql('DROP TABLE chill_person_social_action_goal');
-        $this->addSql('DROP TABLE chill_person_social_action_result');
-        $this->addSql('DROP TABLE chill_person_social_issue');
-        $this->addSql('DROP TABLE chill_person_social_work_goal');
-        $this->addSql('DROP TABLE chill_person_social_work_goal_result');
-        $this->addSql('DROP TABLE chill_person_social_work_result');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php b/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php
index 853d0b763..7da2d67d0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,16 +15,33 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create tables for the entites AccomanyingPeriodWork, AccomanyingPeriodWorkGoal & Social/WorkEvaluation
+ * Create tables for the entites AccomanyingPeriodWork, AccomanyingPeriodWorkGoal & Social/WorkEvaluation.
  */
 final class Version20210427125700 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_result DROP CONSTRAINT FK_46E95929B99F6060');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_third_party DROP CONSTRAINT FK_83B57B86B99F6060');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal DROP CONSTRAINT FK_911B88FEC55C1209');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal_result DROP CONSTRAINT FK_3E37D1F37B14AD03');
+        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_goal_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_social_work_evaluation_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_result');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_third_party');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_goal');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_goal_result');
+        $this->addSql('DROP TABLE chill_person_social_work_evaluation');
+    }
+
+    public function getDescription(): string
     {
         return 'Create tables for the entites AccomanyingPeriodWork, AccomanyingPeriodWorkGoal & Social/WorkEvaluation';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_work_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_work_goal_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
@@ -57,21 +81,4 @@ final class Version20210427125700 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal_result ADD CONSTRAINT FK_3E37D1F37A7B643 FOREIGN KEY (result_id) REFERENCES chill_person_social_work_result (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation ADD CONSTRAINT FK_2E23F3FEBF32A3DA FOREIGN KEY (socialAction_id) REFERENCES chill_person_social_action (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_result DROP CONSTRAINT FK_46E95929B99F6060');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_third_party DROP CONSTRAINT FK_83B57B86B99F6060');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal DROP CONSTRAINT FK_911B88FEC55C1209');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal_result DROP CONSTRAINT FK_3E37D1F37B14AD03');
-        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_goal_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_social_work_evaluation_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_result');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_third_party');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_goal');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_goal_result');
-        $this->addSql('DROP TABLE chill_person_social_work_evaluation');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php b/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php
index cf5a93164..d79b31e3c 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210505093408.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create Household and HouseholdMembers tables
+ * Create Household and HouseholdMembers tables.
  */
 final class Version20210505093408 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE HouseholdMembers DROP CONSTRAINT FK_4D1FB288E79FF843');
+        $this->addSql('ALTER TABLE HouseholdMembers DROP CONSTRAINT FK_4D1FB288217BBB47');
+        $this->addSql('DROP SEQUENCE Household_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE HouseholdMembers_id_seq CASCADE');
+        $this->addSql('DROP TABLE Household');
+        $this->addSql('DROP TABLE HouseholdMembers');
+    }
+
     public function getDescription(): string
     {
         return 'Create Household and HouseholdMembers tables';
@@ -28,14 +45,4 @@ final class Version20210505093408 extends AbstractMigration
         $this->addSql('ALTER TABLE HouseholdMembers ADD CONSTRAINT FK_4D1FB288217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE HouseholdMembers ADD CONSTRAINT FK_4D1FB288E79FF843 FOREIGN KEY (household_id) REFERENCES Household (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE HouseholdMembers DROP CONSTRAINT FK_4D1FB288E79FF843');
-        $this->addSql('ALTER TABLE HouseholdMembers DROP CONSTRAINT FK_4D1FB288217BBB47');
-        $this->addSql('DROP SEQUENCE Household_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE HouseholdMembers_id_seq CASCADE');
-        $this->addSql('DROP TABLE Household');
-        $this->addSql('DROP TABLE HouseholdMembers');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php b/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php
index bb3a56337..cddb987bf 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210505154316.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a household_to_address table
+ * Add a household_to_address table.
  */
 final class Version20210505154316 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_person_household_to_addresses');
+    }
+
     public function getDescription(): string
     {
         return 'Add a household_to_addresses table';
@@ -25,9 +37,4 @@ final class Version20210505154316 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_household_to_addresses ADD CONSTRAINT FK_7109483E79FF843 FOREIGN KEY (household_id) REFERENCES Household (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_household_to_addresses ADD CONSTRAINT FK_7109483F5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP TABLE chill_person_household_to_addresses');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php b/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php
index e2806e761..7b3517c19 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210518075908.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a link between social issues and accompanying periods
+ * Add a link between social issues and accompanying periods.
  */
 final class Version20210518075908 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_person_accompanying_period_social_issues');
+    }
+
     public function getDescription(): string
     {
         return 'Add a link between social issue and accompanying period';
@@ -25,9 +37,4 @@ final class Version20210518075908 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_social_issues ADD CONSTRAINT FK_CAFE078F550B0C53 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_social_issues ADD CONSTRAINT FK_CAFE078FA549916C FOREIGN KEY (socialissue_id) REFERENCES chill_person_social_issue (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP TABLE chill_person_accompanying_period_social_issues');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php b/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php
index 6907a64c6..210d35008 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210518162439.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a column "initial comment" in accompanying period
+ * Add a column "initial comment" in accompanying period.
  */
 final class Version20210518162439 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP initialComment_id');
+    }
+
     public function getDescription(): string
     {
         return 'Add a column "initial comment" in accompanying period';
@@ -23,9 +35,4 @@ final class Version20210518162439 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A8683111D50B FOREIGN KEY (initialComment_id) REFERENCES chill_person_accompanying_period_comment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_E260A8683111D50B ON chill_person_accompanying_period (initialComment_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP initialComment_id');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php b/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
index c71f7b203..c2c9333fc 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,17 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add updatedAt, updatedBy, createdAt on accompanying period
+ * Add updatedAt, updatedBy, createdAt on accompanying period.
  */
 final class Version20210519204938 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP createdAt');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP updatedBy_id');
+    }
+
     public function getDescription(): string
     {
         return 'Add updatedAt, updatedBy, createdAt on accompanying period';
@@ -25,11 +39,4 @@ final class Version20210519204938 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A86865FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_E260A86865FF1AEC ON chill_person_accompanying_period (updatedBy_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP createdAt');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP updatedAt');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP updatedBy_id');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php b/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php
index 15df9386e..6953689b0 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210525211214.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Specify ON DELETE behaviour to handle deletion of parents in associated tables
+ * Specify ON DELETE behaviour to handle deletion of parents in associated tables.
  */
 final class Version20210525211214 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment DROP CONSTRAINT fk_cd960ef3d7fa8ef0');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT fk_cd960ef3d7fa8ef0 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
     public function getDescription(): string
     {
         return 'Specify ON DELETE behaviour to handle deletion of parents in associated tables';
@@ -22,10 +35,4 @@ final class Version20210525211214 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_comment DROP CONSTRAINT FK_CD960EF3D7FA8EF0');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT FK_CD960EF3D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment DROP CONSTRAINT fk_cd960ef3d7fa8ef0');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ADD CONSTRAINT fk_cd960ef3d7fa8ef0 FOREIGN KEY (accompanyingperiod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
index 1ce855140..ad261b59a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528092625.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * prefix table concerning household with 'chill_person' and add constraints
+ * prefix table concerning household with 'chill_person' and add constraints.
  */
 final class Version20210528092625 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException('the down method is not implemented');
+    }
+
     public function getDescription(): string
     {
         return 'prefix table concerning household with \'chill_person\' and add constraints';
@@ -37,13 +49,13 @@ final class Version20210528092625 extends AbstractMigration
 
         // create constraint 'householdmembers not overlaps'
         $this->addSql('ALTER TABLE chill_person_household_members ADD CHECK (startdate < enddate)');
-        $this->addSql('ALTER TABLE chill_person_household_members ADD CONSTRAINT '.
-            "household_members_not_overlaps EXCLUDE USING GIST(
+        $this->addSql('ALTER TABLE chill_person_household_members ADD CONSTRAINT ' .
+            'household_members_not_overlaps EXCLUDE USING GIST(
               -- extension btree_gist required to include comparaison with integer
               person_id WITH =,
               daterange(startdate, enddate) WITH &&
            ) WHERE (sharedhousehold IS TRUE)
-           INITIALLY DEFERRED");
+           INITIALLY DEFERRED');
 
         // rename constraints
         $this->addSql('ALTER TABLE public.chill_person_household_to_addresses DROP CONSTRAINT fk_7109483e79ff843');
@@ -55,9 +67,4 @@ final class Version20210528092625 extends AbstractMigration
         $this->addSql('ALTER INDEX idx_4d1fb288e79ff843 RENAME TO IDX_EEF5DED7E79FF843');
         $this->addSql('ALTER INDEX idx_4d1fb288217bbb47 RENAME TO IDX_EEF5DED7217BBB47');
     }
-
-    public function down(Schema $schema): void
-    {   
-        $this->throwIrreversibleMigrationException("the down method is not implemented");
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php
index 2228d42c3..9e90da31a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528111624.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,19 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add position to househould_member
+ * Add position to househould_member.
  */
 final class Version20210528111624 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_household_members DROP CONSTRAINT FK_EEF5DED7DD842E46');
+        $this->addSql('DROP SEQUENCE chill_person_household_position_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_household_position');
+        $this->addSql('ALTER TABLE chill_person_household_members ADD "position" VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_household_members DROP position_id');
+    }
+
     public function getDescription(): string
     {
         return 'Add position to househould_member';
@@ -21,19 +37,10 @@ final class Version20210528111624 extends AbstractMigration
     {
         $this->addSql('CREATE SEQUENCE chill_person_household_position_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_person_household_position (id INT NOT NULL, label JSON NOT NULL, shareHouseHold BOOLEAN NOT NULL, allowHolder BOOLEAN NOT NULL, ordering DOUBLE PRECISION NOT NULL, PRIMARY KEY(id))');
-        
+
         $this->addSql('ALTER TABLE chill_person_household_members ADD position_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_household_members DROP "position"');
         $this->addSql('ALTER TABLE chill_person_household_members ADD CONSTRAINT FK_EEF5DED7DD842E46 FOREIGN KEY (position_id) REFERENCES chill_person_household_position (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_EEF5DED7DD842E46 ON chill_person_household_members (position_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_household_members DROP CONSTRAINT FK_EEF5DED7DD842E46');
-        $this->addSql('DROP SEQUENCE chill_person_household_position_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_household_position');
-        $this->addSql('ALTER TABLE chill_person_household_members ADD "position" VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_household_members DROP position_id');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php
index f9e94532a..926bf605a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528132405.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Household members: allow startdate and enddate to be null
+ * Household members: allow startdate and enddate to be null.
  */
 final class Version20210528132405 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_household_members ALTER startDate SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_household_members ALTER endDate SET NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Household members: allow startdate and enddate to be null';
@@ -22,10 +35,4 @@ final class Version20210528132405 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_household_members ALTER startdate DROP NOT NULL');
         $this->addSql('ALTER TABLE chill_person_household_members ALTER enddate DROP NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_household_members ALTER startDate SET NOT NULL');
-        $this->addSql('ALTER TABLE chill_person_household_members ALTER endDate SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php b/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php
index 4eaf149af..e1a39b258 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210528142121.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add house holder on membership
+ * Add house holder on membership.
  */
 final class Version20210528142121 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_household_members DROP COLUMN holder');
+    }
+
     public function getDescription(): string
     {
         return 'Add house holder on membership';
@@ -21,9 +33,4 @@ final class Version20210528142121 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_household_members ADD holder BOOLEAN DEFAULT FALSE  NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_household_members DROP COLUMN holder');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php b/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php
index 991ed49fd..37f740e09 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210614191600.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,17 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add comments and expecting birth to household
+ * Add comments and expecting birth to household.
  */
 final class Version20210614191600 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_household DROP comment_members');
+        $this->addSql('ALTER TABLE chill_person_household DROP waiting_for_birth');
+        $this->addSql('ALTER TABLE chill_person_household DROP waiting_for_birth_date');
+    }
+
     public function getDescription(): string
     {
         return 'Add comments and expecting birth to household';
@@ -24,11 +38,4 @@ final class Version20210614191600 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_household ADD waiting_for_birth_date DATE DEFAULT NULL');
         $this->addSql('COMMENT ON COLUMN chill_person_household.waiting_for_birth_date IS \'(DC2Type:date_immutable)\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_household DROP comment_members');
-        $this->addSql('ALTER TABLE chill_person_household DROP waiting_for_birth');
-        $this->addSql('ALTER TABLE chill_person_household DROP waiting_for_birth_date');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php b/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php
index d2024b0b5..97926c02a 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210615074857.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Set comment in household as Embedded Comment
+ * Set comment in household as Embedded Comment.
  */
 final class Version20210615074857 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_household RENAME comment_members_comment TO comment_members');
+        $this->addSql('ALTER TABLE chill_person_household ALTER comment_members SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_person_household ALTER comment_members SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_household DROP comment_members_comment');
+        $this->addSql('ALTER TABLE chill_person_household DROP comment_members_userId');
+        $this->addSql('ALTER TABLE chill_person_household DROP comment_members_date');
+    }
+
     public function getDescription(): string
     {
         return 'replace comment in household as embedded comment';
@@ -26,14 +43,4 @@ final class Version20210615074857 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_household ADD comment_members_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_household ADD CONSTRAINT fk_household_comment_embeddable_user FOREIGN KEY (comment_members_userId) REFERENCES users (id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_household RENAME comment_members_comment TO comment_members');
-        $this->addSql('ALTER TABLE chill_person_household ALTER comment_members SET DEFAULT \'\'');
-        $this->addSql('ALTER TABLE chill_person_household ALTER comment_members SET NOT NULL');
-        $this->addSql('ALTER TABLE chill_person_household DROP comment_members_comment');
-        $this->addSql('ALTER TABLE chill_person_household DROP comment_members_userId');
-        $this->addSql('ALTER TABLE chill_person_household DROP comment_members_date');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
index 1774cb0b3..ad6b44dfe 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210616102900.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create a view for assembling household, person and addresses
+ * Create a view for assembling household, person and addresses.
  */
 final class Version20210616102900 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP VIEW view_chill_person_household_address');
+    }
+
     public function getDescription(): string
     {
         return 'Create a view for assembling household, person and addresses';
@@ -19,25 +31,20 @@ final class Version20210616102900 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql("CREATE VIEW view_chill_person_household_address AS ".
-            "SELECT ".
-                "members.person_id AS person_id, ".
-                "members.household_id AS household_id, ".
-                "members.id AS member_id, ".
-                "address.id AS address_id, ".
-                "CASE WHEN address.validFrom < members.startDate THEN members.startDate ELSE address.validFrom END AS validFrom, ".
-                "CASE WHEN COALESCE(address.validTo, 'infinity') < COALESCE(members.endDate, 'infinity') THEN address.validTo ELSE members.endDate END AS validTo ".
-            "FROM chill_person_household_members AS members ".
-            "JOIN chill_person_household_to_addresses AS household_to_addr ON household_to_addr.household_id = members.household_id ".
-            "JOIN chill_main_address AS address ON household_to_addr.address_id = address.id ".
-                "AND daterange(address.validFrom, address.validTo) && daterange(members.startDate, members.endDate) ".
-            "WHERE members.sharedhousehold IS TRUE "
+        $this->addSql(
+            'CREATE VIEW view_chill_person_household_address AS ' .
+            'SELECT ' .
+                'members.person_id AS person_id, ' .
+                'members.household_id AS household_id, ' .
+                'members.id AS member_id, ' .
+                'address.id AS address_id, ' .
+                'CASE WHEN address.validFrom < members.startDate THEN members.startDate ELSE address.validFrom END AS validFrom, ' .
+                "CASE WHEN COALESCE(address.validTo, 'infinity') < COALESCE(members.endDate, 'infinity') THEN address.validTo ELSE members.endDate END AS validTo " .
+            'FROM chill_person_household_members AS members ' .
+            'JOIN chill_person_household_to_addresses AS household_to_addr ON household_to_addr.household_id = members.household_id ' .
+            'JOIN chill_main_address AS address ON household_to_addr.address_id = address.id ' .
+                'AND daterange(address.validFrom, address.validTo) && daterange(members.startDate, members.endDate) ' .
+            'WHERE members.sharedhousehold IS TRUE '
         );
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql("DROP VIEW view_chill_person_household_address");
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php b/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php
index f9e96697d..1083d872d 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210617073504.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,25 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add new fields to Person entity
+ * Add new fields to Person entity.
  */
 final class Version20210617073504 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person DROP deathdate');
+        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusDate');
+        $this->addSql('ALTER TABLE chill_person_person DROP acceptSMS');
+        $this->addSql('ALTER TABLE chill_person_person DROP acceptEmail');
+        $this->addSql('ALTER TABLE chill_person_person DROP numberOfChildren');
+        $this->addSql('ALTER TABLE chill_person_person DROP genderComment_comment');
+        $this->addSql('ALTER TABLE chill_person_person DROP genderComment_userId');
+        $this->addSql('ALTER TABLE chill_person_person DROP genderComment_date');
+        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusComment_comment');
+        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusComment_userId');
+        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusComment_date');
+    }
+
     public function getDescription(): string
     {
         return 'Add new fields to Person entity';
@@ -31,19 +53,4 @@ final class Version20210617073504 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_person ADD maritalStatusComment_userId INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_person ADD maritalStatusComment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_person DROP deathdate');
-        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusDate');
-        $this->addSql('ALTER TABLE chill_person_person DROP acceptSMS');
-        $this->addSql('ALTER TABLE chill_person_person DROP acceptEmail');
-        $this->addSql('ALTER TABLE chill_person_person DROP numberOfChildren');
-        $this->addSql('ALTER TABLE chill_person_person DROP genderComment_comment');
-        $this->addSql('ALTER TABLE chill_person_person DROP genderComment_userId');
-        $this->addSql('ALTER TABLE chill_person_person DROP genderComment_date');
-        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusComment_comment');
-        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusComment_userId');
-        $this->addSql('ALTER TABLE chill_person_person DROP maritalStatusComment_date');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php b/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php
index 93c6b8bf0..a75377615 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210618080702.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,23 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add createdAt, createdBy, updatedAt, updatedBy fields on Person
+ * Add createdAt, createdBy, updatedAt, updatedBy fields on Person.
  */
 final class Version20210618080702 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person DROP CONSTRAINT FK_BF210A143174800F');
+        $this->addSql('ALTER TABLE chill_person_person DROP CONSTRAINT FK_BF210A1465FF1AEC');
+        $this->addSql('DROP INDEX IDX_BF210A143174800F');
+        $this->addSql('DROP INDEX IDX_BF210A1465FF1AEC');
+        $this->addSql('ALTER TABLE chill_person_person DROP createdAt');
+        $this->addSql('ALTER TABLE chill_person_person DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_person_person DROP createdBy_id');
+        $this->addSql('ALTER TABLE chill_person_person DROP updatedBy_id');
+        $this->addSql('COMMENT ON COLUMN chill_person_person.deathdate IS NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Add createdAt, createdBy, updatedAt, updatedBy fields on Person';
@@ -29,17 +49,4 @@ final class Version20210618080702 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_BF210A143174800F ON chill_person_person (createdBy_id)');
         $this->addSql('CREATE INDEX IDX_BF210A1465FF1AEC ON chill_person_person (updatedBy_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_person DROP CONSTRAINT FK_BF210A143174800F');
-        $this->addSql('ALTER TABLE chill_person_person DROP CONSTRAINT FK_BF210A1465FF1AEC');
-        $this->addSql('DROP INDEX IDX_BF210A143174800F');
-        $this->addSql('DROP INDEX IDX_BF210A1465FF1AEC');
-        $this->addSql('ALTER TABLE chill_person_person DROP createdAt');
-        $this->addSql('ALTER TABLE chill_person_person DROP updatedAt');
-        $this->addSql('ALTER TABLE chill_person_person DROP createdBy_id');
-        $this->addSql('ALTER TABLE chill_person_person DROP updatedBy_id');
-        $this->addSql('COMMENT ON COLUMN chill_person_person.deathdate IS NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php b/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php
index 17d1e31aa..fbea185f4 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210620143757.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,25 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * add updated information to accompanying period work
+ * add updated information to accompanying period work.
  */
 final class Version20210620143757 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP updatedBy_id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER createdAt DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER startDate TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER startDate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER endDate TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER endDate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.createdat IS NULL');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.startdate IS NULL');
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.enddate IS NULL');
+    }
+
     public function getDescription(): string
     {
         return 'add updated information to accompanying period work';
@@ -33,19 +55,4 @@ final class Version20210620143757 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.startDate IS \'(DC2Type:datetime_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.endDate IS \'(DC2Type:datetime_immutable)\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP updatedAt');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP updatedBy_id');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER createdAt DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER startDate TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER startDate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER endDate TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ALTER endDate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.createdat IS NULL');
-        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.startdate IS NULL');
-        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work.enddate IS NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php b/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php
index d7f2f4ccc..8cb57e5e1 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210623135043.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add link to accompanying period work and persons
+ * Add link to accompanying period work and persons.
  */
 final class Version20210623135043 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_person');
+    }
+
     public function getDescription(): string
     {
         return 'Add link to accompanying period work and persons';
@@ -19,16 +31,10 @@ final class Version20210623135043 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->addSql("CREATE TABLE chill_person_accompanying_period_work_person (accompanyingperiodwork_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(accompanyingperiodwork_id, person_id))");
-        $this->addSql("CREATE INDEX IDX_615F494CB99F6060 ON chill_person_accompanying_period_work_person (accompanyingperiodwork_id)");
-        $this->addSql("CREATE INDEX IDX_615F494C217BBB47 ON chill_person_accompanying_period_work_person (person_id)");
-        $this->addSql("ALTER TABLE chill_person_accompanying_period_work_person ADD CONSTRAINT FK_615F494CB99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE");
-        $this->addSql("ALTER TABLE chill_person_accompanying_period_work_person ADD CONSTRAINT FK_615F494C217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE");
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql("DROP TABLE chill_person_accompanying_period_work_person");
+        $this->addSql('CREATE TABLE chill_person_accompanying_period_work_person (accompanyingperiodwork_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(accompanyingperiodwork_id, person_id))');
+        $this->addSql('CREATE INDEX IDX_615F494CB99F6060 ON chill_person_accompanying_period_work_person (accompanyingperiodwork_id)');
+        $this->addSql('CREATE INDEX IDX_615F494C217BBB47 ON chill_person_accompanying_period_work_person (person_id)');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_person ADD CONSTRAINT FK_615F494CB99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_person ADD CONSTRAINT FK_615F494C217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php b/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
index 8baffb867..3e7d6a22e 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210623142046.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -12,6 +19,11 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210623142046 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_action ALTER defaultNotificationDelay SET NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -21,9 +33,4 @@ final class Version20210623142046 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_social_action ALTER defaultnotificationdelay DROP NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_social_action ALTER defaultNotificationDelay SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php b/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
index ebeb33e50..32de7a8da 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210624131722.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -12,6 +19,11 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210624131722 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay SET NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -21,9 +33,4 @@ final class Version20210624131722 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay DROP NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php b/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
index d36d23733..98f73e0c6 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210624131723.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -12,6 +19,11 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20210624131723 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay SET NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return '';
@@ -21,9 +33,4 @@ final class Version20210624131723 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay DROP NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php b/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php
index f49c819d7..226c06bb5 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210727152826.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add location to accompanying period
+ * Add location to accompanying period.
  */
 final class Version20210727152826 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868D5213D34');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A8689B07D6BF');
+        $this->addSql('DROP INDEX IDX_E260A868D5213D34');
+        $this->addSql('DROP INDEX IDX_E260A8689B07D6BF');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP personLocation_id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP addressLocation_id');
+    }
+
     public function getDescription(): string
     {
         return 'Add location to accompanying period';
@@ -26,14 +43,4 @@ final class Version20210727152826 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_E260A868D5213D34 ON chill_person_accompanying_period (personLocation_id)');
         $this->addSql('CREATE INDEX IDX_E260A8689B07D6BF ON chill_person_accompanying_period (addressLocation_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A868D5213D34');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP CONSTRAINT FK_E260A8689B07D6BF');
-        $this->addSql('DROP INDEX IDX_E260A868D5213D34');
-        $this->addSql('DROP INDEX IDX_E260A8689B07D6BF');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP personLocation_id');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP addressLocation_id');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php b/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php
index 40fd84266..b303b5fbc 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210729163023.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create class AccompanyingPeriodWorkEvaluation
+ * Create class AccompanyingPeriodWorkEvaluation.
  */
 final class Version20210729163023 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_evaluation_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_evaluation');
+    }
+
     public function getDescription(): string
     {
         return 'create class and tables for AccompanyingPeriodWorkEvaluation';
@@ -36,10 +49,4 @@ final class Version20210729163023 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation ADD CONSTRAINT FK_741A3A0B3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation ADD CONSTRAINT FK_741A3A0B65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_evaluation_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_evaluation');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php b/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php
index a96d0fd58..e1f6a1c29 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210730094514.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add document to AccompanyingPeriodWorkEvaluation
+ * Add document to AccompanyingPeriodWorkEvaluation.
  */
 final class Version20210730094514 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:datetimetz_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:datetimetz_immutable)\'');
+        $this->addSql('DROP TABLE chill_person_accompanying_period_work_evaluation_document');
+        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_eval_doc_id_seq');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP CONSTRAINT FK_B694FB365FF1AEC');
+        $this->addSql('DROP INDEX IDX_B694FB365FF1AEC');
+    }
+
     public function getDescription(): string
     {
         return 'add documents to AccompanyingPeriodWorkEvaluation';
@@ -34,14 +51,4 @@ final class Version20210730094514 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD CONSTRAINT FK_B694FB365FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_B694FB365FF1AEC ON chill_person_accompanying_period_work (updatedBy_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:datetimetz_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:datetimetz_immutable)\'');
-        $this->addSql('DROP TABLE chill_person_accompanying_period_work_evaluation_document');
-        $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_eval_doc_id_seq');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP CONSTRAINT FK_B694FB365FF1AEC');
-        $this->addSql('DROP INDEX IDX_B694FB365FF1AEC');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php b/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php
index 0904856c4..f93d33e06 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210730205407.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * add nullable fields to social work evaluation
+ * add nullable fields to social work evaluation.
  */
 final class Version20210730205407 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationDelay SET NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return 'add nullable fields to social work evaluation';
@@ -22,10 +35,4 @@ final class Version20210730205407 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay DROP NOT NULL');
         $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay DROP NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay SET NOT NULL');
-        $this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationDelay SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php b/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php
index 8ef9f59d2..c83390b80 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210802202838.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add comment to accompanying period work evaluation d
+ * Add comment to accompanying period work evaluation d.
  */
 final class Version20210802202838 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation DROP comment');
+    }
+
     public function getDescription(): string
     {
         return 'Add comment to accompanying period work evaluation';
@@ -21,9 +33,4 @@ final class Version20210802202838 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation ADD comment TEXT DEFAULT \'\' NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation DROP comment');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php b/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php
index 65b07766c..02553b629 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210820093927.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a link between evaluation document, stored object, and document template
+ * Add a link between evaluation document, stored object, and document template.
  */
 final class Version20210820093927 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP CONSTRAINT FK_33EC92296C99C13A');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP CONSTRAINT FK_33EC92295DA0FB8');
+        $this->addSql('DROP INDEX IDX_33EC92296C99C13A');
+        $this->addSql('DROP INDEX IDX_33EC92295DA0FB8');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP template_id');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP storedObject_id');
+    }
+
     public function getDescription(): string
     {
         return 'Add a link between evaluation document, stored object, and document template';
@@ -26,14 +43,4 @@ final class Version20210820093927 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_33EC92296C99C13A ON chill_person_accompanying_period_work_evaluation_document (storedObject_id)');
         $this->addSql('CREATE INDEX IDX_33EC92295DA0FB8 ON chill_person_accompanying_period_work_evaluation_document (template_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP CONSTRAINT FK_33EC92296C99C13A');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP CONSTRAINT FK_33EC92295DA0FB8');
-        $this->addSql('DROP INDEX IDX_33EC92296C99C13A');
-        $this->addSql('DROP INDEX IDX_33EC92295DA0FB8');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP template_id');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document DROP storedObject_id');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php b/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php
index fd05a884c..dbb2aaa33 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210820100407.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add missing sequence for evaluation documents
+ * Add missing sequence for evaluation documents.
  */
 final class Version20210820100407 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_person_social_work_eval_doc_id_seq');
+    }
+
     public function getDescription(): string
     {
         return 'Add missing sequence for evaluation documents';
@@ -21,9 +33,4 @@ final class Version20210820100407 extends AbstractMigration
     {
         $this->addSql('CREATE SEQUENCE chill_person_social_work_eval_doc_id_seq INCREMENT BY 1 MINVALUE 1000 START 1000');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_person_social_work_eval_doc_id_seq');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
index dd3a60d75..2b2baa1d3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210831140339.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Allow to create persons without center
+ * Allow to create persons without center.
  */
 final class Version20210831140339 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ALTER center_id SET NOT NULL');
+    }
+
     public function getDescription(): string
     {
         return 'Allow to create persons without center';
@@ -21,9 +33,4 @@ final class Version20210831140339 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_person ALTER center_id DROP NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_person ALTER center_id SET NOT NULL');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
index 82cade6cf..f3535787f 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210910161858.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Optimize trigram index on person fullname: create index for both center_id and fullname
+ * Optimize trigram index on person fullname: create index for both center_id and fullname.
  */
 final class Version20210910161858 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
+        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (fullnameCanonical gist_trgm_ops)');
+    }
+
     public function getDescription(): string
     {
         return 'Optimize trigram index on person fullname: create index for both center_id and fullname';
@@ -22,10 +35,4 @@ final class Version20210910161858 extends AbstractMigration
         $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
         $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (center_id, fullnameCanonical gist_trgm_ops)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
-        $this->addSql('CREATE INDEX fullnameCanonical_trgm_idx ON chill_person_person USING GIST (fullnameCanonical gist_trgm_ops)');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
index f285fde47..980218c92 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210915093624.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -8,10 +15,17 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create view for PersonCurrentAddress and related indexes
+ * Create view for PersonCurrentAddress and related indexes.
  */
 final class Version20210915093624 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP VIEW view_chill_person_current_address');
+        $this->addSql('DROP INDEX chill_custom_main_address_filtering_idx');
+        $this->addSql('DROP INDEX chill_custom_person_household_members_sharing_idx');
+    }
+
     public function getDescription(): string
     {
         return 'Create view for PersonCurrentAddress and related indexes';
@@ -36,14 +50,7 @@ final class Version20210915093624 extends AbstractMigration
                   current_date between cma.validfrom AND coalesce(validto, 'infinity'::date)
       ");
 
-        $this->addSql("CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address USING btree (id, validfrom ASC, validto DESC)");
-        $this->addSql("CREATE INDEX chill_custom_person_household_members_sharing_idx ON chill_person_household_members USING btree (person_id, startdate ASC, enddate DESC, household_id) WHERE sharedhousehold IS TRUE");
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql("DROP VIEW view_chill_person_current_address");
-        $this->addSql("DROP INDEX chill_custom_main_address_filtering_idx");
-        $this->addSql("DROP INDEX chill_custom_person_household_members_sharing_idx");
+        $this->addSql('CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address USING btree (id, validfrom ASC, validto DESC)');
+        $this->addSql('CREATE INDEX chill_custom_person_household_members_sharing_idx ON chill_person_household_members USING btree (person_id, startdate ASC, enddate DESC, household_id) WHERE sharedhousehold IS TRUE');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php b/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php
new file mode 100644
index 000000000..43e1e4535
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211020131133.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+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 down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX person_unique');
+        $this->addSql('DROP INDEX thirdparty_unique');
+    }
+
+    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');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
new file mode 100644
index 000000000..adaf6b578
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211021125359.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+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 down(Schema $schema): void
+    {
+        $this->addSql('CREATE UNIQUE INDEX participation_unique ON chill_person_accompanying_period_participation (accompanyingperiod_id, person_id)');
+    }
+
+    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');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php b/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php
new file mode 100644
index 000000000..289b5e090
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211025141226.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Create the relationship and relation entity.
+ */
+final class Version20211025141226 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_relationships DROP CONSTRAINT FK_23D47C513256915B');
+        $this->addSql('DROP SEQUENCE chill_person_relations_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_relationships_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_relations');
+        $this->addSql('DROP TABLE chill_person_relationships');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Create the relationship and relation entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_person_relations_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_person_relationships_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_relations (id INT NOT NULL, title JSON DEFAULT NULL, reverseTitle JSON DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE TABLE chill_person_relationships (id INT NOT NULL, relation_id INT NOT NULL, reverse BOOLEAN NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, fromPerson_id INT NOT NULL, toPerson_id INT NOT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_23D47C51CBA59C1E ON chill_person_relationships (fromPerson_id)');
+        $this->addSql('CREATE INDEX IDX_23D47C514013E22A ON chill_person_relationships (toPerson_id)');
+        $this->addSql('CREATE INDEX IDX_23D47C513256915B ON chill_person_relationships (relation_id)');
+        $this->addSql('CREATE INDEX IDX_23D47C513174800F ON chill_person_relationships (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_23D47C5165FF1AEC ON chill_person_relationships (updatedBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_person_relationships.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_person_relationships.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_person_relationships ADD CONSTRAINT FK_23D47C51CBA59C1E FOREIGN KEY (fromPerson_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_relationships ADD CONSTRAINT FK_23D47C514013E22A FOREIGN KEY (toPerson_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_relationships ADD CONSTRAINT FK_23D47C513256915B FOREIGN KEY (relation_id) REFERENCES chill_person_relations (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_relationships ADD CONSTRAINT FK_23D47C513174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_relationships ADD CONSTRAINT FK_23D47C5165FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php b/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php
new file mode 100644
index 000000000..222900450
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211029075117.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * isActive property added to Relation entity.
+ */
+final class Version20211029075117 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_relations DROP isActive');
+    }
+
+    public function getDescription(): string
+    {
+        return 'isActive property added to Relation entity.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_relations ADD isActive BOOLEAN DEFAULT true NOT NULL');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php b/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php
new file mode 100644
index 000000000..2fea4a64c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211108100849.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add Civility to Person.
+ */
+final class Version20211108100849 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person DROP CONSTRAINT FK_BF210A1423D6A298');
+        $this->addSql('DROP INDEX IDX_BF210A1423D6A298');
+        $this->addSql('ALTER TABLE chill_person_person DROP civility_id');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add Civility to Person';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ADD civility_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ADD CONSTRAINT FK_BF210A1423D6A298 FOREIGN KEY (civility_id) REFERENCES chill_main_civility (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_BF210A1423D6A298 ON chill_person_person (civility_id)');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php b/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php
new file mode 100644
index 000000000..4339b43a9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211112170027.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * drop not null in person phonenumber.
+ */
+final class Version20211112170027 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber SET DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber SET DEFAULT NULL');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Drop not null in person table: set default empty value';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE chill_person_person SET mobilenumber = \'\' WHERE mobilenumber IS NULL');
+        $this->addSql('UPDATE chill_person_person SET phonenumber = \'\' WHERE phonenumber IS NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber SET NOT NULL');
+        $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber SET DEFAULT \'\'');
+        $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber SET DEFAULT \'\'');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php b/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php
new file mode 100644
index 000000000..e3ba27e81
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211119211101.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211119211101 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX person_birthdate');
+        $this->addSql('DROP INDEX phonenumber');
+    }
+
+    public function getDescription(): string
+    {
+        return 'add indexes for searching by birthdate';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE INDEX person_birthdate ON chill_person_person (birthdate)');
+        $this->addSql('CREATE INDEX phonenumber ON chill_person_phone USING GIST (phonenumber gist_trgm_ops)');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php b/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php
new file mode 100644
index 000000000..bcc461104
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20211119215630.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211119215630 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql("CREATE OR REPLACE VIEW view_chill_person_current_address AS
+            SELECT
+                cphm.person_id  AS person_id,
+                cma.id AS address_id,
+                CASE WHEN cphm.startdate > COALESCE(cma.validfrom, '-infinity'::date) THEN cphm.startdate ELSE cma.validfrom END AS valid_from,
+                CASE WHEN COALESCE(cphm.enddate, 'infinity'::date) < COALESCE(cma.validto, 'infinity'::date) THEN cphm.enddate ELSE cma.validto END AS valid_to
+            FROM chill_person_household_members AS cphm
+                     LEFT JOIN chill_person_household_to_addresses AS cphta ON cphta.household_id = cphm.household_id
+                     LEFT JOIN chill_main_address AS cma ON cphta.address_id = cma.id
+            WHERE
+                  cphm.sharedhousehold IS TRUE
+            AND
+                  current_date between cphm.startdate AND coalesce(enddate, 'infinity'::date)
+            AND
+                  current_date between cma.validfrom AND coalesce(validto, 'infinity'::date)
+      ");
+    }
+
+    public function getDescription(): string
+    {
+        return 'update computation of view_chill_person_current_address: do not take enddate into account';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("CREATE OR REPLACE VIEW view_chill_person_current_address AS
+            SELECT
+                cphm.person_id  AS person_id,
+                cma.id AS address_id,
+                CASE WHEN cphm.startdate > COALESCE(cma.validfrom, '-infinity'::date) THEN cphm.startdate ELSE cma.validfrom END AS valid_from,
+                CASE WHEN COALESCE(cphm.enddate, 'infinity'::date) < COALESCE(cma.validto, 'infinity'::date) THEN cphm.enddate ELSE cma.validto END AS valid_to
+            FROM chill_person_household_members AS cphm
+                     JOIN chill_person_household_to_addresses AS cphta ON cphta.household_id = cphm.household_id
+                     JOIN chill_main_address AS cma ON cphta.address_id = cma.id
+            WHERE
+                  cphm.sharedhousehold IS TRUE
+            AND
+                  daterange(cphm.startdate, cphm.enddate, '[)') @> current_date
+            AND
+                  daterange(cma.validfrom, cma.validto, '[)') @> current_date
+      ");
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index c92dc6a31..cb2fcc494 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -12,11 +12,20 @@ Requestor: >-
         other {Demandeur·euse}
     }
 
+person:
+    and_himself: >-
+        {gender, select,
+            man {et lui-même}
+            woman {et elle-même}
+            other {et lui·elle-même}
+        }
+    from_the: depuis le
+
 household:
     Household: Ménage
     Household number: Ménage {household_num}
     Household members: Membres du ménage
-    Household editor: Modifier l'appartenance
+    Household editor: Renseigner l'appartenance
     Members at same time: Membres simultanés
     Any simultaneous members: Aucun membre simultanément
     Select people to move: Choisir les usagers
@@ -26,6 +35,12 @@ household:
             many {Montrer # anciennes ou futures appartenances}
             other {Montrer # anciennes ou futures appartenances}
         }
+    Show accompanying periods of past or future memberships: >-
+        {length, plural,
+            one {Montrer les parcours d'une ancienne appartenance}
+            many {Montrer # parcours des anciennes ou futures appartenances}
+            other {Montrer # parcours des anciennes ou futures appartenances}
+        }
     Hide memberships: Masquer
     Those members does not share address: Ces usagers ne partagent pas l'adresse du ménage.
     Any persons into this position: Aucune personne n'appartient au ménage à cette position.
@@ -45,17 +60,17 @@ household:
     is holder: Est titulaire
     is not holder: N'est pas titulaire
     holder: Titulaire
-    Edit member household: Modifier l'appartenance au ménage
+    Edit member household: Renseigner l'appartenance au ménage
     Edit his household: Modifier son appartenance au ménage
     Current household members: Membres actuels
     Household summary: Résumé du ménage
     Accompanying period: Parcours d'accompagnement
     Addresses: Historique adresse
-    Relationship: Composition familiale
-    Household relationships: Composition du ménage
+    Relationship: Filiation
+    Household relationships: Filiations dans le ménage
     Current address: Adresse actuelle
     Household does not have any address currently: Le ménage n'a pas d'adresse renseignée actuellement
-    Edit household members: Modifier l'appartenance au ménage
+    Edit household members: Renseigner l'appartenance au ménage
     and x other persons: >-
         {x, plural,
             one {et une autre personne}
@@ -77,6 +92,7 @@ household:
     Household history for %name%: Historique des ménages pour {name}
     Household shared: Ménages domiciliés
     Household not shared: Ménage non domiciliés
+    Members without position: Membres non positionnés
     Never in any household: Membre d'aucun ménage
     Membership currently running: En cours
     from: Depuis
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index a17bbc55f..4a712633d 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -47,9 +47,11 @@ Phonenumber: 'Numéro de téléphone'
 phonenumber: numéro de téléphone
 Mobilenumber: 'Numéro de téléphone portable'
 mobilenumber: numéro de téléphone portable
-Accept short text message ?: Accepte les SMS?
-Accept short text message: Accepte les SMS
+Accept short text message ?: La personne a donné l'autorisation d'utiliser ce no de téléphone pour l'envoi de rappel par SMS
+Accept short text message: La personne a donné l'autorisation d'utiliser ce no de téléphone pour l'envoi de rappel par SMS
 Other phonenumber: Autre numéro de téléphone
+Others phone numbers: Autres numéros de téléphone
+No additional phone numbers: Aucun numéro de téléphone supplémentaire
 Description: description
 Add new phone: Ajouter un numéro de téléphone
 Remove phone: Supprimer
@@ -80,6 +82,9 @@ Married: Marié(e)
 'Contact information': 'Informations de contact'
 'Administrative information': Administratif
 File number: Dossier n°
+Civility: Civilité
+choose civility: --
+All genders: tous les genres
 
 # dédoublonnage
 Old person: Doublon
@@ -119,8 +124,8 @@ address_country_code: Code pays
 
 'Alreay existing person': 'Dossiers déjà encodés'
 'Add the person': 'Ajouter la personne'
-'Add the person and create an accompanying period': "Créer la personne ET créer une période d'accompagnement"
-'Add the person and create an household': "Créer la personne ET créer un ménage"
+'Add the person and create an accompanying period': "Créer la personne & créer une période d'accompagnement"
+'Add the person and create an household': "Créer la personne & créer un ménage"
 Show person: Voir le dossier de la personne
 'Confirm the creation': 'Confirmer la création'
 'You will create this person': 'Vous allez créer le dossier suivant'
@@ -164,6 +169,7 @@ Update accompanying period: Mettre à jour une période d'accompagnement
 'Period not opened': "La période d'accompagnement n'a pas été ouverte"
 "Period not opened : form is invalid": "La période n'a pas été ouverte: le formulaire est invalide."
 'Closing motive': 'Motif de clôture'
+Close accompanying course: Clôturer le parcours
 'Person details': 'Détails de la personne'
 'Update details for %name%': 'Modifier détails de %name%'
 An accompanying period ends: Une periode d'accompagnement se clôture
@@ -192,6 +198,7 @@ Resources: Interlocuteurs privilégiés
 Any requestor to this accompanying course: Aucun demandeur pour ce parcours
 Social actions: Actions d'accompagnement
 Last social actions: Les dernières actions d'accompagnement
+Social issue: Problématique sociale
 Social issues: Problématiques sociales
 Last events on accompanying course: Dernières actions de suivi
 Edit & activate accompanying course: Modifier et valider
@@ -199,10 +206,15 @@ See accompanying periods: Voir toutes les périodes d'accompagnement
 See accompanying period: Voir la période
 Edit accompanying period: Modifier la période
 See this period: Voir cette période
+Requestor: Demandeur
+No requestor: Pas de demandeur
+No resources: "Pas d'interlocuteurs privilégiés"
+Persons associated: Usagers concernés
 Referrer: Référent
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
+course.draft: Brouillon
 
 # pickAPersonType
 Pick a person: Choisir une personne
@@ -323,6 +335,7 @@ crud:
             add_new: Ajouter une nouvelle action d'accompagnements
         title_new: Nouvelle action d'accompagnements
         title_edit: Modifier l'action d'accompagnements
+        title_link: Voir l'action d'accompagnement
     social_goal:
         index:
             title: Liste des objectifs d'action d'accompagnements
@@ -365,11 +378,17 @@ accompanying_period:
     dates: Période
     dates_from_%opening_date%: Ouvert depuis le %opening_date%
     dates_from_%opening_date%_to_%closing_date%: Ouvert du %opening_date% au %closing_date%
+    DRAFT: Brouillon
+    CONFIRMED: Confirmé
+    CLOSED: Clotûré
+    emergency: Urgent
 occasional: ponctuel
 regular: régulier
 Confidential: confidentiel
+confidential: confidentiel
 Draft: brouillon
 Confirmed: en file active
+Closed: Cloturé
 
 # Accompanying Course
 Accompanying Course: Parcours d'accompagnement
@@ -377,6 +396,7 @@ Accompanying Course History: Historique du parcours
 Resume Accompanying Course: Résumé du parcours
 Show Accompanying Course: Voir le parcours
 Edit Accompanying Course: Modifier le parcours
+Close Accompanying Course: Clôturer le parcours
 Create Accompanying Course: Créer un nouveau parcours
 Drop Accompanying Course: Supprimer le parcours
 This course is located at a temporarily address. You should locate this course to an user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'une personne concernée.
@@ -386,6 +406,7 @@ This course has a temporarily location: Localisation temporaire
 Choose a person to locate by: Localiser auprès d'un usager concerné
 Associate at least one member with an household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
 Locate by: Localiser auprès de
+fix it: Compléter
 
 # Household
 Household: Ménage
@@ -403,6 +424,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
@@ -412,13 +435,35 @@ accompanying_course_work:
     create_date: Date de création
     start_date: Date de début
     end_date: Date de fin
+    max_date: Date d'échéance
+    warning_interval: Rappel
+    '%days% days before max_date': "%days% jour(s) avant l'échéance"
     results without objective: Aucun objectif - motif -  dispositif
     no_results: Aucun résultat - orientation
     results: Résultats - orientations
     goal: Objectif - motif - dispositif
+    evaluations: Évaluations
     Any work: Aucune action d'accompagnement
+    remove: Supprimer une action d'accompagnement
+    social_evaluation: Évaluation
 
 #
 Person addresses: Adresses de résidence
 Household addresses: Adresses de domicile
 Insert an address: Insérer une adresse
+see social issues: Voir les problématiques sociales
+see persons associated: Voir les usagers concernés
+
+docgen:
+    Accompanying Period basic: "Parcours d'accompagnement (basique)"
+    Accompanying period work: "Action d'accompagnement"
+    Accompanying period work context: "Evaluation des actions d'accompagnement"
+    Main person: Personne principale
+    person 1: Première personne
+    person 2: Seconde personne
+    Ask for main person: Demander à l'utilisateur de préciser la personne principale
+    Ask for person 1: Demander à l'utilisateur de préciser la première personne
+    Ask for person 2: Demander à l'utilisateur de préciser la seconde personne
+    A basic context for accompanying period: Contexte pour les parcours
+    A context for accompanying period work: Contexte pour les actions d'accompagnement
+    A context for accompanying period work evaluation: Contexte pour les évaluations dans les actions d'accompagnement
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
index 0e77dae0c..b421e9f43 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
@@ -41,3 +41,9 @@ 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é à ce parcours.'
+A course must contains at least one social issue: 'Un parcours doit être associé à au moins une problématique sociale'
+A course must be associated to at least one scope: 'Un parcours doit être associé à au moins un service'
+The social %name% issue cannot be deleted because it is associated with an activity or an action: 'La problématique sociale "%name%" ne peut pas être supprimée car elle est associée à une activité ou une action'
diff --git a/src/Bundle/ChillReportBundle/ChillReportBundle.php b/src/Bundle/ChillReportBundle/ChillReportBundle.php
index 967796d8b..b791932e8 100644
--- a/src/Bundle/ChillReportBundle/ChillReportBundle.php
+++ b/src/Bundle/ChillReportBundle/ChillReportBundle.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ReportBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php
index 3cebec016..dfe9064e1 100644
--- a/src/Bundle/ChillReportBundle/Controller/ReportController.php
+++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php
@@ -1,325 +1,72 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\ReportBundle\Entity\Report;
 use Chill\ReportBundle\Form\ReportType;
-
+use DateTime;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Role\Role;
+use function count;
 
 /**
- * Class ReportController
- *
- * @package Chill\ReportBundle\Controller
+ * Class ReportController.
  */
 class ReportController extends AbstractController
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    
     /**
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
+
     /**
      * @var PaginatorFactory
      */
     protected $paginator;
-    
+
     /**
      * ReportController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param AuthorizationHelper $authorizationHelper
-     * @param PaginatorFactory $paginator
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         PaginatorFactory $paginator
-    )
-    {
+    ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->paginator = $paginator;
     }
-    
-    
-    /**
-     * List all the report entities for a given person.
-     *
-     * @param integer $person_id The id of the person.
-     * @param Request $request The request
-     * @return Response The web page.
-     */
-    public function listAction($person_id, Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $reachableScopes = $this->authorizationHelper
-                ->getReachableScopes($this->getUser(), new Role('CHILL_REPORT_SEE'),
-                        $person->getCenter());
-
-        $total = $em
-            ->createQuery("SELECT COUNT(r.id) FROM ChillReportBundle:Report r "
-                . "WHERE r.person = :person AND r.scope IN (:scopes) ")
-            ->setParameter('person', $person)
-            ->setParameter('scopes', $reachableScopes)
-            ->getSingleScalarResult();
-
-        // get the PaginatorFactory
-        $paginator = $this->paginator->create($total);
-
-        $reports = $em->createQuery('SELECT r
-                FROM ChillReportBundle:Report r
-                WHERE r.person = :person AND r.scope IN (:scopes)
-                ORDER BY r.date DESC')
-            ->setParameter('person', $person)
-            ->setParameter('scopes', $reachableScopes)
-            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
-            ->setMaxResults($paginator->getItemsPerPage())
-            ->getResult()
-            ;
-
-        $event = new PrivacyEvent($person, array(
-            'element_class' => Report::class,
-            'action' => 'list' 
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
-        return $this->render('ChillReportBundle:Report:list.html.twig', array(
-            'reports'   => $reports,
-            'person'    => $person,
-            'paginator' => $paginator
-        ));
-    }
 
     /**
-     * Display a form for selecting which type of report to add for a given person
+     * Create a new report for a given person and of a given type.
      *
-     * @param integer $person_id The id of the person.
-     * @param Request $request The request
-     * @return Response The web page.
-     */
-    public function selectReportTypeAction($person_id, Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $person = $em->getRepository('ChillPersonBundle:Person')
-                ->find($person_id);
-
-        if ($person === NULL) {
-            throw $this->createNotFoundException('Person not found!');
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person, 'access denied for person view');
-        // check access on report creation for a dummy report
-        $this->denyAccessUnlessGranted('CHILL_REPORT_CREATE',
-                (new Report())->setPerson($person), 'access denied for report creation');
-
-
-        $cFGroupId = $request->query->get('cFGroup');
-
-        if($cFGroupId) {
-            return $this->redirect(
-                $this->generateUrl('report_new',
-                    array('person_id' => $person_id, 'cf_group_id' => $cFGroupId)));
-        }
-
-        $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-            ->findByEntity('Chill\ReportBundle\Entity\Report');
-
-        if(count($cFGroups) === 1 ){
-            return $this->redirect(
-                $this->generateUrl('report_new',
-                    array('person_id' => $person_id, 'cf_group_id' => $cFGroups[0]->getId())));
-        }
-
-        $cFGroupsChoice = array();
-
-        foreach ($cFGroups as $cFGroup) {
-            $cFGroupsChoice[$cFGroup->getId()] = $cFGroup->getName($request->getLocale());
-        }
-
-        $form = $this->get('form.factory')
-            ->createNamedBuilder(null, FormType::class, null, array(
-                'method' => 'GET',
-                'csrf_protection' => false
-            ))
-            ->add('cFGroup', ChoiceType::class, array(
-                'choices' => array_combine(array_values($cFGroupsChoice),array_keys($cFGroupsChoice)),
-            ))
-            ->getForm();
-
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-
-        return $this->render('ChillReportBundle:Report:select_report_type.html.twig', array(
-            'form'     => $form->createView(),
-            'person'   => $person
-        ));
-    }
-
-    /**
-     * Display a form for selecting which type of report to export
-     * (a csv file with all the report of this type)
-     *
-     * @param Request $request The request
-     * @return Response The web page.
-     */
-    public function selectReportTypeForExportAction(Request $request)
-    {
-        $cFGroupId = $request->query->get('cFGroup');
-
-        if($cFGroupId) {
-            return $this->redirect(
-                $this->generateUrl('report_export_list',
-                    array('cf_group_id' => $cFGroupId)));
-        }
-
-        $em = $this->getDoctrine()->getManager();
-
-        $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-            ->findByEntity('Chill\ReportBundle\Entity\Report');
-
-        if(count($cFGroups) === 1 ){
-            return $this->redirect(
-                $this->generateUrl('report_export_list',
-                    array('cf_group_id' => $cFGroups[0]->getId())));
-        }
-
-        $cFGroupsChoice = array();
-
-        foreach ($cFGroups as $cFGroup) {
-            $cFGroupsChoice[$cFGroup->getId()] = $cFGroup->getName($request->getLocale());
-        }
-
-        $form = $this->get('form.factory')
-            ->createNamedBuilder(null, FormType::class, null, array(
-                'method' => 'GET',
-                'csrf_protection' => false
-            ))
-            ->add('cFGroup', ChoiceType::class, array(
-                'choices' => array_combine(array_values($cFGroupsChoice),array_keys($cFGroupsChoice)),
-            ))
-            ->getForm();
-
-        return $this->render('ChillReportBundle:Report:select_report_type_for_export.html.twig', array(
-            'form'     => $form->createView(),
-            'layout_name' => "@ChillMain/Export/layout.html.twig"
-        ));
-    }
-
-    /**
-     * Return a csv file with all the reports of a given type
-     *
-     * @param integer $cf_group_id The id of the report type to export
-     * @param Request $request The request
-     * @return A csv file with all the reports of the selected type
-     */
-    public function exportAction($cf_group_id, Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($cf_group_id);
-        $reports = $em->getRepository('ChillReportBundle:Report')->findByCFGroup($cFGroup);
-
-
-        $response = $this->render('ChillReportBundle:Report:export.csv.twig', array(
-            'reports' => $reports,
-            'cf_group' => $cFGroup
-        ));
-
-        $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
-        $response->headers->set('Content-Disposition', 'attachment; filename="export.csv"');
-        return $response;
-    }
-
-    /**
-     * Display a form for creating a new report for a given person and of a given type
-     *
-     * @param integer $person_id The id of the person.
-     * @param integer $cf_group_id The id of the report type.
-     * @param Request $request The request
-     * @return Response The web page.
-     */
-    public function newAction($person_id, $cf_group_id, Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-        $cFGroup = $em
-                ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-                ->find($cf_group_id);
-
-        if ($person === NULL) {
-            throw $this->createNotFoundException("Person not found");
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        // check access on report creation for a dummy report
-        $this->denyAccessUnlessGranted('CHILL_REPORT_CREATE',
-                (new Report())->setPerson($person), 'access denied for report creation');
-
-        if ($cFGroup === NULL){
-            throw $this->createNotFoundException("custom fields group not found");
-        }
-
-        $entity = new Report();
-        $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
-        $entity->setDate(new \DateTime('now'));
-
-        $entity->setCFGroup($cFGroup);
-
-        $form = $this->createCreateForm($entity, $person, $cFGroup);
-
-        return $this->render('ChillReportBundle:Report:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-            'person'   => $person
-        ));
-    }
-
-    /**
-     * Create a new report for a given person and of a given type
-     *
-     * @param integer $person_id The id of the person.
-     * @param integer $cf_group_id The id of the report type.
+     * @param int $person_id The id of the person.
+     * @param int $cf_group_id The id of the report type.
      * @param Request $request The request containing the form data (from the newAction)
+     *
      * @return Response The web page.
      */
     public function createAction($person_id, $cf_group_id, Request $request)
@@ -328,12 +75,12 @@ class ReportController extends AbstractController
 
         $entity = new Report();
         $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-              ->find($cf_group_id);
+            ->find($cf_group_id);
 
         $person = $em->getRepository('ChillPersonBundle:Person')
-              ->find($person_id);
+            ->find($person_id);
 
-        if($person === NULL || $cFGroup === NULL) {
+        if (null === $person || null === $cFGroup) {
             throw $this->createNotFoundException();
         }
 
@@ -353,110 +100,58 @@ class ReportController extends AbstractController
 
             $this->get('session')
                 ->getFlashBag()
-                ->add('success',
+                ->add(
+                    'success',
                     $this->get('translator')
                         ->trans('Success : report created!')
                 );
 
-            return $this->redirect($this->generateUrl('report_view',
-                array('person_id' => $person_id,'report_id' => $entity->getId())));
+            return $this->redirect($this->generateUrl(
+                'report_view',
+                ['person_id' => $person_id, 'report_id' => $entity->getId()]
+            ));
         }
 
-
         $this->get('session')
-            ->getFlashBag()->add('error',
+            ->getFlashBag()->add(
+                'error',
                 $this->get('translator')
                     ->trans('The form is not valid. The report has not been created !')
             );
 
-        return $this->render('ChillReportBundle:Report:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-            'person' => $person
-        ));
-    }
-
-    /**
-     * Creates a form to create a Report entity.
-     *
-     * @param Report $entity The entity
-     * @param integer $person_id The id of the person.
-     * @param integer $cf_group_id The id of the report type.
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(Report $entity, Person $person, $cFGroup)
-    {
-        $form = $this->createForm(ReportType::class, $entity, array(
-            'action' => $this->generateUrl('report_create',
-                array('person_id' => $person->getId(),
-                          'cf_group_id' => $cFGroup->getId())),
-            'method' => 'POST',
-            'cFGroup' => $cFGroup,
-            'role' => new Role('CHILL_REPORT_CREATE'),
-            'center' => $person->getCenter()
-        ));
-
-        return $form;
-    }
-
-    /**
-     * Find and display a report.
-     *
-     * @param integer $report_id The id of the report.
-     * @param integer $person_id The id of the person.
-     * @return Response The web page.
-     */
-    public function viewAction($report_id, $person_id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
-
-        $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id);
-
-        if (!$entity || !$person) {
-            throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.'));
-        }
-
-        $this->denyAccessUnlessGranted('CHILL_REPORT_SEE', $entity);
-    
-    
-        $event = new PrivacyEvent($person, array(
-            'element_class' => Report::class,
-            'element_id' => $entity->getId(),
-            'action' => 'view'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
-        return $this->render('ChillReportBundle:Report:view.html.twig', array(
+        return $this->render('ChillReportBundle:Report:new.html.twig', [
             'entity' => $entity,
+            'form' => $form->createView(),
             'person' => $person,
-        ));
+        ]);
     }
 
     /**
      * Display a form to edit an existing Report entity.
      *
-     * @param integer $person_id The id of the person.
-     * @param integer $report_id The id of the report.
+     * @param int|string $person_id The id of the person.
+     * @param int|string $report_id The id of the report.
+     *
      * @return Response The web page.
      */
-    public function editAction($person_id, $report_id, Request $request)
+    public function editAction($person_id, $report_id)
     {
         $em = $this->getDoctrine()->getManager();
 
+        /** @var Report $report */
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
             throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.'));
+                $this->get('translator')->trans('Unable to find this report.')
+            );
         }
 
-        if(intval($person_id) !== intval($report->getPerson()->getId())) {
-            throw new \RuntimeException(
-                $this->get('translator')->trans('This is not the report of the person.'), 1);
+        if ((int) $person_id !== (int) $report->getPerson()->getId()) {
+            throw new RuntimeException(
+                $this->get('translator')->trans('This is not the report of the person.'),
+                1
+            );
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -464,47 +159,288 @@ class ReportController extends AbstractController
         $person = $report->getPerson();
 
         $editForm = $this->createEditForm($report);
-    
-        $event = new PrivacyEvent($person, array(
+
+        $event = new PrivacyEvent($person, [
             'element_class' => Report::class,
             'element_id' => $report->getId(),
-            'action' => 'edit'
-        ));
+            'action' => 'edit',
+        ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-        return $this->render('ChillReportBundle:Report:edit.html.twig', array(
-            'edit_form'   => $editForm->createView(),
+        return $this->render('ChillReportBundle:Report:edit.html.twig', [
+            'edit_form' => $editForm->createView(),
             'person' => $person,
-        ));
+        ]);
     }
 
     /**
-     * Creates a form to edit a Report entity.
+     * Return a csv file with all the reports of a given type.
      *
-     * @param Report $entity The report to edit.
-     * @param integer $person_id The id of the person.
-     * @return \Symfony\Component\Form\Form The form
+     * @param int $cf_group_id The id of the report type to export
+     * @param Request $request The request
+     *
+     * @return A csv file with all the reports of the selected type
      */
-    private function createEditForm(Report $entity)
+    public function exportAction($cf_group_id, Request $request)
     {
-        $form = $this->createForm(ReportType::class, $entity, array(
-            'action' => $this->generateUrl('report_update',
-                array('person_id' => $entity->getPerson()->getId(),
-                    'report_id' => $entity->getId())),
-            'method' => 'PUT',
-            'cFGroup' => $entity->getCFGroup(),
-            'role' => new Role('CHILL_REPORT_UPDATE'),
-            'center' => $entity->getPerson()->getCenter()
-        ));
+        $em = $this->getDoctrine()->getManager();
 
-        return $form;
+        $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($cf_group_id);
+        $reports = $em->getRepository('ChillReportBundle:Report')->findByCFGroup($cFGroup);
+
+        $response = $this->render('ChillReportBundle:Report:export.csv.twig', [
+            'reports' => $reports,
+            'cf_group' => $cFGroup,
+        ]);
+
+        $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
+        $response->headers->set('Content-Disposition', 'attachment; filename="export.csv"');
+
+        return $response;
+    }
+
+    /**
+     * List all the report entities for a given person.
+     *
+     * @param int $person_id The id of the person.
+     * @param Request $request The request
+     *
+     * @return Response The web page.
+     */
+    public function listAction($person_id, Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableScopes(
+                $this->getUser(),
+                new Role('CHILL_REPORT_SEE'),
+                $person->getCenter()
+            );
+
+        $total = $em
+            ->createQuery('SELECT COUNT(r.id) FROM ChillReportBundle:Report r '
+                . 'WHERE r.person = :person AND r.scope IN (:scopes) ')
+            ->setParameter('person', $person)
+            ->setParameter('scopes', $reachableScopes)
+            ->getSingleScalarResult();
+
+        // get the PaginatorFactory
+        $paginator = $this->paginator->create($total);
+
+        $reports = $em->createQuery('SELECT r
+                FROM ChillReportBundle:Report r
+                WHERE r.person = :person AND r.scope IN (:scopes)
+                ORDER BY r.date DESC')
+            ->setParameter('person', $person)
+            ->setParameter('scopes', $reachableScopes)
+            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
+            ->setMaxResults($paginator->getItemsPerPage())
+            ->getResult();
+
+        $event = new PrivacyEvent($person, [
+            'element_class' => Report::class,
+            'action' => 'list',
+        ]);
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        return $this->render('ChillReportBundle:Report:list.html.twig', [
+            'reports' => $reports,
+            'person' => $person,
+            'paginator' => $paginator,
+        ]);
+    }
+
+    /**
+     * Display a form for creating a new report for a given person and of a given type.
+     *
+     * @param int $person_id The id of the person.
+     * @param int $cf_group_id The id of the report type.
+     * @param Request $request The request
+     *
+     * @return Response The web page.
+     */
+    public function newAction($person_id, $cf_group_id, Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        $cFGroup = $em
+            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->find($cf_group_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException('Person not found');
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+        // check access on report creation for a dummy report
+        $this->denyAccessUnlessGranted(
+            'CHILL_REPORT_CREATE',
+            (new Report())->setPerson($person),
+            'access denied for report creation'
+        );
+
+        if (null === $cFGroup) {
+            throw $this->createNotFoundException('custom fields group not found');
+        }
+
+        $entity = new Report();
+        $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
+        $entity->setDate(new DateTime('now'));
+
+        $entity->setCFGroup($cFGroup);
+
+        $form = $this->createCreateForm($entity, $person, $cFGroup);
+
+        return $this->render('ChillReportBundle:Report:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+            'person' => $person,
+        ]);
+    }
+
+    /**
+     * Display a form for selecting which type of report to add for a given person.
+     *
+     * @param int $person_id The id of the person.
+     * @param Request $request The request
+     *
+     * @return Response The web page.
+     */
+    public function selectReportTypeAction($person_id, Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $person = $em->getRepository('ChillPersonBundle:Person')
+            ->find($person_id);
+
+        if (null === $person) {
+            throw $this->createNotFoundException('Person not found!');
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person, 'access denied for person view');
+        // check access on report creation for a dummy report
+        $this->denyAccessUnlessGranted(
+            'CHILL_REPORT_CREATE',
+            (new Report())->setPerson($person),
+            'access denied for report creation'
+        );
+
+        $cFGroupId = $request->query->get('cFGroup');
+
+        if ($cFGroupId) {
+            return $this->redirect(
+                $this->generateUrl(
+                    'report_new',
+                    ['person_id' => $person_id, 'cf_group_id' => $cFGroupId]
+                )
+            );
+        }
+
+        $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->findByEntity('Chill\ReportBundle\Entity\Report');
+
+        if (count($cFGroups) === 1) {
+            return $this->redirect(
+                $this->generateUrl(
+                    'report_new',
+                    ['person_id' => $person_id, 'cf_group_id' => $cFGroups[0]->getId()]
+                )
+            );
+        }
+
+        $cFGroupsChoice = [];
+
+        foreach ($cFGroups as $cFGroup) {
+            $cFGroupsChoice[$cFGroup->getId()] = $cFGroup->getName($request->getLocale());
+        }
+
+        $form = $this->get('form.factory')
+            ->createNamedBuilder(null, FormType::class, null, [
+                'method' => 'GET',
+                'csrf_protection' => false,
+            ])
+            ->add('cFGroup', ChoiceType::class, [
+                'choices' => array_combine(array_values($cFGroupsChoice), array_keys($cFGroupsChoice)),
+            ])
+            ->getForm();
+
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+
+        return $this->render('ChillReportBundle:Report:select_report_type.html.twig', [
+            'form' => $form->createView(),
+            'person' => $person,
+        ]);
+    }
+
+    /**
+     * Display a form for selecting which type of report to export
+     * (a csv file with all the report of this type).
+     *
+     * @param Request $request The request
+     *
+     * @return Response The web page.
+     */
+    public function selectReportTypeForExportAction(Request $request)
+    {
+        $cFGroupId = $request->query->get('cFGroup');
+
+        if ($cFGroupId) {
+            return $this->redirect(
+                $this->generateUrl(
+                    'report_export_list',
+                    ['cf_group_id' => $cFGroupId]
+                )
+            );
+        }
+
+        $em = $this->getDoctrine()->getManager();
+
+        $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->findByEntity('Chill\ReportBundle\Entity\Report');
+
+        if (count($cFGroups) === 1) {
+            return $this->redirect(
+                $this->generateUrl(
+                    'report_export_list',
+                    ['cf_group_id' => $cFGroups[0]->getId()]
+                )
+            );
+        }
+
+        $cFGroupsChoice = [];
+
+        foreach ($cFGroups as $cFGroup) {
+            $cFGroupsChoice[$cFGroup->getId()] = $cFGroup->getName($request->getLocale());
+        }
+
+        $form = $this->get('form.factory')
+            ->createNamedBuilder(null, FormType::class, null, [
+                'method' => 'GET',
+                'csrf_protection' => false,
+            ])
+            ->add('cFGroup', ChoiceType::class, [
+                'choices' => array_combine(array_values($cFGroupsChoice), array_keys($cFGroupsChoice)),
+            ])
+            ->getForm();
+
+        return $this->render('ChillReportBundle:Report:select_report_type_for_export.html.twig', [
+            'form' => $form->createView(),
+            'layout_name' => '@ChillMain/Export/layout.html.twig',
+        ]);
     }
 
     /**
      * Web page for editing an existing report.
      *
-     * @param integer $person_id The id of the person.
-     * @param integer $report_id The id of the report.
+     * @param int $person_id The id of the person.
+     * @param int $report_id The id of the report.
+     *
      * @return Response The web page.
      */
     public function updateAction($person_id, $report_id, Request $request)
@@ -515,7 +451,8 @@ class ReportController extends AbstractController
 
         if (!$report) {
             throw $this->createNotFoundException(
-                $this->get('translator')->trans('Unable to find this report.'));
+                $this->get('translator')->trans('Unable to find this report.')
+            );
         }
 
         $this->denyAccessUnlessGranted('CHILL_REPORT_UPDATE', $report);
@@ -528,34 +465,120 @@ class ReportController extends AbstractController
 
             $this->get('session')
                 ->getFlashBag()
-                ->add('success',
+                ->add(
+                    'success',
                     $this->get('translator')
                         ->trans('Success : report updated!')
                 );
-    
+
             $person = $report->getPerson();
-            
-            $event = new PrivacyEvent($person, array(
+
+            $event = new PrivacyEvent($person, [
                 'element_class' => Report::class,
                 'element_id' => $report->getId(),
-                'action' => 'update'
-            ));
+                'action' => 'update',
+            ]);
             $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-    
-            return $this->redirect($this->generateUrl('report_view',
-                array('person_id' => $report->getPerson()->getId(), 'report_id' => $report_id)));
+
+            return $this->redirect($this->generateUrl(
+                'report_view',
+                ['person_id' => $report->getPerson()->getId(), 'report_id' => $report_id]
+            ));
         }
 
         $this->get('session')
             ->getFlashBag()
-            ->add('error',
+            ->add(
+                'error',
                 $this->get('translator')
                     ->trans('The form is not valid. The report has not been updated !')
             );
 
-        return $this->render('ChillReportBundle:Report:edit.html.twig', array(
-            'edit_form'   => $editForm->createView(),
-            'person' => $report->getPerson()
-        ));
+        return $this->render('ChillReportBundle:Report:edit.html.twig', [
+            'edit_form' => $editForm->createView(),
+            'person' => $report->getPerson(),
+        ]);
+    }
+
+    /**
+     * Find and display a report.
+     *
+     * @param int $report_id The id of the report.
+     * @param int $person_id The id of the person.
+     *
+     * @return Response The web page.
+     */
+    public function viewAction($report_id, $person_id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+
+        $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id);
+
+        if (!$entity || !$person) {
+            throw $this->createNotFoundException(
+                $this->get('translator')->trans('Unable to find this report.')
+            );
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_REPORT_SEE', $entity);
+
+        $event = new PrivacyEvent($person, [
+            'element_class' => Report::class,
+            'element_id' => $entity->getId(),
+            'action' => 'view',
+        ]);
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        return $this->render('ChillReportBundle:Report:view.html.twig', [
+            'entity' => $entity,
+            'person' => $person,
+        ]);
+    }
+
+    /**
+     * Creates a form to create a Report entity.
+     *
+     * @param Report $entity The entity
+     * @param mixed $cFGroup
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(Report $entity, Person $person, $cFGroup)
+    {
+        return $this->createForm(ReportType::class, $entity, [
+            'action' => $this->generateUrl(
+                'report_create',
+                ['person_id' => $person->getId(),
+                    'cf_group_id' => $cFGroup->getId(), ]
+            ),
+            'method' => 'POST',
+            'cFGroup' => $cFGroup,
+            'role' => new Role('CHILL_REPORT_CREATE'),
+            'center' => $person->getCenter(),
+        ]);
+    }
+
+    /**
+     * Creates a form to edit a Report entity.
+     *
+     * @param Report $entity The report to edit.
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(Report $entity)
+    {
+        return $this->createForm(ReportType::class, $entity, [
+            'action' => $this->generateUrl(
+                'report_update',
+                ['person_id' => $entity->getPerson()->getId(),
+                    'report_id' => $entity->getId(), ]
+            ),
+            'method' => 'PUT',
+            'cFGroup' => $entity->getCFGroup(),
+            'role' => new Role('CHILL_REPORT_UPDATE'),
+            'center' => $entity->getPerson()->getCenter(),
+        ]);
     }
 }
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
index a19537cc4..0b3652ff7 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomField.php
@@ -1,33 +1,24 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\DataFixtures\ORM;
 
+use Chill\CustomFieldsBundle\Entity\CustomField;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\CustomFieldsBundle\Entity\CustomField;
+use function count;
 
 /**
- * Load CustomField for Report into database
+ * Load CustomField for Report into database.
  */
 class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -39,53 +30,52 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         $cFTypes = [
-            array('type' => 'text', 'options' => array('maxLength' => '255')),
-            array('type' => 'text', 'options' => array('maxLength' => '1000')),
-            array('type' => 'text', 'options' => array('maxLength' => '2000')),
-            array('type' => 'title', 'options' => array('type' => 'title')),
-            array('type' => 'title', 'options' => array('type' => 'subtitle')),
-            array('type' => 'choice', 'options' => array(
+            ['type' => 'text', 'options' => ['maxLength' => '255']],
+            ['type' => 'text', 'options' => ['maxLength' => '1000']],
+            ['type' => 'text', 'options' => ['maxLength' => '2000']],
+            ['type' => 'title', 'options' => ['type' => 'title']],
+            ['type' => 'title', 'options' => ['type' => 'subtitle']],
+            ['type' => 'choice', 'options' => [
                 'multiple' => false,
-                'expanded'=> false,
+                'expanded' => false,
                 'other' => false,
-                'choices'=> [
-                    array(
-                        'name' => array(
+                'choices' => [
+                    [
+                        'name' => [
                             'fr' => 'Options 1 FR',
                             'nl' => 'Options 1 NL',
-                            'en' => 'Options 1 EN'),
+                            'en' => 'Options 1 EN', ],
                         'active' => true,
-                        'slug' => 'el-1-fr'),
-                    array(
-                        'name' => array(
+                        'slug' => 'el-1-fr', ],
+                    [
+                        'name' => [
                             'fr' => 'Options 2 FR',
                             'nl' => 'Options 2 NL',
-                            'en' => 'Options 2 EN'),
+                            'en' => 'Options 2 EN', ],
                         'active' => true,
-                        'slug' => 'el-2-fr'),
-                    array(
-                        'name' => array(
+                        'slug' => 'el-2-fr', ],
+                    [
+                        'name' => [
                             'fr' => 'Options 2 FR',
                             'nl' => 'Options 2 NL',
-                            'en' => 'Options 2 EN'),
+                            'en' => 'Options 2 EN', ],
                         'active' => true,
-                        'slug' => 'el-3-fr')
-                    ]
-                )
-            )
+                        'slug' => 'el-3-fr', ],
+                ],
+            ],
+            ],
         ];
 
-        for($i=0; $i <= 25; $i++) {
-            $cFType = $cFTypes[rand(0,sizeof($cFTypes) - 1)];
+        for ($i = 0; 25 >= $i; ++$i) {
+            $cFType = $cFTypes[mt_rand(0, count($cFTypes) - 1)];
 
             $customField = (new CustomField())
                 ->setSlug("cf_report_{$i}")
                 ->setType($cFType['type'])
                 ->setOptions($cFType['options'])
-                ->setName(array("fr" => "CustomField {$i}"))
-                ->setOrdering(rand(0,1000) / 1000)
-                ->setCustomFieldsGroup($this->getReference('cf_group_report_'.(rand(0,3))))
-            ;
+                ->setName(['fr' => "CustomField {$i}"])
+                ->setOrdering(mt_rand(0, 1000) / 1000)
+                ->setCustomFieldsGroup($this->getReference('cf_group_report_' . (mt_rand(0, 3))));
 
             $manager->persist($customField);
         }
@@ -101,119 +91,108 @@ class LoadCustomField extends AbstractFixture implements OrderedFixtureInterface
         $reportLogement = $this->getReference('cf_group_report_logement');
 
         $houseTitle = (new CustomField())
-                ->setSlug('house_title')
-                ->setType('title')
-                ->setOptions(array('type' => 'title'))
-                ->setName(array('fr' => 'Situation de logement'))
-                ->setOrdering(10)
-                ->setCustomFieldsGroup($reportLogement)
-                ;
+            ->setSlug('house_title')
+            ->setType('title')
+            ->setOptions(['type' => 'title'])
+            ->setName(['fr' => 'Situation de logement'])
+            ->setOrdering(10)
+            ->setCustomFieldsGroup($reportLogement);
         $manager->persist($houseTitle);
 
         $hasLogement = (new CustomField())
-                ->setSlug('has_logement')
-                ->setName(array('fr' => 'Logement actuel'))
-                ->setType('choice')
-                ->setOptions(array(
-                    'multiple' => FALSE,
-                    'expanded' => TRUE,
-                    'other' => TRUE,
-                    'choices' => [
-                        array(
-                            'name' => ['fr' => 'Locataire d\' un logement'],
-                            'slug' => 'rent_house',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'Propriétaire d\' un logement'],
-                            'slug' => 'own_house',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'Par-ci, par là (amis, famille, ...)'],
-                            'slug' => 'here-and-there',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'A la rue'],
-                            'slug' => 'street',
-                            'active' => true
-                        )
-                    ]
-
-                ))
-                ->setOrdering(20)
-                ->setCustomFieldsGroup($reportLogement)
-                ;
+            ->setSlug('has_logement')
+            ->setName(['fr' => 'Logement actuel'])
+            ->setType('choice')
+            ->setOptions([
+                'multiple' => false,
+                'expanded' => true,
+                'other' => true,
+                'choices' => [
+                    [
+                        'name' => ['fr' => 'Locataire d\' un logement'],
+                        'slug' => 'rent_house',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'Propriétaire d\' un logement'],
+                        'slug' => 'own_house',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'Par-ci, par là (amis, famille, ...)'],
+                        'slug' => 'here-and-there',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'A la rue'],
+                        'slug' => 'street',
+                        'active' => true,
+                    ],
+                ],
+            ])
+            ->setOrdering(20)
+            ->setCustomFieldsGroup($reportLogement);
         $manager->persist($hasLogement);
 
         $descriptionLogement = (new CustomField())
-                ->setSlug('house-desc')
-                ->setName(array('fr' => 'Plaintes éventuelles sur le logement'))
-                ->setType('text')
-                ->setOptions(['maxLength' => 1500])
-                ->setOrdering(30)
-                ->setCustomFieldsGroup($reportLogement)
-                ;
+            ->setSlug('house-desc')
+            ->setName(['fr' => 'Plaintes éventuelles sur le logement'])
+            ->setType('text')
+            ->setOptions(['maxLength' => 1500])
+            ->setOrdering(30)
+            ->setCustomFieldsGroup($reportLogement);
         $manager->persist($descriptionLogement);
 
-
         //report problems
         $reportEducation = $this->getReference('cf_group_report_education');
 
         $title = (new CustomField())
-                ->setSlug('title')
-                ->setType('title')
-                ->setOptions(array('type' => 'title'))
-                ->setName(array('fr' => 'Éducation'))
-                ->setOrdering(10)
-                ->setCustomFieldsGroup($reportEducation)
-                ;
+            ->setSlug('title')
+            ->setType('title')
+            ->setOptions(['type' => 'title'])
+            ->setName(['fr' => 'Éducation'])
+            ->setOrdering(10)
+            ->setCustomFieldsGroup($reportEducation);
         $manager->persist($title);
 
         $educationLevel = (new CustomField())
-                ->setSlug('level')
-                ->setName(array('fr' => 'Niveau du plus haut diplôme'))
-                ->setType('choice')
-                ->setOptions(array(
-                    'multiple' => FALSE,
-                    'expanded' => FALSE,
-                    'other' => FALSE,
-                    'choices' => [
-                        array(
-                            'name' => ['fr' => 'Supérieur'],
-                            'slug' => 'superieur',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'Secondaire supérieur (CESS)'],
-                            'slug' => 'cess',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'Secondaire deuxième degré ou inférieur (C2D)'],
-                            'slug' => 'c2d',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'Primaire'],
-                            'slug' => 'low',
-                            'active' => true
-                        ),
-                        array(
-                            'name' => ['fr' => 'Aucun diplome'],
-                            'slug' => 'no',
-                            'active' => true
-                        )
-                    ]
-
-                ))
-                ->setOrdering(20)
-                ->setCustomFieldsGroup($reportEducation)
-                ;
+            ->setSlug('level')
+            ->setName(['fr' => 'Niveau du plus haut diplôme'])
+            ->setType('choice')
+            ->setOptions([
+                'multiple' => false,
+                'expanded' => false,
+                'other' => false,
+                'choices' => [
+                    [
+                        'name' => ['fr' => 'Supérieur'],
+                        'slug' => 'superieur',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'Secondaire supérieur (CESS)'],
+                        'slug' => 'cess',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'Secondaire deuxième degré ou inférieur (C2D)'],
+                        'slug' => 'c2d',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'Primaire'],
+                        'slug' => 'low',
+                        'active' => true,
+                    ],
+                    [
+                        'name' => ['fr' => 'Aucun diplome'],
+                        'slug' => 'no',
+                        'active' => true,
+                    ],
+                ],
+            ])
+            ->setOrdering(20)
+            ->setCustomFieldsGroup($reportEducation);
         $manager->persist($educationLevel);
-
-
-
     }
 }
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
index ee45cc728..f5826f2f7 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadCustomFieldsGroup.php
@@ -1,33 +1,23 @@
 <?php
 
-/*
- * Chill is a software for social workers 
+/**
+ * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\DataFixtures\ORM;
 
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 
 /**
- * Load CustomFieldsGroup for Report into database
+ * Load CustomFieldsGroup for Report into database.
  */
 class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -35,55 +25,52 @@ class LoadCustomFieldsGroup extends AbstractFixture implements OrderedFixtureInt
     {
         return 15000;
     }
-    
+
     public function load(ObjectManager $manager)
     {
         echo "loading customFieldsGroup...\n";
-        
-        $report = $this->createReport($manager, 
-              array('fr' => 'Situation de logement'), 
-              ['summary_fields' => ['has_logement', 'house-desc']]);
+
+        $report = $this->createReport(
+            $manager,
+            ['fr' => 'Situation de logement'],
+            ['summary_fields' => ['has_logement', 'house-desc']]
+        );
         $this->addReference(
-              'cf_group_report_logement', 
-              $report
-              );
-        
-        $report = $this->createReport($manager, array('fr' => 'Alphabétisme'));
+            'cf_group_report_logement',
+            $report
+        );
+
+        $report = $this->createReport($manager, ['fr' => 'Alphabétisme']);
         $this->addReference('cf_group_report_education', $report);
 
-        for($i=0; $i <= 3; $i++) {
-            
-            $report = $this->createReport($manager, array('fr' => 'ZZ Rapport aléatoire '.$i));
+        for ($i = 0; 3 >= $i; ++$i) {
+            $report = $this->createReport($manager, ['fr' => 'ZZ Rapport aléatoire ' . $i]);
 
-            $this->addReference('cf_group_report_'.$i, $report);
+            $this->addReference('cf_group_report_' . $i, $report);
         }
-        
-        
-        
+
         $manager->flush();
     }
-    
+
     /**
-     * create a report and persist in the db
-     * 
-     * @param ObjectManager $manager
-     * @param array $name
+     * create a report and persist in the db.
+     *
      * @return CustomFieldsGroup
      */
     private function createReport(
-          ObjectManager $manager, 
-          array $name, 
-          array $options = array())
-    {
-        echo $name['fr']." \n";
-        
+        ObjectManager $manager,
+        array $name,
+        array $options = []
+    ) {
+        echo $name['fr'] . " \n";
+
         $cFGroup = (new CustomFieldsGroup())
             ->setName($name)
             ->setEntity('Chill\ReportBundle\Entity\Report')
             ->setOptions($options);
 
         $manager->persist($cFGroup);
-        
+
         return $cFGroup;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
index f2a97c16d..006f18afe 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
@@ -1,36 +1,27 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use function in_array;
 
 /**
  * Add a role CHILL_REPORT_UPDATE & CHILL_REPORT_CREATE for all groups except administrative,
- * and a role CHILL_REPORT_SEE for administrative
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * and a role CHILL_REPORT_SEE for administrative.
  */
 class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -39,13 +30,13 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
         return 14999;
     }
 
-    
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
             printf("processing permission group %s \n", $permissionsGroup->getName());
-            foreach (LoadScopes::$references as $scopeRef){
+
+            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 printf("processing scope %s \n", $scope->getName()['en']);
                 //create permission group
@@ -53,36 +44,42 @@ class LoadReportACL extends AbstractFixture implements OrderedFixtureInterface
                     case 'social':
                         if ($scope->getName()['en'] === 'administrative') {
                             printf("denying power on administrative \n");
+
                             break 2; // we do not want any power on administrative
                         }
+
                         break;
+
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             printf("denying power on %s\n", $scope->getName()['en']);
+
                             break 2; // we do not want any power on social or administrative
-                        }  
+                        }
+
                         break;
                 }
-                
-                printf("Adding CHILL_REPORT_UPDATE & CHILL_REPORT_CREATE to %s "
-                        . "permission group, scope '%s' \n", 
-                        $permissionsGroup->getName(), $scope->getName()['en']);
+
+                printf(
+                    'Adding CHILL_REPORT_UPDATE & CHILL_REPORT_CREATE to %s '
+                        . "permission group, scope '%s' \n",
+                    $permissionsGroup->getName(),
+                    $scope->getName()['en']
+                );
                 $roleScopeUpdate = (new RoleScope())
-                            ->setRole('CHILL_REPORT_UPDATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_REPORT_UPDATE')
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
                 $roleScopeCreate = (new RoleScope())
-                            ->setRole('CHILL_REPORT_CREATE')
-                            ->setScope($scope);
+                    ->setRole('CHILL_REPORT_CREATE')
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeCreate);
                 $manager->persist($roleScopeUpdate);
                 $manager->persist($roleScopeCreate);
             }
-            
         }
-        
+
         $manager->flush();
     }
-
 }
diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
index 31994c2e6..504cb2709 100644
--- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
@@ -1,46 +1,37 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\DataFixtures\ORM;
 
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\ReportBundle\Entity\Report;
+use DateTime;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Chill\ReportBundle\Entity\Report;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Faker\Factory as FakerFactory;
-use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use function count;
+use function in_array;
 
 /**
- * Load reports into DB
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Load reports into DB.
  */
-class LoadReports extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+class LoadReports extends AbstractFixture implements ContainerAwareInterface, OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
     /**
-     *
      * @var \Faker\Generator
      */
     private $faker;
@@ -66,6 +57,26 @@ class LoadReports extends AbstractFixture implements OrderedFixtureInterface, Co
         $manager->flush();
     }
 
+    private function createExpected(ObjectManager $manager)
+    {
+        $charline = $this->container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillPersonBundle:Person')
+            ->findOneBy(['firstName' => 'Charline', 'lastName' => 'DEPARDIEU']);
+
+        if (null !== $charline) {
+            $report = (new Report())
+                ->setPerson($charline)
+                ->setCFGroup($this->getReference('cf_group_report_logement'))
+                ->setDate(new DateTime('2015-01-05'))
+                ->setScope($this->getReference('scope_social'));
+            $this->fillReport($report);
+
+            $manager->persist($report);
+        } else {
+            echo 'WARNING: Charline DEPARDIEU not found in database';
+        }
+    }
+
     private function createRandom(ObjectManager $manager, $percentage)
     {
         $people = $this->getPeopleRandom($percentage);
@@ -73,100 +84,57 @@ class LoadReports extends AbstractFixture implements OrderedFixtureInterface, Co
         foreach ($people as $person) {
             //create a report, set logement or education report
             $report = (new Report())
-                    ->setPerson($person)
-                    ->setCFGroup(rand(0,10) > 5 ?
+                ->setPerson($person)
+                ->setCFGroup(
+                    mt_rand(0, 10) > 5 ?
                             $this->getReference('cf_group_report_logement') :
                             $this->getReference('cf_group_report_education')
-                        )
-                    ->setScope($this->getScopeRandom())
-                ;
+                )
+                ->setScope($this->getScopeRandom());
             $this->fillReport($report);
             $manager->persist($report);
         }
     }
 
-    private function createExpected(ObjectManager $manager)
-    {
-        $charline = $this->container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillPersonBundle:Person')
-                ->findOneBy(array('firstName' => 'Charline', 'lastName' => 'DEPARDIEU'))
-                ;
-
-        if (NULL !== $charline) {
-            $report = (new Report())
-                ->setPerson($charline)
-                ->setCFGroup($this->getReference('cf_group_report_logement'))
-                ->setDate(new \DateTime('2015-01-05'))
-                ->setScope($this->getReference('scope_social'))
-            ;
-            $this->fillReport($report);
-
-            $manager->persist($report);
-        } else {
-            print("WARNING: Charline DEPARDIEU not found in database");
-        }
-    }
-
-    /**
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getScopeRandom()
-    {
-        $ref = LoadScopes::$references[array_rand(LoadScopes::$references)];
-        return $this->getReference($ref);
-    }
-
-    private function getPeopleRandom($percentage)
-    {
-        $people = $this->container->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillPersonBundle:Person')
-                ->findAll()
-                ;
-
-        //keep only a part ($percentage) of the people
-        $selectedPeople = array();
-        foreach($people as $person) {
-            if (rand(0,100) < $percentage) {
-                $selectedPeople[] = $person;
-            }
-        }
-
-        return $selectedPeople;
-    }
-
     private function fillReport(Report $report)
     {
         //setUser
         $usernameRef = array_rand(LoadUsers::$refs);
         $report->setUser(
-                $this->getReference($usernameRef)
-                );
+            $this->getReference($usernameRef)
+        );
 
         //set date if null
-        if ($report->getDate() === NULL) {
+        if ($report->getDate() === null) {
             //set date. 30% of the dates are 2015-05-01
-            $expectedDate = new \DateTime('2015-01-05');
-            if (rand(0,100) < 30) {
+            $expectedDate = new DateTime('2015-01-05');
+
+            if (mt_rand(0, 100) < 30) {
                 $report->setDate($expectedDate);
             } else {
                 $report->setDate($this->faker->dateTimeBetween('-1 year', 'now')
-                        ->setTime(0, 0, 0));
+                    ->setTime(0, 0, 0));
             }
         }
 
         //fill data
-        $datas = array();
+        $datas = [];
+
         foreach ($report->getCFGroup()->getCustomFields() as $field) {
             switch ($field->getType()) {
-                case 'title' :
-                    $datas[$field->getSlug()] = array();
+                case 'title':
+                    $datas[$field->getSlug()] = [];
+
                     break;
-                case 'choice' :
+
+                case 'choice':
                     $datas[$field->getSlug()] = $this->getRandomChoice($field);
+
                     break;
-                case 'text' :
+
+                case 'text':
                     $datas[$field->getSlug()] = $this->faker->realText($field->getOptions()['maxLength']);
+
                     break;
             }
         }
@@ -175,11 +143,28 @@ class LoadReports extends AbstractFixture implements OrderedFixtureInterface, Co
         return $report;
     }
 
+    private function getPeopleRandom($percentage)
+    {
+        $people = $this->container->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillPersonBundle:Person')
+            ->findAll();
+
+        //keep only a part ($percentage) of the people
+        $selectedPeople = [];
+
+        foreach ($people as $person) {
+            if (mt_rand(0, 100) < $percentage) {
+                $selectedPeople[] = $person;
+            }
+        }
+
+        return $selectedPeople;
+    }
+
     /**
-     * pick a random choice
+     * pick a random choice.
      *
-     * @param CustomField $field
-     * @return string[]|string the array of slug if multiple, a single slug otherwise
+     * @return string|string[] the array of slug if multiple, a single slug otherwise
      */
     private function getRandomChoice(CustomField $field)
     {
@@ -188,57 +173,61 @@ class LoadReports extends AbstractFixture implements OrderedFixtureInterface, Co
         $other = $field->getOptions()['other'];
 
         //add other if allowed
-        if($other) {
-            $choices[] = array('slug' => '_other');
+        if ($other) {
+            $choices[] = ['slug' => '_other'];
         }
 
         //initialize results
-        $picked = array();
+        $picked = [];
 
         if ($multiple) {
-            $numberSelected = rand(1, count($choices) -1);
-            for ($i = 0; $i < $numberSelected; $i++) {
+            $numberSelected = mt_rand(1, count($choices) - 1);
+
+            for ($i = 0; $i < $numberSelected; ++$i) {
                 $picked[] = $this->pickChoice($choices);
             }
 
             if ($other) {
-                $result = array("_other" => NULL, "_choices" => $picked);
+                $result = ['_other' => null, '_choices' => $picked];
 
-                if (in_array('_other', $picked)) {
+                if (in_array('_other', $picked, true)) {
                     $result['_other'] = $this->faker->realText(70);
                 }
 
                 return $result;
             }
-
         } else {
             $picked = $this->pickChoice($choices);
 
             if ($other) {
-                $result = array('_other' => NULL, '_choices' => $picked);
+                $result = ['_other' => null, '_choices' => $picked];
 
-                if ($picked === '_other') {
+                if ('_other' === $picked) {
                     $result['_other'] = $this->faker->realText(70);
                 }
 
                 return $result;
             }
         }
-
-
     }
 
     /**
-     * pick a choice within a 'choices' options (for choice type)
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getScopeRandom()
+    {
+        $ref = LoadScopes::$references[array_rand(LoadScopes::$references)];
+
+        return $this->getReference($ref);
+    }
+
+    /**
+     * pick a choice within a 'choices' options (for choice type).
      *
-     * @param array $choices
      * @return the slug of the selected choice
      */
     private function pickChoice(array $choices)
     {
         return $choices[array_rand($choices)]['slug'];
     }
-
-
-
 }
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
index 359017020..3acf8d5ee 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/ChillReportExtension.php
@@ -1,101 +1,74 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Chill\MainBundle\DependencyInjection\MissingBundleException;
 use Chill\CustomFieldsBundle\Form\Type\LinkedCustomFieldsType;
+use Chill\MainBundle\DependencyInjection\MissingBundleException;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillReportExtension extends Extension implements PrependExtensionInterface
 {
     /**
-     * {@inheritdoc}
+     * Declare the entity Report, as a customizable entity (can add custom fields).
      */
+    public function declareReportAsCustomizable(ContainerBuilder $container)
+    {
+        $bundles = $container->getParameter('kernel.bundles');
+
+        if (!isset($bundles['ChillCustomFieldsBundle'])) {
+            throw new MissingBundleException('ChillCustomFieldsBundle');
+        }
+
+        $container->prependExtensionConfig(
+            'chill_custom_fields',
+            ['customizables_entities' => [
+                [
+                    'class' => 'Chill\ReportBundle\Entity\Report',
+                    'name' => 'ReportEntity',
+                    'options' => [
+                        'summary_fields' => [
+                            'form_type' => LinkedCustomFieldsType::class,
+                            'form_options' => [
+                                'multiple' => true,
+                                'expanded' => false,
+                            ],
+                        ],
+                    ], ],
+            ],
+            ]
+        );
+    }
+
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/controller.yaml');
     }
 
-    /**
-     * Declare the entity Report, as a customizable entity (can add custom fields)
-     *
-     * @param ContainerBuilder $container
-     */
-    public function declareReportAsCustomizable(ContainerBuilder $container)
-    {
-        $bundles = $container->getParameter('kernel.bundles');
-        if (!isset($bundles['ChillCustomFieldsBundle'])) {
-            throw new MissingBundleException('ChillCustomFieldsBundle');
-        }
-
-        $container->prependExtensionConfig('chill_custom_fields',
-            array('customizables_entities' =>
-                array(
-                    array(
-                       'class' => 'Chill\ReportBundle\Entity\Report',
-                       'name' => 'ReportEntity',
-                       'options' => array(
-                          'summary_fields' => array(
-                             'form_type' => LinkedCustomFieldsType::class,
-                             'form_options' =>
-                                [
-                                   'multiple' => true,
-                                   'expanded' => false
-                                ]
-                          )
-                       ))
-                )
-            )
-        );
-    }
-
-    /**
-     * declare routes from report bundle
-     *
-     * @param ContainerBuilder $container
-     */
-    private function declareRouting(ContainerBuilder $container)
-    {
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillReportBundle/config/routes.yaml'
-              )
-           )
-        ));
-    }
-
-    protected function prependRoleHierarchy(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-              'CHILL_REPORT_UPDATE' => array('CHILL_REPORT_SEE'),
-              'CHILL_REPORT_CREATE' => array('CHILL_REPORT_SEE')
-           )
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param ContainerBuilder $container
-     */
     public function prepend(ContainerBuilder $container)
     {
         $this->declareReportAsCustomizable($container);
@@ -103,4 +76,27 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac
         $this->prependRoleHierarchy($container);
     }
 
+    protected function prependRoleHierarchy(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                'CHILL_REPORT_UPDATE' => ['CHILL_REPORT_SEE'],
+                'CHILL_REPORT_CREATE' => ['CHILL_REPORT_SEE'],
+            ],
+        ]);
+    }
+
+    /**
+     * declare routes from report bundle.
+     */
+    private function declareRouting(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillReportBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
index 2b3b75672..c3218bc20 100644
--- a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
@@ -1,20 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_report');
diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php
index fa81d9283..bfe654f43 100644
--- a/src/Bundle/ChillReportBundle/Entity/Report.php
+++ b/src/Bundle/ChillReportBundle/Entity/Report.php
@@ -1,46 +1,56 @@
 <?php
 
-/*
- * 
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\User;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class Report
+ * Class Report.
  *
- * @package Chill\ReportBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
  * @ORM\Table(name="report")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
  */
 class Report implements HasCenterInterface, HasScopeInterface
 {
     /**
-     * @var integer
+     * @var array
+     * @ORM\Column(type="json")
+     */
+    private $cFData;
+
+    /**
+     * @var CustomFieldsGroup
+     * @ORM\ManyToOne(
+     * targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
+     */
+    private $cFGroup;
+
+    /**
+     * @var DateTime
+     * @ORM\Column(type="datetime")
+     */
+    private $date;
+
+    /**
+     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -48,24 +58,12 @@ class Report implements HasCenterInterface, HasScopeInterface
      */
     private $id;
 
-    /**
-     * @var User
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private $user;
-
     /**
      * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
     private $person;
 
-    /**
-     * @var \DateTime
-     * @ORM\Column(type="datetime")
-     */
-    private $date;
-
     /**
      * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
@@ -73,23 +71,53 @@ class Report implements HasCenterInterface, HasScopeInterface
     private $scope;
 
     /**
-     * @var array
-     * @ORM\Column(type="json_array")
+     * @var User
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private $cFData;
+    private $user;
 
     /**
-     * @var CustomFieldsGroup
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\CustomFieldsBundle\Entity\CustomFieldsGroup")
+     * @return Center
      */
-    private $cFGroup;
-
+    public function getCenter()
+    {
+        return $this->person->getCenter();
+    }
 
     /**
-     * Get id
+     * Get cFData.
      *
-     * @return integer
+     * @return array
+     */
+    public function getCFData()
+    {
+        return $this->cFData;
+    }
+
+    /**
+     * Get cFGroup.
+     *
+     * @return CustomFieldsGroup
+     */
+    public function getCFGroup()
+    {
+        return $this->cFGroup;
+    }
+
+    /**
+     * Get date.
+     *
+     * @return DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
      */
     public function getId()
     {
@@ -97,43 +125,7 @@ class Report implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Set user
-     *
-     * @param User $user
-     * @return Report
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    /**
-     * Get user
-     *
-     * @return User
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * Set person
-     *
-     * @param Person $person
-     * @return Report
-     */
-    public function setPerson(Person $person)
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    /**
-     * Get person
+     * Get person.
      *
      * @return Person
      */
@@ -143,43 +135,7 @@ class Report implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Set date
-     *
-     * @param \DateTime $date
-     * @return Report
-     */
-    public function setDate($date)
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    /**
-     * Get date
-     *
-     * @return \DateTime
-     */
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * Set scope
-     *
-     * @param string $scope
-     * @return Report
-     */
-    public function setScope(Scope $scope)
-    {
-        $this->scope = $scope;
-
-        return $this;
-    }
-
-    /**
-     * Get scope
+     * Get scope.
      *
      * @return Scope
      */
@@ -189,9 +145,18 @@ class Report implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Set cFData
+     * Get user.
+     *
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * Set cFData.
      *
-     * @param array $cFData
      * @return Report
      */
     public function setCFData(array $cFData)
@@ -202,19 +167,8 @@ class Report implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Get cFData
+     * Set cFGroup.
      *
-     * @return array
-     */
-    public function getCFData()
-    {
-        return $this->cFData;
-    }
-
-    /**
-     * Set cFGroup
-     *
-     * @param CustomFieldsGroup $cFGroup
      * @return Report
      */
     public function setCFGroup(CustomFieldsGroup $cFGroup)
@@ -225,21 +179,54 @@ class Report implements HasCenterInterface, HasScopeInterface
     }
 
     /**
-     * Get cFGroup
+     * Set date.
      *
-     * @return CustomFieldsGroup
+     * @param DateTime $date
+     *
+     * @return Report
      */
-    public function getCFGroup()
+    public function setDate($date)
     {
-        return $this->cFGroup;
-    }
-    
-    /**
-     * @return Center
-     */
-    public function getCenter()
-    {
-        return $this->person->getCenter();
+        $this->date = $date;
+
+        return $this;
     }
 
+    /**
+     * Set person.
+     *
+     * @return Report
+     */
+    public function setPerson(Person $person)
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    /**
+     * Set scope.
+     *
+     * @param string $scope
+     *
+     * @return Report
+     */
+    public function setScope(Scope $scope)
+    {
+        $this->scope = $scope;
+
+        return $this;
+    }
+
+    /**
+     * Set user.
+     *
+     * @return Report
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
index 583db8f4b..85bb35774 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php
@@ -1,77 +1,77 @@
 <?php
-/*
- * 
- */
-namespace Chill\ReportBundle\Export\Export;
-
-use Chill\MainBundle\Export\ListInterface;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\ReportBundle\Security\Authorization\ReportVoter;
-use Chill\PersonBundle\Export\Declarations;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraints\Callback;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\ReportBundle\Entity\Report;
-use Doctrine\ORM\Query;
-use Chill\MainBundle\Entity\Scope;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
-class ReportList implements ListInterface, ExportElementValidatedInterface
+
+declare(strict_types=1);
+
+namespace Chill\ReportBundle\Export\Export;
+
+use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
+use Chill\CustomFieldsBundle\Entity\CustomField;
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\ReportBundle\Entity\Report;
+use Chill\ReportBundle\Security\Authorization\ReportVoter;
+use Closure;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Exception;
+use LogicException;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function array_keys;
+use function array_merge;
+use function count;
+use function in_array;
+use function strlen;
+use function strtolower;
+use function ucfirst;
+use function uniqid;
+
+class ReportList implements ExportElementValidatedInterface, ListInterface
 {
-    /**
-     *
-     * @var CustomFieldsGroup
-     */
-    protected $customfieldsGroup;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
-     * @var CustomFieldProvider
-     */
-    protected $customFieldProvider;
-    
-    protected $em;
-    
-    protected $fields = array(
+    protected CustomFieldProvider $customFieldProvider;
+
+    protected CustomFieldsGroup $customfieldsGroup;
+
+    protected EntityManagerInterface $em;
+
+    protected array $fields = [
         'person_id',  'person_firstName', 'person_lastName', 'person_birthdate',
         'person_placeOfBirth', 'person_gender', 'person_memo', 'person_email', 'person_phonenumber',
         'person_countryOfBirth', 'person_nationality', 'person_address_street_address_1',
         'person_address_street_address_2', 'person_address_valid_from', 'person_address_postcode_label',
         'person_address_postcode_code', 'person_address_country_name', 'person_address_country_code',
-        'report_id', 'report_user', 'report_date', 'report_scope'
-    );
-    
-    protected $slugs = [];
-    
-    function __construct(
-        CustomFieldsGroup $customfieldsGroup, 
+        'report_id', 'report_user', 'report_date', 'report_scope',
+    ];
+
+    protected array $slugs = [];
+
+    protected TranslatableStringHelper $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
+    public function __construct(
+        CustomFieldsGroup $customfieldsGroup,
         TranslatableStringHelper $translatableStringHelper,
         TranslatorInterface $translator,
         CustomFieldProvider $customFieldProvider,
@@ -84,335 +84,229 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
         $this->em = $em;
     }
 
-        
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder)
     {
-       $choices = array_combine($this->fields, $this->fields);
-        
+        $choices = array_combine($this->fields, $this->fields);
+
         foreach ($this->getCustomFields() as $cf) {
-            $choices
-                [$this->translatableStringHelper->localize($cf->getName())] 
-                = 
+            $choices[$this->translatableStringHelper->localize($cf->getName())]
+                =
                 $cf->getSlug();
         }
-        
+
         // Add a checkbox to select fields
-        $builder->add('fields', ChoiceType::class, array(
+        $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
             'expanded' => true,
             'choices' => $choices,
-            'label'    => 'Fields to include in export',
-            'choice_attr' => function($val, $key, $index) {
+            'label' => 'Fields to include in export',
+            'choice_attr' => static function ($val, $key, $index) {
                 // add a 'data-display-target' for address fields
                 if (substr($val, 0, 8) === 'address_') {
                     return ['data-display-target' => 'address_date'];
-                } else {
-                    return [];
                 }
+
+                return [];
             },
-            'choice_label' => function($key, $label) {
-                switch (\substr($key, 0, 7)) {
+            'choice_label' => function (string $key, string $label): string {
+                switch (substr($key, 0, 7)) {
                     case 'person_':
-                        return $this->translator->trans(\substr($key, 7, \strlen($key) - 7)).
-                            ' ('.$this->translator->trans('Person').')';
+                        return $this->translator->trans(substr($key, 7, strlen($key) - 7)) .
+                            ' (' . $this->translator->trans('Person') . ')';
+
                     case 'report_':
-                        return $this->translator->trans(\ucfirst(\substr($key, 7, \strlen($key) - 7))).
-                            ' ('.$this->translator->trans('Report').')';
+                        return $this->translator->trans(ucfirst(substr($key, 7, strlen($key) - 7))) .
+                            ' (' . $this->translator->trans('Report') . ')';
+
                     default:
-                        return $label.
-                            ' ('.$this->translator->trans("Report's question").')';;
+                        return $label .
+                            ' (' . $this->translator->trans("Report's question") . ')';
                 }
             },
-            'constraints' => [new Callback(array(
-                'callback' => function($selected, ExecutionContextInterface $context) {
+            'constraints' => [new Callback([
+                'callback' => static function ($selected, ExecutionContextInterface $context) {
                     if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
-                }
-            ))]
-        ));
-        
+                },
+            ])],
+        ]);
+
         // add a date  field for addresses
-        $builder->add('address_date', ChillDateType::class, array(
-            'label' => "Address valid at this date",
-            'data'  => new \DateTime(),
+        $builder->add('address_date', ChillDateType::class, [
+            'label' => 'Address valid at this date',
+            'data' => new DateTime(),
             'required' => false,
-            'block_name' => 'list_export_form_address_date'
-        ));
-    }
-    
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        // get the field starting with address_
-        $addressFields = array_filter(function($el) {
-                return substr($el, 0, 8) === 'address_';
-            }, $this->fields);
-        
-        // check if there is one field starting with address in data
-        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
-            // if a field address is checked, the date must not be empty
-            if (empty($data['address_date'])) {
-                $context
-                    ->buildViolation("You must set this date if an address is checked")
-                    ->atPath('address_date')
-                    ->addViolation();
-            }
-        }
-    }
-    
-    /**
-     * Get custom fields associated with person
-     * 
-     * @return CustomField[]
-     */
-    private function getCustomFields()
-    {
-        return \array_filter($this->customfieldsGroup
-            ->getCustomFields()->toArray(), function(CustomField $cf) {
-                return $cf->getType() !== 'title';
-            });
+            'block_name' => 'list_export_form_address_date',
+        ]);
     }
 
     public function getAllowedFormattersTypes()
     {
-        return array(FormatterInterface::TYPE_LIST);
+        return [FormatterInterface::TYPE_LIST];
     }
 
     public function getDescription()
     {
         return $this->translator->trans(
             "Generate list of report '%type%'",
-            [ 
-                '%type%' => $this->translatableStringHelper->localize($this->customfieldsGroup->getName())
+            [
+                '%type%' => $this->translatableStringHelper->localize($this->customfieldsGroup->getName()),
             ]
         );
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @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':
             case 'report_date':
                 // for birthdate or report date, we have to transform the string into a date
                 // to format the date correctly.
-                return function($value) use ($key) {
-                    if ($value === '_header') { 
-                        return $key === 'person_birthdate' ? 'birthdate' : 'report_date'; 
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'person_birthdate' === $key ? 'birthdate' : 'report_date';
                     }
-                    
-                    if (empty($value))
-                    {
-                        return "";
+
+                    if (empty($value)) {
+                        return '';
                     }
-                    
-                    if ($key === 'person_birthdate') {
-                        $date = \DateTime::createFromFormat('Y-m-d', $value);
+
+                    if ('person_birthdate' === $key) {
+                        $date = DateTime::createFromFormat('Y-m-d', $value);
                     } else {
-                        $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                        $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
                     }
                     // check that the creation could occurs.
-                    if ($date === false) { 
-                        throw new \Exception(sprintf("The value %s could "
-                            . "not be converted to %s", $value, \DateTime::class));
+                    if (false === $date) {
+                        throw new Exception(sprintf('The value %s could '
+                            . 'not be converted to %s', $value, DateTime::class));
                     }
-                    
-                    return $date->format('d-m-Y'); 
+
+                    return $date->format('d-m-Y');
                 };
+
             case 'report_scope':
                 $qb = $this->em->getRepository(Scope::class)
                     ->createQueryBuilder('s');
                 $qb->addSelect('s.name')
                     ->addSelect('s.id')
-                    ->where($qb->expr()->in('s.id', $values))
-                    ;
+                    ->where($qb->expr()->in('s.id', $values));
                 $rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-                
-                foreach($rows as $row) {
-                    $scopes[$row['id']] = $this->translatableStringHelper
-                        ->localize($row['name']);
+
+                $scopes = [];
+
+                foreach ($rows as $row) {
+                    $scopes[$row['id']] = $this->translatableStringHelper->localize($row['name']);
                 }
-                
-                return function($value) use ($scopes) {
-                    if ($value === '_header') {
+
+                return static function ($value) use ($scopes): string {
+                    if ('_header' === $value) {
                         return 'circle';
                     }
-                    
+
                     return $scopes[$value];
                 };
+
             case 'report_user':
                 $qb = $this->em->getRepository(User::class)
                     ->createQueryBuilder('u');
                 $qb->addSelect('u.username')
                     ->addSelect('u.id')
-                    ->where($qb->expr()->in('u.id', $values))
-                    ;
+                    ->where($qb->expr()->in('u.id', $values));
                 $rows = $qb->getQuery()->getResult(Query::HYDRATE_ARRAY);
-                
-                foreach($rows as $row) {
+
+                $users = [];
+
+                foreach ($rows as $row) {
                     $users[$row['id']] = $row['username'];
                 }
-                
-                return function($value) use ($users) {
-                    if ($value === '_header') {
+
+                return static function ($value) use ($users): string {
+                    if ('_header' === $value) {
                         return 'user';
                     }
-                    
+
                     return $users[$value];
                 };
-            case 'person_gender' :
+
+            case 'person_gender':
                 // for gender, we have to translate men/women statement
-                return function($value) {
-                    if ($value === '_header') { return 'gender'; }
-                    
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'gender';
+                    }
+
                     return $this->translator->trans($value);
                 };
+
             case 'person_countryOfBirth':
             case 'person_nationality':
                 $countryRepository = $this->em
                     ->getRepository('ChillMainBundle:Country');
-                
+
                 // load all countries in a single query
-                 $countryRepository->findBy(array('countryCode' => $values));
-                 
-                return function($value) use ($key, $countryRepository) {
-                    if ($value === '_header') { return \strtolower($key); }
-                    
-                    if ($value === NULL) { 
+                 $countryRepository->findBy(['countryCode' => $values]);
+
+                return function ($value) use ($key, $countryRepository) {
+                    if ('_header' === $value) {
+                        return strtolower($key);
+                    }
+
+                    if (null === $value) {
                         return $this->translator->trans('no data');
                     }
-                    
+
                     $country = $countryRepository->find($value);
-                    
+
                     return $this->translatableStringHelper->localize(
-                            $country->getName());
+                        $country->getName()
+                    );
                 };
+
             case 'person_address_country_name':
-                return function($value) use ($key) {
-                    if ($value === '_header') { return \strtolower($key); }
-                    
-                    if ($value === NULL) {
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return strtolower($key);
+                    }
+
+                    if (null === $value) {
                         return '';
                     }
-                    
+
                     return $this->translatableStringHelper->localize(json_decode($value, true));
                 };
+
             default:
                 // for fields which are associated with person
-                if (in_array($key, $this->fields)) {
-                    return function($value) use ($key) {
-                        if ($value === '_header') { return \strtolower($key); } 
+                if (in_array($key, $this->fields, true)) {
+                    return static function ($value) use ($key) {
+                        if ('_header' === $value) {
+                            return strtolower($key);
+                        }
 
-                        return $value; 
-
-                        };
-                } else {
-                    return $this->getLabelForCustomField($key, $values, $data);
-                }
-        }
-        
-    }
-    
-    private function getLabelForCustomField($key, array $values, $data)
-    {
-        // for fields which are custom fields
-        /* @var $cf CustomField */
-        $cf = $this->em
-            ->getRepository(CustomField::class)
-            ->findOneBy(array('slug' => $this->DQLToSlug($key)));
-        
-        $cfType = $this->customFieldProvider->getCustomFieldByType($cf->getType());
-        $defaultFunction = function($value) use ($cf) {
-                if ($value === '_header') {
-                    return $this->translatableStringHelper->localize($cf->getName()); 
+                        return $value;
+                    };
                 }
 
-                return $this->customFieldProvider
-                    ->getCustomFieldByType($cf->getType())
-                    ->render(json_decode($value, true), $cf, 'csv');
-            };
-        
-        if ($cfType instanceof CustomFieldChoice and $cfType->isMultiple($cf)) {
-                return function($value) use ($cf, $cfType, $key) {
-                    $slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug'];
-                    $decoded = \json_decode($value, true);
-                    
-                    if ($value === '_header') {
-                        
-                        $label = $cfType->getChoices($cf)[$slugChoice];
-                        
-                        return $this->translatableStringHelper->localize($cf->getName())
-                            .' | '.$label;
-                    }
-                    
-                    if ($slugChoice === '_other' and $cfType->isChecked($cf, $choiceSlug, $decoded)) {
-                        return $cfType->extractOtherValue($cf, $decoded);
-                    } else {
-                        return $cfType->isChecked($cf, $slugChoice, $decoded);
-                    }
-                };
-            
-        } else {
-            return $defaultFunction;
+                return $this->getLabelForCustomField($key, $values, $data);
         }
     }
 
     public function getQueryKeys($data)
     {
-        $fields = array();
-        
+        $fields = [];
+
         foreach ($data['fields'] as $key) {
-            if (in_array($key, $this->fields)) {
+            if (in_array($key, $this->fields, true)) {
                 $fields[] = $key;
             }
         }
-        
+
         // add the key from slugs and return
-        return \array_merge($fields, \array_keys($this->slugs));
-    }
-    
-   /**
-     * clean a slug to be usable by DQL
-     * 
-     * @param string $slugsanitize 
-     * @param string $type the type of the customfield, if required (currently only for choices)
-     * @return string
-     */
-    private function slugToDQL($slug, $type = "default", array $additionalInfos = [])
-    {
-        $uid = 'slug_'.\uniqid();
-        
-        $this->slugs[$uid] = [
-            'slug' => $slug,
-            'type' => $type,
-            'additionnalInfos' => $additionalInfos
-        ];
-        
-        return $uid;
-    }
-    
-    private function DQLToSlug($cleanedSlug)
-    {   
-        return $this->slugs[$cleanedSlug]['slug'];
-    }
-    
-    /**
-     * 
-     * @param type $cleanedSlug
-     * @return an array with keys = 'slug', 'type', 'additionnalInfo'
-     */
-    private function extractInfosFromSlug($slug)
-    {
-        return $this->slugs[$slug];
+        return array_merge($fields, array_keys($this->slugs));
     }
 
     public function getResult($query, $data)
@@ -424,8 +318,8 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
     {
         return $this->translator->trans(
             "List for report '%type%'",
-            [ 
-                '%type%' => $this->translatableStringHelper->localize($this->customfieldsGroup->getName())
+            [
+                '%type%' => $this->translatableStringHelper->localize($this->customfieldsGroup->getName()),
             ]
         );
     }
@@ -435,32 +329,34 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
         return 'report';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = array())
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
-        
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
+
         // throw an error if any fields are present
-        if (!\array_key_exists('fields', $data)) {
-            throw new \Doctrine\DBAL\Exception\InvalidArgumentException("any fields "
-                . "have been checked");
+        if (!array_key_exists('fields', $data)) {
+            throw new \Doctrine\DBAL\Exception\InvalidArgumentException('any fields '
+                . 'have been checked');
         }
-        
+
         $qb = $this->em->createQueryBuilder();
-        
+
         // process fields which are not custom fields
         foreach ($this->fields as $f) {
             // do not add fields which are not selected
-            if (!\in_array($f, $data['fields'])) {
+            if (!in_array($f, $data['fields'], true)) {
                 continue;
             }
-            
+
             // add a column to the query for each field
             switch ($f) {
                 case 'person_countryOfBirth':
                 case 'person_nationality':
-                    $suffix = \substr($f, 7);
+                    $suffix = substr($f, 7);
                     $qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $suffix, $f));
+
                     break;
+
                 case 'person_address_street_address_1':
                 case 'person_address_street_address_2':
                 case 'person_address_valid_from':
@@ -469,79 +365,94 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
                 case 'person_address_country_name':
                 case 'person_address_country_code':
                     // remove 'person_'
-                    $suffix = \substr($f, 7);
-                    
+                    $suffix = substr($f, 7);
+
                     $qb->addSelect(sprintf(
                         'GET_PERSON_ADDRESS_%s(person.id, :address_date) AS %s',
                         // get the part after address_
-                        strtoupper(substr($suffix, 8)), 
-                        $f));
+                        strtoupper(substr($suffix, 8)),
+                        $f
+                    ));
                     $qb->setParameter('address_date', $data['address_date']);
+
                     break;
+
                 case 'report_scope':
                     $qb->addSelect(sprintf('IDENTITY(report.scope) AS %s', 'report_scope'));
+
                     break;
+
                 case 'report_user':
                     $qb->addSelect(sprintf('IDENTITY(report.user) AS %s', 'report_user'));
+
                     break;
+
                 default:
-                    $prefix = \substr($f, 0, 7);
-                    $suffix = \substr($f, 7);
-                    
-                    switch($prefix) {
+                    $prefix = substr($f, 0, 7);
+                    $suffix = substr($f, 7);
+
+                    switch ($prefix) {
                         case 'person_':
                             $qb->addSelect(sprintf('person.%s as %s', $suffix, $f));
+
                             break;
+
                         case 'report_':
                             $qb->addSelect(sprintf('report.%s as %s', $suffix, $f));
+
                             break;
+
                         default:
-                            throw new \LogicException("this prefix $prefix should "
-                                . "not be encountered. Full field: $f");
+                            throw new LogicException("this prefix {$prefix} should "
+                                . "not be encountered. Full field: {$f}");
                     }
             }
-
         }
-        
+
         // process fields which are custom fields
         foreach ($this->getCustomFields() as $cf) {
             // do not add custom fields which are not selected
-            if (!\in_array($cf->getSlug(), $data['fields'])) {
+            if (!in_array($cf->getSlug(), $data['fields'], true)) {
                 continue;
             }
-            
+
             $cfType = $this->customFieldProvider->getCustomFieldByType($cf->getType());
-            
+
             // if is multiple, split into multiple columns
-            if ($cfType instanceof CustomFieldChoice and $cfType->isMultiple($cf)) {
-                foreach($cfType->getChoices($cf) as $choiceSlug => $label) {
-                    $slug = $this->slugToDQL($cf->getSlug(), 'choice', [ 'choiceSlug' => $choiceSlug ]);
+            if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
+                foreach ($cfType->getChoices($cf) as $choiceSlug => $label) {
+                    $slug = $this->slugToDQL($cf->getSlug(), 'choice', ['choiceSlug' => $choiceSlug]);
                     $qb->addSelect(
-                        sprintf('GET_JSON_FIELD_BY_KEY(report.cFData, :slug%s) AS %s', 
-                            $slug, $slug));
+                        sprintf(
+                            'GET_JSON_FIELD_BY_KEY(report.cFData, :slug%s) AS %s',
+                            $slug,
+                            $slug
+                        )
+                    );
                     $qb->setParameter(sprintf('slug%s', $slug), $cf->getSlug());
                 }
             } else {
                 // not multiple, add a single column
                 $slug = $this->slugToDQL($cf->getSlug());
                 $qb->addSelect(
-                    sprintf('GET_JSON_FIELD_BY_KEY(report.cFData, :slug%s) AS %s', 
-                        $slug, $slug));
+                    sprintf(
+                        'GET_JSON_FIELD_BY_KEY(report.cFData, :slug%s) AS %s',
+                        $slug,
+                        $slug
+                    )
+                );
                 $qb->setParameter(sprintf('slug%s', $slug), $cf->getSlug());
             }
         }
-        
-        $qb
-                ->from(Report::class, 'report')
-                ->leftJoin('report.person', 'person')
-                ->join('person.center', 'center')
-                ->andWhere($qb->expr()->eq('report.cFGroup', ':cFGroup'))
-                ->setParameter('cFGroup', $this->customfieldsGroup)
-                ->andWhere('center IN (:authorized_centers)')
-                ->setParameter('authorized_centers', $centers);
-                ;
-        
-        return $qb;
+
+        return $qb
+            ->from(Report::class, 'report')
+            ->leftJoin('report.person', 'person')
+            ->join('person.center', 'center')
+            ->andWhere($qb->expr()->eq('report.cFGroup', ':cFGroup'))
+            ->setParameter('cFGroup', $this->customfieldsGroup)
+            ->andWhere('center IN (:authorized_centers)')
+            ->setParameter('authorized_centers', $centers);
     }
 
     public function requiredRole()
@@ -553,4 +464,102 @@ class ReportList implements ListInterface, ExportElementValidatedInterface
     {
         return [Declarations::PERSON_IMPLIED_IN, Declarations::PERSON_TYPE, 'report'];
     }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        // get the field starting with address_
+        $addressFields = array_filter(
+            $this->fields,
+            static fn (string $el): bool => substr($el, 0, 8) === 'address_'
+        );
+
+        // check if there is one field starting with address in data
+        if (count(array_intersect($data['fields'], $addressFields)) > 0) {
+            // if a field address is checked, the date must not be empty
+            if (empty($data['address_date'])) {
+                $context
+                    ->buildViolation('You must set this date if an address is checked')
+                    ->atPath('address_date')
+                    ->addViolation();
+            }
+        }
+    }
+
+    private function DQLToSlug($cleanedSlug)
+    {
+        return $this->slugs[$cleanedSlug]['slug'];
+    }
+
+    private function extractInfosFromSlug($slug)
+    {
+        return $this->slugs[$slug];
+    }
+
+    /**
+     * Get custom fields associated with person.
+     *
+     * @return CustomField[]
+     */
+    private function getCustomFields()
+    {
+        return array_filter($this->customfieldsGroup
+            ->getCustomFields()->toArray(), static function (CustomField $cf) {
+                return $cf->getType() !== 'title';
+            });
+    }
+
+    private function getLabelForCustomField($key, array $values, $data)
+    {
+        // for fields which are custom fields
+        /** @var CustomField $cf */
+        $cf = $this->em
+            ->getRepository(CustomField::class)
+            ->findOneBy(['slug' => $this->DQLToSlug($key)]);
+
+        $cfType = $this->customFieldProvider->getCustomFieldByType($cf->getType());
+        $defaultFunction = function ($value) use ($cf) {
+            if ('_header' === $value) {
+                return $this->translatableStringHelper->localize($cf->getName());
+            }
+
+            return $this->customFieldProvider
+                ->getCustomFieldByType($cf->getType())
+                ->render(json_decode($value, true), $cf, 'csv');
+        };
+
+        if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
+            return function ($value) use ($cf, $cfType, $key) {
+                $slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug'];
+                $decoded = json_decode($value, true);
+
+                if ('_header' === $value) {
+                    $label = $cfType->getChoices($cf)[$slugChoice];
+
+                    return $this->translatableStringHelper->localize($cf->getName())
+                            . ' | ' . $label;
+                }
+
+                if ('_other' === $slugChoice && $cfType->isChecked($cf, $choiceSlug, $decoded)) {
+                    return $cfType->extractOtherValue($cf, $decoded);
+                }
+
+                return $cfType->isChecked($cf, $slugChoice, $decoded);
+            };
+        }
+
+        return $defaultFunction;
+    }
+
+    private function slugToDQL($slug, $type = 'default', array $additionalInfos = [])
+    {
+        $uid = 'slug_' . uniqid('', true);
+
+        $this->slugs[$uid] = [
+            'slug' => $slug,
+            'type' => $type,
+            'additionnalInfos' => $additionalInfos,
+        ];
+
+        return $uid;
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php b/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
index e7b8a2a79..f3b829548 100644
--- a/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
+++ b/src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
@@ -1,49 +1,48 @@
 <?php
-/*
- */
-namespace Chill\ReportBundle\Export\Export;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\ReportBundle\Entity\Report;
-use Chill\MainBundle\Export\ExportElementsProviderInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\ReportBundle\Export\Export;
+
+use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
+use Chill\MainBundle\Export\ExportElementsProviderInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\ReportBundle\Entity\Report;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+
 class ReportListProvider implements ExportElementsProviderInterface
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
      * @var CustomFieldProvider
      */
     protected $customFieldProvider;
-    
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
-    
-    function __construct(
-        EntityManagerInterface $em, 
+
+    public function __construct(
+        EntityManagerInterface $em,
         TranslatableStringHelper $translatableStringHelper,
         TranslatorInterface $translator,
         CustomFieldProvider $customFieldProvider
@@ -54,24 +53,22 @@ class ReportListProvider implements ExportElementsProviderInterface
         $this->customFieldProvider = $customFieldProvider;
     }
 
-    
-    
     public function getExportElements()
     {
         $groups = $this->em->getRepository(CustomFieldsGroup::class)
-            ->findBy([ 'entity' => Report::class ])
-            ;
+            ->findBy(['entity' => Report::class]);
         $reports = [];
-        
+
         foreach ($groups as $group) {
             $reports[$group->getId()] = new ReportList(
-                $group, 
+                $group,
                 $this->translatableStringHelper,
                 $this->translator,
                 $this->customFieldProvider,
-                $this->em);
+                $this->em
+            );
         }
-        
+
         return $reports;
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
index 379d9ccda..0cdb8e26c 100644
--- a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+++ b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
@@ -1,24 +1,23 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Doctrine\ORM\Query\Expr;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ReportDateFilter implements FilterInterface
 {
-
     public function addRole()
     {
         return null;
@@ -27,15 +26,18 @@ class ReportDateFilter implements FilterInterface
     public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between('report.date', ':report_date_filter_date_from', 
-            ':report_date_filter_date_to');
+        $clause = $qb->expr()->between(
+            'report.date',
+            ':report_date_filter_date_from',
+            ':report_date_filter_date_to'
+        );
 
         if ($where instanceof Expr\Andx) {
             $where->add($clause);
         } else {
             $where = $qb->expr()->andX($clause);
         }
-        
+
         $qb->add('where', $where);
         $qb->setParameter('report_date_filter_date_from', $data['date_from']);
         $qb->setParameter('report_date_filter_date_to', $data['date_to']);
@@ -48,24 +50,24 @@ class ReportDateFilter implements FilterInterface
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', ChillDateType::class, array(
-            'label' => "Report is after this date",
-            'data'  => new \DateTime(),
-        ));
-        
-        $builder->add('date_to', ChillDateType::class, array(
-            'label' => "Report is before this date",
-            'data'  => new \DateTime(),
-        ));
+        $builder->add('date_from', ChillDateType::class, [
+            'label' => 'Report is after this date',
+            'data' => new DateTime(),
+        ]);
+
+        $builder->add('date_to', ChillDateType::class, [
+            'label' => 'Report is before this date',
+            'data' => new DateTime(),
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return array('Filtered by report\'s date: '
-            . 'between %date_from% and %date_to%', array(
+        return ['Filtered by report\'s date: '
+            . 'between %date_from% and %date_to%', [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ));
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ], ];
     }
 
     public function getTitle()
diff --git a/src/Bundle/ChillReportBundle/Form/ReportType.php b/src/Bundle/ChillReportBundle/Form/ReportType.php
index 1b0b2dc8f..80163f4ba 100644
--- a/src/Bundle/ChillReportBundle/Form/ReportType.php
+++ b/src/Bundle/ChillReportBundle/Form/ReportType.php
@@ -1,110 +1,99 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Form;
 
+use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
+use Chill\MainBundle\Form\Type\AppendScopeChoiceTypeTrait;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\AppendScopeChoiceTypeTrait;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\Persistence\ObjectManager;
-use Chill\CustomFieldsBundle\Form\Type\CustomFieldType;
 
 class ReportType extends AbstractType
 {
     use AppendScopeChoiceTypeTrait;
 
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
     /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    /**
-     *
      * @var \Doctrine\Persistence\ObjectManager
      */
     protected $om;
 
     /**
-     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
+    /**
      * @var \Chill\MainBundle\Entity\User
      */
     protected $user;
 
-    public function __construct(AuthorizationHelper $helper,
+    public function __construct(
+        AuthorizationHelper $helper,
         TokenStorageInterface $tokenStorage,
         TranslatableStringHelper $translatableStringHelper,
-        ObjectManager $om)
-    {
+        ObjectManager $om
+    ) {
         $this->authorizationHelper = $helper;
         $this->user = $tokenStorage->getToken()->getUser();
         $this->translatableStringHelper = $translatableStringHelper;
         $this->om = $om;
     }
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('user')
-            ->add('date', ChillDateType::class,
-                array('required' => true)
+            ->add(
+                'date',
+                ChillDateType::class,
+                ['required' => true]
             )
-            ->add('cFData', CustomFieldType::class,
-                array('attr' => array('class' => 'cf-fields'),
-                   'group' => $options['cFGroup']))
-        ;
+            ->add(
+                'cFData',
+                CustomFieldType::class,
+                ['attr' => ['class' => 'cf-fields'],
+                    'group' => $options['cFGroup'], ]
+            );
 
-        $this->appendScopeChoices($builder, $options['role'], $options['center'],
-                $this->user, $this->authorizationHelper,
-                $this->translatableStringHelper,
-                $this->om);
+        $this->appendScopeChoices(
+            $builder,
+            $options['role'],
+            $options['center'],
+            $this->user,
+            $this->authorizationHelper,
+            $this->translatableStringHelper,
+            $this->om
+        );
     }
 
-    /**
-     * @param OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ReportBundle\Entity\Report'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\ReportBundle\Entity\Report',
+        ]);
 
-        $resolver->setRequired(array(
+        $resolver->setRequired([
             'cFGroup',
-        ));
+        ]);
 
         $resolver->setAllowedTypes('cFGroup', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
 
diff --git a/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/AppKernel.php
index 4222efe69..ef1f928c1 100644
--- a/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -1,13 +1,38 @@
 <?php
 
-use Symfony\Component\HttpKernel\Kernel;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
 {
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ChillReportBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ChillReportBundle/logs';
+    }
+
     public function registerBundles()
     {
-        return array(
+        return [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\ReportBundle\ChillReportBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
@@ -19,28 +44,12 @@ class AppKernel extends Kernel
             new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
-            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle()
-        );   
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+        ];
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir().'/ChillReportBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir().'/ChillReportBundle/logs';
+        $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/autoload.php
index 39dc0e2ba..ea351fb8a 100644
--- a/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -1,11 +1,20 @@
 <?php
 
-use Doctrine\Common\Annotations\AnnotationRegistry;
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /** @var ClassLoader $loader */
-$loader = require __DIR__.'/../../../../../vendor/autoload.php';
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index be4063802..47014cfef 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -1,69 +1,60 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Search;
 
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Search\AbstractSearch;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Chill\MainBundle\Search\ParsingException;
-use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Entity\Scope;
+use function array_key_exists;
 
 /**
- * Search amongst reports
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Search amongst reports.
  */
 class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-    
+
     /**
      * @var EntityManagerInterface
      */
     private $em;
-    
+
     /**
-     *
      * @var AuthorizationHelper
      */
     private $helper;
-    
+
     /**
-     *
      * @var \Chill\MainBundle\Entity\User
      */
     private $user;
-    
-    public function __construct(EntityManagerInterface $em,
-        AuthorizationHelper $helper, TokenStorageInterface $tokenStorage)
-    {
+
+    public function __construct(
+        EntityManagerInterface $em,
+        AuthorizationHelper $helper,
+        TokenStorageInterface $tokenStorage
+    ) {
         $this->em = $em;
         $this->helper = $helper;
-        
-        if(! $tokenStorage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User) {
-            throw new \RuntimeException('an user must be associated with token');
+
+        if (!$tokenStorage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User) {
+            throw new RuntimeException('an user must be associated with token');
         }
         $this->user = $tokenStorage->getToken()->getUser();
     }
@@ -78,109 +69,103 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
         return false;
     }
 
-    public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
+    public function renderResult(array $terms, $start = 0, $limit = 50, array $options = [], $format = 'html')
     {
-        return $this->container->get('templating')->render('ChillReportBundle:Search:results.html.twig', array(
+        return $this->container->get('templating')->render('ChillReportBundle:Search:results.html.twig', [
             'reports' => $this->getReports($terms, $start, $limit),
             'total' => $this->count($terms),
-            'pattern' => $this->recomposePattern($terms, array( 'date'), 'report')
-        ));
-    }
-    
-    private function getReports(array $terms, $start, $limit)
-    {
-        $qb = $this->buildQuery($terms);
-        
-        $qb->select('r')
-                ->setMaxResults($limit)
-                ->setFirstResult($start)
-                ->orderBy('r.date', 'desc')
-                ;
-        
-        $reportQuery = $qb->getQuery();
-        $reportQuery->setFetchMode("Chill\ReportBundle\Entity\Report", "person", \Doctrine\ORM\Mapping\ClassMetadata::FETCH_EAGER);
-        
-        return $reportQuery->getResult();
-    }
-    
-    private function count(array $terms)
-    {
-        $qb = $this->buildQuery($terms);
-        
-        $qb->select('COUNT(r.id)');
-        
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-    
-    
-    /**
-     * @param array $terms the terms
-     * @return \Doctrine\ORM\QueryBuilder
-     */
-    private function buildQuery(array $terms)
-    {
-        
-        $query = $this->em->createQueryBuilder();
-        
-        $query->from('ChillReportBundle:Report', 'r');
-        
-        //throw a parsing exception if key 'date' and default is set
-        if (array_key_exists('date', $terms) && $terms['_default'] !== '') {
-            throw new ParsingException('You may not set a date argument and a date in default');
-        }
-        //throw a parsing exception if no argument except report
-        if (!array_key_exists('date', $terms) && $terms['_default'] === '') {
-            throw new ParsingException('You must provide either a date:YYYY-mm-dd argument or a YYYY-mm-dd default search');
-        }
-                
-        
-        if (array_key_exists('date', $terms)) {
-            $query->andWhere($query->expr()->eq('r.date', ':date'))
-                    ->setParameter('date', $this->parseDate($terms['date']))
-                    ;
-        } elseif (array_key_exists('_default', $terms)) {
-            $query->andWhere($query->expr()->eq('r.date', ':date'))
-                    ->setParameter('date', $this->parseDate($terms['_default']))
-                    ;
-        }
-        
-        $query->andWhere($this->addACL($query));
-        
-        return $query;
-    }
-    
-    private function addACL(QueryBuilder $qb)
-    {
-        //adding join
-        $qb->join('r.person', 'p');
-        
-        $role = new Role('CHILL_REPORT_SEE');
-        $reachableCenters = $this->helper->getReachableCenters($this->user, $role);
-        
-        $whereElement = $qb->expr()->orX();
-        $i = 0;
-        foreach ($reachableCenters as $center) {
-            $reachableScopesId = array_map(
-                    function (Scope $scope) { return $scope->getId(); },
-                    $this->helper->getReachableScopes($this->user, $role, $center)
-                    );
-            $whereElement->add(
-                    $qb->expr()->andX(
-                        $qb->expr()->eq('p.center', ':center_'.$i),
-                        $qb->expr()->in('r.scope', ':reachable_scopes_'.$i)
-                    )
-                )
-                ;
-            $qb->setParameter('center_'.$i, $center);
-            $qb->setParameter('reachable_scopes_'.$i, $reachableScopesId);
-        }
-        
-        return $whereElement;
+            'pattern' => $this->recomposePattern($terms, ['date'], 'report'),
+        ]);
     }
 
     public function supports($domain, $format = 'html')
     {
-        return $domain === 'report';
+        return 'report' === $domain;
     }
 
+    private function addACL(QueryBuilder $qb)
+    {
+        //adding join
+        $qb->join('r.person', 'p');
+
+        $role = new Role('CHILL_REPORT_SEE');
+        $reachableCenters = $this->helper->getReachableCenters($this->user, $role);
+
+        $whereElement = $qb->expr()->orX();
+        $i = 0;
+
+        foreach ($reachableCenters as $center) {
+            $reachableScopesId = array_map(
+                static function (Scope $scope) { return $scope->getId(); },
+                $this->helper->getReachableScopes($this->user, $role, $center)
+            );
+            $whereElement->add(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('p.center', ':center_' . $i),
+                    $qb->expr()->in('r.scope', ':reachable_scopes_' . $i)
+                )
+            );
+            $qb->setParameter('center_' . $i, $center);
+            $qb->setParameter('reachable_scopes_' . $i, $reachableScopesId);
+        }
+
+        return $whereElement;
+    }
+
+    /**
+     * @param array $terms the terms
+     *
+     * @return \Doctrine\ORM\QueryBuilder
+     */
+    private function buildQuery(array $terms)
+    {
+        $query = $this->em->createQueryBuilder();
+
+        $query->from('ChillReportBundle:Report', 'r');
+
+        //throw a parsing exception if key 'date' and default is set
+        if (array_key_exists('date', $terms) && '' !== $terms['_default']) {
+            throw new ParsingException('You may not set a date argument and a date in default');
+        }
+        //throw a parsing exception if no argument except report
+        if (!array_key_exists('date', $terms) && '' === $terms['_default']) {
+            throw new ParsingException('You must provide either a date:YYYY-mm-dd argument or a YYYY-mm-dd default search');
+        }
+
+        if (array_key_exists('date', $terms)) {
+            $query->andWhere($query->expr()->eq('r.date', ':date'))
+                ->setParameter('date', $this->parseDate($terms['date']));
+        } elseif (array_key_exists('_default', $terms)) {
+            $query->andWhere($query->expr()->eq('r.date', ':date'))
+                ->setParameter('date', $this->parseDate($terms['_default']));
+        }
+
+        $query->andWhere($this->addACL($query));
+
+        return $query;
+    }
+
+    private function count(array $terms)
+    {
+        $qb = $this->buildQuery($terms);
+
+        $qb->select('COUNT(r.id)');
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
+    private function getReports(array $terms, $start, $limit)
+    {
+        $qb = $this->buildQuery($terms);
+
+        $qb->select('r')
+            ->setMaxResults($limit)
+            ->setFirstResult($start)
+            ->orderBy('r.date', 'desc');
+
+        $reportQuery = $qb->getQuery();
+        $reportQuery->setFetchMode('Chill\\ReportBundle\\Entity\\Report', 'person', \Doctrine\ORM\Mapping\ClassMetadata::FETCH_EAGER);
+
+        return $reportQuery->getResult();
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
index 5741b567b..ed4dde1b7 100644
--- a/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+++ b/src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
@@ -1,92 +1,80 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Security\Authorization;
 
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Chill\MainBundle\Entity\Center;
 
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\ReportBundle\Entity\Report;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use function in_array;
 
-
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_REPORT_CREATE';
-    const SEE    = 'CHILL_REPORT_SEE';
-    const UPDATE = 'CHILL_REPORT_UPDATE';
-    const LISTS  = 'CHILL_REPORT_LISTS';
+    public const CREATE = 'CHILL_REPORT_CREATE';
+
+    public const LISTS = 'CHILL_REPORT_LISTS';
+
+    public const SEE = 'CHILL_REPORT_SEE';
+
+    public const UPDATE = 'CHILL_REPORT_UPDATE';
 
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $helper;
 
-
     public function __construct(AuthorizationHelper $helper)
     {
         $this->helper = $helper;
     }
 
+    public function getRoles(): array
+    {
+        return [self::CREATE, self::UPDATE, self::SEE, self::LISTS];
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Report' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [self::LISTS];
+    }
 
     protected function supports($attribute, $subject)
     {
         if ($subject instanceof Report) {
-            return \in_array($attribute, [
-                self::CREATE, self::UPDATE, self::SEE
-            ]);
-        } elseif ($subject instanceof Center) {
-            return $attribute === self::LISTS;
+            return in_array($attribute, [
+                self::CREATE, self::UPDATE, self::SEE,
+            ], true);
+        }
+
+        if ($subject instanceof Center) {
+            return self::LISTS === $attribute;
         }
     }
 
-
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
         if (!$token->getUser() instanceof User) {
             return false;
         }
+
         return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
     }
-
-
-    public function getRoles()
-    {
-        return [self::CREATE, self::UPDATE, self::SEE, self::LISTS];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return array(self::LISTS);
-    }
-
-    public function getRolesWithHierarchy()
-    {
-        return [ 'Report' => $this->getRoles() ];
-    }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
index e3c96bf22..0a47bcc0f 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
@@ -1,178 +1,191 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Chill\PersonBundle\Entity\Person;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
+use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Client;
+use function in_array;
 
 /**
  * This class is much well writtend than ReportControllerTest class, and will
  * replace ReportControllerTest in the future.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ReportControllerNextTest extends WebTestCase
+final class ReportControllerNextTest extends WebTestCase
 {
     /**
-     *
-     * @var Person
-     */
-    protected $person;
-    
-    /**
-     *
      * @var CustomFieldsGroup
      */
     protected $group;
-    
-    
+
+    /**
+     * @var Person
+     */
+    protected $person;
+
     public function setUp()
     {
-        static::bootKernel();
+        self::bootKernel();
         // get person from fixture
-        $em = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager');
-        
+        $em = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager');
+
         $this->person = $em
-              ->getRepository('ChillPersonBundle:Person')
-              ->findOneBy(array(
-                  'lastName' => 'Charline',
-                  'firstName'  => 'Depardieu'
-                  )
-                );
-        
-        if ($this->person === NULL) {
-            throw new \RuntimeException("The expected person is not present in the database. "
-                    . "Did you run `php app/console doctrine:fixture:load` before launching tests ? "
+            ->getRepository('ChillPersonBundle:Person')
+            ->findOneBy(
+                [
+                    'lastName' => 'Charline',
+                    'firstName' => 'Depardieu',
+                ]
+            );
+
+        if (null === $this->person) {
+            throw new RuntimeException('The expected person is not present in the database. '
+                    . 'Did you run `php app/console doctrine:fixture:load` before launching tests ? '
                     . "(expecting person is 'Charline Depardieu'");
         }
-        
+
         // get custom fields group from fixture
-        $customFieldsGroups = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-              ->findBy(array('entity' => 'Chill\ReportBundle\Entity\Report'))
-                ;
+        $customFieldsGroups = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']);
         //filter customFieldsGroup to get only "situation de logement"
-        $filteredCustomFieldsGroupHouse = array_filter($customFieldsGroups,
-                function(CustomFieldsGroup $group) {
-                    return in_array("Situation de logement", $group->getName());
-                });
+        $filteredCustomFieldsGroupHouse = array_filter(
+            $customFieldsGroups,
+            static function (CustomFieldsGroup $group) {
+                return in_array('Situation de logement', $group->getName(), true);
+            }
+        );
         $this->group = $filteredCustomFieldsGroupHouse[0];
     }
-    
+
+    public function testUngrantedUserIsDeniedAccessOnListReports()
+    {
+        $client = $this->getAuthenticatedClient('center b_social');
+        $client->request('GET', sprintf(
+            '/fr/person/%d/report/list',
+            $this->person->getId()
+        ));
+
+        $this->assertEquals(
+            403,
+            $client->getResponse()->getStatusCode(),
+            'assert that user for center b has a 403 status code when listing'
+                . 'reports on person from center a'
+        );
+    }
+
+    public function testUngrantedUserIsDeniedAccessOnReport()
+    {
+        $client = $this->getAuthenticatedClient('center b_social');
+        $reports = self::$kernel->getContainer()->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillReportBundle:Report')
+            ->findBy(['person' => $this->person]);
+        $report = $reports[0];
+
+        $client->request('GET', sprintf(
+            '/fr/person/%d/report/%d/view',
+            $this->person->getId(),
+            $report->getId()
+        ));
+
+        $this->assertEquals(
+            403,
+            $client->getResponse()->getStatusCode(),
+            'assert that user for center b has a 403 status code when '
+                . 'trying to watch a report from person from center a'
+        );
+    }
+
+    public function testUngrantedUserIsDeniedReportCreate()
+    {
+        $clientCenterA = $this->getAuthenticatedClient('center a_social');
+
+        $form = $this->getReportForm($this->person, $this->group, $clientCenterA);
+
+        $clientCenterB = $this->getAuthenticatedClient('center b_social');
+        $clientCenterB->submit($form);
+
+        $this->assertEquals(
+            403,
+            $clientCenterB->getResponse()->getStatusCode(),
+            'assert that user is denied on trying to show a form "new" for'
+                . ' a person on another center'
+        );
+    }
+
+    public function testUngrantedUserIsDeniedReportNew()
+    {
+        $client = $this->getAuthenticatedClient('center b_social');
+
+        $client->request('GET', sprintf(
+            'fr/person/%d/report/cfgroup/%d/new',
+            $this->person->getId(),
+            $this->group->getId()
+        ));
+
+        $this->assertEquals(
+            403,
+            $client->getResponse()->getStatusCode(),
+            'assert that user is denied on trying to show a form "new" for'
+                . ' a person on another center'
+        );
+    }
+
     public function testValidCreate()
     {
         $client = $this->getAuthenticatedClient();
         $form = $this->getReportForm($this->person, $this->group, $client);
-        
+
         $form->get('chill_reportbundle_report[date]')->setValue(
-              (new \DateTime())->format('d-m-Y'));
-        
+            (new DateTime())->format('d-m-Y')
+        );
+
         $client->submit($form);
-        
-        $this->assertTrue($client->getResponse()->isRedirect(),
-              "The next page is a redirection to the new report's view page");
-        
+
+        $this->assertTrue(
+            $client->getResponse()->isRedirect(),
+            "The next page is a redirection to the new report's view page"
+        );
     }
-    
-    public function testUngrantedUserIsDeniedAccessOnListReports()
-    {
-        $client = $this->getAuthenticatedClient('center b_social');
-        $client->request('GET', sprintf('/fr/person/%d/report/list', 
-                $this->person->getId()));
-        
-        $this->assertEquals(403, $client->getResponse()->getStatusCode(),
-                'assert that user for center b has a 403 status code when listing'
-                . 'reports on person from center a');
-    }
-    
-    public function testUngrantedUserIsDeniedAccessOnReport()
-    {
-        $client = $this->getAuthenticatedClient('center b_social');
-        $reports = static::$kernel->getContainer()->get('doctrine.orm.entity_manager')
-                ->getRepository('ChillReportBundle:Report')
-                ->findBy(array('person' => $this->person));
-        $report = $reports[0];
-        
-        $client->request('GET', sprintf('/fr/person/%d/report/%d/view', 
-                $this->person->getId(), $report->getId()));
-        
-        $this->assertEquals(403, $client->getResponse()->getStatusCode(),
-                'assert that user for center b has a 403 status code when '
-                . 'trying to watch a report from person from center a');
-    }
-    
-    public function testUngrantedUserIsDeniedReportNew()
-    {
-        $client = $this->getAuthenticatedClient('center b_social');
-        
-        $client->request('GET', sprintf('fr/person/%d/report/cfgroup/%d/new',
-                $this->person->getId(), $this->group->getId()));
-        
-        $this->assertEquals(403, $client->getResponse()->getStatusCode(),
-                'assert that user is denied on trying to show a form "new" for'
-                . ' a person on another center');
-    }
-    
-    public function testUngrantedUserIsDeniedReportCreate()
-    {
-        $clientCenterA = $this->getAuthenticatedClient('center a_social');
-        
-        $form = $this->getReportForm($this->person, $this->group, $clientCenterA);
-        
-        $clientCenterB = $this->getAuthenticatedClient('center b_social');
-        $clientCenterB->submit($form);
-        
-        $this->assertEquals(403, $clientCenterB->getResponse()->getStatusCode(),
-                'assert that user is denied on trying to show a form "new" for'
-                . ' a person on another center');
-    }
-    
+
     protected function getAuthenticatedClient($username = 'center a_social')
     {
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        return self::createClient([], [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
-    
+
     /**
-     * 
-     * @param Person $person
-     * @param CustomFieldsGroup $group
-     * @param Client $client
      * @return \Symfony\Component\DomCrawler\Form
      */
     protected function getReportForm(Person $person, CustomFieldsGroup $group, Client $client)
     {
-        $url = sprintf('fr/person/%d/report/cfgroup/%d/new', $person->getId(),
-                $group->getId());
+        $url = sprintf(
+            'fr/person/%d/report/cfgroup/%d/new',
+            $person->getId(),
+            $group->getId()
+        );
         $crawler = $client->request('GET', $url);
-        
+
         return $crawler->selectButton('Ajouter le rapport')
-              ->form();
+            ->form();
     }
-            
-    
-    
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index d7bf25f06..b9578ec6b 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -1,290 +1,304 @@
 <?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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\DomCrawler\Form;
-use Symfony\Component\DomCrawler\Link;
-use Symfony\Component\DomCrawler\Crawler;
 use Chill\CustomFieldsBundle\Entity\CustomFieldsGroup;
 use Chill\PersonBundle\Entity\Person;
+use DateTime;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Component\DomCrawler\Form;
+use Symfony\Component\DomCrawler\Link;
+use function count;
+use function in_array;
 
 /**
- * Test the life cycles of controllers, according to 
- * https://redmine.champs-libres.coop/projects/report/wiki/Test_plan_for_report_lifecycle
+ * Test the life cycles of controllers, according to
+ * https://redmine.champs-libres.coop/projects/report/wiki/Test_plan_for_report_lifecycle.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ReportControllerTest extends WebTestCase
+final class ReportControllerTest extends WebTestCase
 {
-    
-    const REPORT_NAME_FIELD = 'cFGroup';
-    
+    public const REPORT_NAME_FIELD = 'cFGroup';
+
     /**
-     *
-     * @var \Chill\PersonBundle\Entity\Person 
-     */
-    private static $person;
-    
-    /**
-     *
      * @var \SClientymfony\Component\BrowserKit\
      */
     private static $client;
-    
-    private static $user;
-    
+
     /**
-     *
-     * @var CustomFieldsGroup
-     */
-    private static $group;
-    
-    /**
-     *
      * @var \Doctrine\ORM\EntityManagerInterface
      */
     private static $em;
 
+    /**
+     * @var CustomFieldsGroup
+     */
+    private static $group;
+
+    /**
+     * @var \Chill\PersonBundle\Entity\Person
+     */
+    private static $person;
+
+    private static $user;
+
     public static function setUpBeforeClass()
     {
-        static::bootKernel();
-        
-        static::$em = static::$kernel->getContainer()
+        self::bootKernel();
+
+        self::$em = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager');
 
         //get a random person
-        static::$person = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillPersonBundle:Person')
-              ->findOneBy(array(
-                  'lastName' => 'Charline',
-                  'firstName'  => 'Depardieu'
-                  )
-                );
-        
-        if (static::$person === NULL) {
-            throw new \RuntimeException("The expected person is not present in the database. "
-                    . "Did you run `php app/console doctrine:fixture:load` before launching tests ? "
+        self::$person = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillPersonBundle:Person')
+            ->findOneBy(
+                [
+                    'lastName' => 'Charline',
+                    'firstName' => 'Depardieu',
+                ]
+            );
+
+        if (null === self::$person) {
+            throw new RuntimeException('The expected person is not present in the database. '
+                    . 'Did you run `php app/console doctrine:fixture:load` before launching tests ? '
                     . "(expecting person is 'Charline Depardieu'");
         }
-        
-        $customFieldsGroups = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-              ->findBy(array('entity' => 'Chill\ReportBundle\Entity\Report'))
-                ;
+
+        $customFieldsGroups = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']);
         //filter customFieldsGroup to get only "situation de logement"
-        $filteredCustomFieldsGroupHouse = array_filter($customFieldsGroups,
-                function(CustomFieldsGroup $group) {
-                    return in_array("Situation de logement", $group->getName());
-                });
-        static::$group = $filteredCustomFieldsGroupHouse[0];
-        
-        static::$user =  static::$kernel->getContainer()
-                  ->get('doctrine.orm.entity_manager')
-                  ->getRepository('ChillMainBundle:User')
-                  ->findOneBy(array('username' => "center a_social"));
+        $filteredCustomFieldsGroupHouse = array_filter(
+            $customFieldsGroups,
+            static function (CustomFieldsGroup $group) {
+                return in_array('Situation de logement', $group->getName(), true);
+            }
+        );
+        self::$group = $filteredCustomFieldsGroupHouse[0];
+
+        self::$user = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillMainBundle:User')
+            ->findOneBy(['username' => 'center a_social']);
     }
-    
-    public function setUp() 
+
+    public function setUp()
     {
-        static::$client = static::createClient(array(), array(
-           'PHP_AUTH_USER' => 'center a_social',
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        self::$client = self::createClient([], [
+            'PHP_AUTH_USER' => 'center a_social',
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
-    
+
     /**
-     * 
      * @param type $username
+     *
      * @return Client
      */
     public function getAuthenticatedClient($username = 'center a_social')
     {
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        return self::createClient([], [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
-    
+
+    /**
+     * @return type
+     * @depends testMenu
+     */
+    public function testChooseReportModelPage(Link $link)
+    {
+        // When I click on "add a report" link in menu
+        $client = $this->getAuthenticatedClient();
+        $crawlerAddAReportPage = $client->click($link);
+
+        $form = $crawlerAddAReportPage->selectButton('Créer un nouveau rapport')->form();
+
+        $this->assertInstanceOf(
+            'Symfony\Component\DomCrawler\Form',
+            $form,
+            'I can see a form with a button "add a new report" '
+        );
+
+        $this->assertGreaterThan(
+            1,
+            count($form->get(self::REPORT_NAME_FIELD)
+                ->availableOptionValues()),
+            'I can choose between report models'
+        );
+
+        $possibleOptionsValue = $form->get(self::REPORT_NAME_FIELD)
+            ->availableOptionValues();
+        $form->get(self::REPORT_NAME_FIELD)->setValue(
+            $possibleOptionsValue[array_rand($possibleOptionsValue)]
+        );
+
+        $client->submit($form);
+
+        $this->assertTrue($client->getResponse()->isRedirect());
+
+        return $client->followRedirect();
+    }
+
+    /**
+     * Test that setting a Null date redirect to an error page.
+     *
+     * @depends testNewReportPage
+     */
+    public function testInvalidDate(Form $form)
+    {
+        $client = $this->getAuthenticatedClient();
+        $this->markTestSkipped('This test raise an error since symfony 2.7. '
+                . 'The user is not correctly reloaded from database.');
+        $filledForm = $this->fillCorrectForm($form);
+        $filledForm->get('chill_reportbundle_report[date]')->setValue('invalid date value');
+
+        $crawler = $client->submit($filledForm);
+
+        $this->assertFalse($client->getResponse()->isRedirect());
+        $this->assertGreaterThan(0, $crawler->filter('.error')->count());
+    }
+
+    /**
+     * Test that a incorrect value in user will show an error page.
+     *
+     * @depends testNewReportPage
+     */
+    public function testInvalidUser(Form $form)
+    {
+        $client = $this->getAuthenticatedClient();
+        $filledForm = $this->fillCorrectForm($form);
+        $select = $filledForm->get('chill_reportbundle_report[user]')
+            ->disableValidation()
+            ->setValue(-1);
+
+        $crawler = $client->submit($filledForm);
+
+        $this->assertFalse($client->getResponse()->isRedirect());
+        $this->assertGreaterThan(0, $crawler->filter('.error')->count());
+    }
+
+    /**
+     * @depends testValidCreate
+     *
+     * @param int $reportId
+     */
+    public function testList($reportId)
+    {
+        $client = $this->getAuthenticatedClient();
+        $crawler = $client->request('GET', sprintf(
+            '/fr/person/%s/report/list',
+            self::$person->getId()
+        ));
+
+        $this->assertTrue($client->getResponse()->isSuccessful());
+
+        $linkSee = $crawler->filter('.bt-view')->links();
+        $this->assertGreaterThan(0, count($linkSee));
+        $this->assertRegExp(sprintf(
+            '|/fr/person/%s/report/[0-9]*/view$|',
+            self::$person->getId(),
+            $reportId
+        ), $linkSee[0]->getUri());
+
+        $linkUpdate = $crawler->filter('.bt-update')->links();
+        $this->assertGreaterThan(0, count($linkUpdate));
+        $this->assertRegExp(sprintf(
+            '|/fr/person/%s/report/[0-9]*/edit$|',
+            self::$person->getId(),
+            $reportId
+        ), $linkUpdate[0]->getUri());
+    }
+
     /**
      * Set up the browser to be at a random person general page (/fr/person/%d/general),
-     * check if there is a menu link for adding a new report and return this link (as producer)
-     * 
-     * We assume that : 
+     * check if there is a menu link for adding a new report and return this link (as producer).
+     *
+     * We assume that :
      * - we are on a "person" page
      * - there are more than one report model
-     * 
      */
     public function testMenu()
     {
         $client = $this->getAuthenticatedClient();
-        $crawlerPersonPage = $client->request('GET', sprintf('/fr/person/%d/general', 
-              static::$person->getId()));
-        
-        if (! $client->getResponse()->isSuccessful()) {
+        $crawlerPersonPage = $client->request('GET', sprintf(
+            '/fr/person/%d/general',
+            self::$person->getId()
+        ));
+
+        if (!$client->getResponse()->isSuccessful()) {
             var_dump($crawlerPersonPage->html());
-            throw new \RuntimeException('the request at person page failed');
+
+            throw new RuntimeException('the request at person page failed');
         }
-        
+
         $link = $crawlerPersonPage->selectLink("AJOUT D'UN RAPPORT")->link();
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Link', $link, 
-              "There is a \"add a report\" link in menu");
-        $this->assertContains(sprintf("/fr/person/%d/report/select/type/for/creation",
-              static::$person->getId()), $link->getUri(), 
-              "There is a \"add a report\" link in menu");
-        
+        $this->assertInstanceOf(
+            'Symfony\Component\DomCrawler\Link',
+            $link,
+            'There is a "add a report" link in menu'
+        );
+        $this->assertContains(
+            sprintf(
+                '/fr/person/%d/report/select/type/for/creation',
+                self::$person->getId()
+            ),
+            $link->getUri(),
+            'There is a "add a report" link in menu'
+        );
+
         return $link;
     }
-    
-    /**
-     * 
-     * @param \Symfony\Component\DomCrawler\Link $link
-     * @return type
-     * @depends testMenu
-     */
-    public function testChooseReportModelPage(Link $link) 
-    {   
-        // When I click on "add a report" link in menu
-        $client = $this->getAuthenticatedClient();
-        $crawlerAddAReportPage = $client->click($link);
-        
-        $form = $crawlerAddAReportPage->selectButton("Créer un nouveau rapport")->form();
-        
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Form', $form,
-              'I can see a form with a button "add a new report" ');
-        
-        $this->assertGreaterThan(1, count($form->get(self::REPORT_NAME_FIELD)
-                  ->availableOptionValues()),
-                "I can choose between report models");
 
-        $possibleOptionsValue = $form->get(self::REPORT_NAME_FIELD)
-              ->availableOptionValues();
-        $form->get(self::REPORT_NAME_FIELD)->setValue(
-              $possibleOptionsValue[array_rand($possibleOptionsValue)]);
-        
-        $client->submit($form);
-        
-        $this->assertTrue($client->getResponse()->isRedirect());
-        return $client->followRedirect();
-    }
-    
     /**
-     * 
-     * @param \Symfony\Component\DomCrawler\Crawler $crawlerNewReportPage
      * @return type
      * @depends testChooseReportModelPage
      */
     public function testNewReportPage(Crawler $crawlerNewReportPage)
-    {   
-        
+    {
         $addForm = $crawlerNewReportPage
-              ->selectButton('Ajouter le rapport')
-              ->form();
-        
-        $this->assertInstanceOf('Symfony\Component\DomCrawler\Form', $addForm,
-              'I have a report form');
-        
+            ->selectButton('Ajouter le rapport')
+            ->form();
+
+        $this->assertInstanceOf(
+            'Symfony\Component\DomCrawler\Form',
+            $addForm,
+            'I have a report form'
+        );
+
         $this->isFormAsExpected($addForm);
-        
+
         return $addForm;
     }
-    
+
     /**
-     * get a form for report new
-     * 
-     * @param \Chill\ReportBundle\Tests\Controller\Person $person
-     * @param CustomFieldsGroup $group
-     * @param \Symfony\Component\BrowserKit\Client $client
-     * @return Form
-     */
-    protected function getReportForm(Person $person, CustomFieldsGroup $group, 
-        \Symfony\Component\BrowserKit\Client $client)
-    {
-        $url = sprintf('fr/person/%d/report/cfgroup/%d/new', $person->getId(),
-                $group->getId());
-        $crawler = $client->request('GET', $url);
-        
-        return $crawler->selectButton('Ajouter le rapport')
-              ->form();
-    }
-    
-    /**
-     * Test the expected field are present
-     * 
-     * @param Form $form
-     * @param boolean $isDefault if the form should be at default values
-     * 
-     */
-    private function isFormAsExpected(Form $form, $isDefault = true)
-    {
-        $this->assertTrue($form->has('chill_reportbundle_report[date]'), 
-              'the report form have a field "date"' );
-        $this->assertTrue($form->has('chill_reportbundle_report[user]'),
-              'the report form have field "user" ');
-        
-        $this->assertEquals('select', $form->get('chill_reportbundle_report[user]')
-              ->getType(), "the user field is a select input");
-        
-        if ($isDefault) {
-            $date = new \DateTime('now');
-            $this->assertEquals(
-                $date->format('d-m-Y'), 
-                $form->get('chill_reportbundle_report[date]')->getValue(),
-                "the date field contains the current date by default"
-                  );
-            
-            //resolve the user
-            $userId = $form->get('chill_reportbundle_report[user]')->getValue();
-            
-            $this->assertEquals('center a_social', static::$user->getUsername(),
-                  "the user field is the current user by default");
-        }
-    }
-    
-    /**
-     * fill the form with correct data
-     * 
-     * @param Form $form
-     */
-    private function fillCorrectForm(Form $form)
-    {
-        $form->get('chill_reportbundle_report[date]')->setValue(
-              (new \DateTime())->format('d-m-Y'));
-        
-        return $form;
-    }
-    
-    /**
-     * Test that setting a Null date redirect to an error page
-     * 
+     * Test that setting a Null date redirect to an error page.
      */
     public function testNullDate()
     {
         $client = $this->getAuthenticatedClient();
-        $form = $this->getReportForm(static::$person, static::$group, 
-                $client);
+        $form = $this->getReportForm(
+            self::$person,
+            self::$group,
+            $client
+        );
         //var_dump($form);
         $filledForm = $this->fillCorrectForm($form);
         $filledForm->get('chill_reportbundle_report[date]')->setValue('');
@@ -294,50 +308,52 @@ class ReportControllerTest extends WebTestCase
         $this->assertFalse($client->getResponse()->isRedirect());
         $this->assertGreaterThan(0, $crawler->filter('.error')->count());
     }
-    
+
     /**
-     * Test that setting a Null date redirect to an error page
-     * 
-     * @param Form $form
-     * @depends testNewReportPage
+     * test the update form.
+     *
+     * @depends testValidCreate
+     *
+     * @param int $reportId
      */
-    public function testInvalidDate(Form $form)
+    public function testUpdate($reportId)
     {
         $client = $this->getAuthenticatedClient();
-        $this->markTestSkipped("This test raise an error since symfony 2.7. "
-                . "The user is not correctly reloaded from database.");
-        $filledForm = $this->fillCorrectForm($form);
-        $filledForm->get('chill_reportbundle_report[date]')->setValue('invalid date value');
-        
-        $crawler = $client->submit($filledForm);
-        
-        $this->assertFalse($client->getResponse()->isRedirect());
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count());
+        $crawler = $client->request(
+            'GET',
+            sprintf('/fr/person/%s/report/%s/edit', self::$person->getId(), $reportId)
+        );
+
+        $this->assertTrue($client->getResponse()->isSuccessful());
+
+        $form = $crawler
+            ->selectButton('Enregistrer le rapport')
+            ->form();
+
+        $form->get('chill_reportbundle_report[date]')->setValue(
+            (new DateTime('yesterday'))->format('d-m-Y')
+        );
+
+        $client->submit($form);
+
+        $this->assertTrue($client->getResponse()->isRedirect(
+            sprintf(
+                '/fr/person/%s/report/%s/view',
+                self::$person->getId(),
+                $reportId
+            )
+        ));
+
+        $this->assertEquals(new DateTime('yesterday'), self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager')
+            ->getRepository('ChillReportBundle:Report')
+            ->find($reportId)
+            ->getDate());
     }
-    
+
     /**
-     * Test that a incorrect value in user will show an error page
-     * 
-     * @depends testNewReportPage
-     * @param Form $form
-     */
-    public function testInvalidUser(Form $form)
-    {
-        $client = $this->getAuthenticatedClient();
-        $filledForm = $this->fillCorrectForm($form);
-        $select = $filledForm->get('chill_reportbundle_report[user]')
-              ->disableValidation()
-              ->setValue(-1);
-        
-        $crawler = $client->submit($filledForm);
-        
-        $this->assertFalse($client->getResponse()->isRedirect());
-        $this->assertGreaterThan(0, $crawler->filter('.error')->count());
-    }
-    
-    /**
-     * Test the creation of a report
-     * 
+     * Test the creation of a report.
+     *
      * depends testNewReportPage
      * param Form $form
      */
@@ -349,95 +365,120 @@ class ReportControllerTest extends WebTestCase
         $addForm = $this->getReportForm(self::$person, self::$group, $client);
         $filledForm = $this->fillCorrectForm($addForm);
         $c = $client->submit($filledForm);
-        
-        $this->assertTrue($client->getResponse()->isRedirect(),
-              "The next page is a redirection to the new report's view page");
+
+        $this->assertTrue(
+            $client->getResponse()->isRedirect(),
+            "The next page is a redirection to the new report's view page"
+        );
         $client->followRedirect();
-        
-        $this->assertRegExp("|/fr/person/".static::$person->getId()."/report/[0-9]*/view$|",
-              $client->getHistory()->current()->getUri(),
-              "The next page is a redirection to the new report's view page");
-        
-        $matches = array();
-        preg_match('|/report/([0-9]*)/view$|', 
-              $client->getHistory()->current()->getUri(), $matches);
+
+        $this->assertRegExp(
+            '|/fr/person/' . self::$person->getId() . '/report/[0-9]*/view$|',
+            $client->getHistory()->current()->getUri(),
+            "The next page is a redirection to the new report's view page"
+        );
+
+        $matches = [];
+        preg_match(
+            '|/report/([0-9]*)/view$|',
+            $client->getHistory()->current()->getUri(),
+            $matches
+        );
 
         return $matches[1];
     }
-    
 
     /**
+     * Test the view of a report.
+     *
      * @depends testValidCreate
-     * @param int $reportId
-     */
-    public function testList($reportId)
-    {
-        $client = $this->getAuthenticatedClient();
-        $crawler = $client->request('GET', sprintf('/fr/person/%s/report/list',
-              static::$person->getId()));
-        
-        $this->assertTrue($client->getResponse()->isSuccessful());
-        
-        $linkSee = $crawler->filter('.bt-view')->links();
-        $this->assertGreaterThan(0, count($linkSee));
-        $this->assertRegExp(sprintf('|/fr/person/%s/report/[0-9]*/view$|', 
-              static::$person->getId(), $reportId), $linkSee[0]->getUri());
-        
-        $linkUpdate = $crawler->filter('.bt-update')->links();
-        $this->assertGreaterThan(0, count($linkUpdate));
-        $this->assertRegExp(sprintf('|/fr/person/%s/report/[0-9]*/edit$|',
-              static::$person->getId(), $reportId), $linkUpdate[0]->getUri());
-        
-    }
-    
-    /**
-     * Test the view of a report
-     * 
-     * @depends testValidCreate
+     *
      * @param int $reportId
      */
     public function testView($reportId)
     {
         $client = $this->getAuthenticatedClient();
-        $client->request('GET', 
-              sprintf('/fr/person/%s/report/%s/view', static::$person->getId(), $reportId));
-        
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-              'the page is shown');
+        $client->request(
+            'GET',
+            sprintf('/fr/person/%s/report/%s/view', self::$person->getId(), $reportId)
+        );
+
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'the page is shown'
+        );
     }
-    
+
     /**
-     * test the update form
-     * 
-     * @depends testValidCreate
-     * @param int $reportId
+     * get a form for report new.
+     *
+     * @param \Chill\ReportBundle\Tests\Controller\Person $person
+     *
+     * @return Form
      */
-    public function testUpdate($reportId)
-    {
-        $client = $this->getAuthenticatedClient();
-        $crawler = $client->request('GET',
-              sprintf('/fr/person/%s/report/%s/edit', static::$person->getId(), $reportId));
-        
-        $this->assertTrue($client->getResponse()->isSuccessful());
-        
-        $form = $crawler
-                ->selectButton('Enregistrer le rapport')
-                ->form();
-        
-        $form->get('chill_reportbundle_report[date]')->setValue(
-              (new \DateTime('yesterday'))->format('d-m-Y'));
-        
-        $client->submit($form);
-        
-        $this->assertTrue($client->getResponse()->isRedirect(
-              sprintf('/fr/person/%s/report/%s/view', 
-                    static::$person->getId(), $reportId)));
+    protected function getReportForm(
+        Person $person,
+        CustomFieldsGroup $group,
+        \Symfony\Component\BrowserKit\Client $client
+    ) {
+        $url = sprintf(
+            'fr/person/%d/report/cfgroup/%d/new',
+            $person->getId(),
+            $group->getId()
+        );
+        $crawler = $client->request('GET', $url);
 
-        $this->assertEquals(new \DateTime('yesterday'), static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager')
-              ->getRepository('ChillReportBundle:Report')
-              ->find($reportId)
-              ->getDate());
+        return $crawler->selectButton('Ajouter le rapport')
+            ->form();
     }
 
+    /**
+     * fill the form with correct data.
+     */
+    private function fillCorrectForm(Form $form)
+    {
+        $form->get('chill_reportbundle_report[date]')->setValue(
+            (new DateTime())->format('d-m-Y')
+        );
+
+        return $form;
+    }
+
+    /**
+     * Test the expected field are present.
+     *
+     * @param bool $isDefault if the form should be at default values
+     */
+    private function isFormAsExpected(Form $form, $isDefault = true)
+    {
+        $this->assertTrue(
+            $form->has('chill_reportbundle_report[date]'),
+            'the report form have a field "date"'
+        );
+        $this->assertTrue(
+            $form->has('chill_reportbundle_report[user]'),
+            'the report form have field "user" '
+        );
+
+        $this->assertEquals('select', $form->get('chill_reportbundle_report[user]')
+            ->getType(), 'the user field is a select input');
+
+        if ($isDefault) {
+            $date = new DateTime('now');
+            $this->assertEquals(
+                $date->format('d-m-Y'),
+                $form->get('chill_reportbundle_report[date]')->getValue(),
+                'the date field contains the current date by default'
+            );
+
+            //resolve the user
+            $userId = $form->get('chill_reportbundle_report[user]')->getValue();
+
+            $this->assertEquals(
+                'center a_social',
+                self::$user->getUsername(),
+                'the user field is the current user by default'
+            );
+        }
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
index beb246ea0..3a883b780 100644
--- a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php
@@ -1,29 +1,43 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-class ChillReportExtensionTest extends KernelTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ChillReportExtensionTest extends KernelTestCase
 {
     /*
      * Check if class Chill\ReportBundle\Entity\Report is in chill_custom_fields.customizables_entities
      */
     public function testDeclareReportAsCustomizable()
     {
-        self::bootKernel(array('environment' => 'test'));
-        $customizablesEntities = static::$kernel->getContainer()
-                ->getParameter('chill_custom_fields.customizables_entities');
+        self::bootKernel(['environment' => 'test']);
+        $customizablesEntities = self::$kernel->getContainer()
+            ->getParameter('chill_custom_fields.customizables_entities');
 
         $reportFounded = false;
+
         foreach ($customizablesEntities as $customizablesEntity) {
-            if($customizablesEntity['class'] === 'Chill\ReportBundle\Entity\Report') {
+            if ('Chill\ReportBundle\Entity\Report' === $customizablesEntity['class']) {
                 $reportFounded = true;
             }
         }
 
-        if(! $reportFounded) {
-            throw new Exception("Class Chill\ReportBundle\Entity\Report not found in chill_custom_fields.customizables_entities", 1);
+        if (!$reportFounded) {
+            throw new Exception('Class Chill\\ReportBundle\\Entity\\Report not found in chill_custom_fields.customizables_entities', 1);
         }
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
index ce0bd1053..45b189aa7 100644
--- a/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Search/ReportSearchTest.php
@@ -1,126 +1,117 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Tests\Search;
 
+use DateTime;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
- * Test for report search
+ * Test for report search.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ReportSearchTest extends WebTestCase
+final class ReportSearchTest extends WebTestCase
 {
-    
-    public function testSearchExpectedDefault()
-    {
-        $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array(
-            'q' => '@report 2015-01-05'
-        ));
-        
-        $this->assertTrue($client->getResponse()->isSuccessful());
-        $this->assertRegExp('/Situation de logement/i', $crawler->text());
-    }
-    
     public function testNamedSearch()
     {
         $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array(
-            'q' => '@report '.(new \DateTime('tomorrow'))->format('Y-m-d'), //there should be any result for future. And future is tomorrow
-            'name' => 'report' 
-        ));
-        
+
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@report ' . (new DateTime('tomorrow'))->format('Y-m-d'), //there should be any result for future. And future is tomorrow
+            'name' => 'report',
+        ]);
+
         $this->assertTrue($client->getResponse()->isSuccessful());
     }
-    
+
     public function testSearchByDate()
     {
         $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array(
-            'q' => '@report date:2015-01-05'
-        ));
-        
+
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@report date:2015-01-05',
+        ]);
+
         $this->assertTrue($client->getResponse()->isSuccessful());
         $this->assertRegExp('/Situation de logement/i', $crawler->text());
     }
-    
+
     public function testSearchDoubleDate()
     {
         $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array(
-            'q' => '@report date:2014-05-01 2014-05-06'
-        ));
-        
+
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@report date:2014-05-01 2014-05-06',
+        ]);
+
         $this->assertGreaterThan(0, $crawler->filter('.error')->count());
     }
-    
+
     public function testSearchEmtpy()
     {
         $client = $this->getAuthenticatedClient();
-        
-        $crawler = $client->request('GET', '/fr/search', array(
-            'q' => '@report '
-        ));
-        
+
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@report ',
+        ]);
+
         $this->assertGreaterThan(0, $crawler->filter('.error')->count());
     }
-    
+
+    public function testSearchExpectedDefault()
+    {
+        $client = $this->getAuthenticatedClient();
+
+        $crawler = $client->request('GET', '/fr/search', [
+            'q' => '@report 2015-01-05',
+        ]);
+
+        $this->assertTrue($client->getResponse()->isSuccessful());
+        $this->assertRegExp('/Situation de logement/i', $crawler->text());
+    }
+
     /**
-     * Test that the user do not see unauthorized results
-     * 
-     * We test for that that : 
+     * Test that the user do not see unauthorized results.
+     *
+     * We test for that that :
      * - we do not see any unauthorized scope mention
      */
     public function testUsersDoNotSeeUnauthorizedResults()
     {
         $clientSocial = $this->getAuthenticatedClient();
         $clientAdministrative = $this->getAuthenticatedClient('center a_administrative');
-        
-        $params = array('q' => '@report date:2015-01-05');
-        
+
+        $params = ['q' => '@report date:2015-01-05'];
+
         $crawlerSocial = $clientSocial->request('GET', '/fr/search', $params);
         $crawlerAdministrative = $clientAdministrative->request('GET', '/fr/search', $params);
-        
-        
+
         $this->assertNotContains('social', $crawlerAdministrative->filter('.content')
-                ->text());
+            ->text());
         $this->assertNotContains('administrative', $crawlerAdministrative->filter('.content')
-                ->text());
+            ->text());
     }
-    
-    
+
     /**
-     * 
+     * @param mixed $username
+     *
      * @return \Symfony\Component\BrowserKit\Client
      */
     private function getAuthenticatedClient($username = 'center a_social')
     {
-        return static::createClient(array(), array(
-           'PHP_AUTH_USER' => $username,
-           'PHP_AUTH_PW'   => 'password',
-        ));
+        return self::createClient([], [
+            'PHP_AUTH_USER' => $username,
+            'PHP_AUTH_PW' => 'password',
+        ]);
     }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
index 8fa450fb0..170be6c49 100644
--- a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php
@@ -1,122 +1,58 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Tests\Security\Authorization;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Chill\MainBundle\Test\PrepareUserTrait;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\PrepareCenterTrait;
 use Chill\MainBundle\Test\PrepareScopeTrait;
-use Chill\ReportBundle\Entity\Report;
-use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Test\PrepareUserTrait;
 use Chill\PersonBundle\Entity\Person;
+use Chill\ReportBundle\Entity\Report;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 /**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class ReportVoterTest extends KernelTestCase
-{    
-    
-    use PrepareUserTrait, PrepareCenterTrait, PrepareScopeTrait;
-    
+final class ReportVoterTest extends KernelTestCase
+{
+    use PrepareCenterTrait;
+    use PrepareScopeTrait;
+    use PrepareUserTrait;
+
     /**
-     *
-     * @var \Chill\ReportBundle\Security\Authorization\ReportVoter
-     */
-    protected $voter;
-    
-    /**
-     *
      * @var \Prophecy\Prophet
      */
     protected $prophet;
-    
+
+    /**
+     * @var \Chill\ReportBundle\Security\Authorization\ReportVoter
+     */
+    protected $voter;
+
     public static function setUpBeforeClass()
     {
-        
     }
-    
+
     public function setUp()
     {
-        static::bootKernel();
-        $this->voter = static::$kernel->getContainer()
-                ->get('chill.report.security.authorization.report_voter');
+        self::bootKernel();
+        $this->voter = self::$kernel->getContainer()
+            ->get('chill.report.security.authorization.report_voter');
         $this->prophet = new \Prophecy\Prophet();
     }
-    
-    /**
-     * @dataProvider dataProvider
-     * @param type $expectedResult
-     * @param Report $report
-     * @param User $user
-     * @param type $action
-     * @param type $message
-     */
-    public function testAccess($expectedResult, Report $report, $action, 
-            $message, User $user = null)
-    {
-        $token = $this->prepareToken($user);
-        $result = $this->voter->vote($token, $report, [$action]);
-        $this->assertEquals($expectedResult, $result, $message);
-    }
-    
-    /**
-     * prepare a person
-     * 
-     * The only properties set is the center, others properties are ignored.
-     * 
-     * @param Center $center
-     * @return Person
-     */
-    protected function preparePerson(Center $center)
-    {
-        return (new Person())
-              ->setCenter($center)
-              ;
-    }
-    
-    /**
-     * prepare a token interface with correct rights
-     * 
-     * if $permissions = null, user will be null (no user associated with token
-     * 
-     * @param User $user
-     * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
-     */
-    protected function prepareToken(User $user = null)
-    {        
-        $token = $this->prophet->prophesize();
-        $token
-            ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
-        if ($user === NULL) {
-            $token->getUser()->willReturn(null);
-        } else {
-            $token->getUser()->willReturn($user);
-        }
-        
-        return $token->reveal();
-    }
-    
+
     public function dataProvider()
     {
         $centerA = $this->prepareCenter(1, 'center A');
@@ -124,70 +60,119 @@ class ReportVoterTest extends KernelTestCase
         $scopeA = $this->prepareScope(1, 'scope default');
         $scopeB = $this->prepareScope(2, 'scope B');
         $scopeC = $this->prepareScope(3, 'scope C');
-        
-        $userA = $this->prepareUser(array(
-            array(
-                'center' => $centerA, 
-                'permissionsGroup' => array(
+
+        $userA = $this->prepareUser([
+            [
+                'center' => $centerA,
+                'permissionsGroup' => [
                     ['scope' => $scopeB, 'role' => 'CHILL_REPORT_SEE'],
-                    ['scope' => $scopeA, 'role' => 'CHILL_REPORT_UPDATE']
-                )
-            ),
-            array(
-               'center' => $centerB,
-               'permissionsGroup' => array(
-                     ['scope' => $scopeA, 'role' => 'CHILL_REPORT_SEE'],
-               )
-            )
-            
-        ));
-        
-        $reportA = (new Report)
-                ->setScope($scopeA)
-                ->setPerson($this->preparePerson($centerA))
-                ;
+                    ['scope' => $scopeA, 'role' => 'CHILL_REPORT_UPDATE'],
+                ],
+            ],
+            [
+                'center' => $centerB,
+                'permissionsGroup' => [
+                    ['scope' => $scopeA, 'role' => 'CHILL_REPORT_SEE'],
+                ],
+            ],
+        ]);
+
+        $reportA = (new Report())
+            ->setScope($scopeA)
+            ->setPerson($this->preparePerson($centerA));
         $reportB = (new Report())
-                ->setScope($scopeB)
-                ->setPerson($this->preparePerson($centerA))
-                ;
+            ->setScope($scopeB)
+            ->setPerson($this->preparePerson($centerA));
         $reportC = (new Report())
-                ->setScope($scopeC)
-                ->setPerson($this->preparePerson($centerB))
-                ;
-        
-        
-        return array(
-            array(
+            ->setScope($scopeC)
+            ->setPerson($this->preparePerson($centerB));
+
+        return [
+            [
                 VoterInterface::ACCESS_DENIED,
                 $reportA,
                 'CHILL_REPORT_SEE',
-                "assert is denied to a null user",
-                null
-            ),
-            array(
+                'assert is denied to a null user',
+                null,
+            ],
+            [
                 VoterInterface::ACCESS_GRANTED,
                 $reportA,
                 'CHILL_REPORT_SEE',
-                "assert access is granted to a user with inheritance UPDATE > SEE",
-                $userA
-            ),
-            array(
+                'assert access is granted to a user with inheritance UPDATE > SEE',
+                $userA,
+            ],
+            [
                 VoterInterface::ACCESS_GRANTED,
                 $reportB,
                 'CHILL_REPORT_SEE',
-                "assert access is granted to a user without inheritance",
-                $userA
-            ),
-            array(
+                'assert access is granted to a user without inheritance',
+                $userA,
+            ],
+            [
                 VoterInterface::ACCESS_DENIED,
                 $reportC,
                 'CHILL_REPORT_SEE',
                 'assert access is denied to a report',
-                $userA
-            )
-        );
-        
+                $userA,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param type $expectedResult
+     * @param User $user
+     * @param type $action
+     * @param type $message
+     */
+    public function testAccess(
+        $expectedResult,
+        Report $report,
+        $action,
+        $message,
+        ?User $user = null
+    ) {
+        $token = $this->prepareToken($user);
+        $result = $this->voter->vote($token, $report, [$action]);
+        $this->assertEquals($expectedResult, $result, $message);
+    }
+
+    /**
+     * prepare a person.
+     *
+     * The only properties set is the center, others properties are ignored.
+     *
+     * @return Person
+     */
+    protected function preparePerson(Center $center)
+    {
+        return (new Person())
+            ->setCenter($center);
+    }
+
+    /**
+     * prepare a token interface with correct rights.
+     *
+     * if $permissions = null, user will be null (no user associated with token
+     *
+     * @param User $user
+     *
+     * @return \Symfony\Component\Security\Core\Authentication\Token\TokenInterface
+     */
+    protected function prepareToken(?User $user = null)
+    {
+        $token = $this->prophet->prophesize();
+        $token
+            ->willImplement('\Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+
+        if (null === $user) {
+            $token->getUser()->willReturn(null);
+        } else {
+            $token->getUser()->willReturn($user);
+        }
+
+        return $token->reveal();
     }
-    
-    
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index 830600a6e..25d175782 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -1,182 +1,91 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Tests\Timeline;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Tests\TestHelper as MainTestHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ReportBundle\Entity\Report;
-use Chill\MainBundle\Tests\TestHelper as MainTestHelper;
-use Chill\MainBundle\Entity\Scope;
+use DateTime;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function count;
 
 /**
- * Test a report is shown into timeline
+ * Test a report is shown into timeline.
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * @internal
+ * @coversNothing
  */
-class TimelineProviderTest extends WebTestCase
+final class TimelineProviderTest extends WebTestCase
 {
-    
     /**
-     *
      * @var \Doctrine\ORM\EntityManager
      */
     private static $em;
-    
+
     /**
-     *
      * @var Person
      */
     private $person;
-    
+
     /**
-     *
      * @var Report
      */
     private $report;
-    
+
     /**
-     * Create a person with a report associated with the person
+     * Create a person with a report associated with the person.
      */
     public function setUp()
     {
-        static::bootKernel();
-        
-        static::$em = static::$kernel->getContainer()
-              ->get('doctrine.orm.entity_manager');
-        
-        $center = static::$em->getRepository('ChillMainBundle:Center')
-              ->findOneBy(array('name' => 'Center A'));
-        
-        $person = (new Person(new \DateTime('2015-05-01')))
-          ->setGender(Person::FEMALE_GENDER)
-          ->setFirstName('Nelson')
-          ->setLastName('Mandela')
-          ->setCenter($center);
-        static::$em->persist($person);
-        $this->person = $person;
-        
-        $scopesSocial = array_filter(static::$em
-                ->getRepository('ChillMainBundle:Scope')
-                ->findAll(), 
-                function(Scope $scope) { return $scope->getName()['en'] === 'social'; })
-                ;
-        
-        $report = (new Report)
-              ->setUser(static::$em->getRepository('ChillMainBundle:User')
-                    ->findOneByUsername('center a_social'))
-              ->setDate(new \DateTime('2015-05-02'))
-              ->setPerson($this->person)
-              ->setCFGroup($this->getHousingCustomFieldsGroup())
-              ->setCFData(['has_logement' => 'own_house', 
-           'house-desc' => 'blah blah'])
-              ->setScope(end($scopesSocial));
-        
-        static::$em->persist($report);
-        $this->report = $report;
-        
-        
-        
-        static::$em->flush();
-        
-    }
-    
-    /**
-     * Test that a report is shown in timeline
-     */
-    public function testTimelineReport()
-    {
-        $client = static::createClient(array(),
-              MainTestHelper::getAuthenticatedClientOptions()
-              );
-        
-        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
-              .'/timeline');
-        
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-              'The page timeline is loaded successfully');
-        $this->assertContains('a ajouté un rapport', $crawler->text(),
-              'the page contains the text "a publié un rapport"');
-    }
-    
-    public function testTimelineReportWithSummaryField()
-    {
-        //load the page
-        $client = static::createClient(array(),
-              MainTestHelper::getAuthenticatedClientOptions()
-              );
-        
-        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
-              .'/timeline');
-        
-        //performs tests
-        $this->assertTrue($client->getResponse()->isSuccessful(),
-              'The page timeline is loaded successfully');
-        $this->assertGreaterThan(0, $crawler->filter('.report_entry .summary')
-              ->count(), 
-              'the page contains a .report .summary element');
-        $this->assertContains('blah blah', $crawler->filter('.report_entry .summary')
-              ->text(),
-              'the page contains the text "blah blah"');
-        $this->assertContains('Propriétaire', $crawler->filter('.report_entry .summary')
-              ->text(),
-              'the page contains the mention "Propriétaire"');
-    }
-    
-    public function testReportIsNotVisibleToUngrantedUsers()
-    {
-        $client = static::createClient(array(),
-            MainTestHelper::getAuthenticatedClientOptions('center a_administrative')
-            );
-        
-        $crawler = $client->request('GET', '/fr/person/'.$this->person->getId()
-              .'/timeline');
+        self::bootKernel();
 
-         $this->assertEquals(0, $crawler->filter('.report_entry .summary')
-              ->count(), 
-              'the page does not contains a .report .summary element');
+        self::$em = self::$kernel->getContainer()
+            ->get('doctrine.orm.entity_manager');
+
+        $center = self::$em->getRepository('ChillMainBundle:Center')
+            ->findOneBy(['name' => 'Center A']);
+
+        $person = (new Person(new DateTime('2015-05-01')))
+            ->setGender(Person::FEMALE_GENDER)
+            ->setFirstName('Nelson')
+            ->setLastName('Mandela')
+            ->setCenter($center);
+        self::$em->persist($person);
+        $this->person = $person;
+
+        $scopesSocial = array_filter(
+            self::$em
+                ->getRepository('ChillMainBundle:Scope')
+                ->findAll(),
+            static function (Scope $scope) { return $scope->getName()['en'] === 'social'; }
+        );
+
+        $report = (new Report())
+            ->setUser(self::$em->getRepository('ChillMainBundle:User')
+            ->findOneByUsername('center a_social'))
+            ->setDate(new DateTime('2015-05-02'))
+            ->setPerson($this->person)
+            ->setCFGroup($this->getHousingCustomFieldsGroup())
+            ->setCFData(['has_logement' => 'own_house',
+                'house-desc' => 'blah blah', ])
+            ->setScope(end($scopesSocial));
+
+        self::$em->persist($report);
+        $this->report = $report;
+
+        self::$em->flush();
     }
-    
-    /**
-     * get a random custom fields group
-     * 
-     * @return \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup
-     */
-    private function getHousingCustomFieldsGroup()
-    {
-        $groups = static::$em
-              ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
-              ->findAll();
-        
-        foreach ($groups as $group) {
-            if ($group->getName()['fr'] === 'Situation de logement') {
-                return $group;
-            }
-        }
-        
-        return $groups[rand(0, count($groups) -1)];
-    }
-    
-    
-    
+
     public function tearDown()
     {
         //static::$em->refresh($this->person);
@@ -184,4 +93,102 @@ class TimelineProviderTest extends WebTestCase
        // static::$em->remove($this->person);
         //static::$em->remove($this->report);
     }
+
+    public function testReportIsNotVisibleToUngrantedUsers()
+    {
+        $client = self::createClient(
+            [],
+            MainTestHelper::getAuthenticatedClientOptions('center a_administrative')
+        );
+
+        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
+              . '/timeline');
+
+        $this->assertEquals(
+            0,
+            $crawler->filter('.report_entry .summary')
+                ->count(),
+            'the page does not contains a .report .summary element'
+        );
+    }
+
+    /**
+     * Test that a report is shown in timeline.
+     */
+    public function testTimelineReport()
+    {
+        $client = self::createClient(
+            [],
+            MainTestHelper::getAuthenticatedClientOptions()
+        );
+
+        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
+              . '/timeline');
+
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The page timeline is loaded successfully'
+        );
+        $this->assertContains(
+            'a ajouté un rapport',
+            $crawler->text(),
+            'the page contains the text "a publié un rapport"'
+        );
+    }
+
+    public function testTimelineReportWithSummaryField()
+    {
+        //load the page
+        $client = self::createClient(
+            [],
+            MainTestHelper::getAuthenticatedClientOptions()
+        );
+
+        $crawler = $client->request('GET', '/fr/person/' . $this->person->getId()
+              . '/timeline');
+
+        //performs tests
+        $this->assertTrue(
+            $client->getResponse()->isSuccessful(),
+            'The page timeline is loaded successfully'
+        );
+        $this->assertGreaterThan(
+            0,
+            $crawler->filter('.report_entry .summary')
+                ->count(),
+            'the page contains a .report .summary element'
+        );
+        $this->assertContains(
+            'blah blah',
+            $crawler->filter('.report_entry .summary')
+                ->text(),
+            'the page contains the text "blah blah"'
+        );
+        $this->assertContains(
+            'Propriétaire',
+            $crawler->filter('.report_entry .summary')
+                ->text(),
+            'the page contains the mention "Propriétaire"'
+        );
+    }
+
+    /**
+     * get a random custom fields group.
+     *
+     * @return \Chill\CustomFieldsBundle\Entity\CustomFieldsGroup
+     */
+    private function getHousingCustomFieldsGroup()
+    {
+        $groups = self::$em
+            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->findAll();
+
+        foreach ($groups as $group) {
+            if ($group->getName()['fr'] === 'Situation de logement') {
+                return $group;
+            }
+        }
+
+        return $groups[mt_rand(0, count($groups) - 1)];
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/Tests/bootstrap.php b/src/Bundle/ChillReportBundle/Tests/bootstrap.php
index 2437ecd2d..d4e1e46fa 100644
--- a/src/Bundle/ChillReportBundle/Tests/bootstrap.php
+++ b/src/Bundle/ChillReportBundle/Tests/bootstrap.php
@@ -1,7 +1,16 @@
 <?php
 
-if (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
     throw new \LogicException('Could not find autoload.php in vendor/. Did you run "composer install --dev"?');
 }
 
-require $autoloadFile;
\ No newline at end of file
+require $autoloadFile;
diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
index 49e237d87..97bca3bd4 100644
--- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
@@ -1,301 +1,158 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ReportBundle\Timeline;
 
-use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Doctrine\ORM\EntityManager;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\Scope;
 use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
-use Chill\ReportBundle\Entity\Report;
-use Symfony\Component\Security\Core\Security;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Chill\MainBundle\Timeline\TimelineSingleQuery;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ReportBundle\Entity\Report;
+use Doctrine\ORM\EntityManager;
+use LogicException;
+use Symfony\Component\Security\Core\Security;
+use UnexpectedValueException;
+use function array_fill;
+use function array_key_exists;
+use function array_merge;
+use function count;
+use function implode;
+use function in_array;
+use function strtr;
 
 /**
- * Provide report for inclusion in timeline
+ * Provide report for inclusion in timeline.
  */
 class TimelineReportProvider implements TimelineProviderInterface
 {
-    
-    protected EntityManager $em;
-    
-    protected AuthorizationHelper $helper;
-    
     protected CustomFieldsHelper $customFieldsHelper;
-    
-    protected $showEmptyValues;
-    
+
+    protected EntityManager $em;
+
+    protected AuthorizationHelper $helper;
+
+    protected bool $showEmptyValues;
+
+    private Security $security;
+
     public function __construct(
         EntityManager $em,
         AuthorizationHelper $helper,
         Security $security,
         CustomFieldsHelper $customFieldsHelper,
         $showEmptyValues
-    )
-    {
+    ) {
         $this->em = $em;
         $this->helper = $helper;
         $this->security = $security;
         $this->customFieldsHelper = $customFieldsHelper;
         $this->showEmptyValues = $showEmptyValues;
     }
-    
-    /**
-     * 
-     * {@inheritDoc}
-     */
+
     public function fetchQuery($context, array $args)
     {
         $this->checkContext($context);
-        
+
         $report = $this->em->getClassMetadata(Report::class);
         [$where, $parameters] = $this->getWhereClause($context, $args);
 
         return TimelineSingleQuery::fromArray([
-           'id' => $report->getTableName()
-                .'.'.$report->getColumnName('id'),
-           'type' => 'report',
-           'date' => $report->getTableName()
-                .'.'.$report->getColumnName('date'),
-           'FROM' => $this->getFromClause($context),
-           'WHERE' => $where,
-           'parameters' => $parameters
-       ]);
-    }
-    
-    private function getWhereClause(string $context, array $args): array
-    {
-        switch ($context) {
-            case 'person':
-                return $this->getWhereClauseForPerson($context, $args);
-            case 'center':
-                return $this->getWhereClauseForCenter($context, $args);
-            default:
-                throw new \UnexpectedValueException("This context $context is not implemented");
-        }
+            'id' => $report->getTableName()
+                 . '.' . $report->getColumnName('id'),
+            'type' => 'report',
+            'date' => $report->getTableName()
+                 . '.' . $report->getColumnName('date'),
+            'FROM' => $this->getFromClause($context),
+            'WHERE' => $where,
+            'parameters' => $parameters,
+        ]);
     }
 
-    private function getWhereClauseForCenter(string $context, array $args): array
-    {
-        $report = $this->em->getClassMetadata(Report::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $role = new Role('CHILL_REPORT_SEE');
-        $reachableCenters = $this->helper->getReachableCenters($this->security->getUser(), 
-                $role);
-        $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
-        $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
-        // parameters for the query, will be filled later
-        $parameters = [];
-
-        // the clause, that will be joined with an "OR"
-        $centerScopesClause = "({person}.{center_id} = ? ".
-            "AND {report}.{scopes_id} IN ({scopes_ids}))";
-        // container for formatted clauses
-        $formattedClauses = [];
-
-        $askedCenters = $args['centers'];
-        foreach ($reachableCenters as $center) {
-            if (FALSE === \in_array($center, $askedCenters)) {
-                continue;
-            }
-
-            // add the center id to the parameters
-            $parameters[] = $center->getId(); 
-            // loop over scopes
-            $scopeIds = [];
-            foreach ($this->helper->getReachableScopes($this->security->getUser(), 
-                $role, $center) as $scope) {
-                if (\in_array($scope->getId(), $scopeIds)) {
-                    continue; 
-                }
-                $scopeIds[] = $scope->getId();
-            }
-
-            $formattedClauses[] = \strtr($centerScopesClause, [
-                '{scopes_ids}' => \implode(', ', \array_fill(0, \count($scopeIds), '?'))
-            ]);
-            // append $scopeIds to parameters
-            $parameters = \array_merge($parameters, $scopeIds);
-        }
-
-        if (0 === count($formattedClauses)) {
-            return [ 'FALSE = TRUE', [] ];
-        }
-
-        return [
-            \strtr(
-                \implode(' OR ', $formattedClauses),
-                [
-                    '{person}' => $person->getTableName(),
-                    '{center_id}' => $personCenterId,
-                    '{report}' => $report->getTableName(),
-                    '{scopes_id}' => $reportScopeId,
-                ]
-            ),
-            $parameters
-        ];
-    }
-
-    private function getWhereClauseForPerson(string $context, array $args): array
-    {
-        $report = $this->em->getClassMetadata(Report::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $role = new Role('CHILL_REPORT_SEE');
-        $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
-        $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
-        // parameters for the query, will be filled later
-        $parameters = [ $args['person']->getId() ];
-
-        // this is the final clause  that we are going to fill
-        $clause = "{report}.{person_id} = ? AND {report}.{scopes_id} IN ({scopes_ids})";
-        // iterate over reachable scopes
-        $scopes = $this->helper->getReachableScopes($this->security->getUser(), $role, 
-            $args['person']->getCenter());
-
-        foreach ($scopes as $scope) {
-            if (\in_array($scope->getId(), $parameters)) {
-                continue;
-            }
-
-            $parameters[] = $scope->getId();
-        }
-
-        if (1 === count($parameters)) {
-            // nothing change, we simplify the clause
-            $clause = "{report}.{person_id} = ? AND FALSE = TRUE";
-        }
-
-        return [
-            \strtr(
-                $clause,
-                [
-                    '{report}' => $report->getTableName(),
-                    '{person_id}' => $reportPersonId, 
-                    '{scopes_id}' => $reportScopeId,
-                    '{scopes_ids}' => \implode(', ', 
-                        \array_fill(0, \count($parameters)-1, '?'))
-                ]
-            ),
-            $parameters
-        ];
-    }
-    
-    private function getFromClause(string $context): string
-    {
-        $report = $this->em->getClassMetadata(Report::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $reportPersonId = $report
-            ->getAssociationMapping('person')['joinColumns'][0]['name']
-            ;
-        $personId = $report
-            ->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName']
-            ;
-
-        $clause = "{report} ".
-            "JOIN {person} ON {report}.{person_id} = {person}.{id_person} ";
-
-        return \strtr($clause,
-            [
-                '{report}' => $report->getTableName(),
-                '{person}' => $person->getTableName(),
-                '{person_id}' => $reportPersonId,
-                '{id_person}' => $personId
-            ]
-        );
-    }
-
-    /**
-     * 
-     * {@inheritDoc}
-     */
     public function getEntities(array $ids)
     {
         $reports = $this->em->getRepository('ChillReportBundle:Report')
-              ->findBy(array('id' => $ids));
-        
-        $result = array();
-        foreach($reports as $report) {
+            ->findBy(['id' => $ids]);
+
+        $result = [];
+
+        foreach ($reports as $report) {
             $result[$report->getId()] = $report;
         }
-        
+
         return $result;
     }
 
-    /**
-     * 
-     * {@inheritDoc}
-     */
     public function getEntityTemplate($entity, $context, array $args)
     {
         $this->checkContext($context);
-        
-        return array(
-           'template' => 'ChillReportBundle:Timeline:report.html.twig',
-           'template_data' => array(
-               'report' => $entity,
-               'context' => $context,
-               'custom_fields_in_summary' => $this->getFieldsToRender($entity, $context),
-           )
-        );
+
+        return [
+            'template' => 'ChillReportBundle:Timeline:report.html.twig',
+            'template_data' => [
+                'report' => $entity,
+                'context' => $context,
+                'custom_fields_in_summary' => $this->getFieldsToRender($entity, $context),
+            ],
+        ];
     }
-    
-    protected function getFieldsToRender(Report $entity, $context, array $args = array())
+
+    public function supportsType($type)
+    {
+        return 'report' === $type;
+    }
+
+    protected function getFieldsToRender(Report $entity, $context, array $args = [])
     {
         //gather all custom fields which should appears in summary
-        $gatheredFields = array();
-        
+        $gatheredFields = [];
+
         if (array_key_exists('summary_fields', $entity->getCFGroup()->getOptions())) {
             // keep in memory title
             $title = null;
             $subtitle = null;
-            
+
             foreach ($entity->getCFGroup()->getCustomFields() as $customField) {
-                if (in_array($customField->getSlug(), 
-                      $entity->getCFGroup()->getOptions()['summary_fields'])) {
+                if (in_array(
+                    $customField->getSlug(),
+                    $entity->getCFGroup()->getOptions()['summary_fields'],
+                    true
+                )) {
                     // if we do not want to show empty values
-                    if ($this->showEmptyValues === false) {
+                    if (false === $this->showEmptyValues) {
                         if ($customField->getType() === 'title') {
                             $options = $customField->getOptions();
-                            switch($options['type']) {
-                                case 'title': $title = $customField; break;
-                                case 'subtitle': $subtitle = $customField; break;
+
+                            switch ($options['type']) {
+                                case 'title': $title = $customField;
+
+break;
+
+                                case 'subtitle': $subtitle = $customField;
+
+break;
                             }
                         } else {
                             if ($this->customFieldsHelper->isEmptyValue($entity->getCFData(), $customField)
                                 === false) {
-                                if ($title !== NULL) {
+                                if (null !== $title) {
                                     $gatheredFields[] = $title;
                                     $title = null;
                                 }
-                                if ($subtitle !== NULL) {
+
+                                if (null !== $subtitle) {
                                     $gatheredFields[] = $subtitle;
                                     $subtitle = null;
                                 }
-                            $gatheredFields[] = $customField;
+                                $gatheredFields[] = $customField;
                             }
                         }
                     } else {
@@ -304,32 +161,169 @@ class TimelineReportProvider implements TimelineProviderInterface
                 }
             }
         }
-        
+
         return $gatheredFields;
-        
     }
 
     /**
-     * 
-     * {@inheritDoc}
-     */
-    public function supportsType($type)
-    {
-        return $type === 'report';
-    }
-    
-    /**
-     * check if the context is supported
-     * 
+     * check if the context is supported.
+     *
      * @param string $context
-     * @throws \LogicException if the context is not supported
+     *
+     * @throws LogicException if the context is not supported
      */
     private function checkContext($context)
     {
-        if ($context !== 'person' && $context !== 'center') {
-            throw new \LogicException("The context '$context' is not "
+        if ('person' !== $context && 'center' !== $context) {
+            throw new LogicException("The context '{$context}' is not "
                   . "supported. Currently only 'person' and 'center' is supported");
         }
     }
 
+    private function getFromClause(string $context): string
+    {
+        $report = $this->em->getClassMetadata(Report::class);
+        $person = $this->em->getClassMetadata(Person::class);
+        $reportPersonId = $report
+            ->getAssociationMapping('person')['joinColumns'][0]['name'];
+        $personId = $report
+            ->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
+
+        $clause = '{report} ' .
+            'JOIN {person} ON {report}.{person_id} = {person}.{id_person} ';
+
+        return strtr(
+            $clause,
+            [
+                '{report}' => $report->getTableName(),
+                '{person}' => $person->getTableName(),
+                '{person_id}' => $reportPersonId,
+                '{id_person}' => $personId,
+            ]
+        );
+    }
+
+    private function getWhereClause(string $context, array $args): array
+    {
+        switch ($context) {
+            case 'person':
+                return $this->getWhereClauseForPerson($context, $args);
+
+            case 'center':
+                return $this->getWhereClauseForCenter($context, $args);
+
+            default:
+                throw new UnexpectedValueException("This context {$context} is not implemented");
+        }
+    }
+
+    private function getWhereClauseForCenter(string $context, array $args): array
+    {
+        $role = 'CHILL_REPORT_SEE';
+
+        $report = $this->em->getClassMetadata(Report::class);
+        $person = $this->em->getClassMetadata(Person::class);
+
+        $reachableCenters = $this->helper->getReachableCenters($this->security->getUser(), $role);
+        $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
+        $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
+        $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
+        // parameters for the query, will be filled later
+        $parameters = [];
+
+        // the clause, that will be joined with an "OR"
+        $centerScopesClause = '({person}.{center_id} = ? ' .
+            'AND {report}.{scopes_id} IN ({scopes_ids}))';
+        // container for formatted clauses
+        $formattedClauses = [];
+
+        $askedCenters = $args['centers'];
+
+        foreach ($reachableCenters as $center) {
+            if (false === in_array($center, $askedCenters, true)) {
+                continue;
+            }
+
+            // add the center id to the parameters
+            $parameters[] = $center->getId();
+            // loop over scopes
+            $scopeIds = [];
+
+            foreach ($this->helper->getReachableScopes($this->security->getUser(), $role, $center) as $scope) {
+                if (in_array($scope->getId(), $scopeIds, true)) {
+                    continue;
+                }
+                $scopeIds[] = $scope->getId();
+            }
+
+            $formattedClauses[] = strtr($centerScopesClause, [
+                '{scopes_ids}' => implode(', ', array_fill(0, count($scopeIds), '?')),
+            ]);
+            // append $scopeIds to parameters
+            $parameters = array_merge($parameters, $scopeIds);
+        }
+
+        if (0 === count($formattedClauses)) {
+            return ['FALSE = TRUE', []];
+        }
+
+        return [
+            strtr(
+                implode(' OR ', $formattedClauses),
+                [
+                    '{person}' => $person->getTableName(),
+                    '{center_id}' => $personCenterId,
+                    '{report}' => $report->getTableName(),
+                    '{scopes_id}' => $reportScopeId,
+                ]
+            ),
+            $parameters,
+        ];
+    }
+
+    private function getWhereClauseForPerson(string $context, array $args): array
+    {
+        $role = 'CHILL_REPORT_SEE';
+        $report = $this->em->getClassMetadata(Report::class);
+        $person = $this->em->getClassMetadata(Person::class);
+        $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
+        $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
+        $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
+        // parameters for the query, will be filled later
+        $parameters = [$args['person']->getId()];
+
+        // this is the final clause  that we are going to fill
+        $clause = '{report}.{person_id} = ? AND {report}.{scopes_id} IN ({scopes_ids})';
+        // iterate over reachable scopes
+        $scopes = $this->helper->getReachableScopes($this->security->getUser(), $role, $args['person']->getCenter());
+
+        foreach ($scopes as $scope) {
+            if (in_array($scope->getId(), $parameters, true)) {
+                continue;
+            }
+
+            $parameters[] = $scope->getId();
+        }
+
+        if (1 === count($parameters)) {
+            // nothing change, we simplify the clause
+            $clause = '{report}.{person_id} = ? AND FALSE = TRUE';
+        }
+
+        return [
+            strtr(
+                $clause,
+                [
+                    '{report}' => $report->getTableName(),
+                    '{person_id}' => $reportPersonId,
+                    '{scopes_id}' => $reportScopeId,
+                    '{scopes_ids}' => implode(
+                        ', ',
+                        array_fill(0, count($parameters) - 1, '?')
+                    ),
+                ]
+            ),
+            $parameters,
+        ];
+    }
 }
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php b/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php
index 3108024f8..287521396 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20141129012050.php
@@ -1,30 +1,38 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Report;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20141129012050 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("CREATE SEQUENCE Report_id_seq INCREMENT BY 1 MINVALUE 1 START 1;");
-        $this->addSql("CREATE TABLE Report (id INT NOT NULL, user_id INT DEFAULT NULL, person_id INT DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, scope VARCHAR(255) DEFAULT NULL, cFData JSON NOT NULL, cFGroup_id INT DEFAULT NULL, PRIMARY KEY(id));");
-        $this->addSql("CREATE INDEX IDX_C38372B2A76ED395 ON Report (user_id);");
-        $this->addSql("CREATE INDEX IDX_C38372B2217BBB47 ON Report (person_id);");
-        $this->addSql("CREATE INDEX IDX_C38372B216D2C9F0 ON Report (cFGroup_id);");
-        $this->addSql("ALTER TABLE Report ADD CONSTRAINT FK_C38372B2A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE Report ADD CONSTRAINT FK_C38372B2217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-        $this->addSql("ALTER TABLE Report ADD CONSTRAINT FK_C38372B216D2C9F0 FOREIGN KEY (cFGroup_id) REFERENCES CustomFieldsGroup (id) NOT DEFERRABLE INITIALLY IMMEDIATE;");
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
+    }
 
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE Report_id_seq INCREMENT BY 1 MINVALUE 1 START 1;');
+        $this->addSql('CREATE TABLE Report (id INT NOT NULL, user_id INT DEFAULT NULL, person_id INT DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, scope VARCHAR(255) DEFAULT NULL, cFData JSON NOT NULL, cFGroup_id INT DEFAULT NULL, PRIMARY KEY(id));');
+        $this->addSql('CREATE INDEX IDX_C38372B2A76ED395 ON Report (user_id);');
+        $this->addSql('CREATE INDEX IDX_C38372B2217BBB47 ON Report (person_id);');
+        $this->addSql('CREATE INDEX IDX_C38372B216D2C9F0 ON Report (cFGroup_id);');
+        $this->addSql('ALTER TABLE Report ADD CONSTRAINT FK_C38372B2A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE Report ADD CONSTRAINT FK_C38372B2217BBB47 FOREIGN KEY (person_id) REFERENCES Person (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+        $this->addSql('ALTER TABLE Report ADD CONSTRAINT FK_C38372B216D2C9F0 FOREIGN KEY (cFGroup_id) REFERENCES CustomFieldsGroup (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
     }
 }
diff --git a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
index 3e0353b41..685906658 100644
--- a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
+++ b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php
@@ -1,62 +1,80 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Report;
 
-use Doctrine\Migrations\AbstractMigration;
+use Chill\MainBundle\Entity\Scope;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Chill\MainBundle\Entity\Scope;
-
 
 /**
- * Add a scope to report
+ * Add a scope to report.
  */
-class Version20150622233319 extends AbstractMigration 
-    implements ContainerAwareInterface
+class Version20150622233319 extends AbstractMigration implements ContainerAwareInterface
 {
-    
     /**
-     *
      * @var ContainerInterface
      */
     private $container;
 
-    public function setContainer(ContainerInterface $container = null)
+    public function down(Schema $schema): void
     {
-        if ($container === NULL) {
-            throw new \RuntimeException('Container is not provided. This migration '
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
+
+        $this->addSql('ALTER TABLE Report DROP CONSTRAINT FK_report_scope');
+        $this->addSql('DROP INDEX IDX_report_scope');
+        $this->addSql('ALTER TABLE Report ADD scope VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE Report DROP scope_id');
+    }
+
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        if (null === $container) {
+            throw new RuntimeException('Container is not provided. This migration '
                     . 'need container to set a default center');
         }
-        
+
         $this->container = $container;
     }
-    
-    /**
-     * @param Schema $schema
-     */
+
     public function up(Schema $schema): void
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
-                'Migration can only be executed safely on \'postgresql\'.');
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'postgresql',
+            'Migration can only be executed safely on \'postgresql\'.'
+        );
 
         $this->addSql('ALTER TABLE report ADD scope_id INT DEFAULT NULL');
-        
+
         /*
          * Before the upgrade to symfony version 4, this code worked.
-         * 
+         *
          * But it doesn't work any more after the migration and currently this
          * code should note be necessary.
-         * 
+         *
          * This code is kept for reference, and may be re-activated if needed, but
          * the probability that this will happens is near 0
-         * 
+         *
 
         //add a default scope
         $scopes = $this->container->get('doctrine.orm.default_entity_manager')
               ->getRepository('ChillMainBundle:Scope')
               ->findAll();
-        
+
         if (count($scopes) > 0) {
             $defaultScopeId = $scopes[0]->getId();
         } else {
@@ -64,7 +82,7 @@ class Version20150622233319 extends AbstractMigration
             $nbReports = $this->container->get('doctrine.orm.default_entity_manager')
                   ->createQuery('SELECT count(r.id) FROM ChillReportBundle:Report r')
                   ->getSingleScalarResult();
-            
+
             if ($nbReports > 0) {
                 //create a default scope
                 $scope = new Scope();
@@ -90,27 +108,13 @@ class Version20150622233319 extends AbstractMigration
         $this->addSql('ALTER TABLE report ADD CONSTRAINT FK_report_scope '
                 . 'FOREIGN KEY (scope_id) '
                 . 'REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-        if (isset($defaultScopeId)){
-            $this->addSql('UPDATE report SET scope_id = :id', array(
-               'id' => $defaultScopeId
-            ));
+
+        if (isset($defaultScopeId)) {
+            $this->addSql('UPDATE report SET scope_id = :id', [
+                'id' => $defaultScopeId,
+            ]);
         }
         $this->addSql('ALTER TABLE report ALTER COLUMN scope_id SET NOT NULL');
         $this->addSql('CREATE INDEX IDX_report_scope ON report (scope_id)');
     }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 
-                'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE Report DROP CONSTRAINT FK_report_scope');
-        $this->addSql('DROP INDEX IDX_report_scope');
-        $this->addSql('ALTER TABLE Report ADD scope VARCHAR(255) DEFAULT NULL');
-        $this->addSql('ALTER TABLE Report DROP scope_id');
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/ChillTaskBundle.php b/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
index acd8b8607..b12e4be76 100644
--- a/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
+++ b/src/Bundle/ChillTaskBundle/ChillTaskBundle.php
@@ -1,36 +1,26 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Chill\TaskBundle\DependencyInjection\Compiler\TaskWorkflowDefinitionCompilerPass;
 
 /**
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle;
+
+use Chill\TaskBundle\DependencyInjection\Compiler\TaskWorkflowDefinitionCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
 class ChillTaskBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
-        
+
         $container->addCompilerPass(new TaskWorkflowDefinitionCompilerPass());
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index bc76dacd4..22513580c 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -1,238 +1,209 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Controller;
 
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
+use Chill\MainBundle\Timeline\TimelineBuilder;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Chill\TaskBundle\Entity\SingleTask;
+use Chill\TaskBundle\Event\TaskEvent;
+use Chill\TaskBundle\Event\UI\UIEvent;
+use Chill\TaskBundle\Form\SingleTaskType;
+use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Routing\Annotation\Route;
-use Doctrine\ORM\EntityManager;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Chill\TaskBundle\Entity\SingleTask;
-use Chill\TaskBundle\Form\SingleTaskType;
-use Chill\TaskBundle\Form\SingleTaskListType;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormFactoryInterface;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\TaskBundle\Repository\SingleTaskRepository;
-use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\MainBundle\Entity\UserRepository;
-use Chill\TaskBundle\Event\TaskEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\TaskBundle\Event\UI\UIEvent;
-use Chill\MainBundle\Repository\CenterRepository;
-use Chill\MainBundle\Timeline\TimelineBuilder;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_map;
+use function array_merge;
 
-/**
- * Class SingleTaskController
- *
- * @package Chill\TaskBundle\Controller
- */
-class SingleTaskController extends AbstractController
+final class SingleTaskController extends AbstractController
 {
-    
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-    
-    /**
-     *
-     * @var TimelineBuilder
-     */
-    protected $timelineBuilder;
-    
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     * SingleTaskController constructor.
-     *
-     * @param EventDispatcherInterface $eventDispatcher
-     */
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+
+    private EventDispatcherInterface $eventDispatcher;
+
+    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
+
+    private LoggerInterface $logger;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository;
+
+    private TimelineBuilder $timelineBuilder;
+
+    private TranslatorInterface $translator;
+
     public function __construct(
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
+        PaginatorFactory $paginatorFactory,
+        SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository,
+        TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
         TimelineBuilder $timelineBuilder,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        FilterOrderHelperFactoryInterface $filterOrderHelperFactory
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->timelineBuilder = $timelineBuilder;
         $this->logger = $logger;
+        $this->translator = $translator;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->singleTaskAclAwareRepository = $singleTaskAclAwareRepository;
+        $this->filterOrderHelperFactory = $filterOrderHelperFactory;
     }
-    
-    
-    /**
-     * @Route(
-     * "/{_locale}/task/single-task/new",
-     * name="chill_task_single_task_new"
-     * )
-     */
-    public function newAction(
-        Request $request,
-        TranslatorInterface $translator
-    ) {
-
-      $task = (new SingleTask())
-          ->setAssignee($this->getUser())
-          ->setType('task_default')
-          ;
-
-        if ($request->query->has('person_id')) {
-            
-            $personId = $request->query->getInt('person_id', 0); // sf4 check:
-            // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given`
-
-            if ($personId === null) {
-                return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
-            }
-
-            $person = $this->getDoctrine()->getManager()
-                ->getRepository(Person::class)
-                ->find($personId);
-
-            if ($person === null) {
-                $this->createNotFoundException("Invalid person id");
-            }
-
-            $task->setPerson($person);
-        }
-
-        $this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not '
-            . 'allowed to create this task');
-
-        $form = $this->setCreateForm($task, new Role(TaskVoter::CREATE));
-
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted()) {
-            if ($form->isValid()) {
-                $em = $this->getDoctrine()->getManager();
-                $em->persist($task);
-
-                $this->eventDispatcher->dispatch(TaskEvent::PERSIST, new TaskEvent($task));
-
-                $em->flush();
-
-                $this->addFlash('success', $translator->trans("The task is created"));
-
-                return $this->redirectToRoute('chill_task_singletask_list', [
-                    'person_id' => $task->getPerson()->getId()
-                ]);
-
-            } else {
-                $this->addFlash('error', $translator->trans("This form contains errors"));
-            }
-        }
-
-        return $this->render('ChillTaskBundle:SingleTask:new.html.twig', array(
-            'form' => $form->createView(),
-            'task' => $task
-        ));
-    }
-
 
     /**
      * @Route(
-     * "/{_locale}/task/single-task/{id}/show",
-     * name="chill_task_single_task_show"
+     *     "/{_locale}/task/single-task/{id}/delete",
+     *     name="chill_task_single_task_delete"
      * )
+     *
+     * @param mixed $id
      */
-    public function showAction(Request $request, $id)
+    public function deleteAction(Request $request, $id)
     {
-        
+        $course = null;
         $em = $this->getDoctrine()->getManager();
         $task = $em->getRepository(SingleTask::class)->find($id);
 
+        if (null === $task) {
+            throw $this->createNotFoundException('Unable to find Task entity.');
+        }
+
         if ($task->getPerson() !== null) {
             $personId = $task->getPerson()->getId();
 
-            if ($personId === null) {
-                return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
+            if (null === $personId) {
+                return new Response('You must provide a person_id', Response::HTTP_BAD_REQUEST);
             }
 
             $person = $this->getDoctrine()->getManager()
                 ->getRepository(Person::class)
                 ->find($personId);
 
-            if ($person === null) {
-                throw $this->createNotFoundException("Invalid person id");
+            if (null === $person) {
+                throw $this->createNotFoundException('Invalid person id');
+            }
+        } else {
+            $courseId = $task->getCourse()->getId();
+
+            if (null === $courseId) {
+                return new Response('You must provide a course_id', Response::HTTP_BAD_REQUEST);
+            }
+
+            $course = $this->getDoctrine()->getManager()
+                ->getRepository(AccompanyingPeriod::class)
+                ->find($courseId);
+
+            if (null === $course) {
+                throw $this->createNotFoundException('Invalid accompanying period id');
             }
         }
-        $this->denyAccessUnlessGranted(TaskVoter::SHOW, $task, 'You are not '
-            . 'allowed to view this task');
 
-        if (!$task) {
-            throw $this->createNotFoundException('Unable to find Task entity.');
+        // TODO: reactivate right to delete
+
+        // $this->denyAccessUnlessGranted(TaskVoter::DELETE, $task, 'You are not '
+        //     . 'allowed to delete this task');
+
+        $form = $this->createDeleteForm($id);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->logger->notice('A task has been removed', [
+                    'by_user' => $this->getUser()->getUsername(),
+                    'task_id' => $task->getId(),
+                    'description' => $task->getDescription(),
+                    'assignee' => $task->getAssignee(),
+                    //    TODO reimplement scope
+                    //    'scope_id' => $task->getScope()->getId(),
+                ]);
+
+                $em = $this->getDoctrine()->getManager();
+                $em->remove($task);
+                $em->flush();
+
+                $this->addFlash('success', $this->translator
+                    ->trans('The task has been successfully removed.'));
+
+                if ($task->getContext() instanceof Person) {
+                    return $this->redirect($this->generateUrl(
+                        'chill_task_singletask_by-person_list',
+                        ['id' => $task->getPerson()->getId()]
+                    ));
+                }
+
+                return $this->redirect($this->generateUrl(
+                    'chill_task_singletask_by-course_list',
+                    ['id' => $task->getCourse()->getId()]
+                ));
+            }
         }
 
-        $timeline = $this->timelineBuilder
-            ->getTimelineHTML('task', array('task' => $task));
-    
-        $event = new PrivacyEvent($person, array(
-            'element_class' => SingleTask::class,
-            'element_id' => $task->getId(),
-            'action' => 'show'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        
-        return $this->render('ChillTaskBundle:SingleTask:show.html.twig', array(
-            'task'      => $task,
-            'timeline'  => $timeline
-        ));
-    }
+        if ($task->getContext() instanceof Person) {
+            return $this->render(
+                '@ChillTask/SingleTask/Person/confirm_delete.html.twig',
+                [
+                    'task' => $task,
+                    'delete_form' => $form->createView(),
+                ]
+            );
+        }
 
+        return $this->render(
+            '@ChillTask/SingleTask/AccompanyingCourse/confirm_delete.html.twig',
+            [
+                'task' => $task,
+                'delete_form' => $form->createView(),
+                'accompanyingCourse' => $course,
+            ]
+        );
+    }
 
     /**
      * @Route(
-     * "/{_locale}/task/single-task/{id}/edit",
-     * name="chill_task_single_task_edit"
+     *     "/{_locale}/task/single-task/{id}/edit",
+     *     name="chill_task_single_task_edit"
      * )
      */
     public function editAction(
-        Request $request,
-        $id,
-        TranslatorInterface $translator
+        SingleTask $task,
+        Request $request
     ) {
-        
-        $em = $this->getDoctrine()->getManager();
-        $task = $em->getRepository(SingleTask::class)->find($id);
-
-        if ($task->getPerson() !== null) {
-            $personId = $task->getPerson()->getId();
-            if ($personId === null) {
-                return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
-            }
-
-            $person = $this->getDoctrine()->getManager()
-                ->getRepository(Person::class)
-                ->find($personId);
-
-            if ($person === null) {
-                throw $this->createNotFoundException("Invalid person id");
-            }
-        }
         $this->denyAccessUnlessGranted(TaskVoter::UPDATE, $task, 'You are not '
             . 'allowed to edit this task');
 
-        if (!$task) {
-            throw $this->createNotFoundException('Unable to find Task entity.');
-        }
-        
         $event = (new UIEvent('single-task', $task))
-            ->setForm($this->setCreateForm($task, new Role(TaskVoter::UPDATE)))
-            ;
-        
+            ->setForm($this->setCreateForm($task, new Role(TaskVoter::UPDATE)));
         $this->eventDispatcher->dispatch(UIEvent::EDIT_FORM, $event);
-        
+
         $form = $event->getForm();
 
         $form->handleRequest($request);
@@ -244,135 +215,413 @@ class SingleTaskController extends AbstractController
 
                 $em->flush();
 
-                $this->addFlash('success', $translator
-                    ->trans("The task has been updated"));
-    
-                $event = new PrivacyEvent($person, array(
-                    'element_class' => SingleTask::class,
-                    'element_id' => $task->getId(),
-                    'action' => 'update'
-                ));
-                $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+                $this->addFlash('success', $this->translator
+                    ->trans('The task has been updated'));
+
+                if ($task->getContext() instanceof Person) {
+                    $event = new PrivacyEvent($task->getPerson(), [
+                        'element_class' => SingleTask::class,
+                        'element_id' => $task->getId(),
+                        'action' => 'update',
+                    ]);
+                    $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+                    if ($request->query->has('returnPath')) {
+                        return $this->redirect($request->query->get('returnPath'));
+                    }
+
+                    return $this->redirectToRoute(
+                        'chill_task_singletask_list',
+                    );
+                }
+
+                if ($request->query->has('returnPath')) {
+                    return $this->redirect($request->query->get('returnPath'));
+                }
 
                 return $this->redirectToRoute(
-                    'chill_task_singletask_list', 
-                    $request->query->get('list_params', [])
+                    'chill_task_singletask_by-course_list',
+                    ['id' => $task->getCourse()->getId()]
                 );
-
-            } else {
-                $this->addFlash('error', $translator->trans("This form contains errors"));
             }
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
-        
+
         $this->eventDispatcher->dispatch(UIEvent::EDIT_PAGE, $event);
-        
+
         if ($event->hasResponse()) {
             return $event->getResponse();
         }
-    
-        $event = new PrivacyEvent($person, array(
-            'element_class' => SingleTask::class,
-            'element_id' => $task->getId(),
-            'action' => 'edit'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-    
-        return $this->render('ChillTaskBundle:SingleTask:edit.html.twig', array(
-            'task'      => $task,
-            'form'      => $form->createView()
-        ));
+
+        if ($task->getContext() instanceof Person) {
+            $event = new PrivacyEvent($task->getPerson(), [
+                'element_class' => SingleTask::class,
+                'element_id' => $task->getId(),
+                'action' => 'edit',
+            ]);
+            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+            return $this->render('@ChillTask/SingleTask/Person/edit.html.twig', [
+                'task' => $task,
+                'form' => $form->createView(),
+            ]);
+        }
+
+        return $this->render('@ChillTask/SingleTask/AccompanyingCourse/edit.html.twig', [
+            'task' => $task,
+            'form' => $form->createView(),
+            'accompanyingCourse' => $task->getCourse(),
+        ]);
     }
 
+    /**
+     * Arguments:
+     *  - user_id
+     *  - scope_id
+     *  - s
+     *  - person_id
+     *  - hide_form (hide the form to filter the tasks)
+     *  - status: date state, amongst SingleTaskRepository::DATE_STATUSES, or 'closed'.
+     *
+     * @Route(
+     *     "/{_locale}/task/single-task/list",
+     *     name="chill_task_singletask_list"
+     * )
+     */
+    public function listAction(
+        Request $request
+    ) {
+        $this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
+
+        $filterOrder = $this->buildFilterOrder();
+        $flags = array_merge(
+            $filterOrder->getCheckboxData('status'),
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+        );
+        $nb = $this->singleTaskAclAwareRepository->countByAllViewable(
+            $filterOrder->getQueryString(),
+            $flags
+        );
+        $paginator = $this->paginatorFactory->create($nb);
+
+        if (0 < $nb) {
+            $tasks = $this->singleTaskAclAwareRepository->findByAllViewable(
+                $filterOrder->getQueryString(),
+                $flags,
+                $paginator->getCurrentPageFirstItemNumber(),
+                $paginator->getItemsPerPage(),
+                [
+                    'startDate' => 'DESC',
+                    'endDate' => 'DESC',
+                ]
+            );
+        } else {
+            $tasks = [];
+        }
+
+        return $this->render('@ChillTask/SingleTask/List/index.html.twig', [
+            'tasks' => $tasks,
+            'paginator' => $paginator,
+            'filter_order' => $filterOrder,
+        ]);
+    }
 
     /**
      * @Route(
-     * "/{_locale}/task/single-task/{id}/delete",
-     * name="chill_task_single_task_delete"
-     * )
+     *     "/{_locale}/task/single-task/by-course/{id}",
+     * name="chill_task_singletask_by-course_list")
      */
-    public function deleteAction(
-        Request $request,
-        $id,
-        TranslatorInterface $translator
-    ) {
-    
-        $em = $this->getDoctrine()->getManager();
-        $task = $em->getRepository(SingleTask::class)->find($id);
+    public function listCourseTasks(
+        AccompanyingPeriod $course,
+        FormFactoryInterface $formFactory,
+        Request $request
+    ): Response {
+        $this->denyAccessUnlessGranted(TaskVoter::SHOW, $course);
 
-        if (!$task) {
-            throw $this->createNotFoundException('Unable to find Task entity.');
+        $filterOrder = $this->buildFilterOrder();
+        $flags = array_merge(
+            $filterOrder->getCheckboxData('status'),
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+        );
+        $nb = $this->singleTaskAclAwareRepository->countByCourse(
+            $course,
+            $filterOrder->getQueryString(),
+            $flags
+        );
+        $paginator = $this->paginatorFactory->create($nb);
+
+        if (0 < $nb) {
+            $tasks = $this->singleTaskAclAwareRepository->findByCourse(
+                $course,
+                $filterOrder->getQueryString(),
+                $flags,
+                $paginator->getCurrentPageFirstItemNumber(),
+                $paginator->getItemsPerPage(),
+                [
+                    'startDate' => 'DESC',
+                    'endDate' => 'DESC',
+                ]
+            );
+        } else {
+            $tasks = [];
         }
 
-        if ($task->getPerson() !== null) {
-            $personId = $task->getPerson()->getId();
-            if ($personId === null) {
-                return new Response("You must provide a person_id", Response::HTTP_BAD_REQUEST);
-            }
-
-            $person = $this->getDoctrine()->getManager()
-                ->getRepository(Person::class)
-                ->find($personId);
-
-            if ($person === null) {
-                throw $this->createNotFoundException("Invalid person id");
-            }
-
-        }
-
-        $this->denyAccessUnlessGranted(TaskVoter::DELETE, $task, 'You are not '
-            . 'allowed to delete this task');
-
-        $form = $this->createDeleteForm($id);
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-                
-                $this->logger->notice("A task has been removed", array(
-                   'by_user' => $this->getUser()->getUsername(),
-                   'task_id' => $task->getId(),
-                   'description' => $task->getDescription(),
-                   'assignee' => $task->getAssignee(),
-                   'scope_id' => $task->getScope()->getId(),
-                   //'start_date' => $task->getStartDate()->format('Y-m-d'),
-                   //'end_date' => $task->getEndDate()->format('Y-m-d'),
-                   //'warning_interval' => $task->getWarningInterval()->format('Y-m-d')
-                ));
-
-                $em = $this->getDoctrine()->getManager();
-                $em->remove($task);
-                $em->flush();
-
-                $this->addFlash('success', $translator
-                      ->trans("The task has been successfully removed."));
-
-                return $this->redirect($this->generateUrl(
-                  'chill_task_singletask_list', 
-                  $request->query->get('list_params', [
-                      'person_id' => $person->getId()
-                  ])));
-            }
-        }
-
-
-        return $this->render('ChillTaskBundle:SingleTask:confirm_delete.html.twig', array(
-           'task' => $task,
-           'delete_form' => $form->createView()
-        ));
+        return $this->render(
+            '@ChillTask/SingleTask/AccompanyingCourse/list.html.twig',
+            [
+                'tasks' => $tasks,
+                'accompanyingCourse' => $course,
+                'paginator' => $paginator,
+                'filter_order' => $filterOrder,
+            ]
+        );
+    }
+
+    /**
+     * @Route(
+     *     "/{_locale}/task/single-task/by-person/{id}",
+     * name="chill_task_singletask_by-person_list")
+     */
+    public function listPersonTasks(
+        Person $person
+    ): Response {
+        $this->denyAccessUnlessGranted(TaskVoter::SHOW, $person);
+
+        $filterOrder = $this->buildFilterOrder();
+        $flags = array_merge(
+            $filterOrder->getCheckboxData('status'),
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+        );
+        $nb = $this->singleTaskAclAwareRepository->countByPerson(
+            $person,
+            $filterOrder->getQueryString(),
+            $flags
+        );
+        $paginator = $this->paginatorFactory->create($nb);
+
+        if (0 < $nb) {
+            $tasks = $this->singleTaskAclAwareRepository->findByPerson(
+                $person,
+                $filterOrder->getQueryString(),
+                $flags,
+                $paginator->getCurrentPageFirstItemNumber(),
+                $paginator->getItemsPerPage(),
+                [
+                    'startDate' => 'DESC',
+                    'endDate' => 'DESC',
+                ]
+            );
+        } else {
+            $tasks = [];
+        }
+
+        return $this->render(
+            '@ChillTask/SingleTask/Person/list.html.twig',
+            [
+                'tasks' => $tasks,
+                'person' => $person,
+                'paginator' => $paginator,
+                'filter_order' => $filterOrder,
+            ]
+        );
+    }
+
+    /**
+     * @return Response
+     * @Route(
+     *     "/{_locale}/task/single-task/list/my",
+     *     name="chill_task_singletask_my_tasks"
+     * )
+     */
+    public function myTasksAction()
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $filterOrder = $this->buildFilterOrder();
+        $flags = array_merge(
+            $filterOrder->getCheckboxData('status'),
+            array_map(static fn ($i) => 'state_' . $i, $filterOrder->getCheckboxData('states'))
+        );
+        $nb = $this->singleTaskAclAwareRepository->countByCurrentUsersTasks(
+            $filterOrder->getQueryString(),
+            $flags
+        );
+        $paginator = $this->paginatorFactory->create($nb);
+        $tasks = $this->singleTaskAclAwareRepository->findByCurrentUsersTasks(
+            $filterOrder->getQueryString(),
+            $flags,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage(),
+            [
+                'startDate' => 'DESC',
+                'endDate' => 'DESC',
+            ]
+        );
+
+        return $this->render('@ChillTask/SingleTask/List/index_my_tasks.html.twig', [
+            'tasks' => $tasks,
+            'paginator' => $paginator,
+            'filter_order' => $filterOrder,
+        ]);
+    }
+
+    /**
+     * @Route(
+     *     "/{_locale}/task/single-task/new",
+     *     name="chill_task_single_task_new"
+     * )
+     */
+    public function newAction(Request $request)
+    {
+        $task = (new SingleTask())
+            ->setAssignee($this->getUser())
+            ->setType('task_default');
+
+        $entityType = $this->getEntityContext($request);
+
+        if (null === $entityType) {
+            throw new BadRequestHttpException('You must provide a entity_type');
+        }
+
+        $entityId = $request->query->getInt("{$entityType}_id", 0);
+
+        if (null === $entityId) {
+            return new BadRequestHttpException("You must provide a {$entityType}_id");
+        }
+
+        switch ($entityType) {
+            case 'person':
+                $person = $this->getDoctrine()->getManager()
+                    ->getRepository(Person::class)
+                    ->find($entityId);
+
+                if (null === $person) {
+                    $this->createNotFoundException('Invalid person id');
+                }
+
+                $task->setPerson($person);
+                $role = TaskVoter::CREATE_PERSON;
+
+                break;
+
+            case 'course':
+                $course = $this->getDoctrine()->getManager()
+                    ->getRepository(AccompanyingPeriod::class)
+                    ->find($entityId);
+
+                if (null === $course) {
+                    $this->createNotFoundException('Invalid accompanying course id');
+                }
+
+                $task->setCourse($course);
+                $role = TaskVoter::CREATE_COURSE;
+
+                break;
+
+            default:
+                return new BadRequestHttpException("context with {$entityType} is not supported");
+        }
+
+        $this->denyAccessUnlessGranted($role, $task, 'You are not '
+             . 'allowed to create this task');
+
+        $form = $this->setCreateForm($task, new Role($role));
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted()) {
+            if ($form->isValid()) {
+                $em = $this->getDoctrine()->getManager();
+                $em->persist($task);
+
+                $this->eventDispatcher->dispatch(TaskEvent::PERSIST, new TaskEvent($task));
+
+                $em->flush();
+
+                $this->addFlash('success', $this->translator->trans('The task is created'));
+
+                if ($request->query->has('returnPath')) {
+                    return $this->redirect($request->query->get('returnPath'));
+                }
+
+                if ('person' === $entityType) {
+                    return $this->redirectToRoute('chill_task_singletask_by-person_list', [
+                        'id' => $task->getPerson()->getId(),
+                    ]);
+                }
+
+                if ('course' === $entityType) {
+                    return $this->redirectToRoute('chill_task_singletask_by-course_list', [
+                        'id' => $task->getCourse()->getId(),
+                    ]);
+                }
+            } else {
+                $this->addFlash('error', $this->translator->trans('This form contains errors'));
+            }
+        }
+
+        switch ($entityType) {
+            case 'person':
+                return $this->render('@ChillTask/SingleTask/Person/new.html.twig', [
+                    'form' => $form->createView(),
+                    'task' => $task,
+                    'person' => $task->getPerson(),
+                ]);
+
+            case 'course':
+                return $this->render('@ChillTask/SingleTask/AccompanyingCourse/new.html.twig', [
+                    'form' => $form->createView(),
+                    'task' => $task,
+                    'accompanyingCourse' => $task->getCourse(),
+                ]);
+
+            default:
+                throw new LogicException('entity context not supported');
+        }
+    }
+
+    /**
+     * @Route(
+     *     "/{_locale}/task/single-task/{id}/show",
+     *     name="chill_task_single_task_show"
+     * )
+     */
+    public function showAction(SingleTask $task, Request $request)
+    {
+        $this->denyAccessUnlessGranted(TaskVoter::SHOW, $task);
+
+        if ($person = $task->getContext() instanceof Person) {
+            $event = new PrivacyEvent($person, [
+                'element_class' => SingleTask::class,
+                'element_id' => $task->getId(),
+                'action' => 'show',
+            ]);
+            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        }
+
+        $timeline = $this->timelineBuilder
+            ->getTimelineHTML('task', ['task' => $task]);
+
+        if ($task->getContext() instanceof Person) {
+            return $this->render('@ChillTask/SingleTask/Person/show.html.twig', [
+                'task' => $task,
+                'timeline' => $timeline,
+            ]);
+        }
+
+        return $this->render('@ChillTask/SingleTask/AccompanyingCourse/show.html.twig', [
+            'task' => $task,
+            'timeline' => $timeline,
+        ]);
     }
 
     /**
-     *
-     * @param SingleTask $task
-     * @param Role $role
      * @return \Symfony\Component\Form\FormInterface
      */
     protected function setCreateForm(SingleTask $task, Role $role)
     {
         $form = $this->createForm(SingleTaskType::class, $task, [
-            'center' => $task->getCenter(),
-            'role'   => $role
+            'role' => $role,
         ]);
 
         $form->add('submit', SubmitType::class);
@@ -380,228 +629,25 @@ class SingleTaskController extends AbstractController
         return $form;
     }
 
-    /**
-     *
-     * @return Response
-     * @Route(
-     *   "/{_locale}/task/single-task/list/my",
-     *   name="chill_task_single_my_tasks"
-     * )
-     */
-    public function myTasksAction(TranslatorInterface $translator)
+    private function buildFilterOrder(): FilterOrderHelper
     {
-        return $this->redirectToRoute('chill_task_singletask_list', [
-            'user_id' => $this->getUser()->getId(),
-            'hide_form' => true,
-            'title' => $translator->trans('My tasks')
-        ]);
-    }
+        $statuses = ['no-alert', 'warning', 'alert'];
+        $statusTrans = [
+            'Tasks without alert',
+            'Tasks near deadline',
+            'Tasks over deadline',
+        ];
+        $states = [
+            // todo: get a list of possible states dynamically
+            'new', 'in_progress', 'closed', 'canceled',
+        ];
 
-    /**
-     *
-     * Arguments:
-     *  - user_id
-     *  - scope_id
-     *  - person_id
-     *  - hide_form (hide the form to filter the tasks)
-     *  - status: date state, amongst SingleTaskRepository::DATE_STATUSES, or 'closed'
-     *
-     * @Route(
-     *  "/{_locale}/task/singletask/list",
-     *  name="chill_task_singletask_list"
-     * )
-     */
-    public function listAction(
-        Request $request,
-        PaginatorFactory $paginatorFactory,
-        SingleTaskRepository $taskRepository,
-        PersonRepository $personRepository,
-        CenterRepository $centerRepository,
-        FormFactoryInterface $formFactory
-    ) {
-        /* @var $viewParams array The parameters for the view */
-        /* @var $params array The parameters for the query */
-
-        $viewParams['person'] = null;
-        $params['person'] = null;
-        $viewParams['user'] = null;
-        $params['user'] = null;
-        $viewParams['center'] = null;
-        $params['types'] = null;
-
-        
-        // Get parameters from url
-        if (!empty($request->query->get('person_id', NULL))) {
-            
-            $personId = $request->query->getInt('person_id', 0);
-            $person = $personRepository->find($personId);
-
-            if ($person === null) {
-                 throw $this->createNotFoundException("This person ' $personId ' does not exist.");
-            }
-            $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
-
-            $viewParams['person'] = $person;
-            $params['person'] = $person;
-        }
-        
-        if (!empty($request->query->get('center_id', NULL))) {
-            $center = $centerRepository->find($request->query->getInt('center_id'));
-            if ($center === null) {
-                throw $this->createNotFoundException('center not found');
-            }
-            $params['center'] = $center;
-        }
-        
-        if(!empty($request->query->get('types', []))) {
-            $types = $request->query->get('types', []);
-            if (count($types) > 0) {
-                $params['types'] = $types;
-            }
-        }
-        
-        if (!empty($request->query->get('user_id', null))) {
-            if ($request->query->get('user_id') === '_unassigned') {
-                $params['unassigned'] = true;
-            } else {
-                
-                $userId = $request->query->getInt('user_id', 0);
-                $user = $this->getDoctrine()->getManager()
-                    ->getRepository('ChillMainBundle:User')
-                    ->find($userId);
-
-                if ($user === null) {
-                     throw $this->createNotFoundException("This user ' $userId ' does not exist.");
-                }
-
-                $viewParams['user'] = $user;
-                $params['user'] = $user;
-            }
-        }
-
-        if (!empty($request->query->get('scope_id'))) {
-
-            $scopeId = $request->query->getInt('scope_id', 0);
-            
-            $scope = $this->getDoctrine()->getManager()
-                ->getRepository('ChillMainBundle:Scope')
-                ->find($scopeId);
-
-            if ($scope === null) {
-                 throw $this->createNotFoundException("This scope' $scopeId 'does not exist.");
-            }
-
-            $viewParams['scope'] = $scope;
-            $params['scope'] = $scope;
-        }
-
-        // collect parameters for filter
-        $possibleStatuses = \array_merge(SingleTaskRepository::DATE_STATUSES, [ 'closed' ]);
-        $statuses = $request->query->get('status', $possibleStatuses);
-
-        // check for invalid statuses
-        $diff = \array_diff($statuses, $possibleStatuses);
-        if (count($diff) > 0) {
-            return new Response(
-                'date_status not allowed: '. \implode(', ', $diff),
-                 Response::HTTP_BAD_REQUEST
-                );
-        }
-
-        $viewParams['isSingleStatus'] = $singleStatus = count($statuses) === 1;
-
-        $tasks_count = 0;
-
-        foreach($statuses as $status) {
-            if($request->query->has('status')
-                && FALSE === \in_array($status, $statuses)) {
-                continue;
-            }
-
-            // different query if regarding to date or 'closed'
-            if (in_array($status, SingleTaskRepository::DATE_STATUSES)) {
-                $params['date_status'] = $status;
-                $params['is_closed']   = false;
-            } else {
-                $params['date_status'] = null;
-                $params['is_closed']   = true;
-            }
-
-            $count = $taskRepository
-                ->countByParameters($params, $this->getUser())
-                ;
-            $paginator = $paginatorFactory->create($count);
-
-            $viewParams['single_task_'.$status.'_count'] = $count;
-            $viewParams['single_task_'.$status.'_paginator'] = $paginator;
-            $viewParams['single_task_'.$status.'_tasks'] = $taskRepository
-                ->findByParameters($params, $this->getUser(),
-                    $singleStatus ? $paginator->getCurrentPage()->getFirstItemNumber() : 0,
-                    $singleStatus ? $paginator->getItemsPerPage() : 10)
-                ;
-
-            $tasks_count = $tasks_count + $count;
-        }
-
-        // total number of tasks
-        $viewParams['tasks_count'] = $tasks_count;
-
-        if ($viewParams['person'] !== null){
-            $viewParams['layout'] = '@ChillPerson/Person/layout.html.twig';
-        } else {
-            $viewParams['layout'] = '@ChillMain/layout.html.twig';
-        }
-
-        // Form for filtering tasks
-        $form = $formFactory->createNamed(null, SingleTaskListType::class, null, [
-            'person' => $viewParams['person'],
-            'method' => Request::METHOD_GET,
-            'csrf_protection' => false,
-            'add_type' => true
-        ]);
-
-        $form->handleRequest($request);
-    
-        if (isset($person)) {
-            $event = new PrivacyEvent($person, array(
-                'element_class' => SingleTask::class,
-                'action' => 'list'
-            ));
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        }
-        
-        return $this->render('ChillTaskBundle:SingleTask:index.html.twig',
-            \array_merge($viewParams, [ 'form' => $form->createView() ]));
-    }
-
-
-    protected function getPersonParam(Request $request, EntityManagerInterface $em)
-    {
-        $person = $em->getRepository(Person::class)
-            ->find($request->query->getInt('person_id'))
-            ;
-
-        if (NULL === $person) {
-            throw $this->createNotFoundException('person not found');
-        }
-
-        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person, "You are "
-            . "not allowed to see this person");
-
-        return $person;
-    }
-
-    protected function getUserParam(Request $request, EntityManagerInterface $em)
-    {
-        $user = $em->getRepository(User::class)
-            ->find($request->query->getInt('user_id'))
-            ;
-
-        if (NULL === $user) {
-            throw $this->createNotFoundException('user not found');
-        }
-
-        return $user;
+        return $this->filterOrderHelperFactory
+            ->create(self::class)
+            ->addSearchBox()
+            ->addCheckbox('status', $statuses, $statuses, $statusTrans)
+            ->addCheckbox('states', $states, ['new', 'in_progress'])
+            ->build();
     }
 
     /**
@@ -616,11 +662,23 @@ class SingleTaskController extends AbstractController
         return $this->createFormBuilder()
             ->setAction($this->generateUrl(
                 'chill_task_single_task_delete',
-                array('id' => $id)))
+                ['id' => $id]
+            ))
             ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
     }
 
+    private function getEntityContext(Request $request)
+    {
+        if ($request->query->has('person_id')) {
+            return 'person';
+        }
+
+        if ($request->query->has('course_id')) {
+            return 'course';
+        }
+
+        return null;
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
index 0c2b1f8d2..761bc5fa4 100644
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -1,45 +1,50 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Chill\TaskBundle\Entity\AbstractTask;
+use Chill\TaskBundle\Event\UI\UIEvent;
 use Chill\TaskBundle\Repository\SingleTaskRepository;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Symfony\Component\Workflow\Registry;
-use Symfony\Component\HttpFoundation\Response;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Chill\TaskBundle\Event\UI\UIEvent;
-use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Transition;
+use function array_filter;
+use function array_values;
 
 /**
- * Class TaskController
- *
- * @package Chill\TaskBundle\Controller
+ * Class TaskController.
  */
 class TaskController extends AbstractController
 {
     /**
-     * Apply a transition to a task
+     * Apply a transition to a task.
      *
      * @Route(
-     *  "/{_locale}/task/transition/{kind}/{taskId}/{transition}",
-     *  name="chill_task_task_transition"
+     *     "/{_locale}/task/transition/{kind}/{taskId}/{transition}",
+     *     name="chill_task_task_transition"
      * )
      *
      * @param string $kind
      * @param int $taskId
      * @param string $transition
-     * @param SingleTaskRepository $singleTaskRepository
-     * @param Registry $registry
-     * @param EntityManagerInterface $em
-     * @param Request $request
-     * @param TranslatorInterface $translator
+     *
      * @return Response
      */
     public function applyTransitionAction(
@@ -56,91 +61,90 @@ class TaskController extends AbstractController
         switch ($kind) {
             case 'single-task':
                 $task = $singleTaskRepository
-                    ->find($taskId)
-                    ;
+                    ->find($taskId);
                 $defaultReturnPath = $this->generateUrl(
                     'chill_task_single_task_show',
-                    [ 
+                    [
                         'id' => $task->getId(),
-                        'list_params' => $request->query->get('list_params', [])
-                    ]);
-                $defaultTemplate = '@ChillTask/SingleTask/transition.html.twig';
+                        'list_params' => $request->query->get('list_params', []),
+                    ]
+                );
+                $task->getCourse() === null ? $defaultTemplate = '@ChillTask/SingleTask/Person/transition.html.twig' : $defaultTemplate = '@ChillTask/SingleTask/AccompanyingCourse/transition.html.twig';
+
                 break;
+
             default:
-                return new Response("The type '$kind' is not implemented",
-                    Response::HTTP_BAD_REQUEST);
+                return new Response(
+                    "The type '{$kind}' is not implemented",
+                    Response::HTTP_BAD_REQUEST
+                );
         }
 
-        if (NULL === $task) {
-            throw $this->createNotFoundException("task with id '$taskId' and type "
-                . "'$type' does not exists");
+        if (null === $task) {
+            throw $this->createNotFoundException("task with id '{$taskId}' and type "
+                . "'{$type}' does not exists");
         }
-        
+
         $workflow = $registry->get($task);
-        
+
         if (!$workflow->can($task, $transition)) {
             throw $this->createAccessDeniedException('You are not allowed to apply this transition');
         }
-        $transitionInstance = \array_values( // array_values needed to reset keys (array_filter preserves keys)
-            \array_filter(
-                        $workflow->getEnabledTransitions($task), 
-                        function(Transition $t) use ($transition) {
-                            return $t->getName() === $transition;
-                        }
-                     ))[0];
-        
-        $form = $this->createTransitionForm($task);
-        
-        $form->handleRequest($request);
-        
-        if ($form->isSubmitted() && $form->isValid()) {
+        $transitionInstance = array_values( // array_values needed to reset keys (array_filter preserves keys)
+            array_filter(
+                $workflow->getEnabledTransitions($task),
+                static function (Transition $t) use ($transition) {
+                    return $t->getName() === $transition;
+                }
+            ))[0];
 
+        $form = $this->createTransitionForm($task);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
             if ($workflow->can($task, $transition)) {
                 $workflow->apply($task, $transition);
 
                 $em->flush();
 
                 $this->addFlash('success', $translator->trans('The transition is successfully applied'));
-
             } else {
                 $this->addFlash('error', $translator->trans('The transition could not be applied'));
             }
-            
+
             return $this->redirect($defaultReturnPath);
-        } else {
-            $event = (new UIEvent($kind, $task))
-                ->setForm($form)
-                ->setTransition($transitionInstance)
-                ;
-            
-            $eventDispatcher->dispatch(UIEvent::SHOW_TRANSITION_PAGE, $event);
-            
-            if ($event->hasResponse()) {
-                return $event->getResponse();
-            } else {
-                // we simply check that the user can see the task. Other ACL checks
-                // should be performed using `guard` events.
-                $this->denyAccessUnlessGranted(TaskVoter::SHOW, $task);
-                
-                return $this->render($defaultTemplate, [
-                    'task' => $task,
-                    'form' => $form->createView(),
-                    'transition' => $transitionInstance
-                ]);
-            }
         }
+        $event = (new UIEvent($kind, $task))
+            ->setForm($form)
+            ->setTransition($transitionInstance);
+
+        $eventDispatcher->dispatch(UIEvent::SHOW_TRANSITION_PAGE, $event);
+
+        if ($event->hasResponse()) {
+            return $event->getResponse();
+        }
+        // we simply check that the user can see the task. Other ACL checks
+        // should be performed using `guard` events.
+        $this->denyAccessUnlessGranted(TaskVoter::SHOW, $task);
+
+        return $this->render($defaultTemplate, [
+            'task' => $task,
+            'form' => $form->createView(),
+            'transition' => $transitionInstance,
+        ]);
     }
-    
+
     /**
-     * 
      * @param \Chill\TaskBundle\Controller\AbstractTask $task
+     *
      * @return \Symfony\Component\Form\FormInterface
      */
     protected function createTransitionForm(AbstractTask $task)
     {
         $builder = $this->createFormBuilder($task);
         $builder->add('submit', SubmitType::class);
-        
+
         return $builder->getForm();
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
index 5af11f6a2..6bd251a60 100644
--- a/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
+++ b/src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
@@ -1,37 +1,28 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use function in_array;
 
 /**
  * Add a role UPDATE & CREATE for all groups except administrative,
- * and a role SEE for administrative
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * and a role SEE for administrative.
  */
 class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -40,12 +31,12 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
         return 16000;
     }
 
-    
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
-            foreach (LoadScopes::$references as $scopeRef){
+
+            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 //create permission group
                 switch ($permissionsGroup->getName()) {
@@ -53,39 +44,48 @@ class LoadTaskACL extends AbstractFixture implements OrderedFixtureInterface
                         if ($scope->getName()['en'] === 'administrative') {
                             break 2; // we do not want any power on administrative
                         }
+
                         break;
+
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
-                        }  
+                        }
+
                         break;
                 }
-                
-                printf("Adding CHILL_TASK_TASK_UPDATE & CHILL_TASK_TASK_CREATE & Chill_TASK_TASK_DELETE permissions to %s "
-                        . "permission group, scope '%s' \n", 
-                        $permissionsGroup->getName(), $scope->getName()['en']);
+
+                printf(
+                    'Adding CHILL_TASK_TASK_UPDATE & CHILL_TASK_TASK_CREATE & Chill_TASK_TASK_DELETE permissions to %s '
+                        . "permission group, scope '%s' \n",
+                    $permissionsGroup->getName(),
+                    $scope->getName()['en']
+                );
                 $roleScopeUpdate = (new RoleScope())
-                            ->setRole(TaskVoter::UPDATE)
-                            ->setScope($scope);
+                    ->setRole(TaskVoter::UPDATE)
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
-                $roleScopeCreate = (new RoleScope())
-                            ->setRole(TaskVoter::CREATE)
-                            ->setScope($scope);
-                $permissionsGroup->addRoleScope($roleScopeCreate);
+                $roleScopeCreateP = (new RoleScope())
+                    ->setRole(TaskVoter::CREATE_PERSON)
+                    ->setScope($scope);
+                $permissionsGroup->addRoleScope($roleScopeCreateP);
+                $roleScopeCreateC = (new RoleScope())
+                    ->setRole(TaskVoter::CREATE_COURSE)
+                    ->setScope($scope);
+                $permissionsGroup->addRoleScope($roleScopeCreateC);
                 $roleScopeDelete = (new RoleScope())
-                            ->setRole(TaskVoter::DELETE)
-                            ->setScope($scope);
+                    ->setRole(TaskVoter::DELETE)
+                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeDelete);
-                
+
                 $manager->persist($roleScopeUpdate);
-                $manager->persist($roleScopeCreate);
+                $manager->persist($roleScopeCreateP);
+                $manager->persist($roleScopeCreateC);
                 $manager->persist($roleScopeDelete);
             }
-            
         }
-        
+
         $manager->flush();
     }
-
 }
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
index 5ffbd38e7..a535cae11 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/ChillTaskExtension.php
@@ -1,31 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\TaskBundle\Workflow\TaskWorkflowManager;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillTaskExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services/controller.yaml');
         $loader->load('services/security.yaml');
         $loader->load('services/repositories.yaml');
@@ -44,29 +50,30 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
         $this->prependRoute($container);
         $this->prependWorkflows($container);
     }
-    
+
+    protected function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                TaskVoter::UPDATE => [TaskVoter::SHOW],
+                TaskVoter::CREATE_COURSE => [TaskVoter::SHOW],
+                TaskVoter::CREATE_PERSON => [TaskVoter::SHOW],
+            ],
+        ]);
+    }
+
     protected function prependRoute(ContainerBuilder $container)
     {
         //declare routes for task bundle
-        $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillTaskBundle/config/routes.yaml'
-              )
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillTaskBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
     }
-    
-    protected function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-               TaskVoter::UPDATE => [TaskVoter::SHOW],
-               TaskVoter::CREATE => [TaskVoter::SHOW]
-           )
-        ));
-    }
-    
+
     protected function prependWorkflows(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('framework', [
@@ -75,29 +82,29 @@ class ChillTaskExtension extends Extension implements PrependExtensionInterface
                     'marking_store' => [
                         'type' => 'multiple_state',
                         'arguments' => [
-                            'currentStates'
+                            'currentStates',
                         ],
                     ],
-                    'type'          => 'state_machine',
+                    'type' => 'state_machine',
                     'support_strategy' => TaskWorkflowManager::class,
-                    'places' => [ 'new', 'in_progress', 'closed', 'canceled'],
+                    'places' => ['new', 'in_progress', 'closed', 'canceled'],
                     'initial_place' => 'new',
                     'transitions' => [
                         'start' => [
                             'from' => 'new',
-                            'to'   => 'in_progress'
+                            'to' => 'in_progress',
                         ],
                         'close' => [
                             'from' => ['new', 'in_progress'],
-                            'to'   => 'closed'
+                            'to' => 'closed',
                         ],
                         'cancel' => [
                             'from' => ['new', 'in_progress'],
-                            'to'   => 'canceled'
-                        ]
-                    ]
-                ]
-            ]
+                            'to' => 'canceled',
+                        ],
+                    ],
+                ],
+            ],
         ]);
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
index 76e849d73..3ea1e1054 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php
@@ -1,47 +1,37 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Chill\TaskBundle\Workflow\TaskWorkflowManager;
-use Symfony\Component\DependencyInjection\Reference;
-use Chill\TaskBundle\Templating\UI\CountNotificationTask;
-use Chill\TaskBundle\Event\Lifecycle\TaskLifecycleEvent;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\DependencyInjection\Compiler;
+
+use Chill\TaskBundle\Event\Lifecycle\TaskLifecycleEvent;
+use Chill\TaskBundle\Templating\UI\CountNotificationTask;
+use Chill\TaskBundle\Workflow\TaskWorkflowManager;
+use LogicException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
 class TaskWorkflowDefinitionCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         if (!$container->hasDefinition(TaskWorkflowManager::class)) {
-            throw new \LogicException("The service ".TaskWorkflowManager::class." is "
-                . "not registered");
+            throw new LogicException('The service ' . TaskWorkflowManager::class . ' is '
+                . 'not registered');
         }
-        
+
         $workflowManagerDefinition = $container->getDefinition(TaskWorkflowManager::class);
         $counterDefinition = $container->getDefinition(CountNotificationTask::class);
         $lifecycleDefinition = $container->getDefinition(TaskLifecycleEvent::class);
-        
+
         foreach ($container->findTaggedServiceIds('chill_task.workflow_definition') as $id => $tags) {
             // registering the definition to manager
             $workflowManagerDefinition
@@ -50,21 +40,21 @@ class TaskWorkflowDefinitionCompilerPass implements CompilerPassInterface
             $definition = $container->getDefinition($id);
             $workflowManagerDefinition
                 ->addTag('kernel.event_listener', [
-                    'event' => sprintf('workflow.%s.entered', $definition->getClass()::getAssociatedWorkflowName()), 
-                    'method' => 'onTaskStateEntered', 
-                    'priority' => -255 
-                    ]);
+                    'event' => sprintf('workflow.%s.entered', $definition->getClass()::getAssociatedWorkflowName()),
+                    'method' => 'onTaskStateEntered',
+                    'priority' => -255,
+                ]);
             $counterDefinition
                 ->addTag('kernel.event_listener', [
                     'event' => sprintf('workflow.%s.entered', $definition->getClass()::getAssociatedWorkflowName()),
                     'method' => 'resetCacheOnNewStates',
-                    'priority' => 0
+                    'priority' => 0,
                 ]);
             $lifecycleDefinition
                 ->addTag('kernel.event_listener', [
                     'event' => sprintf('workflow.%s.transition', $definition->getClass()::getAssociatedWorkflowName()),
                     'method' => 'onTransition',
-                    'priority' => 0
+                    'priority' => 0,
                 ]);
         }
     }
diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
index 21d50c7f5..4388bfd7b 100644
--- a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -12,9 +21,6 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_task');
diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
index 73e98c0dd..6513b71b6 100644
--- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
@@ -1,34 +1,61 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
-use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
+use function array_fill_keys;
+use function array_keys;
 
 /**
- * AbstractTask
+ * AbstractTask.
  *
- * @ORM\MappedSuperclass()
- * @UserCircleConsistency(
- *  "CHILL_TASK_TASK_SHOW",
- *  getUserFunction="getAssignee"
- * )
+ * @ORM\MappedSuperclass
  */
-abstract class AbstractTask implements HasScopeInterface, HasCenterInterface
+abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
 {
+    /**
+     * @var User
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\MainBundle\Entity\User"
+     * )
+     */
+    private $assignee;
 
     /**
-     * @var string
-     *
-     * @ORM\Column(name="type", type="string", length=255)
+     * @var Scope
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\MainBundle\Entity\Scope"
+     * )
      */
-    private $type;
+    private $circle;
+
+    /**
+     * @var bool
+     * @ORM\Column(name="closed", type="boolean", options={ "default": false })
+     */
+    private $closed = false;
+
+    /**
+     * @var AccompanyingPeriod
+     * @ORM\ManyToOne(targetEntity="\Chill\PersonBundle\Entity\AccompanyingPeriod")
+     */
+    private $course;
 
     /**
      * @var json
@@ -37,77 +64,111 @@ abstract class AbstractTask implements HasScopeInterface, HasCenterInterface
      */
     private $currentStates = [];
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="description", type="text")
+     */
+    private $description = '';
+
+    /**
+     * @var Person
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Person"
+     * )
+     */
+    private $person;
+
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="text")
-     * @Assert\NotBlank()
+     * @Assert\NotBlank
      */
     private $title = '';
 
     /**
      * @var string
      *
-     * @ORM\Column(name="description", type="text")
+     * @ORM\Column(name="type", type="string", length=255)
      */
-    private $description = '';
-    
-    /**
-     *
-     * @var User
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\MainBundle\Entity\User"
-     * )
-     */
-    private $assignee;
-    
-    /**
-     *
-     * @var Person
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\PersonBundle\Entity\Person"
-     * )
-     * @Assert\NotNull()
-     */
-    private $person;
-    
-    /**
-     *
-     * @var Scope
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\MainBundle\Entity\Scope"
-     *  ) 
-     * @Assert\NotNull()
-     */
-    private $circle;
-    
-    /**
-     * @var boolean
-     * @ORM\Column(name="closed", type="boolean", options={ "default"=false })
-     */
-    private $closed = false;
-    
-    public function __construct()
+    private $type;
+
+    public function getAssignee(): ?User
     {
-        
+        return $this->assignee;
+    }
+
+    public function getCenter(): ?\Chill\MainBundle\Entity\Center
+    {
+        if ($this->getPerson() instanceof Person) {
+            return $this->getPerson()->getCenter();
+        }
+
+        return $this->getCourse()->getCenter();
+
+        return null;
+    }
+
+    public function getCircle(): ?Scope
+    {
+        return $this->circle;
+    }
+
+    public function getContext()
+    {
+        return $this->getPerson() ?? $this->getCourse();
+    }
+
+    public function getCourse(): ?AccompanyingPeriod
+    {
+        return $this->course;
     }
 
     /**
-     * Set type
+     * Get currentStates.
      *
-     * @param string $type
+     * The states are returned as required by marking store format.
      *
-     * @return AbstractTask
+     * @return array
      */
-    public function setType($type)
+    public function getCurrentStates()
     {
-        $this->type = (string) $type;
-
-        return $this;
+        return array_fill_keys($this->currentStates, 1);
     }
 
     /**
-     * Get type
+     * Get description.
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getScope(): ?Scope
+    {
+        return $this->getCircle();
+    }
+
+    /**
+     * Get title.
+     *
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Get type.
      *
      * @return string
      */
@@ -116,9 +177,40 @@ abstract class AbstractTask implements HasScopeInterface, HasCenterInterface
         return $this->type;
     }
 
+    public function isClosed(): bool
+    {
+        return $this->closed;
+    }
+
+    public function setAssignee(?User $assignee = null)
+    {
+        $this->assignee = $assignee;
+
+        return $this;
+    }
+
+    public function setCircle(Scope $circle)
+    {
+        $this->circle = $circle;
+
+        return $this;
+    }
+
+    public function setClosed(bool $closed)
+    {
+        $this->closed = $closed;
+    }
+
+    public function setCourse(AccompanyingPeriod $course)
+    {
+        $this->course = $course;
+
+        return $this;
+    }
+
     /**
-     * Set currentStates
-     * 
+     * Set currentStates.
+     *
      * The current states are sorted in a single array, non associative.
      *
      * @param $currentStates
@@ -127,25 +219,34 @@ abstract class AbstractTask implements HasScopeInterface, HasCenterInterface
      */
     public function setCurrentStates($currentStates)
     {
-        $this->currentStates = \array_keys($currentStates);
+        $this->currentStates = array_keys($currentStates);
 
         return $this;
     }
 
     /**
-     * Get currentStates
-     * 
-     * The states are returned as required by marking store format. 
+     * Set description.
      *
-     * @return array
+     * @param string $description
+     *
+     * @return AbstractTask
      */
-    public function getCurrentStates()
+    public function setDescription($description)
     {
-        return \array_fill_keys($this->currentStates, 1);
+        $this->description = (string) $description;
+
+        return $this;
+    }
+
+    public function setPerson(Person $person)
+    {
+        $this->person = $person;
+
+        return $this;
     }
 
     /**
-     * Set title
+     * Set title.
      *
      * @param string $title
      *
@@ -159,102 +260,16 @@ abstract class AbstractTask implements HasScopeInterface, HasCenterInterface
     }
 
     /**
-     * Get title
+     * Set type.
      *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->title;
-    }
-
-    /**
-     * Set description
-     *
-     * @param string $description
+     * @param string $type
      *
      * @return AbstractTask
      */
-    public function setDescription($description)
+    public function setType($type)
     {
-        $this->description = (string) $description;
+        $this->type = (string) $type;
 
         return $this;
     }
-
-    /**
-     * Get description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-    
-    public function getAssignee(): ?User
-    {
-        return $this->assignee;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
-    public function getCircle(): ?Scope
-    {
-        return $this->circle;
-    }
-    
-    public function setAssignee(User $assignee = null)
-    {
-        $this->assignee = $assignee;
-        return $this;
-    }
-
-    public function setPerson(Person $person)
-    {
-        $this->person = $person;
-        return $this;
-    }
-
-    public function setCircle(Scope $circle)
-    {
-        $this->circle = $circle;
-        return $this;
-    }
-
-    public function getCenter(): ?\Chill\MainBundle\Entity\Center
-    {
-        if ($this->getPerson() instanceof Person) {
-            return $this->getPerson()->getCenter();
-        }
-        
-        return null;
-        
-    }
-    
-    public function getScope(): ?\Chill\MainBundle\Entity\Scope
-    {
-        return $this->getCircle();
-    }
-
-    /**
-     * @return bool
-     */
-    public function isClosed(): bool
-    {
-        return $this->closed;
-    }
-    
-    /**
-     * 
-     * @param bool $closed
-     */
-    public function setClosed(bool $closed)
-    {
-        $this->closed = $closed;
-    }
 }
-
diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
index 20bffab18..9d74e9180 100644
--- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
@@ -1,20 +1,37 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Entity;
 
-use Doctrine\ORM\Mapping as ORM;
+use DateTime;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * RecurringTask
+ * RecurringTask.
  *
  * @ORM\Table(name="chill_task.recurring_task")
  * @ORM\Entity(repositoryClass="Chill\TaskBundle\Repository\RecurringTaskRepository")
  */
 class RecurringTask extends AbstractTask
 {
+    /**
+     * @var DateTime
+     *
+     * @ORM\Column(name="first_occurence_end_date", type="date")
+     */
+    private $firstOccurenceEndDate;
+
     /**
      * @var int
      *
@@ -25,14 +42,7 @@ class RecurringTask extends AbstractTask
     private $id;
 
     /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="first_occurence_end_date", type="date")
-     */
-    private $firstOccurenceEndDate;
-
-    /**
-     * @var \DateTime
+     * @var DateTime
      *
      * @ORM\Column(name="last_occurence_end_date", type="date")
      */
@@ -58,27 +68,34 @@ class RecurringTask extends AbstractTask
      * @ORM\Column(name="occurence_warning_interval", type="dateinterval", nullable=true)
      */
     private $occurenceWarningInterval;
-    
+
     /**
-     *
      * @var Collection
-     * 
+     *
      * @ORM\OneToMany(
-     *  targetEntity="SingleTask",
-     *  mappedBy="recurringTask"
+     *     targetEntity="SingleTask",
+     *     mappedBy="recurringTask"
      * )
      */
     private $singleTasks;
 
-
     public function __construct()
     {
         $this->singleTasks = new ArrayCollection();
     }
 
-    
     /**
-     * Get id
+     * Get firstOccurenceEndDate.
+     *
+     * @return DateTime
+     */
+    public function getFirstOccurenceEndDate()
+    {
+        return $this->firstOccurenceEndDate;
+    }
+
+    /**
+     * Get id.
      *
      * @return int
      */
@@ -88,9 +105,49 @@ class RecurringTask extends AbstractTask
     }
 
     /**
-     * Set firstOccurenceEndDate
+     * Get lastOccurenceEndDate.
      *
-     * @param \DateTime $firstOccurenceEndDate
+     * @return DateTime
+     */
+    public function getLastOccurenceEndDate()
+    {
+        return $this->lastOccurenceEndDate;
+    }
+
+    /**
+     * Get occurenceFrequency.
+     *
+     * @return string
+     */
+    public function getOccurenceFrequency()
+    {
+        return $this->occurenceFrequency;
+    }
+
+    /**
+     * Get occurenceStartDate.
+     *
+     * @return dateinterval
+     */
+    public function getOccurenceStartDate()
+    {
+        return $this->occurenceStartDate;
+    }
+
+    /**
+     * Get occurenceWarningInterval.
+     *
+     * @return dateinterval
+     */
+    public function getOccurenceWarningInterval()
+    {
+        return $this->occurenceWarningInterval;
+    }
+
+    /**
+     * Set firstOccurenceEndDate.
+     *
+     * @param DateTime $firstOccurenceEndDate
      *
      * @return RecurringTask
      */
@@ -102,19 +159,9 @@ class RecurringTask extends AbstractTask
     }
 
     /**
-     * Get firstOccurenceEndDate
+     * Set lastOccurenceEndDate.
      *
-     * @return \DateTime
-     */
-    public function getFirstOccurenceEndDate()
-    {
-        return $this->firstOccurenceEndDate;
-    }
-
-    /**
-     * Set lastOccurenceEndDate
-     *
-     * @param \DateTime $lastOccurenceEndDate
+     * @param DateTime $lastOccurenceEndDate
      *
      * @return RecurringTask
      */
@@ -126,17 +173,7 @@ class RecurringTask extends AbstractTask
     }
 
     /**
-     * Get lastOccurenceEndDate
-     *
-     * @return \DateTime
-     */
-    public function getLastOccurenceEndDate()
-    {
-        return $this->lastOccurenceEndDate;
-    }
-
-    /**
-     * Set occurenceFrequency
+     * Set occurenceFrequency.
      *
      * @param string $occurenceFrequency
      *
@@ -150,17 +187,7 @@ class RecurringTask extends AbstractTask
     }
 
     /**
-     * Get occurenceFrequency
-     *
-     * @return string
-     */
-    public function getOccurenceFrequency()
-    {
-        return $this->occurenceFrequency;
-    }
-
-    /**
-     * Set occurenceStartDate
+     * Set occurenceStartDate.
      *
      * @param dateinterval $occurenceStartDate
      *
@@ -174,17 +201,7 @@ class RecurringTask extends AbstractTask
     }
 
     /**
-     * Get occurenceStartDate
-     *
-     * @return dateinterval
-     */
-    public function getOccurenceStartDate()
-    {
-        return $this->occurenceStartDate;
-    }
-
-    /**
-     * Set occurenceWarningInterval
+     * Set occurenceWarningInterval.
      *
      * @param dateinterval $occurenceWarningInterval
      *
@@ -196,15 +213,4 @@ class RecurringTask extends AbstractTask
 
         return $this;
     }
-
-    /**
-     * Get occurenceWarningInterval
-     *
-     * @return dateinterval
-     */
-    public function getOccurenceWarningInterval()
-    {
-        return $this->occurenceWarningInterval;
-    }
 }
-
diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
index 23bdd61df..1702d4f88 100644
--- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php
@@ -1,31 +1,56 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Entity;
 
+use DateInterval;
+use DateTime;
+use DateTimeImmutable;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
-use Doctrine\Common\Collections\Collection;
 
 /**
- * SingleTask
+ * SingleTask.
  *
  * @ORM\Table(
- *   name="chill_task.single_task",
- *   indexes={
- *     @ORM\Index(
- *        name="by_type",
- *        columns={ "type" }
- *     ),
- *     @ORM\Index(
- *        name="by_current_state",
- *        columns={ "current_states" }
- *     )
- *   }
+ *     name="chill_task.single_task",
+ *     indexes={
+ *         @ORM\Index(
+ *             name="by_type",
+ *             columns={ "type" }
+ *         ),
+ *         @ORM\Index(
+ *             name="by_current_state",
+ *             columns={ "current_states" }
+ *         ),
+ *         @ORM\Index(
+ *             name="by_end_date",
+ *             columns={ "end_date" }
+ *         )
+ *     }
  * )
  * @ORM\Entity(repositoryClass="Chill\TaskBundle\Repository\SingleTaskRepository")
  */
 class SingleTask extends AbstractTask
 {
+    /**
+     * @var DateTime
+     *
+     * @ORM\Column(name="end_date", type="date", nullable=true)
+     * @Assert\Date
+     */
+    private $endDate;
+
     /**
      * @var int
      *
@@ -36,77 +61,72 @@ class SingleTask extends AbstractTask
     private $id;
 
     /**
-     * @var \DateTime
+     * @var RecurringTask
+     * @ORM\ManyToOne(
+     *     targetEntity="RecurringTask",
+     *     inversedBy="singleTasks"
+     * )
+     */
+    private $recurringTask;
+
+    /**
+     * @var DateTime
      *
      * @ORM\Column(name="start_date", type="date", nullable=true)
-     * @Assert\Date()
-     * 
+     * @Assert\Date
+     *
      * @Assert\Expression(
-     *  "value === null or this.getEndDate() === null or value < this.getEndDate()",
-     *  message="The start date must be before the end date"
+     *     "value === null or this.getEndDate() === null or value < this.getEndDate()",
+     *     message="The start date must be before the end date"
      * )
-     * 
+     *
      * @Assert\Expression(
-     *  "value === null or this.getWarningDate() === null or this.getWarningDate() > this.getStartDate()",
-     *  message="The start date must be before warning date"
+     *     "value === null or this.getWarningDate() === null or this.getWarningDate() > this.getStartDate()",
+     *     message="The start date must be before warning date"
      * )
      */
     private $startDate;
 
     /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="end_date", type="date", nullable=true)
-     * @Assert\Date()
-     */
-    private $endDate;
-
-    /**
-     * @var \DateInterval
-     *  and this.getEndDate() === null
-     *
-     * @ORM\Column(name="warning_interval", type="dateinterval", nullable=true)
-     * 
-     * @Assert\Expression(
-     *  "!(value != null and this.getEndDate() == null)",
-     *  message="An end date is required if a warning interval is set"
-     * )
-     * 
-     * 
-     */
-    private $warningInterval;
-    
-    /**
-     *
-     * @var RecurringTask
-     * @ORM\ManyToOne(
-     *  targetEntity="RecurringTask",
-     *  inversedBy="singleTasks"
-     * )
-     */
-    private $recurringTask;
-    
-    /**
-     *
      * @var \Doctrine\Common\Collections\Collection
      * @ORM\OneToMany(
-     *  targetEntity="\Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent",
-     *  mappedBy="task",
-     *  cascade={ "remove" }
+     *     targetEntity="\Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent",
+     *     mappedBy="task",
+     *     cascade={ "remove" }
      * )
      */
     private $taskPlaceEvents;
-    
+
+    /**
+     * @var DateInterval
+     *  and this.getEndDate() === null
+     *
+     * @ORM\Column(name="warning_interval", type="dateinterval", nullable=true)
+     *
+     * @Assert\Expression(
+     *     "!(value != null and this.getEndDate() == null)",
+     *     message="An end date is required if a warning interval is set"
+     * )
+     */
+    private $warningInterval;
+
     public function __construct()
     {
-        $this->taskPlaceEvents = $events = new \Doctrine\Common\Collections\ArrayCollection;
-        
-        parent::__construct();
+        $this->taskPlaceEvents = new ArrayCollection();
     }
 
-    
     /**
-     * Get id
+     * Get endDate.
+     *
+     * @return DateTime
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * Get id.
      *
      * @return int
      */
@@ -115,34 +135,62 @@ class SingleTask extends AbstractTask
         return $this->id;
     }
 
-    /**
-     * Set startDate
-     *
-     * @param \DateTime $startDate
-     *
-     * @return SingleTask
-     */
-    public function setStartDate($startDate)
+    public function getRecurringTask(): RecurringTask
     {
-        $this->startDate = $startDate;
-
-        return $this;
+        return $this->recurringTask;
     }
 
     /**
-     * Get startDate
+     * Get startDate.
      *
-     * @return \DateTime
+     * @return DateTime
      */
     public function getStartDate()
     {
         return $this->startDate;
     }
 
+    public function getTaskPlaceEvents(): Collection
+    {
+        return $this->taskPlaceEvents;
+    }
+
     /**
-     * Set endDate
+     * Get the Warning date, computed from the difference between the
+     * end date and the warning interval.
      *
-     * @param \DateTime $endDate
+     * Return null if warningDate or endDate is null
+     *
+     * @return DateTimeImmutable
+     */
+    public function getWarningDate()
+    {
+        if ($this->getWarningInterval() === null) {
+            return null;
+        }
+
+        if ($this->getEndDate() === null) {
+            return null;
+        }
+
+        return DateTimeImmutable::createFromMutable($this->getEndDate())
+            ->sub($this->getWarningInterval());
+    }
+
+    /**
+     * Get warningInterval.
+     *
+     * @return DateInterval
+     */
+    public function getWarningInterval()
+    {
+        return $this->warningInterval;
+    }
+
+    /**
+     * Set endDate.
+     *
+     * @param DateTime $endDate
      *
      * @return SingleTask
      */
@@ -153,18 +201,34 @@ class SingleTask extends AbstractTask
         return $this;
     }
 
-    /**
-     * Get endDate
-     *
-     * @return \DateTime
-     */
-    public function getEndDate()
+    public function setRecurringTask(RecurringTask $recurringTask)
     {
-        return $this->endDate;
+        $this->recurringTask = $recurringTask;
     }
 
     /**
-     * Set warningInterval
+     * Set startDate.
+     *
+     * @param DateTime $startDate
+     *
+     * @return SingleTask
+     */
+    public function setStartDate($startDate)
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function setTaskPlaceEvents(Collection $taskPlaceEvents)
+    {
+        $this->taskPlaceEvents = $taskPlaceEvents;
+
+        return $this;
+    }
+
+    /**
+     * Set warningInterval.
      *
      * @param string $warningInterval
      *
@@ -176,59 +240,4 @@ class SingleTask extends AbstractTask
 
         return $this;
     }
-
-    /**
-     * Get warningInterval
-     *
-     * @return \DateInterval
-     */
-    public function getWarningInterval()
-    {
-        return $this->warningInterval;
-    }
-    
-    /**
-     * Get the Warning date, computed from the difference between the 
-     * end date and the warning interval
-     * 
-     * Return null if warningDate or endDate is null
-     * 
-     * @return \DateTimeImmutable
-     */
-    public function getWarningDate()
-    {
-        if ($this->getWarningInterval() === null) {
-            return null;
-        }
-        
-        if ($this->getEndDate() === null) {
-            return null;
-        }
-        
-        return \DateTimeImmutable::createFromMutable($this->getEndDate())
-            ->sub($this->getWarningInterval());
-    }
-    
-    function getRecurringTask(): RecurringTask
-    {
-        return $this->recurringTask;
-    }
-
-    function setRecurringTask(RecurringTask $recurringTask)
-    {
-        $this->recurringTask = $recurringTask;
-    }
-
-    public function getTaskPlaceEvents(): Collection
-    {
-        return $this->taskPlaceEvents;
-    }
-
-    public function setTaskPlaceEvents(Collection $taskPlaceEvents)
-    {
-        $this->taskPlaceEvents = $taskPlaceEvents;
-        
-        return $this;
-    }
 }
-
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
index 91ce89a15..00e3fe3a2 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
@@ -1,17 +1,49 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Entity\Task;
 
-use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
- * AbstractTaskPlaceEvent
+ * AbstractTaskPlaceEvent.
  *
- * @ORM\MappedSuperclass()
+ * @ORM\MappedSuperclass
  */
 class AbstractTaskPlaceEvent
 {
+    /**
+     * @var User
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\MainBundle\Entity\User"
+     * )
+     */
+    private $author;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="data", type="json")
+     */
+    private $data = [];
+
+    /**
+     * @var datetime_immutable
+     *
+     * @ORM\Column(name="datetime", type="datetime_immutable")
+     */
+    private $datetime;
+
     /**
      * @var int
      *
@@ -21,13 +53,6 @@ class AbstractTaskPlaceEvent
      */
     private $id;
 
-    /**
-     * @var datetime_immutable
-     *
-     * @ORM\Column(name="datetime", type="datetime_immutable")
-     */
-    private $datetime;
-
     /**
      * @var string
      *
@@ -35,49 +60,24 @@ class AbstractTaskPlaceEvent
      */
     private $transition = '';
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="data", type="json")
-     */
-    private $data = [];
-    
-    /**
-     * 
-     * @var User
-     * @ORM\ManyToOne(
-     *  targetEntity="\Chill\MainBundle\Entity\User"
-     * )
-     */
-    private $author;
-
     public function __construct()
     {
-        $this->datetime = new \DateTimeImmutable('now');
+        $this->datetime = new DateTimeImmutable('now');
     }
 
-        /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
+    public function getAuthor(): User
     {
-        return $this->id;
+        return $this->author;
     }
 
     /**
-     * Set datetime.
+     * Get data.
      *
-     * @param datetime_immutable $datetime
-     *
-     * @return AbstractTaskPlaceEvent
+     * @return string
      */
-    public function setDatetime($datetime)
+    public function getData()
     {
-        $this->datetime = $datetime;
-
-        return $this;
+        return $this->data;
     }
 
     /**
@@ -91,17 +91,13 @@ class AbstractTaskPlaceEvent
     }
 
     /**
-     * Set transition.
+     * Get id.
      *
-     * @param string $transition
-     *
-     * @return AbstractTaskPlaceEvent
+     * @return int
      */
-    public function setTransition($transition)
+    public function getId()
     {
-        $this->transition = $transition;
-
-        return $this;
+        return $this->id;
     }
 
     /**
@@ -114,6 +110,13 @@ class AbstractTaskPlaceEvent
         return $this->transition;
     }
 
+    public function setAuthor(User $author)
+    {
+        $this->author = $author;
+
+        return $this;
+    }
+
     /**
      * Set data.
      *
@@ -129,26 +132,30 @@ class AbstractTaskPlaceEvent
     }
 
     /**
-     * Get data.
+     * Set datetime.
      *
-     * @return string
+     * @param datetime_immutable $datetime
+     *
+     * @return AbstractTaskPlaceEvent
      */
-    public function getData()
+    public function setDatetime($datetime)
     {
-        return $this->data;
-    }
-    
-    public function getAuthor(): User
-    {
-        return $this->author;
-    }
+        $this->datetime = $datetime;
 
-    public function setAuthor(User $author)
-    {
-        $this->author = $author;
-        
         return $this;
     }
 
+    /**
+     * Set transition.
+     *
+     * @param string $transition
+     *
+     * @return AbstractTaskPlaceEvent
+     */
+    public function setTransition($transition)
+    {
+        $this->transition = $transition;
 
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
index fe8d2583e..eff13d1e9 100644
--- a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
+++ b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php
@@ -1,56 +1,45 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Entity\Task;
-
-use Doctrine\ORM\Mapping as ORM;
-use Chill\TaskBundle\Entity\SingleTask;
 
 /**
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Entity\Task;
+
+use Chill\TaskBundle\Entity\SingleTask;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
  * @ORM\Table(
- *  name="chill_task.single_task_place_event",
- *  indexes={
- *    @ORM\Index(
- *      name="transition_task_date", 
- *      columns={"task_id", "transition", "datetime"}
- *    ),
- *    @ORM\Index(
- *      name="transition_task",
- *      columns={"task_id", "transition"}
- *    )
- *  })
- * @ORM\Entity()
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ *     name="chill_task.single_task_place_event",
+ *     indexes={
+ *         @ORM\Index(
+ *             name="transition_task_date",
+ *             columns={"task_id", "transition", "datetime"}
+ *         ),
+ *         @ORM\Index(
+ *             name="transition_task",
+ *             columns={"task_id", "transition"}
+ *         )
+ *     })
+ *     @ORM\Entity
  */
 class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
 {
     /**
-     *
      * @var SingleTask
      * @ORM\ManyToOne(
-     *  targetEntity="\Chill\TaskBundle\Entity\SingleTask",
-     *  inversedBy="taskPlaceEvents"
+     *     targetEntity="\Chill\TaskBundle\Entity\SingleTask",
+     *     inversedBy="taskPlaceEvents"
      * )
      */
     protected $task;
-    
+
     public function getTask(): SingleTask
     {
         return $this->task;
@@ -59,9 +48,7 @@ class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
     public function setTask(SingleTask $task)
     {
         $this->task = $task;
-        
+
         return $this;
     }
-
-
 }
diff --git a/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php b/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
index 74bd33cc9..49576e6d0 100644
--- a/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
@@ -1,90 +1,75 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Event\Lifecycle;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Chill\TaskBundle\Event\TaskEvent;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
-use Symfony\Component\Workflow\Event\Event as WorkflowEvent;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Event\Lifecycle;
+
+use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
+use Chill\TaskBundle\Event\TaskEvent;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Workflow\Event\Event as WorkflowEvent;
+
 class TaskLifecycleEvent implements EventSubscriberInterface
 {
     /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
+    /**
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+
     public function __construct(
-        TokenStorageInterface $tokenStorage, 
+        TokenStorageInterface $tokenStorage,
         EntityManagerInterface $em
     ) {
         $this->tokenStorage = $tokenStorage;
         $this->em = $em;
     }
 
-    
     public static function getSubscribedEvents(): array
     {
         return [
             TaskEvent::PERSIST => [
-                'onTaskPersist'
-            ]
+                'onTaskPersist',
+            ],
         ];
     }
-    
+
     public function onTaskPersist(TaskEvent $e)
     {
         $task = $e->getTask();
         $user = $this->tokenStorage->getToken()->getUser();
-        
+
         $event = (new SingleTaskPlaceEvent())
             ->setTask($task)
             ->setAuthor($user)
             ->setTransition('_creation')
             ->setData([
-                'new_states' => $task->getCurrentStates()
-            ])
-            ;
-        
+                'new_states' => $task->getCurrentStates(),
+            ]);
+
         $task->getTaskPlaceEvents()->add($event);
-        
+
         $this->em->persist($event);
     }
-    
+
     public function onTransition(WorkflowEvent $e)
     {
         $task = $e->getSubject();
         $user = $this->tokenStorage->getToken()->getUser();
-        
+
         $event = (new SingleTaskPlaceEvent())
             ->setTask($task)
             ->setAuthor($user)
@@ -92,13 +77,11 @@ class TaskLifecycleEvent implements EventSubscriberInterface
             ->setData([
                 'old_states' => $e->getTransition()->getFroms(),
                 'new_states' => $e->getTransition()->getTos(),
-                'workflow' => $e->getWorkflowName()
-            ])
-            ;
-        
+                'workflow' => $e->getWorkflowName(),
+            ]);
+
         $task->getTaskPlaceEvents()->add($event);
-        
+
         $this->em->persist($event);
     }
-    
 }
diff --git a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
index 070118c4d..fd0028825 100644
--- a/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/TaskEvent.php
@@ -1,45 +1,33 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Event;
 
 use Chill\TaskBundle\Entity\AbstractTask;
 use Symfony\Component\EventDispatcher\Event;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class TaskEvent extends Event
 {
-    const PERSIST = 'chill_task.task_persist';
-    
+    public const PERSIST = 'chill_task.task_persist';
+
     /**
-     *
      * @var AbstractTask
      */
     protected $task;
-    
+
     public function __construct(AbstractTask $task)
     {
         $this->task = $task;
     }
-    
+
     public function getTask(): AbstractTask
     {
         return $this->task;
@@ -48,8 +36,7 @@ class TaskEvent extends Event
     public function setTask(AbstractTask $task)
     {
         $this->task = $task;
-        
+
         return $this;
     }
 }
-
diff --git a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
index e041da542..101eac377 100644
--- a/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
+++ b/src/Bundle/ChillTaskBundle/Event/UI/UIEvent.php
@@ -1,81 +1,62 @@
 <?php
-/*
- * 
- */
-namespace Chill\TaskBundle\Event\UI;
-
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpFoundation\Response;
-use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Workflow\Transition;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Event\UI;
+
+use Chill\TaskBundle\Entity\AbstractTask;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Workflow\Transition;
+
 class UIEvent extends Event
 {
-    const SHOW_TRANSITION_PAGE = 'chill_task.show_transition_page';
-    const EDIT_FORM = 'chill_task.edit_form';
-    const EDIT_PAGE = 'chill_task.edit_page';
-    
+    public const EDIT_FORM = 'chill_task.edit_form';
+
+    public const EDIT_PAGE = 'chill_task.edit_page';
+
+    public const SHOW_TRANSITION_PAGE = 'chill_task.show_transition_page';
+
+    /**
+     * @var FormInterface|null
+     */
+    protected $form;
+
     /**
-     *
      * @var string
      */
     protected $kind;
-    
+
     /**
-     *
-     * @var AbstractTask 
-     */
-    protected $task;
-    
-    /**
-     *
      * @var Response|null
      */
-    protected $response = null;
-    
+    protected $response;
+
     /**
-     *
-     * @var FormInterface|null
+     * @var AbstractTask
      */
-    protected $form = null;
-    
+    protected $task;
+
     /**
      * @var Transition
      */
-    protected $transition = null;
-    
+    protected $transition;
+
     public function __construct($kind, AbstractTask $task)
     {
         $this->kind = $kind;
         $this->task = $task;
     }
-    
-    /**
-     * 
-     * @return string
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
 
     /**
-     * 
-     * @return AbstractTask
-     */
-    public function getTask(): AbstractTask
-    {
-        return $this->task;
-    }
-    
-    /**
-     * 
      * @return FormInterface|null
      */
     public function getForm()
@@ -83,15 +64,25 @@ class UIEvent extends Event
         return $this->form;
     }
 
-    public function setForm(FormInterface $form)
-    {
-        $this->form = $form;
-        
-        return $this;
-    }
-    
     /**
-     * 
+     * @return string
+     */
+    public function getKind()
+    {
+        return $this->kind;
+    }
+
+    public function getResponse(): Response
+    {
+        return $this->response;
+    }
+
+    public function getTask(): AbstractTask
+    {
+        return $this->task;
+    }
+
+    /**
      * @return Transition
      */
     public function getTransition()
@@ -99,38 +90,32 @@ class UIEvent extends Event
         return $this->transition;
     }
 
-    public function setTransition(Transition $transition)
-    {
-        $this->transition = $transition;
-        
-        return $this;
-    }
-        
-    /**
-     * 
-     * @return Response
-     */
-    public function getResponse(): Response
-    {
-        return $this->response;
-    }
-
-    /**
-     * 
-     * @param Response $response
-     * @return $this
-     */
-    public function setResponse(Response $response)
-    {
-        $this->response = $response;
-        
-        return $this;
-    }
-
     public function hasResponse()
     {
         return $this->response instanceof Response;
     }
 
+    public function setForm(FormInterface $form)
+    {
+        $this->form = $form;
 
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setResponse(Response $response)
+    {
+        $this->response = $response;
+
+        return $this;
+    }
+
+    public function setTransition(Transition $transition)
+    {
+        $this->transition = $transition;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
index 99e8ddb42..c9bb3ab09 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
@@ -1,75 +1,63 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\TaskBundle\Repository\SingleTaskRepository;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\TaskBundle\Entity\SingleTask;
-use Chill\PersonBundle\Form\Type\PickPersonType;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
-use Chill\TaskBundle\Workflow\TaskWorkflowManager;
 
 /**
+ * Chill is a software for social workers
  *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Form;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
+use Chill\PersonBundle\Form\Type\PickPersonType;
+use Chill\TaskBundle\Entity\SingleTask;
+use Chill\TaskBundle\Repository\SingleTaskRepository;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Chill\TaskBundle\Workflow\TaskWorkflowManager;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use function array_combine;
+use function array_map;
+use function count;
+
 class SingleTaskListType extends AbstractType
 {
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
+    /**
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
     /**
-     *
      * @var TaskWorkflowManager
      */
     protected $taskWorkflowManager;
-    
+
+    /**
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+
     public function __construct(
-        EntityManagerInterface $em, 
-        TokenStorageInterface $tokenStorage, 
+        EntityManagerInterface $em,
+        TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
         TaskWorkflowManager $taskWorkflowManager
     ) {
@@ -79,7 +67,6 @@ class SingleTaskListType extends AbstractType
         $this->taskWorkflowManager = $taskWorkflowManager;
     }
 
-    
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $statuses = [
@@ -87,56 +74,54 @@ class SingleTaskListType extends AbstractType
             'Tasks with expired deadline' => SingleTaskRepository::DATE_STATUS_ENDED,
             'Tasks with warning deadline reached' => SingleTaskRepository::DATE_STATUS_WARNING,
             'Current tasks' => SingleTaskRepository::DATE_STATUS_CURRENT,
-            'Closed tasks' => 'closed' 
+            'Closed tasks' => 'closed',
         ];
-        
+
         $builder
             ->add('user_id', ChoiceType::class, [
                 'choices' => $this->getUserChoices($options),
                 'placeholder' => 'Any user',
                 'required' => false,
-                'label' => 'Assignee'
-            ])
-            ;
-        
+                'label' => 'Assignee',
+            ]);
+
         if ($options['add_status']) {
             $builder
                 ->add('status', ChoiceType::class, [
                     'choices' => $statuses,
                     'expanded' => true,
                     'multiple' => true,
-                    'label' => 'status'
+                    'label' => 'status',
                 ]);
         }
-        
+
         if ($options['add_type']) {
             $types = $this->getTaskTypesChoices($options);
-            
+
             if (count($types) > 0) {
                 $builder->add('types', ChoiceType::class, [
                     'choices' => $types,
                     'required' => false,
                     'expanded' => true,
                     'multiple' => true,
-                    'label' => 'Task types'
+                    'label' => 'Task types',
                 ]);
             }
-            
         }
-        
-        if ($options['person'] === null) {
+
+        if (null === $options['person']) {
             $builder
                 ->add('person_id', PickPersonType::class, [
                     'centers' => $this->authorizationHelper
                         ->getReachableCenters(
                             $this->tokenStorage->getToken()->getUser(),
                             new Role(TaskVoter::SHOW)
-                            ),
+                        ),
                     'required' => false,
-                    'label' => 'Associated person'
-                ])
-            ;
+                    'label' => 'Associated person',
+                ]);
             $reachablesCenters = $this->getReachablesCenters();
+
             if (count($reachablesCenters) > 1) {
                 $builder
                     ->add('center_id', EntityType::class, [
@@ -144,7 +129,7 @@ class SingleTaskListType extends AbstractType
                         'choices' => $reachablesCenters,
                         'label' => 'Center',
                         'required' => false,
-                        'placeholder' => 'All centers'
+                        'placeholder' => 'All centers',
                     ]);
             }
         } else {
@@ -152,130 +137,8 @@ class SingleTaskListType extends AbstractType
             $builder
                 ->add('person_id', HiddenType::class);
             $builder->get('person_id')
-                ->addModelTransformer(new PersonToIdTransformer($this->em))
-                ;
+                ->addModelTransformer(new PersonToIdTransformer($this->em));
         }
-        
-    }
-    
-    protected function getUserChoices($options)
-    {
-        $users = $this->getUsersAssigneedToTask($options);
-        $choices = \array_combine(
-            // get usernames
-            \array_map(function(User $user) { return $user->getUsername(); }, $users),
-            // get ids    
-            \array_map(function(User $user) { return $user->getId(); }, $users)
-            );
-        $choices['Unassigned'] = '_unassigned';
-        
-        return $choices;
-    }
-    
-    protected function getTaskTypesChoices($options)
-    {
-        $qb = $this->em->createQueryBuilder();
-        $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
-        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
-        
-        $qb->select('DISTINCT task.type AS type')
-            ->from(SingleTask::class, 'task')
-            ->join('task.person', 'person')
-            ;
-        
-        $i = 0;
-        $orCenters = $qb->expr()->orX();
-        foreach($centers as $center) {
-            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
-            
-            if (count($circles) > 0) {
-                $andX = $qb->expr()->andX();
-                $andX
-                    ->add($qb->expr()->eq('person.center', ':center_'.$i))
-                    ->add($qb->expr()->in('task.circle', ':circles_'.$i))
-                    ;
-                $orCenters->add($andX);
-                
-                $qb
-                    ->setParameter('center_'.$i, $center)
-                    ->setParameter('circles_'.$i, $circles)
-                    ;
-                $i++;
-            }
-        }
-        
-        if ($i > 0) {
-            $qb->where($orCenters);
-        }
-        
-        $types = $qb->getQuery()->getResult();
-        
-        $choices = [];
-        
-        foreach ($types as $row) {
-            $fake = (new SingleTask())->setType($row['type']);
-            $label = $this->taskWorkflowManager->getWorkflowMetadata($fake, 'definition.name');
-            $choices[$label] = $row['type'];
-        }
-        
-        return $choices;
-    }
-    
-    /**
-     * Return a list of user having a task assigned.
-     * 
-     * @return User[]
-     */
-    protected function getUsersAssigneedToTask($options)
-    {
-        $qb = $this->em->createQueryBuilder();
-        $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
-        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
-        
-        $qb->select('DISTINCT user')
-            ->from(User::class, 'user')
-            ->join(SingleTask::class, 'task', \Doctrine\ORM\Query\Expr\Join::WITH, 'task.assignee = user')
-            ->join('task.person', 'person')
-            ->where("user.enabled = 'TRUE'")
-            ;
-        
-        if (NULL !== $options['person']) {
-            $qb
-                ->andWhere($qb->expr()->eq('task.person', ':person'))
-                ->setParameter('person', $options['person'])
-                ;
-        }
-        
-        $i = 0;
-        $circleCenterCond = $qb->expr()->orX();
-        foreach ($centers as $center) {
-            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
-            // add condition about person and circle
-            $circleCenterCond->add(
-                $qb->expr()->andX()
-                    ->add($qb->expr()->eq('person.center', ':center_'.$i))
-                    ->add($qb->expr()->in('task.circle', ':circles_'.$i))
-                );
-            
-            $qb->setParameter('center_'.$i, $center)
-                ->setParameter('circles_'.$i, $circles)
-                ;
-            // increase counter
-            $i++;
-        }
-        $qb->andWhere($circleCenterCond);   
-        
-        return $qb->getQuery()->getResult();
-    }
-    
-    protected function getReachablesCenters()
-    {
-        $user = $this->tokenStorage->getToken()->getUser();
-        $role = new Role(TaskVoter::SHOW);
-        
-        return $this->authorizationHelper->getReachableCenters($user, $role);
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -284,12 +147,130 @@ class SingleTaskListType extends AbstractType
             ->setDefined('person')
             ->setDefault('person', null)
             ->setAllowedTypes('person', [Person::class, 'null'])
+            ->setDefined('accompanyingCourse')
             ->setDefined('add_status')
             ->setDefault('add_status', false)
             ->setAllowedTypes('add_status', ['bool'])
             ->setDefined('add_type')
             ->setDefault('add_type', false)
-            ->setAllowedTypes('add_type', ['bool'])
-            ;
+            ->setAllowedTypes('add_type', ['bool']);
+    }
+
+    protected function getReachablesCenters()
+    {
+        $user = $this->tokenStorage->getToken()->getUser();
+        $role = new Role(TaskVoter::SHOW);
+
+        return $this->authorizationHelper->getReachableCenters($user, $role);
+    }
+
+    protected function getTaskTypesChoices($options)
+    {
+        $qb = $this->em->createQueryBuilder();
+        $user = $this->tokenStorage->getToken()->getUser();
+        $role = new Role(TaskVoter::SHOW);
+        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
+
+        $qb->select('DISTINCT task.type AS type')
+            ->from(SingleTask::class, 'task')
+            ->join('task.person', 'person');
+
+        $i = 0;
+        $orCenters = $qb->expr()->orX();
+
+        foreach ($centers as $center) {
+            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
+
+            if (count($circles) > 0) {
+                $andX = $qb->expr()->andX();
+                $andX
+                    ->add($qb->expr()->eq('person.center', ':center_' . $i))
+                    ->add($qb->expr()->in('task.circle', ':circles_' . $i));
+                $orCenters->add($andX);
+
+                $qb
+                    ->setParameter('center_' . $i, $center)
+                    ->setParameter('circles_' . $i, $circles);
+                ++$i;
+            }
+        }
+
+        if (0 < $i) {
+            $qb->where($orCenters);
+        }
+
+        $types = $qb->getQuery()->getResult();
+
+        $choices = [];
+
+        foreach ($types as $row) {
+            $fake = (new SingleTask())->setType($row['type']);
+            $label = $this->taskWorkflowManager->getWorkflowMetadata($fake, 'definition.name');
+            $choices[$label] = $row['type'];
+        }
+
+        return $choices;
+    }
+
+    protected function getUserChoices($options)
+    {
+        $users = $this->getUsersAssigneedToTask($options);
+        $choices = array_combine(
+            // get usernames
+            array_map(static function (User $user) { return $user->getUsername(); }, $users),
+            // get ids
+            array_map(static function (User $user) { return $user->getId(); }, $users)
+        );
+        $choices['Unassigned'] = '_unassigned';
+
+        return $choices;
+    }
+
+    /**
+     * Return a list of user having a task assigned.
+     *
+     * @param mixed $options
+     *
+     * @return User[]
+     */
+    protected function getUsersAssigneedToTask($options)
+    {
+        $qb = $this->em->createQueryBuilder();
+        $user = $this->tokenStorage->getToken()->getUser();
+        $role = new Role(TaskVoter::SHOW);
+        $centers = $this->authorizationHelper->getReachableCenters($user, $role);
+
+        $qb->select('DISTINCT user')
+            ->from(User::class, 'user')
+            ->join(SingleTask::class, 'task', \Doctrine\ORM\Query\Expr\Join::WITH, 'task.assignee = user')
+            ->join('task.person', 'person')
+            ->where("user.enabled = 'TRUE'");
+
+        if (null !== $options['person']) {
+            $qb
+                ->andWhere($qb->expr()->eq('task.person', ':person'))
+                ->setParameter('person', $options['person']);
+        }
+
+        $i = 0;
+        $circleCenterCond = $qb->expr()->orX();
+
+        foreach ($centers as $center) {
+            $circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
+            // add condition about person and circle
+            $circleCenterCond->add(
+                $qb->expr()->andX()
+                    ->add($qb->expr()->eq('person.center', ':center_' . $i))
+                    ->add($qb->expr()->in('task.circle', ':circles_' . $i))
+            );
+
+            $qb->setParameter('center_' . $i, $center)
+                ->setParameter('circles_' . $i, $circles);
+            // increase counter
+            ++$i;
+        }
+        $qb->andWhere($circleCenterCond);
+
+        return $qb->getQuery()->getResult();
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
index 16f000aa2..7bb5a10c4 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -1,77 +1,95 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Entity\Center;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Form\Type\DateIntervalType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\DateIntervalType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\UserPickerType;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Role\Role;
+
 class SingleTaskType extends AbstractType
 {
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+
+    private ParameterBagInterface $parameterBag;
+
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
+
+    public function __construct(
+        ParameterBagInterface $parameterBag,
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
+        ScopeResolverDispatcher $scopeResolverDispatcher
+    ) {
+        $this->parameterBag = $parameterBag;
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $center = null;
+        $isScopeConcerned = false;
+
+        if (null !== $task = $options['data']) {
+            $center = $this->centerResolverDispatcher->resolveCenter($task);
+            $isScopeConcerned = $this->scopeResolverDispatcher->isConcerned($task);
+        }
+
         $builder
             ->add('title', TextType::class)
             ->add('description', ChillTextareaType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('assignee', UserPickerType::class, [
                 'required' => false,
-                'center' => $options['center'],
-                'role'   => $options['role'],
-                'placeholder' => 'Not assigned'
-            ])
-            ->add('circle', ScopePickerType::class, [
-                'center' => $options['center'],
-                'role' => $options['role']
+                'center' => $center,
+                'role' => TaskVoter::SHOW,
+                'placeholder' => 'Not assigned',
+                'attr' => ['class' => ' select2 '],
             ])
             ->add('startDate', ChillDateType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('endDate', ChillDateType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('warningInterval', DateIntervalType::class, [
-                'required' => false
-            ])
-            ;
+                'required' => false,
+            ]);
+
+        if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
+            $builder
+                ->add('circle', ScopePickerType::class, [
+                    'center' => $center,
+                    'role' => $options['role'],
+                    'required' => false,
+                ]);
+        }
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setRequired('center')
-            ->setAllowedTypes('center', [ Center::class ])
             ->setRequired('role')
-            ->setAllowedTypes('role', [ Role::class ])
-            ;
+            ->setAllowedTypes('role', [Role::class, 'string']);
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
new file mode 100644
index 000000000..0ed5125a5
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Knp\Menu\MenuItem;
+use LogicException;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+
+class MenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    public function __construct(
+        AuthorizationCheckerInterface $authorizationChecker,
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildAccompanyingCourseMenu($menu, $parameters)
+    {
+        $course = $parameters['accompanyingCourse'];
+
+        if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $course)) {
+            $menu->addChild(
+                $this->translator->trans('Tasks'),
+                [
+                    'route' => 'chill_task_singletask_by-course_list',
+                    'routeParameters' => ['id' => $course->getId()],
+                ]
+            )
+                ->setExtra('order', 400);
+        }
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        switch ($menuId) {
+            case 'person':
+                $this->buildPersonMenu($menu, $parameters);
+
+                break;
+
+            case 'accompanyingCourse':
+                $this->buildAccompanyingCourseMenu($menu, $parameters);
+
+                break;
+
+            case 'section':
+                $menu->setExtras('icons', 'tasks');
+
+                break;
+
+            default:
+                throw new LogicException("this menuid {$menuId} is not implemented");
+        }
+    }
+
+    public function buildPersonMenu($menu, $parameters)
+    {
+        //var $person \Chill\PersonBundle\Entity\Person */
+        $person = $parameters['person'] ?? null;
+
+        if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $person)) {
+            $menu->addChild(
+                $this->translator->trans('Tasks'),
+                [
+                    'route' => 'chill_task_singletask_by-person_list',
+                    'routeParameters' => ['id' => $person->getId()],
+                ]
+            )
+                ->setExtra('order', 400);
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['person', 'accompanyingCourse'];
+    }
+}
diff --git a/src/Bundle/ChillTaskBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/PersonMenuBuilder.php
deleted file mode 100644
index ee0afa497..000000000
--- a/src/Bundle/ChillTaskBundle/Menu/PersonMenuBuilder.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@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\TaskBundle\Menu;
-
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Symfony\Component\Translation\TranslatorInterface;
-
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
-class PersonMenuBuilder implements LocalMenuBuilderInterface
-{
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
-    
-    public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-        $this->authorizationChecker = $authorizationChecker;
-    }
-
-    
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
-        $person = $parameters['person'] ?? null;
-        
-        if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $person)) {
-            $menu->addChild(
-                $this->translator->trans('Tasks'), [
-                    'route' => 'chill_task_singletask_list',
-                    'routeParameters' => $menuId === 'person' ? 
-                        [ 'person_id' => $person->getId() ]
-                        :
-                        null,
-                ])
-                ->setExtra('order', 400)
-                ;
-            if ($menuId === 'section') {
-                $menu->setExtra('icons', 'tasks');
-            }
-        }
-    }
-
-    public static function getMenuIds(): array
-    {
-        return ['person'];
-    }
-}
diff --git a/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
index 7ed84dbf5..98d90f75a 100644
--- a/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
@@ -1,47 +1,34 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
-
-/**
- * 
- *
- */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     public $authorizationChecker;
-    
+
     /**
-     *
      * @var TranslatorInterface
      */
     public $translator;
-    
+
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
         TranslatorInterface $translator
@@ -49,30 +36,31 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationChecker = $authorizationChecker;
         $this->translator = $translator;
     }
-    
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if (FALSE === $this->authorizationChecker->isGranted(TaskVoter::SHOW)) {
+        if (false === $this->authorizationChecker->isGranted(TaskVoter::SHOW)) {
             return;
         }
-        
+
         $menu->addChild(
-            $this->translator->trans("Tasks"), 
+            $this->translator->trans('Tasks'),
             [
                 'route' => 'chill_task_singletask_list', [
-                'routeParameters' => [
-                    'hide_form' => false
-                ]
-            ]])
+                    'routeParameters' => [
+                        'hide_form' => false,
+                    ],
+                ], ]
+        )
             ->setExtras([
-                'order'=> 50,
+                'order' => 50,
                 'icon' => 'exclamation-triangle',
-                'entryclass' => 'user_menu__entry--warning-entry'
+                'entryclass' => 'user_menu__entry--warning-entry',
             ]);
     }
 
     public static function getMenuIds(): array
     {
-        return [ 'section' ];
+        return ['section'];
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
index e5841c849..4296301c9 100644
--- a/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
@@ -1,63 +1,46 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Chill\TaskBundle\Templating\UI\CountNotificationTask;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\TaskBundle\Repository\SingleTaskRepository;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Chill\TaskBundle\Templating\UI\CountNotificationTask;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
 
     /**
-     *
      * @var CountNotificationTask
      */
     public $counter;
 
-    /*
+    /**
      * @var TokenStorageInterface
      */
     public $tokenStorage;
 
     /**
-     *
      * @var TranslatorInterface
      */
     public $translator;
 
-    /**
-     *
-     * @var AuthorizationCheckerInterface
-     */
-    public $authorizationChecker;
-
     public function __construct(
         CountNotificationTask $counter,
         TokenStorageInterface $tokenStorage,
@@ -70,14 +53,9 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         $this->authorizationChecker = $authorizationChecker;
     }
 
-    public static function getMenuIds(): array
-    {
-        return [ 'user' ];
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if (FALSE === $this->authorizationChecker->isGranted(TaskVoter::SHOW)) {
+        if (false === $this->authorizationChecker->isGranted(TaskVoter::SHOW)) {
             return;
         }
 
@@ -85,58 +63,63 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         $ended = $this->counter->countNotificationEnded($user);
         $warning = $this->counter->countNotificationWarning($user);
 
-        if ($ended > 0) {
+        if (0 < $ended) {
             $this->addItemInMenu(
                 $menu,
-                $user,
                 '%number% tasks over deadline',
-                'My tasks over deadline',
-                SingleTaskRepository::DATE_STATUS_ENDED,
                 $ended,
-                -15);
+                -15,
+                ['new', 'in_progress'],
+                ['alert']
+            );
         }
 
-        if ($warning > 0) {
+        if (0 < $warning) {
             $this->addItemInMenu(
                 $menu,
-                $user,
                 '%number% tasks near deadline',
-                'My tasks near deadline',
-                SingleTaskRepository::DATE_STATUS_WARNING,
                 $warning,
-                -14);
+                -14,
+                ['new', 'in_progress'],
+                ['warning']
+            );
         }
 
-        $menu->addChild("My tasks", [
-                'route' => 'chill_task_single_my_tasks'
-            ])
+        $menu->addChild('My tasks', [
+            'route' => 'chill_task_singletask_my_tasks',
+        ])
             ->setExtras([
                 'order' => -10,
-                'icon' => 'tasks'
+                'icon' => 'tasks',
             ]);
-
     }
 
-    protected function addItemInMenu(MenuItem $menu, User $u, $message, $title, $status, $number, $order)
+    public static function getMenuIds(): array
     {
-        if ($number > 0) {
+        return ['user'];
+    }
+
+    protected function addItemInMenu(MenuItem $menu, $message, $number, $order, array $states = [], array $status = [])
+    {
+        if (0 < $number) {
             $menu->addChild(
                 $this->translator->transChoice($message, $number),
                 [
-                    'route' => 'chill_task_singletask_list',
+                    'route' => 'chill_task_singletask_my_tasks',
                     'routeParameters' => [
-                        'user_id' => $u->getId(),
-                        'status' => [
-                            $status
+                        'f' => [
+                            'checkboxes' => [
+                                'states' => $states,
+                                'status' => $status,
                             ],
-                        'hide_form' => true,
-                        'title' => $this->translator->trans($title)
+                        ],
+                    ],
                 ]
-            ])
+            )
                 ->setExtras([
-                    'order'=> $order,
+                    'order' => $order,
                     'icon' => 'exclamation-triangle',
-                    'entryclass' => 'user_menu__entry--warning-entry'
+                    'entryclass' => 'user_menu__entry--warning-entry',
                 ]);
         }
     }
diff --git a/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
index d5c7627c0..c8b8982c2 100644
--- a/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/AbstractTaskRepository.php
@@ -1,9 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Repository;
 
 /**
- * AbstractTaskRepository
+ * AbstractTaskRepository.
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
diff --git a/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
index 4a48b32a5..c481236a5 100644
--- a/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/RecurringTaskRepository.php
@@ -1,9 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Repository;
 
 /**
- * RecurringTaskRepository
+ * RecurringTaskRepository.
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
new file mode 100644
index 000000000..3880a0a48
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
@@ -0,0 +1,362 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Repository;
+
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\TaskBundle\Entity\SingleTask;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use DateInterval;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Security\Core\Security;
+use function count;
+use function substr;
+
+final class SingleTaskAclAwareRepository implements SingleTaskAclAwareRepositoryInterface
+{
+    private AuthorizationHelperInterface $authorizationHelper;
+
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+
+    private EntityManagerInterface $em;
+
+    private Security $security;
+
+    public function __construct(
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
+        EntityManagerInterface $em,
+        Security $security,
+        AuthorizationHelperInterface $authorizationHelper
+    ) {
+        $this->centerResolverDispatcher = $centerResolverDispatcher;
+        $this->em = $em;
+        $this->security = $security;
+        $this->authorizationHelper = $authorizationHelper;
+    }
+
+    public function buildBaseQuery(
+        ?string $pattern = null,
+        ?array $flags = []
+    ): QueryBuilder {
+        $qb = $this->em->createQueryBuilder();
+        $qb
+            ->from(SingleTask::class, 't');
+
+        if (!empty($pattern)) {
+            $qb->andWhere($qb->expr()->like('LOWER(UNACCENT(t.title))', 'LOWER(UNACCENT(:pattern))'))
+                ->setParameter('pattern', '%' . $pattern . '%');
+        }
+
+        if (count($flags) > 0) {
+            $orXDate = $qb->expr()->orX();
+            $orXState = $qb->expr()->orX();
+            $now = new DateTime();
+
+            foreach ($flags as $key => $flag) {
+                switch ($flag) {
+                   case 'no-alert':
+                       $orXDate
+                           ->add(
+                               $qb->expr()->orX(
+                                   $qb->expr()->isNull('t.endDate'),
+                                   $qb->expr()->gte('t.endDate - COALESCE(t.warningInterval, :intervalBlank)', ':now')
+                               )
+                           );
+                       $qb
+                           ->setParameter('intervalBlank', new DateInterval('P0D'))
+                           ->setParameter('now', $now);
+
+                       break;
+
+                   case 'warning':
+                       $orXDate
+                           ->add(
+                               $qb->expr()->andX(
+                                   $qb->expr()->not($qb->expr()->isNull('t.endDate')),
+                                   $qb->expr()->not($qb->expr()->isNull('t.warningInterval')),
+                                   $qb->expr()->lte('t.endDate - t.warningInterval', ':now'),
+                                   $qb->expr()->gt('t.endDate', ':now')
+                               )
+                           );
+                       $qb
+                           ->setParameter('now', $now);
+
+                       break;
+
+                   case 'alert':
+                       $orXDate
+                           ->add(
+                               $qb->expr()->andX(
+                                   $qb->expr()->not($qb->expr()->isNull('t.endDate')),
+                                   $qb->expr()->lte('t.endDate', ':now')
+                               )
+                           );
+                       $qb
+                           ->setParameter('now', $now);
+
+                       break;
+
+                   case 'state_new':
+                       $orXState
+                           ->add(
+                               'JSONB_ARRAY_LENGTH(t.currentStates) = 0'
+                           );
+
+                       break;
+
+                   case substr($flag, 0, 6) === 'state_':
+                       $state = substr($flag, 6);
+                       $orXState
+                           ->add(
+                               "JSONB_EXISTS_IN_ARRAY(t.currentStates, :state_{$key}) = 'TRUE'"
+                           );
+                       $qb->setParameter("state_{$key}", $state);
+
+                       break;
+
+                   default:
+                       throw new LogicException("this flag is not supported: {$flag}");
+               }
+            }
+
+            if ($orXDate->count() > 0) {
+                $qb->andWhere($orXDate);
+            }
+
+            if ($orXState->count() > 0) {
+                $qb->andWhere($orXState);
+            }
+        }
+
+        return $qb;
+    }
+
+    public function buildQueryByCourse(
+        AccompanyingPeriod $course,
+        ?string $pattern = null,
+        ?array $flags = []
+    ): QueryBuilder {
+        $qb = $this->buildBaseQuery($pattern, $flags);
+
+        return $qb
+            ->andWhere($qb->expr()->eq('t.course', ':course'))
+            ->setParameter('course', $course);
+    }
+
+    public function buildQueryByPerson(
+        Person $person,
+        ?string $pattern = null,
+        ?array $flags = []
+    ): QueryBuilder {
+        $qb = $this->buildBaseQuery($pattern, $flags);
+
+        return $qb
+            ->andWhere($qb->expr()->eq('t.person', ':person'))
+            ->setParameter('person', $person);
+    }
+
+    public function buildQueryMyTasks(
+        ?string $pattern = null,
+        ?array $flags = []
+    ): QueryBuilder {
+        $qb = $this->buildBaseQuery($pattern, $flags);
+
+        return $qb
+            ->andWhere($qb->expr()->eq('t.assignee', ':user'))
+            ->setParameter('user', $this->security->getUser());
+    }
+
+    public function countByAllViewable(
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int {
+        $qb = $this->buildBaseQuery($pattern, $flags);
+
+        return $this
+            ->addACLGlobal($qb)
+            ->select('COUNT(t)')
+            ->getQuery()->getSingleScalarResult();
+    }
+
+    public function countByCourse(
+        AccompanyingPeriod $course,
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int {
+        $qb = $this->buildQueryByCourse($course, $pattern, $flags);
+
+        return $this
+            ->addACL($qb, $course)
+            ->select('COUNT(t)')
+            ->getQuery()->getSingleScalarResult();
+    }
+
+    public function countByCurrentUsersTasks(
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int {
+        return $this->buildQueryMyTasks($pattern, $flags)
+            ->select('COUNT(t)')
+            ->getQuery()->getSingleScalarResult();
+    }
+
+    public function countByPerson(
+        Person $person,
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int {
+        $qb = $this->buildQueryByPerson($person, $pattern, $flags);
+
+        return $this
+            ->addACL($qb, $person)
+            ->select('COUNT(t)')
+            ->getQuery()->getSingleScalarResult();
+    }
+
+    public function findByAllViewable(
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array {
+        $qb = $this->buildBaseQuery($pattern, $flags);
+        $qb = $this->addACLGlobal($qb);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function findByCourse(
+        AccompanyingPeriod $course,
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array {
+        $qb = $this->buildQueryByCourse($course, $pattern, $flags);
+        $qb = $this->addACL($qb, $course);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function findByCurrentUsersTasks(
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array {
+        $qb = $this->buildQueryMyTasks($pattern, $flags);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function findByPerson(
+        Person $person,
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array {
+        $qb = $this->buildQueryByPerson($person, $pattern, $flags);
+        $qb = $this->addACL($qb, $person);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function getResult(
+        QueryBuilder $qb,
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array {
+        $qb->select('t');
+
+        $qb
+            ->setFirstResult($start)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('t.' . $field, $direction);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function addACL(
+        QueryBuilder $qb,
+        $entity
+    ): QueryBuilder {
+        $scopes = $this->authorizationHelper->getReachableScopes(
+            $this->security->getUser(),
+            TaskVoter::SHOW,
+            $this->centerResolverDispatcher->resolveCenter($entity)
+        );
+
+        return $qb->andWhere($qb->expr()->in('t.circle', ':scopes'))
+            ->setParameter('scopes', $scopes);
+    }
+
+    private function addACLGlobal(
+        QueryBuilder $qb
+    ): QueryBuilder {
+        $allowedCenters = $this->authorizationHelper
+            ->getReachableCenters($this->security->getUser(), TaskVoter::SHOW);
+
+        if ([] === $allowedCenters) {
+            $qb
+                ->andWhere($qb->expr()->lt('t.id', ':falseid'))
+                ->setParameter('falseid', -1);
+        }
+
+        $qb->leftJoin('t.person', 'person')
+            ->leftJoin('t.course', 'course')
+            ->leftJoin('course.participations', 'participation')
+            ->leftJoin('participation.person', 'person_p');
+        $qb->distinct(true);
+
+        $k = 0;
+        $orX = $qb->expr()->orX();
+
+        foreach ($allowedCenters as $center) {
+            $allowedScopes = $this->authorizationHelper->getReachableScopes(
+                $this->security->getUser(),
+                TaskVoter::SHOW,
+                $center
+            );
+
+            $and = $qb->expr()->andX(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('person.center', ':center_' . $k),
+                    $qb->expr()->eq('person_p.center', ':center_' . $k)
+                ),
+                $qb->expr()->in('t.circle', ':scopes_' . $k)
+            );
+            $qb
+                ->setParameter('center_' . $k, $center)
+                ->setParameter('scopes_' . $k, $allowedScopes);
+            $orX->add($and);
+
+            ++$k;
+        }
+        $qb->andWhere($orX);
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
new file mode 100644
index 000000000..84679c34f
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepositoryInterface.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Repository;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+
+interface SingleTaskAclAwareRepositoryInterface
+{
+    public function countByAllViewable(
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int;
+
+    public function countByCourse(
+        AccompanyingPeriod $course,
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int;
+
+    public function countByCurrentUsersTasks(?string $pattern = null, ?array $flags = []): int;
+
+    public function countByPerson(
+        Person $person,
+        ?string $pattern = null,
+        ?array $flags = []
+    ): int;
+
+    public function findByAllViewable(
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array;
+
+    public function findByCourse(
+        AccompanyingPeriod $course,
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array;
+
+    public function findByCurrentUsersTasks(?string $pattern = null, ?array $flags = [], ?int $start = 0, ?int $limit = 50, ?array $orderBy = []): array;
+
+    public function findByPerson(
+        Person $person,
+        ?string $pattern = null,
+        ?array $flags = [],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = []
+    ): array;
+}
diff --git a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
index b63e3127e..563f269cf 100644
--- a/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+++ b/src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
@@ -1,58 +1,68 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Repository;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use LogicException;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Doctrine\DBAL\Types\Type;
-use Chill\MainBundle\Entity\Center;
+use UnexpectedValueException;
+use function array_key_exists;
+use function count;
 
 /**
- * Class SingleTaskRepository
- *
- * @package Chill\TaskBundle\Repository
+ * Class SingleTaskRepository.
  */
 class SingleTaskRepository extends EntityRepository
 {
+    public const DATE_STATUS_CURRENT = 'current';
 
-    const DATE_STATUS_ENDED = 'ended';
-    const DATE_STATUS_WARNING = 'warning';
-    const DATE_STATUS_CURRENT = 'current';
-    const DATE_STATUS_NOT_STARTED = 'not_started';
+    public const DATE_STATUS_ENDED = 'ended';
 
-    const DATE_STATUSES = [
+    public const DATE_STATUS_NOT_STARTED = 'not_started';
+
+    public const DATE_STATUS_WARNING = 'warning';
+
+    public const DATE_STATUSES = [
         self::DATE_STATUS_ENDED,
         self::DATE_STATUS_WARNING,
         self::DATE_STATUS_CURRENT,
-        self::DATE_STATUS_NOT_STARTED
+        self::DATE_STATUS_NOT_STARTED,
     ];
 
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
-    public function setAuthorizationHelper(AuthorizationHelper $authorizationHelper)
-    {
-        $this->authorizationHelper = $authorizationHelper;
-    }
-
     /**
      * Count the tasks for given parameters.
      *
      * The parameters are describe in @see SingleTaskRepository::filterByParameters.
      *
      * @see SingleTaskRepository::filterByParameters
+     *
      * @param array $params
      * @param User $currentUser
+     *
      * @return int
      */
-    public function countByParameters($params, User $currentUser = null)
+    public function countByParameters($params, ?User $currentUser = null)
     {
         $qb = $this->createQueryBuilder('st')
             ->select('COUNT(st)');
@@ -61,8 +71,7 @@ class SingleTaskRepository extends EntityRepository
 
         return (int) $qb
             ->getQuery()
-            ->getSingleScalarResult()
-            ;
+            ->getSingleScalarResult();
     }
 
     /**
@@ -80,9 +89,7 @@ class SingleTaskRepository extends EntityRepository
      * - `types`: string[] an array of task types
      *
      * @param type $params
-     * @param User $currentUser
-     * @param int $firstResult
-     * @param int $maxResults
+     *
      * @return type
      */
     public function findByParameters($params, User $currentUser, int $firstResult = 0, int $maxResults = 50)
@@ -93,68 +100,16 @@ class SingleTaskRepository extends EntityRepository
 
         $qb
             ->setMaxResults($maxResults)
-            ->setFirstResult($firstResult)
-            ;
+            ->setFirstResult($firstResult);
 
         return $qb
             ->getQuery()
-            ->getResult()
-            ;
+            ->getResult();
     }
 
-    protected function buildQuery(QueryBuilder $qb, $params, User $currentUser = null)
+    public function setAuthorizationHelper(AuthorizationHelper $authorizationHelper)
     {
-        if (NULL !== $currentUser) {
-            $this->buildACLQuery($qb, $currentUser);
-        }
-
-        if (\array_key_exists('person', $params) and !empty($params['person'])) {
-            $qb->andWhere($qb->expr()->eq('st.person', ':person'));
-            $qb->setParameter('person', $params['person']);
-        } elseif (\array_key_exists('center', $params)) {
-            if ($params['center'] instanceof Center) {
-                $qb->join('st.person', 'person');
-                $qb->andWhere($qb->expr()->eq('person.center', ':center'));
-                $qb->setParameter('center', $params['center']);
-            } else {
-                throw new \UnexpectedValueException("params 'center' should be an instance of ".Center::class);
-            }
-        }
-        
-        if (\array_key_exists('unassigned', $params) and $params['unassigned'] === true) {
-            if (\array_key_exists('user', $params) and !empty($params['user'])) {
-                throw new \UnexpectedValueException("You should not require for "
-                    . "unassigned tasks and tasks assigned to some user.");
-            }
-            
-            $qb->andWhere($qb->expr()->isNull('st.assignee'));
-        }
-
-        if (\array_key_exists('user', $params) and !empty($params['user'])) {
-            $qb->andWhere($qb->expr()->eq('st.assignee', ':user'));
-            $qb->setParameter('user', $params['user']);
-        }
-
-        if (\array_key_exists('scope', $params) and !empty($params['scope'])) {
-            $qb->andWhere($qb->expr()->eq('st.circle', ':scope'));
-            $qb->setParameter('scope', $params['scope']);
-        }
-        
-        if (\array_key_exists('types', $params) && $params['types'] !== NULL) {
-            if (count($params['types']) > 0) {
-                $qb->andWhere($qb->expr()->in('st.type', ':types'));
-                $qb->setParameter('types', $params['types']);
-            }
-        }
-
-        if (\array_key_exists('date_status', $params) and !empty($params['date_status'])) {
-            $this->addTypeFilter($qb, $params);
-        }
-
-        if (\array_key_exists('is_closed', $params)) {
-            $qb->andWhere($this->buildIsClosed($qb, !$params['is_closed']));
-        }
-        
+        $this->authorizationHelper = $authorizationHelper;
     }
 
     protected function addTypeFilter(QueryBuilder $qb, $params)
@@ -164,15 +119,15 @@ class SingleTaskRepository extends EntityRepository
         switch ($params['date_status']) {
             case self::DATE_STATUS_ENDED:
                 $andWhere
-                    ->add($this->buildNowIsAfterEndDate($qb))
-                    ;
+                    ->add($this->buildNowIsAfterEndDate($qb));
+
                 break;
 
             case self::DATE_STATUS_WARNING:
                 $andWhere
                     ->add($this->buildNowIsAfterEndDate($qb, true))
-                    ->add($this->buildNowIsAfterWarningDate($qb))
-                    ;
+                    ->add($this->buildNowIsAfterWarningDate($qb));
+
                 break;
 
             case self::DATE_STATUS_CURRENT:
@@ -180,125 +135,174 @@ class SingleTaskRepository extends EntityRepository
                 $andWhere
                     ->add($this->buildNowIsAfterEndDate($qb, true))
                     ->add($this->buildNowIsAfterWarningDate($qb, true))
-                    ->add($this->buildNowIsAfterStartDate($qb, false))
-                    ;
+                    ->add($this->buildNowIsAfterStartDate($qb, false));
+
                 break;
 
             case self::DATE_STATUS_NOT_STARTED:
                 $andWhere
                     ->add($this->buildNowIsAfterEndDate($qb, true))
                     ->add($this->buildNowIsAfterWarningDate($qb, true))
-                    ->add($this->buildNowIsAfterStartDate($qb, true))
-                    ;
+                    ->add($this->buildNowIsAfterStartDate($qb, true));
         }
-        $qb->setParameter('now', new \DateTime('today'), Type::DATE);
+        $qb->setParameter('now', new DateTime('today'), Types::DATE_MUTABLE);
         $qb->andWhere($andWhere);
     }
 
-    private function buildNowIsAfterEndDate(QueryBuilder $qb, $negative = false)
-    {
-        if ($negative === false) {
-            return $qb->expr()->andX()
-                ->add($qb->expr()->isNotNull('st.endDate'))
-                ->add($qb->expr()->lte('st.endDate', ':now'))
-                ;
-        } else {
-            return $qb->expr()->orX()
-                ->add(
-                    $qb->expr()->andX()
-                        ->add($qb->expr()->isNotNull('st.endDate'))
-                        ->add($qb->expr()->gt('st.endDate', ':now'))
-                    )
-                ->add($qb->expr()->isNull('st.endDate'))
-                ;
-        }
-    }
-
-    private function buildNowIsAfterWarningDate(QueryBuilder $qb, bool $negative = false)
-    {
-        if ($negative === false) {
-            return $qb->expr()->andX()
-                ->add($qb->expr()->lte(
-                    $qb->expr()->diff('st.endDate', 'st.warningInterval'), ':now'
-                    )
-                );
-        } else {
-            return $qb->expr()->orX()
-                ->add(
-                    $qb->expr()->andX()
-                        ->add($qb->expr()->isNotNull('st.endDate'))
-                        ->add($qb->expr()->isNotNull('st.warningInterval'))
-                        ->add($qb->expr()->gt(
-                            $qb->expr()->diff('st.endDate', 'st.warningInterval'),
-                            ':now'
-                            )
-                    )
-                )
-                ->add($qb->expr()->isNull('st.endDate'))
-                ->add($qb->expr()->isNull('st.warningInterval'))
-                ;
-        }
-    }
-
-    private function buildNowIsAfterStartDate(QueryBuilder $qb, bool $negative = false)
-    {
-        if ($negative === false) {
-            return $qb->expr()->orX()
-                    ->add($qb->expr()->lte('st.startDate', ':now'))
-                    ->add($qb->expr()->isNull('st.startDate'))
-                ;
-        } else {
-            return
-                $qb->expr()->andX()
-                    ->add($qb->expr()->gt('st.startDate', ':now'))
-                    ->add($qb->expr()->isNotNull('st.startDate'))
-                ;
-        }
-    }
-
-    private function buildIsClosed(QueryBuilder $qb, bool $negative = false)
-    {
-        if ($negative === false) {
-            return $qb->expr()->eq('st.closed', "'TRUE'");
-        } else {
-            return $qb->expr()->eq('st.closed', "'FALSE'");
-        }
-    }
-
-
     protected function buildACLQuery(QueryBuilder $qb, User $currentUser)
     {
-        if (NULL === $this->authorizationHelper) {
-            throw new \LogicException("Injecting the authorization helper is "
-                . "required to run this query. Please use dependency injection "
-                . "to initialize this repository or use the method "
-                . "`setAuthorizationHelper`");
+        if (null === $this->authorizationHelper) {
+            throw new LogicException('Injecting the authorization helper is '
+                . 'required to run this query. Please use dependency injection '
+                . 'to initialize this repository or use the method '
+                . '`setAuthorizationHelper`');
         }
 
         $role = new Role(TaskVoter::SHOW);
         $qb->join('st.person', 'p');
 
         $centers = $this->authorizationHelper
-            ->getReachableCenters($currentUser, $role)
-            ;
+            ->getReachableCenters($currentUser, $role);
 
         $i = 0;
         $where = $qb->expr()->orX();
 
-        foreach($centers as $center) {
+        foreach ($centers as $center) {
             $circles = $this->authorizationHelper
                 ->getReachableCircles($currentUser, $role, $center);
 
             $centerWhere = $qb->expr()->andX();
 
-            $centerWhere->add($qb->expr()->eq('p.center', ':center_'.$i));
-            $qb->setParameter('center_'.$i, $center);
-            $centerWhere->add($qb->expr()->in('st.circle', ':circles_'.$i));
-            $qb->setParameter('circles_'.$i, $circles);
+            $centerWhere->add($qb->expr()->eq('p.center', ':center_' . $i));
+            $qb->setParameter('center_' . $i, $center);
+            $centerWhere->add($qb->expr()->in('st.circle', ':circles_' . $i));
+            $qb->setParameter('circles_' . $i, $circles);
             $where->add($centerWhere);
-            $i ++;
+            ++$i;
         }
 
         $qb->where($where);
     }
+
+    protected function buildQuery(QueryBuilder $qb, $params, ?User $currentUser = null)
+    {
+        if (null !== $currentUser) {
+            $this->buildACLQuery($qb, $currentUser);
+        }
+
+        if (array_key_exists('person', $params) && !empty($params['person'])) {
+            $qb->andWhere($qb->expr()->eq('st.person', ':person'));
+            $qb->setParameter('person', $params['person']);
+        } elseif (array_key_exists('center', $params)) {
+            if ($params['center'] instanceof Center) {
+                $qb->join('st.person', 'person');
+                $qb->andWhere($qb->expr()->eq('person.center', ':center'));
+                $qb->setParameter('center', $params['center']);
+            } else {
+                throw new UnexpectedValueException("params 'center' should be an instance of " . Center::class);
+            }
+        }
+
+        if (array_key_exists('unassigned', $params) && true === $params['unassigned']) {
+            if (array_key_exists('user', $params) && !empty($params['user'])) {
+                throw new UnexpectedValueException('You should not require for '
+                    . 'unassigned tasks and tasks assigned to some user.');
+            }
+
+            $qb->andWhere($qb->expr()->isNull('st.assignee'));
+        }
+
+        if (array_key_exists('user', $params) && !empty($params['user'])) {
+            $qb->andWhere($qb->expr()->eq('st.assignee', ':user'));
+            $qb->setParameter('user', $params['user']);
+        }
+
+        if (array_key_exists('scope', $params) && !empty($params['scope'])) {
+            $qb->andWhere($qb->expr()->eq('st.circle', ':scope'));
+            $qb->setParameter('scope', $params['scope']);
+        }
+
+        if (array_key_exists('types', $params) && null !== $params['types']) {
+            if (count($params['types']) > 0) {
+                $qb->andWhere($qb->expr()->in('st.type', ':types'));
+                $qb->setParameter('types', $params['types']);
+            }
+        }
+
+        if (array_key_exists('date_status', $params) && !empty($params['date_status'])) {
+            $this->addTypeFilter($qb, $params);
+        }
+
+        if (array_key_exists('is_closed', $params)) {
+            $qb->andWhere($this->buildIsClosed($qb, !$params['is_closed']));
+        }
+    }
+
+    private function buildIsClosed(QueryBuilder $qb, bool $negative = false)
+    {
+        if (false === $negative) {
+            return $qb->expr()->eq('st.closed', "'TRUE'");
+        }
+
+        return $qb->expr()->eq('st.closed', "'FALSE'");
+    }
+
+    private function buildNowIsAfterEndDate(QueryBuilder $qb, $negative = false)
+    {
+        if (false === $negative) {
+            return $qb->expr()->andX()
+                ->add($qb->expr()->isNotNull('st.endDate'))
+                ->add($qb->expr()->lte('st.endDate', ':now'));
+        }
+
+        return $qb->expr()->orX()
+            ->add(
+                $qb->expr()->andX()
+                    ->add($qb->expr()->isNotNull('st.endDate'))
+                    ->add($qb->expr()->gt('st.endDate', ':now'))
+            )
+            ->add($qb->expr()->isNull('st.endDate'));
+    }
+
+    private function buildNowIsAfterStartDate(QueryBuilder $qb, bool $negative = false)
+    {
+        if (false === $negative) {
+            return $qb->expr()->orX()
+                ->add($qb->expr()->lte('st.startDate', ':now'))
+                ->add($qb->expr()->isNull('st.startDate'));
+        }
+
+        return
+                $qb->expr()->andX()
+                    ->add($qb->expr()->gt('st.startDate', ':now'))
+                    ->add($qb->expr()->isNotNull('st.startDate'));
+    }
+
+    private function buildNowIsAfterWarningDate(QueryBuilder $qb, bool $negative = false)
+    {
+        if (false === $negative) {
+            return $qb->expr()->andX()
+                ->add(
+                    $qb->expr()->lte(
+                        $qb->expr()->diff('st.endDate', 'st.warningInterval'),
+                        ':now'
+                    )
+                );
+        }
+
+        return $qb->expr()->orX()
+            ->add(
+                $qb->expr()->andX()
+                    ->add($qb->expr()->isNotNull('st.endDate'))
+                    ->add($qb->expr()->isNotNull('st.warningInterval'))
+                    ->add(
+                        $qb->expr()->gt(
+                            $qb->expr()->diff('st.endDate', 'st.warningInterval'),
+                            ':now'
+                        )
+                    )
+            )
+            ->add($qb->expr()->isNull('st.endDate'))
+            ->add($qb->expr()->isNull('st.warningInterval'));
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss
index 3350a4ace..e69cf0325 100644
--- a/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss
+++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss
@@ -1,13 +1,21 @@
+/*
+     !!!!!!!
+    This is a legacy version for task list. The new task are now
+    layed out in page/tile_list/index.js
+    !!!!!!
+*/
+
 table.chill-task-list {
+
     .chill-task-list__row > div {
         margin-bottom: 0.50rem;
     }
-    
+
     .chill-task-list__row__title {
         font-weight: bold;
         font-size: 1.40rem;
     }
-    
+
     .chill-task-list__row__type {
         font-variant: small-caps;
         display: inline;
@@ -21,31 +29,31 @@ table.chill-task-list {
         border: 1px solid var(--chill-dark-gray);
         color: var(--chill-dark-gray);
     }
-    
+
     .chill-task-list__row__person-for {
         display: inline;
         font-weight: bold;
     }
-    
+
     .chill-task-list__row__assignee {
         display: inline;
-        
+
     }
-    
+
     .chill_task-list__row__assignee_by {
         display: inline;
         font-weight: bold;
     }
-    
+
     .chill-task-list__row__dates {
         & > ul {
             display: inline;
             list-style: none;
-            
+
             & > li {
                 display: inline;
                 margin-right: 0.25rem;
-                
+
             }
         }
     }
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
index 5e371359e..4f598fc7b 100644
--- a/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
+++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss
@@ -1,34 +1,22 @@
+// Access to Bootstrap variables and mixins
+@import '~ChillMainAssets/module/bootstrap/shared';
+
 .task-status {
-    &.box {
-        font-variant: small-caps;
-        display: inline;
-        padding: .2em .6em .3em;
-        font-size: 0.88rem;
-        font-weight: bold;
-        line-height: 1;
-        text-align: center;
-        white-space: nowrap;
-        vertical-align: baseline;
-        border-radius: .25em;
-        color: white;
+
+    //  'new', 'in_progress', 'closed', 'canceled'
+    &.place-new {
+        background-color: $chill-yellow;
     }
-    
-    &.type-task_default {
-        //  'new', 'in_progress', 'closed', 'canceled'
-            &.place-new {
-                background-color: var(--chill-yellow);
-            }
 
-            &.place-in_progress {
-                background-color: var(--chill-green);
-            }
+    &.place-in_progress {
+        background-color: $chill-green;
+    }
 
-            &.place-closed {
-                background-color: var(--chill-blue);
-            }
+    &.place-closed {
+        background-color: $chill-blue;
+    }
 
-            &.place-canceled {
-                background-color: var(--chill-beige);
-            }
+    &.place-canceled {
+        background-color: $chill-beige;
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/page/tile_list/index.js b/src/Bundle/ChillTaskBundle/Resources/public/page/tile_list/index.js
new file mode 100644
index 000000000..a8217c7a7
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/public/page/tile_list/index.js
@@ -0,0 +1 @@
+require("./task_list.scss");
diff --git a/src/Bundle/ChillTaskBundle/Resources/public/page/tile_list/task_list.scss b/src/Bundle/ChillTaskBundle/Resources/public/page/tile_list/task_list.scss
new file mode 100644
index 000000000..4c71462d1
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/public/page/tile_list/task_list.scss
@@ -0,0 +1,24 @@
+.chill-task-list {
+    .task-type {
+        font-variant: small-caps;
+        display: inline;
+        padding: 0.05rem .15rem;
+        font-size: 0.88rem;
+        font-weight: light;
+        line-height: 1;
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+        border: 1px solid var(--chill-dark-gray);
+        color: var(--chill-dark-gray);
+    }
+
+    .assignee {
+        text-align: right;
+    }
+
+    .dates {
+        text-align: right;
+    }
+
+}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/confirm_delete.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/confirm_delete.html.twig
new file mode 100644
index 000000000..02a0aa31d
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/confirm_delete.html.twig
@@ -0,0 +1,19 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_task_task_list' %}
+{% set course = task.course %}
+
+{% block title 'Remove task'|trans %}
+
+{% block content %}
+
+	{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Remove task'|trans,
+        'confirm_question'  : 'Are you sure you want to remove the task "%title%" ?'|trans({ '%title%' : task.title } ),
+        'cancel_route'      : 'chill_task_singletask_by-course_list',
+        'cancel_parameters' : {'id' : task.course.id },
+        'form'              : delete_form,
+    } ) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/edit.html.twig
new file mode 100644
index 000000000..ccf0bab04
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/edit.html.twig
@@ -0,0 +1,15 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_task_single_task_edit' %}
+{% set course = task.course %}
+
+{% block title %}
+	{{ 'Edit task'|trans }}
+{% endblock %}
+
+{% block content %}
+
+	{% include '@ChillTask/SingleTask/_edit.html.twig' %}
+
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
new file mode 100644
index 000000000..d00ee7a5e
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
@@ -0,0 +1,46 @@
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
+{% block title 'Tasks for this accompanying period'|trans %}
+
+{% block content %}
+    <div class="col-md-10 col-xxl">
+
+        <h1>{{ block('title') }}</h1>
+
+        {{ filter_order|chill_render_filter_order_helper }}
+
+        {% if tasks|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'Any tasks'|trans }}</p>
+        {% else %}
+            <div class="flex-table chill-task-list">
+                {% for task in tasks %}
+                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : false } %}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {{ chill_pagination(paginator) }}
+
+        {% if is_granted('CHILL_TASK_TASK_CREATE_FOR_COURSE', accompanyingCourse) %}
+            <ul class="record_actions sticky-form-buttons">
+                <li>
+                    {% if accompanyingCourse is not null %}
+                        <a href="{{ path('chill_task_single_task_new', {'course_id': accompanyingCourse.id}) }}" class="btn btn-create">
+                            {{ 'Create' | trans }}
+                        </a>
+                    {% endif %}
+                </li>
+            </ul>
+        {% endif %}
+
+    </div>
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('page_task_list') }}
+{% endblock %}
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('page_task_list') }}
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/new.html.twig
new file mode 100644
index 000000000..b8f810540
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/new.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_task_single_task_new' %}
+{# {% set person = task.person %} #}
+
+{% block title %}
+	{{ 'New task'|trans }}
+{% endblock %}
+
+{% block content %}
+	{% include '@ChillTask/SingleTask/_new.html.twig' %}
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/show.html.twig
new file mode 100644
index 000000000..06ff62a60
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/show.html.twig
@@ -0,0 +1,17 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+
+{% set activeRouteKey = 'chill_task_single_task_show' %}
+{% set accompanyingCourse = task.course %}
+
+{% block title %}
+	{{ 'Task'|trans }}
+{% endblock %}
+
+
+{% block content %}
+
+	{% include '@ChillTask/SingleTask/_show.html.twig' %}
+
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/transition.html.twig
new file mode 100644
index 000000000..08bedd31c
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/transition.html.twig
@@ -0,0 +1,12 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_task_task_list' %}
+{% set accompanyingCourse = task.course %}
+
+{% block title  'Remove task'|trans %}
+
+{% block content %}
+
+	{% include '@ChillTask/SingleTask/_transition.html.twig' %}
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
new file mode 100644
index 000000000..8fe45959e
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
@@ -0,0 +1,34 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block title 'Tasks'|trans %}
+
+{% block content %}
+    <div class="col-md-10 col-xxl">
+
+        <h1>{{ block('title') }}</h1>
+
+        {{ filter_order|chill_render_filter_order_helper }}
+
+        {% if tasks|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'Any tasks'|trans }}</p>
+        {% else %}
+            <div class="flex-table chill-task-list">
+                {% for task in tasks %}
+                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : true} %}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {{ chill_pagination(paginator) }}
+
+    </div>
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('page_task_list') }}
+{% endblock %}
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('page_task_list') }}
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
new file mode 100644
index 000000000..284769448
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
@@ -0,0 +1,125 @@
+<div class="item-bloc">
+    <div class="item-row">
+        <div class="item-col">
+            <div class="denomination h2">
+                {{ task.title }}
+                {% for place in workflow_marked_places(task) %}
+                    <span class="task-status badge type-{{ task.type }} place-{{ place }}">
+                        {{ place|trans }}
+                    </span>
+                {% endfor %}
+            </div>
+            {% if  task.type != 'task_default'%}
+                <span class="task-type">
+                    {{ task_workflow_metadata(task, 'definition.name')|trans }}
+                </span>
+            {% endif %}
+            {% if showContext %}
+                <div>
+                    {% if task.person is not null %}
+                        <span class="chill-task-list__row__person">
+                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                    targetEntity: { name: 'person', id: task.person.id },
+                                                    action: 'show',
+                                                    displayBadge: true,
+                                                    buttonText: task.person|chill_entity_render_string
+                                                } %}
+                                            </span>
+                    {% elseif task.course is not null %}
+                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': task.course.id }) }}"
+                           class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
+                            <i class="fa fa-random fa-fw"></i>
+                        </a>
+
+                        {% for part in task.course.currentParticipations %}
+                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                targetEntity: { name: 'person', id: part.person.id },
+                                action: 'show',
+                                displayBadge: true,
+                                buttonText: part.person|chill_entity_render_string
+                            } %}
+                        {% endfor %}
+
+                    {% endif %}
+                </div>
+            {% endif %}
+        </div>
+
+
+        <div class="item-col">
+            <div class="container">
+                {% if task.assignee is not null %}
+                    <div class="assignee row">
+                        <span>{{ task.assignee|chill_entity_render_box }}</span>
+                    </div>
+                {% endif %}
+
+                {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
+                    <div class="dates row">
+                        <ul class="column">
+                            {% if task.startDate is not null %}
+                                <li title="{{ 'Start'|trans|escape('html_attr') }}">
+                                    <i class="fa fa-play"></i>
+                                    {{ task.startDate|format_date('medium') }}
+                                </li>
+                            {% endif %}
+                            {% if task.warningDate is not null %}
+                                <li title="{{ 'Warning'|trans|escape('html_attr') }}">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                    {{ task.warningDate|format_date('medium') }}
+                                </li>
+                            {% endif %}
+                            {% if task.endDate is not null %}
+                                <li title="{{ 'End'|trans|escape('html_attr') }}">
+                                    <i class="fa fa-hourglass-end"></i>
+                                    {{ task.endDate|format_date('medium') }}
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                {% endif %}
+            </div>
+
+        </div>
+
+    </div>
+    <div class="item-row separator">
+        <ul class="record_actions">
+            {% if workflow_transitions(task)|length > 0 %}
+                <li>
+                    <div class="btn-group">
+                        <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+                            {{'Change task status'|trans}}
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="taskExchange">
+                            {% for transition in workflow_transitions(task) %}
+                                <li>
+                                    <a class="dropdown-item" href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+                                        {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+                                    </a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </li>
+            {% endif %}
+
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_task_single_task_show', { 'id': task.id }) }}" class="btn btn-show "></a>
+            </li>
+
+            {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_task_single_task_edit', { 'id': task.id }) }}" class="btn btn-update "></a>
+                </li>
+            {% endif %}
+
+            {% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete "></a>
+                </li>
+            {% endif %}
+        </ul>
+
+    </div>
+</div>
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
new file mode 100644
index 000000000..5d7e88542
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
@@ -0,0 +1,34 @@
+{% extends 'ChillMainBundle::layout.html.twig' %}
+
+{% block title 'My tasks'|trans %}
+
+{% block content %}
+    <div class="col-md-10 col-xxl">
+
+        <h1>{{ block('title') }}</h1>
+
+        {{ filter_order|chill_render_filter_order_helper }}
+
+        {% if tasks|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'Any tasks'|trans }}</p>
+        {% else %}
+            <div class="flex-table chill-task-list">
+                {% for task in tasks %}
+                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : true} %}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {{ chill_pagination(paginator) }}
+
+    </div>
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('page_task_list') }}
+{% endblock %}
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('page_task_list') }}
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_delete.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig
similarity index 100%
rename from src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_delete.html.twig
rename to src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/confirm_delete.html.twig
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig
new file mode 100644
index 000000000..6188bd859
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/edit.html.twig
@@ -0,0 +1,31 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+#}
+{% extends person is defined ? "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_task_single_task_edit' %}
+{% set person = task.person %}
+
+{% block title %}
+	{{ 'Edit task'|trans }}
+{% endblock %}
+
+{% block personcontent %}
+
+	{% include '@ChillTask/SingleTask/_edit.html.twig' %}
+
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
new file mode 100644
index 000000000..ee236b644
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
@@ -0,0 +1,44 @@
+{% extends '@ChillPerson/Person/layout.html.twig' %}
+
+{% set activeRouteKey = '' %}
+
+{% block title 'Tasks for {{ name }}'|trans({ '{{ name }}' : person|chill_entity_render_string }) %}
+
+{% block personcontent %}
+    <div class="col-md-10 col-xxl">
+
+        <h1>{{ block('title') }}</h1>
+
+        {{ filter_order|chill_render_filter_order_helper }}
+
+        {% if tasks|length == 0 %}
+            <p class="chill-no-data-statement">{{ 'Any tasks'|trans }}</p>
+        {% else %}
+            <div class="flex-table chill-task-list">
+                {% for task in tasks %}
+                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : false } %}
+                {% endfor %}
+            </div>
+        {% endif %}
+
+        {{ chill_pagination(paginator) }}
+
+        {% if is_granted('CHILL_TASK_TASK_CREATE_FOR_PERSON', person) %}
+            <ul class="record_actions sticky-form-buttons">
+                <li>
+                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
+                        {{ 'Create' | trans }}
+                    </a>
+                </li>
+            </ul>
+        {% endif %}
+
+    </div>
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_task_list') }}
+{% endblock %}
+{% block js %}
+    {{ encore_entry_script_tags('page_task_list') }}
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig
similarity index 51%
rename from src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
rename to src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig
index 8f6ba2a4b..226956aec 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/new.html.twig
@@ -14,37 +14,17 @@
  * 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/>.
 #}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends person is defined ? "@ChillPerson/Person/layout.html.twig" : "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
 
 {% set activeRouteKey = 'chill_task_single_task_new' %}
 {% set person = task.person %}
 
-{% block title %}{{ 'New task'|trans }}{% endblock %}
+{% block title %}
+	{{ 'New task'|trans }}
+{% endblock %}
+
 
 {% block personcontent %}
-<div class="task-new">
-            
-            <h1>{{ 'New task'|trans }}</h1>
+	{% include '@ChillTask/SingleTask/_new.html.twig' %}
 
-            {{ form_start(form) }}
-            
-            {{ form_errors(form) }}
-
-            {{ form_row(form.title) }}
-            {{ form_row(form.description) }}
-            {{ form_row(form.assignee) }}
-            {{ form_row(form.circle) }}
-            {{ form_row(form.startDate) }}
-            {{ form_row(form.endDate) }}
-            {{ form_row(form.warningInterval) }}
-
-            <ul class="record_actions sticky-form-buttons">
-                <li>
-                    {{ form_widget(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'}  })  }}
-                </li>
-            </ul>
-
-            {{ form_end(form) }}
-
-</div>
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig
new file mode 100644
index 000000000..3ac97f0f3
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/show.html.twig
@@ -0,0 +1,33 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
+#}
+{% extends person is defined ? "@ChillPerson/Person/layout.html.twig" : "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+
+{% set activeRouteKey = 'chill_task_single_task_show' %}
+{% set person = task.person %}
+
+{% block title %}
+	{{ 'Task'|trans }}
+{% endblock %}
+
+
+{% block personcontent %}
+
+	{% include '@ChillTask/SingleTask/_show.html.twig' %}
+
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig
new file mode 100644
index 000000000..05009a2f0
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/transition.html.twig
@@ -0,0 +1,12 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_task_task_list' %}
+{% set person = task.person %}
+
+{% block title  'Remove task'|trans %}
+
+{% block personcontent %}
+
+{% include '@ChillTask/SingleTask/_transition.html.twig' %}
+
+{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_edit.html.twig
new file mode 100644
index 000000000..d0a906c9c
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_edit.html.twig
@@ -0,0 +1,27 @@
+<div class="task-edit">
+
+	<h1>{{ 'Edit task'|trans }}</h1>
+
+	{{ form_start(form) }}
+
+	{{ form_row(form.title) }}
+	{{ form_row(form.description) }}
+	{{ form_row(form.assignee) }}
+    {% if form.circle is defined %}
+        {{ form_row(form.circle) }}
+    {% endif %}
+	{{ form_row(form.startDate) }}
+	{{ form_row(form.endDate) }}
+	{{ form_row(form.warningInterval) }}
+
+	<ul class="record_actions sticky-form-buttons">
+		<li class="cancel">
+			<a class="btn btn-cancel" href={% if task.person is not null %}"{{ chill_return_path_or('chill_task_singletask_list', { 'person_id': task.person.id } ) }}"{% else %}"{{ chill_return_path_or('chill_task_singletask_courselist', {'course_id': task.course.id}) }}" {% endif %}>
+				{{ 'Cancel'|trans }}</a>
+		</li>
+		<li>
+			{{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'btn btn-update'}})}}
+		</li>
+	</ul>
+	{{ form_end(form) }}
+</div>
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
deleted file mode 100644
index a5a867dcc..000000000
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
+++ /dev/null
@@ -1,244 +0,0 @@
-{% macro date_status(title, tasks, count, paginator, status, isSingleStatus, person, user) %}
-    {% if tasks|length > 0 %}
-        <h3>{{ title|trans }}</h3>
-
-        <table class="table table-bordered border-dark chill-task-list">
-            <tbody>
-                {% for task in tasks %}
-                <tr>
-                    <td>
-                        <div>
-                            <span class="chill-task-list__row__title">{{ task.title }}</span>
-                        </div>
-
-                        {% if person is null %}
-                            <div>
-                                <span class="chill-task-list__row__person-for">{{ 'For person'|trans }}&nbsp;:</span> <span class="chill-task-list__row__person"><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></span>
-                            </div>
-                        {% endif %}
-
-                        <div>
-                            <span class="chill-task-list__row__type">{{ task_workflow_metadata(task, 'definition.name')|trans }}</span>
-                        </div>
-
-                        <div>
-                            {% for place in workflow_marked_places(task) %}
-                                <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
-                            {% endfor %}
-                            {% if task.assignee is not null %}
-                                <div class="chill-task-list__row__assignee"><span class="chill_task-list__row__assignee_by">{{ 'By'|trans }}&nbsp;:</span> {{ task.assignee.username }}</div>
-                            {% endif %}
-                        </div>
-
-                        {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
-                        <div class="chill-task-list__row__dates">
-                            <ul class="record_actions column">
-                                {% if task.startDate is not null %}
-                                    <li title="{{ 'Start'|trans|escape('html_attr') }}">
-                                        <i class="fa fa-play" ></i> {{ task.startDate|format_date('medium') }}
-                                    </li>
-                                {% endif %}
-                                {% if task.warningDate is not null %}
-                                    <li title="{{ 'Warning'|trans|escape('html_attr') }}">
-                                        <i class="fa fa-exclamation-triangle"></i> {{ task.warningDate|format_date('medium') }}
-                                    </li>
-                                {% endif %}
-                                {% if task.endDate is not null %}
-                                    <li title="{{ 'End'|trans|escape('html_attr') }}">
-                                        <i class="fa fa-hourglass-end"></i> {{ task.endDate|format_date('medium') }}
-                                    </li>
-                                 {% endif %}
-                            </ul>
-                        </div>
-                        {% endif %}
-
-                    </td>
-                    <td>
-                        <ul class="record_actions">
-                            {% if workflow_transitions(task)|length > 0 %}
-                            <li>
-                                <div class="btn-group">
-                                    <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button"
-                                        id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
-                                        {{'Change task status'|trans}}
-                                    </a>
-                                    <ul class="dropdown-menu" aria-labelledby="taskExchange">
-                                        {% for transition in workflow_transitions(task) %}
-                                        <li>
-                                            <a class="dropdown-item"
-                                                href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
-                                                {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
-                                            </a>
-                                        </li>
-                                        {% endfor %}
-                                    </ul>
-                                </div>
-                            </li>
-                            {% endif %}
-
-                            <li>
-                                <a href="{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-show "></a>
-                            </li>
-
-                            {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-                            <li>
-                                <a href="{{ path('chill_task_single_task_edit', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-update "></a>
-                            </li>
-                            {% endif %}
-
-                            {% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
-                            <li>
-                                <a href="{{ path('chill_task_single_task_delete', { 'id': task.id, 'list_params': app.request.query.all } ) }}" class="btn btn-delete "></a>
-                            </li>
-                            {% endif %}
-                        </ul>
-                    </td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-
-        {% if isSingleStatus %}
-            {% if tasks|length < paginator.getTotalItems %}
-            {{ chill_pagination(paginator) }}
-            {% endif %}
-
-            <!-- lien retour -->
-            <ul class="record_actions">
-                <li>
-                    {% if person is not null %}
-                    <a href="{{ path('chill_task_singletask_list', {'person_id': person.id}) }}" class="btn btn-cancel">
-                        {{ 'Back to the list' | trans }}
-                    </a>
-                    {% endif %}
-                    {% if user is not null %}
-                    <a href="{{ path('chill_task_singletask_list') }}" class="btn btn-cancel">
-                        {{ 'Back to the list' | trans }}
-                    </a>
-                    {% endif %}
-                </li>
-                <li>
-                    {% if person is not null %}
-                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
-                    {% endif %}
-                    {% if user is not null %}
-                    <a href="{{ path('chill_task_single_task_new') }}" class="btn btn-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
-                    {% endif %}
-                </li>
-            </ul>
-        {% else %}
-            <ul class="record_actions">
-                <li>
-                    <a href="{{ path('chill_task_singletask_list', app.request.query.all|merge({ 'status': [ status ] })) }}" class="btn btn-misc">
-                        {{ 'See more' | trans }}
-                    </a>
-                </li>
-
-            </ul>
-        {% endif %}
-
-    {% endif %}
-{% endmacro %}
-
-{% import _self as helper %}
-
-    <h1>{{ app.request.query.get('title', null)|escape('html')|default('Task list'|trans) }}</h1>
-
-    {% if false == app.request.query.boolean('hide_form', false) %}
-        <h2>{{ 'Filter the tasks'|trans }}</h2>
-        {{ form_start(form) }}
-        {{ form_row(form.user_id) }}
-
-        {% if form.status is defined %}
-            {{ form_row(form.status) }}
-        {% endif %}
-
-        {% if form.types is defined %}
-            {{ form_row(form.types) }}
-        {% endif %}
-
-        {% if form.person_id is defined %}
-            {{ form_row(form.person_id) }}
-        {% endif %}
-
-        {% if form.center_id is defined %}
-            {{ form_row(form.center_id) }}
-        {% endif %}
-
-        <ul class="record_actions">
-            <li>
-                <button type="submit" class="btn btn-submit">{{ 'Filter'|trans }}</button>
-            </li>
-        </ul>
-
-        {{ form_end(form)}}
-    {% endif %}
-
-    {% if tasks_count == 0 %}
-        <p class="chill-no-data-statement">{{ "There is no tasks."|trans }}</p>
-        {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person)  %}
-            <ul class="record_actions">
-                <li>
-                    {% if person is not null %}
-                        <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
-                            {{ 'Add a new task' | trans }}
-                        </a>
-                    {% endif %}
-                </li>
-            </ul>
-        {% endif %}
-    {% else %}
-
-    {% if false == app.request.query.boolean('hide_form', false) %}
-        <h2>{{ 'Tasks'|trans }}</h2>
-    {% endif %}
-
-    {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person)  %}
-        <ul class="record_actions">
-            <li>
-                {% if person is not null %}
-                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
-                {% endif %}
-            </li>
-        </ul>
-    {% endif %}
-
-    {% if single_task_ended_tasks is defined %}
-        {{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }}
-    {% endif %}
-
-    {% if single_task_warning_tasks is defined %}
-        {{ helper.date_status('Tasks with warning deadline reached', single_task_warning_tasks, single_task_warning_count, single_task_warning_paginator, 'warning',  isSingleStatus, person) }}
-    {% endif %}
-
-    {% if single_task_current_tasks is defined %}
-        {{ helper.date_status('Current tasks', single_task_current_tasks, single_task_current_count, single_task_current_paginator, 'current',  isSingleStatus, person) }}
-    {% endif %}
-
-    {% if single_task_not_started_tasks is defined %}
-        {{ helper.date_status('Tasks not started', single_task_not_started_tasks, single_task_not_started_count, single_task_not_started_paginator, 'not_started', isSingleStatus, person) }}
-    {% endif %}
-
-    {% if single_task_closed_tasks is defined %}
-        {{ helper.date_status('Closed tasks', single_task_closed_tasks, single_task_closed_count, single_task_closed_paginator, 'closed',  isSingleStatus, person) }}
-    {% endif %}
-
-    {% if isSingleStatus == false %}
-        <ul class="record_actions">
-            <li>
-                {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %}
-                    <a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="btn btn-create">
-                        {{ 'Add a new task' | trans }}
-                    </a>
-                {% endif %}
-            </li>
-        </ul>
-    {% endif %}
-
-{% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_new.html.twig
new file mode 100644
index 000000000..9d324ea85
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_new.html.twig
@@ -0,0 +1,32 @@
+<div class="task-new">
+
+	<h1>{{ 'New task'|trans }}</h1>
+
+	{{ form_start(form) }}
+
+	{{ form_errors(form) }}
+
+	{{ form_row(form.title) }}
+	{{ form_row(form.description) }}
+	{{ form_row(form.assignee) }}
+    {% if form.circle is defined %}
+        {{ form_row(form.circle) }}
+    {% endif %}
+	{{ form_row(form.startDate) }}
+	{{ form_row(form.endDate) }}
+	{{ form_row(form.warningInterval) }}
+
+	<ul class="record_actions sticky-form-buttons">
+		<li class="cancel">
+			<a class="btn btn-cancel" href={% if task.person is not null %} "{{ path('chill_task_singletask_list', { 'person_id': task.person.id, 'list_params': app.request.query.get('list_params', {} )} ) }}" {% else %} "{{ chill_return_path_or('chill_task_singletask_by-course_list', {'id': task.course.id}) }}" {% endif %}>
+				{{'Cancel'|trans}}
+			</a>
+		</li>
+		<li>
+			{{ form_widget(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'}  })  }}
+		</li>
+	</ul>
+
+	{{ form_end(form) }}
+
+</div>
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
new file mode 100644
index 000000000..26d269191
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig
@@ -0,0 +1,113 @@
+<div class="task-show">
+
+	<h1>{{ 'Task'|trans }}</h1>
+
+	<h2>{{ task.title }}
+		{% for place in workflow_marked_places(task) %}
+			<span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
+		{% endfor %}
+	</h2>
+
+	<dl class="chill_view_data">
+
+		<dt class="inline">{{ 'Description'|trans }}</dt>
+		<dd>
+			{% if task.description is empty %}
+				<span class="chill-no-data-statement">{{"No description"|trans}}</span>
+			{% else %}
+				<blockquote class="chill-user-quote">
+					{{ task.description|chill_markdown_to_html }}
+				</blockquote>
+			{% endif %}
+		</dd>
+
+		<dt class="inline">{{ 'Assignee'|trans }}</dt>
+		<dd>
+			{% if task.assignee is null %}
+				<span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
+			{% else %}
+				{{ task.assignee }}
+			{% endif %}
+		</dd>
+
+		{% if task.scope is not null %}
+			<dt class="inline">{{ 'Scope'|trans }}</dt>
+			<dd>
+				<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
+			</dd>
+		{% endif %}
+
+		<h3>{{"Dates"|trans}}</h3>
+		{% if task.startDate is null and task.endDate is null and task.warningDate is null %}
+			<dt></dt>
+			<dd>
+				<span class="chill-no-data-statement">{{"No dates specified"|trans}}</span>
+			</dd>
+		</dt>
+	{% else %}
+		{% if task.startDate is not null %}
+			<dt class="inline">{{ 'Start'|trans }}</dt>
+			<dd>{{ task.startDate|format_date('long') }}</dd>
+		{% endif %}
+
+		{% if task.endDate is not null %}
+			<dt class="inline">{{ 'End'|trans }}</dt>
+			<dd>{{ task.endDate|format_date('long') }}</dd>
+		{% endif %}
+
+		{% if task.warningDate is not null %}
+			<dt class="inline">{{ 'Warning'|trans }}</dt>
+			<dd>{{ task.warningDate|format_date('long') }}</dd>
+		{% endif %}
+
+	{% endif %}
+</dl>
+
+{% if timeline is not null %}
+	<h3>{{"Timeline"|trans}}</h3>
+	{{ timeline|raw }}
+{% endif %}
+
+<ul class="record_actions sticky-form-buttons">
+	<li class="cancel">
+		<a class="btn btn-cancel" href={% if task.person is not null %} "{{ chill_return_path_or('chill_task_singletask_list', { 'person_id': task.person.id } ) }}" {% else %} "{{ chill_return_path_or('chill_task_singletask_by-course_list', {'id': task.course.id}) }}" {% endif %}>
+			{{'Cancel'|trans}}
+		</a>
+	</li>
+
+	{% if workflow_transitions(task)|length > 0 %}
+		<li>
+			<div class="btn-group">
+				<a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+					{{'Change task status'|trans}}
+				</a>
+				<ul class="dropdown-menu" aria-labelledby="taskExchange">
+					{% for transition in workflow_transitions(task) %}
+						<li>
+							<a class="dropdown-item" href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path': app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+								{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+							</a>
+						</li>
+					{% endfor %}
+				</ul>
+			</div>
+		</li>
+	{% endif %}
+
+    {% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
+        <li>
+            <a href="{{ chill_path_forward_return_path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
+                {{ 'Delete'|trans }}
+            </a>
+        </li>
+    {% endif %}
+
+	{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
+		<li>
+			<a class="btn btn-update" href="{{ chill_path_forward_return_path('chill_task_single_task_edit', { 'id': task.id }) }}">
+				{{ 'Edit the task'|trans }}
+			</a>
+		</li>
+	{% endif %}
+
+</ul></div>
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig
new file mode 100644
index 000000000..8f6345352
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig
@@ -0,0 +1,23 @@
+<h2>{{ 'Apply transition on task <em>%title%</em>'|trans({ '%title%': task.title } )|raw }}</h2>
+
+
+{% if task_workflow_metadata(task, 'transition.sentence_confirmation', transition) is not empty %}
+	<p class="message-confirm">{{ task_workflow_metadata(task, 'transition.sentence_confirmation', transition)|trans }}</p>
+{% else %}
+	<p>{{ 'Are you sure to apply the transition %name% on this task ?'|trans({ '%name%': task_workflow_metadata(task, 'transition.name', transition)|default(transition.name)|trans }) }}</p>
+{% endif %}
+
+{{ form_start(form) }}
+
+<ul class="record_actions">
+	<li class="cancel">
+		<a href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', { }) ) }}" class="btn btn-cancel">
+			{{ 'Back to the list'|trans }}
+		</a>
+	</li>
+	<li>
+		{{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
+	</li>
+</ul>
+
+{{ form_end(form) }}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
deleted file mode 100644
index 67604f015..000000000
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
+++ /dev/null
@@ -1,59 +0,0 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
-#}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_task_single_task_edit' %}
-{% set person = task.person %}
-
-{% block title %}{{ 'Edit task'|trans }}{% endblock %}
-
-{% block personcontent %}
-<div class="task-edit">
-                    
-            <h1>{{ 'Edit task'|trans }}</h1>
-
-            {{ form_start(form) }}
-
-            {{ form_row(form.title) }}
-            {{ form_row(form.description) }}
-            {{ form_row(form.assignee) }}
-            {{ form_row(form.circle) }}
-            {{ form_row(form.startDate) }}
-            {{ form_row(form.endDate) }}
-            {{ form_row(form.warningInterval) }}
-
-            <ul class="record_actions sticky-form-buttons">
-                <li class="cancel">
-                    <a class="btn btn-cancel" href="{% apply spaceless %}
-                            {% if app.request.query.has('returnPath') %}
-                                {{ app.request.query.get('returnPath')|escape('html_attr') }}">
-                            {% else %}
-                                {{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.get('list_params', { } )} ) }}
-                            {% endif %}
-                        {% endapply %}">
-                        {{ app.request.query.get('returnLabel')|default('Cancel'|trans) }}
-                    </a>
-                </li>
-                <li>
-                    {{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'btn btn-update'}})}}
-                </li>
-            </ul>
-
-            {{ form_end(form) }}
-
-</div>
-{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
index 2a33fc10c..3cd2a1971 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
@@ -15,30 +15,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends '@ChillPerson/Person/layout.html.twig' %}
+{% extends layout %}
 
 {% set activeRouteKey = 'chill_task_single_task_new' %}
 
-{% block title %}{{ 'Task list'|trans }}{% endblock %}
+{% block title %}
+	{{ 'Task list'|trans }}
+{% endblock %}
 
-{% macro thead() %}
-{% endmacro %}
+{% macro thead() %}{% endmacro %}
 
-{% macro row(task) %}
-{% endmacro %}
+{% macro row(task) %}{% endmacro %}
 
 {% block filtertasks %}
-{% if person is not null %}
-    {% block personcontent %}
-        <div class="tasks">
-            {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
-        </div>
-    {% endblock %}
-{% else %}
-    {% block content %}
-        <div class="col-md-10 col-xxl tasks">
-            {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
-        </div>
-    {% endblock %}
-{% endif %}
+	{% if person is not null %}
+		{% block personcontent %}
+			<div class="tasks">
+				{% include '@ChillTask/SingleTask/Person/list.html.twig' %}
+
+			</div>
+		{% endblock %}
+	{% else %}
+		{% block content %}
+			<div class="col-md-10 col-xxl tasks">
+				{% include '@ChillTask/SingleTask/AccompanyingCourse/list.html.twig' %}
+
+			</div>
+		{% endblock %}
+	{% endif %}
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
deleted file mode 100644
index 8cfa1ea33..000000000
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
+++ /dev/null
@@ -1,139 +0,0 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.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/>.
-#}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_task_single_task_show' %}
-{% set person = task.person %}
-
-{% block title %}{{ 'Task'|trans }}{% endblock %}
-
-
-{% block personcontent %}
-<div class="task-show">
-            
-            <h1>{{ 'Task'|trans }}</h1>
-            
-            <h2>{{ task.title }} {% for place in workflow_marked_places(task) %}
-                <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
-                {% endfor %}</h2>
-                
-            <dl class="chill_view_data">
-                
-                <dt class="inline">{{ 'Description'|trans }}</dt>
-                <dd>
-                    {% if task.description is empty %}
-                    <span class="chill-no-data-statement">{{"No description"|trans}}</span>
-                    {% else %}
-                    <blockquote class="chill-user-quote">
-                        {{ task.description|chill_markdown_to_html }}
-                    </blockquote>
-                    {% endif %}
-                </dd>
-                
-                <dt class="inline">{{ 'Assignee'|trans }}</dt>
-                <dd>
-                    {% if task.assignee is null %}
-                    <span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
-                    {% else %}
-                    {{ task.assignee }}
-                    {% endif %}
-                </dd>
-                
-                <dt class="inline">{{ 'Scope'|trans }}</dt>
-                <dd><span class="scope">{{ task.scope.name|localize_translatable_string }}</span></dd>
-                
-                <h3>{{"Dates"|trans}}</h3>
-                {% if task.startDate is null and task.endDate is null and task.warningDate is null %}
-                <dt>
-                    <dd><span class="chill-no-data-statement">{{"No dates specified"|trans}}</span></dd>
-                </dt>
-                {% else %}
-                {% if task.startDate is not null %}
-                <dt class="inline">{{ 'Start'|trans }}</dt>
-                <dd>{{ task.startDate|format_date('long') }}</dd>
-                {% endif %}
-                
-                {% if task.endDate is not null %}
-                <dt class="inline">{{ 'End'|trans }}</dt>
-                <dd>{{ task.endDate|format_date('long') }}</dd>
-                {% endif %}
-                
-                {% if task.warningDate is not null %}
-                <dt class="inline">{{ 'Warning'|trans }}</dt>
-                <dd>{{ task.warningDate|format_date('long') }}</dd>
-                {% endif %}
-                
-                {% endif %}
-            </dl>
-            
-            {% if timeline is not null %}
-                <h3>{{"Timeline"|trans}}</h3>
-                {{ timeline|raw }}
-            {% endif %}
-            
-            <ul class="record_actions sticky-form-buttons">
-                <li class="cancel">
-                    <a class="btn btn-cancel" href="{%- if app.request.query.has('returnPath') -%}
-                        {{ app.request.query.get('returnPath')|escape('html_attr') }}
-                        {%- else -%}
-                        {{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }}
-                        {%- endif -%}">
-                        {{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
-                    </a>
-                </li>
-                
-                {% if workflow_transitions(task)|length > 0 %}
-                <li>
-                    <div class="btn-group">
-                        <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" 
-                            id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
-                            {{'Change task status'|trans}}
-                        </a>
-                        <ul class="dropdown-menu" aria-labelledby="taskExchange">
-                            {% for transition in workflow_transitions(task) %}
-                            <li>
-                                <a class="dropdown-item"
-                                    href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
-                                    {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
-                                </a>
-                            </li>
-                            {% endfor %}
-                        </ul>
-                    </div>
-                </li>
-                {% endif %}
-                
-                {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-                <li>
-                    <a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
-                        {{ 'Edit the task'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-                
-                {% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
-                <li>
-                    <a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
-                        {{ 'Delete'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-            </ul>
-            
-</div>
-
-{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
deleted file mode 100644
index 617816e4c..000000000
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_task_task_list' %}
-{% set person = task.person %}
-
-{% block title  'Remove task'|trans %}
-
-{% block personcontent %}
-
-<h2>{{ 'Apply transition on task <em>%title%</em>'|trans({ '%title%': task.title } )|raw }}</h2>
-
-
-{% if task_workflow_metadata(task, 'transition.sentence_confirmation', transition) is not empty %}
-    <p class="message-confirm">{{ task_workflow_metadata(task, 'transition.sentence_confirmation', transition)|trans }}</p>
-{% else %}
-    <p>{{ 'Are you sure to apply the transition %name% on this task ?'|trans({ '%name%': task_workflow_metadata(task, 'transition.name', transition)|default(transition.name)|trans }) }}</p>
-{% endif %}
-
-{{ form_start(form) }}
-
-<ul class="record_actions">
-    <li class="cancel">
-        <a href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', { }) ) }}" class="btn btn-cancel">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
-    </li>
-</ul>
-        
-{{ form_end(form) }}
-
-{% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
index 38cda7563..5e6943f92 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
@@ -1,47 +1,46 @@
 <?php
-/*
- * 
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Security\Authorization;
 
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class AuthorizationEvent extends Event
 {
+    public const VOTE = 'chill_task.vote';
+
     /**
-     * @var Chill\TaskBundle\Entity\AbstractTask|\Chill\PersonBundle\Entity\Person|null
-     */
-    protected $subject;
-    
-    /**
-     *
      * @var string
      */
     protected $attribute;
-    
+
+    /**
+     * @var \Chill\PersonBundle\Entity\Person|Chill\TaskBundle\Entity\AbstractTask|null
+     */
+    protected $subject;
+
     /**
-     *
      * @var TokenInterface
      */
     protected $token;
-    
+
     /**
-     *
      * @var bool
      */
     protected $vote;
-    
-    const VOTE = 'chill_task.vote';
-    
+
     public function __construct(
-        $subject, 
-        $attribute, 
+        $subject,
+        $attribute,
         TokenInterface $token
     ) {
         $this->subject = $subject;
@@ -49,40 +48,40 @@ class AuthorizationEvent extends Event
         $this->token = $token;
     }
 
-    public function getSubject()
-    {
-        return $this->subject;
-    }
-
     public function getAttribute()
     {
         return $this->attribute;
     }
 
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
     public function getToken(): TokenInterface
     {
         return $this->token;
     }
-    
+
     public function getVote()
     {
         return $this->vote;
     }
-   
-    public function setVote($vote)
-    {
-        $this->vote = $vote;
-        
-        return $this;
-    }
 
     public function hasVote()
     {
-        return $this->vote !== NULL;
+        return null !== $this->vote;
     }
-    
+
     public function removeVote()
     {
-        $this->vote = NULL;
+        $this->vote = null;
+    }
+
+    public function setVote($vote)
+    {
+        $this->vote = $vote;
+
+        return $this;
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 2f760a84b..c1df4e743 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -1,114 +1,104 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Security\Authorization;
 
-use Chill\EventBundle\Entity\Event;
-use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
 use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\TaskBundle\Entity\AbstractTask;
-use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Psr\Log\LoggerInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\TaskBundle\Entity\AbstractTask;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Chill\TaskBundle\Security\Authorization\AuthorizationEvent;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
+use function in_array;
 
 final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
-    const CREATE = 'CHILL_TASK_TASK_CREATE';
-    const UPDATE = 'CHILL_TASK_TASK_UPDATE';
-    const SHOW   = 'CHILL_TASK_TASK_SHOW';
-    const DELETE   = 'CHILL_TASK_TASK_DELETE';
+    public const CREATE_COURSE = 'CHILL_TASK_TASK_CREATE_FOR_COURSE';
 
-    const ROLES = [
-        self::CREATE,
-        self::UPDATE,
+    public const CREATE_PERSON = 'CHILL_TASK_TASK_CREATE_FOR_PERSON';
+
+    public const DELETE = 'CHILL_TASK_TASK_DELETE';
+
+    public const ROLES = [
+        self::CREATE_COURSE,
+        self::CREATE_PERSON,
+        self::DELETE,
         self::SHOW,
-        self::DELETE
+        self::UPDATE,
     ];
 
-    protected AuthorizationHelper $authorizationHelper;
+    public const SHOW = 'CHILL_TASK_TASK_SHOW';
 
-    protected AccessDecisionManagerInterface $accessDecisionManager;
+    public const UPDATE = 'CHILL_TASK_TASK_UPDATE';
 
-    protected LoggerInterface $logger;
+    private AccessDecisionManagerInterface $accessDecisionManager;
 
-    protected EventDispatcherInterface $eventDispatcher;
+    private EventDispatcherInterface $eventDispatcher;
 
-    protected CenterResolverDispatcher $centerResolverDispatcher;
+    private LoggerInterface $logger;
 
-    protected VoterHelperInterface $voter;
+    private VoterHelperInterface $voter;
 
     public function __construct(
         AccessDecisionManagerInterface $accessDecisionManager,
-        AuthorizationHelper $authorizationHelper,
         EventDispatcherInterface $eventDispatcher,
         LoggerInterface $logger,
-        CenterResolverDispatcher $centerResolverDispatcher,
         VoterHelperFactoryInterface $voterFactory
     ) {
         $this->accessDecisionManager = $accessDecisionManager;
-        $this->authorizationHelper = $authorizationHelper;
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
 
         $this->voter = $voterFactory
             ->generate(AbstractTask::class)
             ->addCheckFor(AbstractTask::class, self::ROLES)
-            ->addCheckFor(Person::class, [self::SHOW])
+            ->addCheckFor(Person::class, [self::SHOW, self::CREATE_PERSON])
+            ->addCheckFor(AccompanyingPeriod::class, [self::SHOW, self::CREATE_COURSE])
             ->addCheckFor(null, [self::SHOW])
-            ->build()
-            ;
+            ->build();
+    }
+
+    public function getRoles(): array
+    {
+        return self::ROLES;
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return [
+            'Task' => self::ROLES,
+        ];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return [];
     }
 
     public function supports($attribute, $subject)
     {
         return $this->voter->supports($attribute, $subject);
-       /*
-        return ($subject instanceof AbstractTask && in_array($attribute, self::ROLES))
-            ||
-            ($subject instanceof Person && \in_array($attribute, [ self::CREATE, self::SHOW ]))
-            ||
-            (NULL === $subject && $attribute === self::SHOW )
-            ;
-       */
     }
 
-    /**
-     *
-     * @param string $attribute
-     * @param AbstractTask $subject
-     * @param TokenInterface $token
-     * @return boolean
-     */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $this->logger->debug(sprintf("Voting from %s class", self::class));
+        $this->logger->debug(sprintf('Voting from %s class', self::class));
 
         if (!$token->getUser() instanceof User) {
             return false;
@@ -119,11 +109,10 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
         $this->eventDispatcher->dispatch(AuthorizationEvent::VOTE, $event);
 
         if ($event->hasVote()) {
-
-            $this->logger->debug("The TaskVoter is overriding by "
-                .AuthorizationEvent::VOTE, [
+            $this->logger->debug('The TaskVoter is overriding by '
+                . AuthorizationEvent::VOTE, [
                     'vote' => $event->getVote(),
-                    'task_id' => $subject->getId()
+                    'task_id' => $subject->getId(),
                 ]);
 
             return $event->getVote();
@@ -132,67 +121,31 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
         // do pre-flight check, relying on other decision manager
         // those pre-flight check concern associated entities
         if ($subject instanceof AbstractTask) {
-            if (NULL !== $person = $subject->getPerson()) {
+            // a user can always see his own tasks
+            if ($subject->getAssignee() === $token->getUser()) {
+                return true;
+            }
+
+            if (null !== $person = $subject->getPerson()) {
                 if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
                     return false;
                 }
-            } elseif (false) {
-                // here will come the test if the task is associated to an accompanying course
+            } elseif (null !== $period = $subject->getCourse()) {
+                if (!$this->accessDecisionManager->decide($token, [AccompanyingPeriodVoter::SEE], $period)) {
+                    return false;
+                }
+            }
+        }
+
+        if ($subject instanceof AccompanyingPeriod) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+                if (in_array($attribute, [self::UPDATE, self::CREATE_COURSE, self::DELETE], true)) {
+                    return false;
+                }
             }
         }
 
         // do regular check.
         return $this->voter->voteOnAttribute($attribute, $subject, $token);
-
-       /*
-        if ($subject instanceof AbstractTask) {
-            if ($subject->getPerson() === null) {
-                throw new \LogicException("You should associate a person with task "
-                    . "in order to check autorizations");
-            }
-
-            $person = $subject->getPerson();
-        } elseif ($subject instanceof Person) {
-            $person = $subject;
-        } else {
-            // subject is null. We check  that at least one center is reachable
-            $centers = $this->authorizationHelper->getReachableCenters($token->getUser(), new Role($attribute));
-
-            return count($centers) > 0;
-        }
-
-        if (!$this->accessDecisionManager->decide($token, [PersonVoter::SEE], $person)) {
-            return false;
-        }
-        $center = $this->centerResolverDispatcher->resolveCenter($subject);
-
-        if (NULL === $center) {
-            return false;
-        }
-
-        return $this->authorizationHelper->userHasAccess(
-            $token->getUser(),
-            $subject,
-            $attribute
-            );
-       */
     }
-
-    public function getRoles()
-    {
-        return self::ROLES;
-    }
-
-    public function getRolesWithHierarchy(): array
-    {
-        return [
-            'Task' => self::ROLES
-        ];
-    }
-
-    public function getRolesWithoutScope()
-    {
-        return [];
-    }
-
 }
diff --git a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
index e79cdcda2..8d5c19924 100644
--- a/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
+++ b/src/Bundle/ChillTaskBundle/Templating/TaskTwigExtension.php
@@ -1,58 +1,45 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Templating;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
-use Chill\TaskBundle\Entity\AbstractTask;
-use Chill\TaskBundle\Workflow\TaskWorkflowManager;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Templating;
+
+use Chill\TaskBundle\Entity\AbstractTask;
+use Chill\TaskBundle\Workflow\TaskWorkflowManager;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
 class TaskTwigExtension extends AbstractExtension
 {
     /**
-     *
      * @var TaskWorkflowManager
      */
     protected $taskWorkflowManager;
-    
+
     public function __construct(TaskWorkflowManager $taskWorkflowManager)
     {
         $this->taskWorkflowManager = $taskWorkflowManager;
     }
 
-    
     public function getFunctions()
     {
         return [
-            new TwigFunction('task_workflow_metadata', [ $this, 'getWorkflowMetadata' ] )
+            new TwigFunction('task_workflow_metadata', [$this, 'getWorkflowMetadata']),
         ];
     }
-    
+
     public function getWorkflowMetadata(
-        AbstractTask $task, 
-        string $key, 
-        $metadataSubject = null, 
-        string $name = null
+        AbstractTask $task,
+        string $key,
+        $metadataSubject = null,
+        ?string $name = null
     ) {
         return $this->taskWorkflowManager->getWorkflowMetadata($task, $key, $metadataSubject, $name);
     }
diff --git a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
index e53b85fbe..2990d8810 100644
--- a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+++ b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
@@ -1,50 +1,38 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Templating\UI;
-
-use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\TaskBundle\Repository\SingleTaskRepository;
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Workflow\Event\Event;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Templating\UI;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
+use Chill\TaskBundle\Repository\SingleTaskRepository;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Workflow\Event\Event;
+use function array_merge;
+
 class CountNotificationTask implements NotificationCounterInterface
 {
+    public const CACHE_KEY = 'chill_task.count_notifications.user.%d.%s';
+
     /**
-     *
-     * @var SingleTaskRepository
-     */
-    protected $singleTaskRepository;
-    
-    /**
-     *
      * @var CacheItempPoolInterface
      */
     protected $cachePool;
-    
-    const CACHE_KEY = 'chill_task.count_notifications.user.%d.%s';
-    
+
+    /**
+     * @var SingleTaskRepository
+     */
+    protected $singleTaskRepository;
+
     public function __construct(
         SingleTaskRepository $singleTaskRepository,
         CacheItemPoolInterface $cachePool
@@ -52,65 +40,38 @@ class CountNotificationTask implements NotificationCounterInterface
         $this->singleTaskRepository = $singleTaskRepository;
         $this->cachePool = $cachePool;
     }
-    
-    public function countNotification(UserInterface $u): int
-    {
-        return 
-            $this->countNotificationEnded($u) 
-                + $this->countNotificationWarning($u);
-    }
-    
-    public function countNotificationEnded(UserInterface $u): int
-    {
-        return $this->_countNotification($u, SingleTaskRepository::DATE_STATUS_ENDED);
-    }
-    
-    public function countNotificationWarning(UserInterface $u): int
-    {
-        return $this->_countNotification($u, SingleTaskRepository::DATE_STATUS_WARNING);
-    }
-    
-    protected function _countNotification(UserInterface $u, $status)
-    {
-        if (!$u instanceof User) {
-            return 0;
-        }
-        
-        $sumCache  = $this->cachePool->getItem($this->getCacheKey($u, $status));
-        
-        if ($sumCache->isHit()) {
-            return $sumCache->get();
-        }
-        
-        $params = [
-            'user' => $u,
-            'is_closed' => false
-        ];
-        
-        $sum = $this->singleTaskRepository->countByParameters(
-                \array_merge($params, [ 'date_status' => $status ])
-            );
-        
-        $sumCache->set($sum);
-        $this->cachePool->save($sumCache);
-        
-        return $sum;
-    }
-    
+
     public function addNotification(UserInterface $u): int
     {
         return $this->countNotification($u);
     }
-    
+
+    public function countNotification(UserInterface $u): int
+    {
+        return
+            $this->countNotificationEnded($u)
+                + $this->countNotificationWarning($u);
+    }
+
+    public function countNotificationEnded(UserInterface $u): int
+    {
+        return $this->_countNotification($u, SingleTaskRepository::DATE_STATUS_ENDED);
+    }
+
+    public function countNotificationWarning(UserInterface $u): int
+    {
+        return $this->_countNotification($u, SingleTaskRepository::DATE_STATUS_WARNING);
+    }
+
     public function resetCacheOnNewStates(Event $e)
     {
-        /* @var $task \Chill\TaskBundle\Entity\SingleTask */
+        /** @var \Chill\TaskBundle\Entity\SingleTask $task */
         $task = $e->getSubject();
-        
-        if (NULL !== $task->getAssignee()) {
+
+        if (null !== $task->getAssignee()) {
             foreach ([
                 SingleTaskRepository::DATE_STATUS_ENDED,
-                SingleTaskRepository::DATE_STATUS_WARNING
+                SingleTaskRepository::DATE_STATUS_WARNING,
             ] as $status) {
                 $key = $this->getCacheKey($task->getAssignee(), $status);
                 $sumCache = $this->cachePool->getItem($key);
@@ -121,9 +82,36 @@ class CountNotificationTask implements NotificationCounterInterface
             }
         }
     }
-    
+
+    protected function _countNotification(UserInterface $u, $status)
+    {
+        if (!$u instanceof User) {
+            return 0;
+        }
+
+        $sumCache = $this->cachePool->getItem($this->getCacheKey($u, $status));
+
+        if ($sumCache->isHit()) {
+            return $sumCache->get();
+        }
+
+        $params = [
+            'user' => $u,
+            'is_closed' => false,
+        ];
+
+        $sum = $this->singleTaskRepository->countByParameters(
+            array_merge($params, ['date_status' => $status])
+        );
+
+        $sumCache->set($sum);
+        $this->cachePool->save($sumCache);
+
+        return $sum;
+    }
+
     private function getCacheKey(User $u, $status)
     {
-        return sprintf(self::CACHE_KEY,  $u->getId(), $status);
+        return sprintf(self::CACHE_KEY, $u->getId(), $status);
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
index d7337029d..9d6baf842 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php
@@ -1,102 +1,116 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Tests\TestHelper;
 use Faker;
-use Chill\MainBundle\Entity\Center;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use function array_filter;
+use function array_rand;
 
-class SingleTaskControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SingleTaskControllerTest extends WebTestCase
 {
     /**
-     *
      * @var Faker\Generator
      */
     protected $faker;
-    
+
     protected function setUp()
     {
         self::bootKernel();
         $this->faker = Faker\Factory::create('fr');
     }
-    
+
+    public function testNew()
+    {
+        $client = self::createClient(
+            [],
+            TestHelper::getAuthenticatedClientOptions()
+        );
+        $person = $this->getRandomPerson('Center A');
+
+        $crawler = $client->request('GET', '/fr/task/single-task/new', [
+            'person_id' => $person->getId(),
+        ]);
+        var_dump($crawler->text());
+
+        $this->assertTrue($client->getResponse()->isSuccessful());
+
+        $form = $crawler->selectButton('Envoi')->form();
+
+        $title = $this->faker->sentence;
+        $circles = $form->get('circle')
+            ->availableOptionsValues();
+
+        $client->submit($form, [
+            'title' => $title,
+            'circle' => $circles[array_rand($circles)],
+        ]);
+
+        $this->assertTrue($client->getResponse()->isRedirect(sprintf(
+            '/fr/task/task/list/%d',
+            $person->getId()
+        )));
+
+        $crawler = $client->followRedirect();
+
+        $this->assertContains(
+            $title,
+            $crawler->text(),
+            'Assert that newly created task title is shown in list page'
+        );
+    }
+
     /**
-     * 
+     * @param mixed $centerName
+     *
      * @return \Chill\PersonBundle\Entity\Person
      */
     protected function getRandomPerson($centerName)
     {
         $em = self::$kernel
             ->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ;
-        
+            ->get('doctrine.orm.entity_manager');
+
         $centers = $em
             ->getRepository(Center::class)
             ->findAll();
-        
-        $center = \array_filter(
-            $centers, 
-            function(Center $c) use ($centerName) {
-                return $centerName === $c->getName();
-            })[0];
-        
+
+        $center = array_filter(
+            $centers,
+            static function (Center $c) use ($centerName) {
+                return $c->getName() === $centerName;
+            }
+        )[0];
+
         $ids = $em
-            ->createQuery('SELECT p.id FROM ChillPersonBundle:Person p '
+            ->createQuery(
+                'SELECT p.id FROM ChillPersonBundle:Person p '
                 . 'WHERE p.center = :center'
-                )
+            )
             ->setParameter('center', $center)
-            ->getResult()
-            ;
-        
-        $id = $ids[\array_rand($ids)];
-        
+            ->getResult();
+
+        $id = $ids[array_rand($ids)];
+
         return self::$kernel
             ->getContainer()
             ->get('doctrine.orm.entity_manager')
             ->getRepository(\Chill\PersonBundle\Entity\Person::class)
-            ->find($id)
-            ;
+            ->find($id);
     }
-    
-    public function testNew()
-    {
-        $client = static::createClient(
-            array(), 
-            TestHelper::getAuthenticatedClientOptions()
-            );
-        $person = $this->getRandomPerson('Center A');
-
-        $crawler = $client->request('GET', '/fr/task/single-task/new', [
-            'person_id' => $person->getId()
-        ]);
-        var_dump($crawler->text());
-        
-        $this->assertTrue($client->getResponse()->isSuccessful());
-        
-        
-        
-        $form = $crawler->selectButton('Envoi')->form();
-        
-        $title = $this->faker->sentence;
-        $circles = $form->get('circle')
-            ->availableOptionsValues()
-            ;
-        
-        $client->submit($form, [
-            'title' => $title,
-            'circle' => $circles[\array_rand($circles)]
-        ]);
-        
-        $this->assertTrue($client->getResponse()->isRedirect(sprintf(
-            '/fr/task/task/list/%d', $person->getId())));
-        
-        $crawler = $client->followRedirect();
-        
-        $this->assertContains($title, $crawler->text(),
-            "Assert that newly created task title is shown in list page")
-            ;
-    }
-
 }
diff --git a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
index 18b980329..e11c2d37d 100644
--- a/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
+++ b/src/Bundle/ChillTaskBundle/Tests/Controller/TaskControllerTest.php
@@ -1,9 +1,22 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class TaskControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class TaskControllerTest extends WebTestCase
 {
 }
diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
index 57a3832af..09cce9e61 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
@@ -1,50 +1,44 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Chill\MainBundle\Timeline\TimelineSingleQuery;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use Chill\TaskBundle\Entity\SingleTask;
+use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
+use Doctrine\ORM\EntityManagerInterface;
+use LogicException;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Workflow;
+use function array_combine;
+use function array_map;
 
 /**
- * Provide timeline elements related to tasks, in tasks context
- *
+ * Provide timeline elements related to tasks, in tasks context.
  */
 class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 {
+    public const TYPE = 'chill_task.transition';
+
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
 
     /**
-     *
      * @var Registry
      */
     protected $registry;
 
-    const TYPE = 'chill_task.transition';
-
     public function __construct(EntityManagerInterface $em, Registry $registry)
     {
         $this->em = $em;
@@ -53,8 +47,8 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
 
     public function fetchQuery($context, $args)
     {
-        if ($context !== 'task') {
-            throw new \LogicException(sprintf('%s is not able '
+        if ('task' !== $context) {
+            throw new LogicException(sprintf('%s is not able '
                     . 'to render context %s', self::class, $context));
         }
 
@@ -67,33 +61,33 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
             'id' => sprintf('%s.%s.%s', $metadata->getSchemaName(), $metadata->getTableName(), $metadata->getColumnName('id')),
             'type' => self::TYPE,
             'date' => $metadata->getColumnName('datetime'),
-            'FROM' => sprintf('%s JOIN %s ON %s = %s',
+            'FROM' => sprintf(
+                '%s JOIN %s ON %s = %s',
                 sprintf('%s.%s', $metadata->getSchemaName(), $metadata->getTableName()),
                 sprintf('%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName()),
                 $metadata->getAssociationMapping('task')['joinColumns'][0]['name'],
                 sprintf('%s.%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName(), $singleTaskMetadata->getColumnName('id'))
-                ),
-            'WHERE' => sprintf('%s.%s = %d',
+            ),
+            'WHERE' => sprintf(
+                '%s.%s = %d',
                 sprintf('%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName()),
                 $singleTaskMetadata->getColumnName('id'),
                 $args['task']->getId()
-                ),
+            ),
             'parameters' => [],
         ]);
-
     }
 
     public function getEntities(array $ids)
     {
         $events = $this->em
             ->getRepository(SingleTaskPlaceEvent::class)
-            ->findBy([ 'id' => $ids ])
-            ;
+            ->findBy(['id' => $ids]);
 
-        return \array_combine(
-            \array_map(function($e) { return $e->getId(); }, $events ),
+        return array_combine(
+            array_map(static function ($e) { return $e->getId(); }, $events),
             $events
-            );
+        );
     }
 
     public function getEntityTemplate($entity, $context, array $args)
@@ -102,21 +96,25 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
             $workflow = $this->registry->get($entity->getTask(), $entity->getData()['workflow']);
             $transition = $this->getTransitionByName($entity->getTransition(), $workflow);
         }
-    
+
         return [
             'template' => 'ChillTaskBundle:Timeline:single_task_transition_task_context.html.twig',
             'template_data' => [
                 'task' => $args['task'],
                 'event' => $entity,
-                'transition' => $transition ?? null
-            ]
+                'transition' => $transition ?? null,
+            ],
         ];
     }
 
+    public function supportsType($type): bool
+    {
+        return self::TYPE === $type;
+    }
+
     /**
-     *
      * @param string $name
-     * @param Workflow $workflow
+     *
      * @return \Symfony\Component\Workflow\Transition
      */
     protected function getTransitionByName($name, Workflow $workflow)
@@ -127,9 +125,4 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
             }
         }
     }
-
-    public function supportsType($type): bool
-    {
-        return $type === self::TYPE;
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
index fe5a8f78d..16e2e945d 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
@@ -1,55 +1,54 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Timeline;
 
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
-use Chill\TaskBundle\Entity\SingleTask;
+use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Chill\PersonBundle\Entity\Person;
+use Chill\TaskBundle\Entity\SingleTask;
+use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Workflow;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
+use UnexpectedValueException;
+use function array_combine;
+use function array_fill;
+use function array_map;
+use function count;
+use function implode;
+use function in_array;
+use function strtr;
 
 /**
- * Provide element for timeline for 'person' and 'center' context
- *
+ * Provide element for timeline for 'person' and 'center' context.
  */
 class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 {
-    protected EntityManagerInterface $em;
-    
-    protected Registry $registry;
-    
+    public const TYPE = 'chill_task.transition';
+
     protected AuthorizationHelper $authorizationHelper;
 
+    protected EntityManagerInterface $em;
+
+    protected Registry $registry;
+
     protected Security $security;
-    
-    
-    const TYPE = 'chill_task.transition';
-    
+
     public function __construct(
-        EntityManagerInterface $em, 
+        EntityManagerInterface $em,
         Registry $registry,
         AuthorizationHelper $authorizationHelper,
         Security $security
@@ -64,16 +63,20 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
     {
         $metadata = $this->em
             ->getClassMetadata(SingleTaskPlaceEvent::class);
-        
+
         switch ($context) {
             case 'person':
                 [ $where, $parameters ] = $this->getWhereClauseForPerson($args['person']);
+
                 break;
+
             case 'center':
                 [ $where, $parameters ] = $this->getWhereClauseForCenter($args['centers']);
+
                 break;
+
             default:
-                throw new \UnexpectedValueException("context {$context} is not supported");
+                throw new UnexpectedValueException("context {$context} is not supported");
         }
 
         return TimelineSingleQuery::fromArray([
@@ -82,10 +85,92 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
             'date' => $metadata->getColumnName('datetime'),
             'FROM' => $this->getFromClause($context),
             'WHERE' => $where,
-            'parameters' => $parameters
+            'parameters' => $parameters,
         ]);
     }
 
+    public function getEntities(array $ids)
+    {
+        $events = $this->em
+            ->getRepository(SingleTaskPlaceEvent::class)
+            ->findBy(['id' => $ids]);
+
+        return array_combine(
+            array_map(static function ($e) { return $e->getId(); }, $events),
+            $events
+        );
+    }
+
+    public function getEntityTemplate($entity, $context, array $args)
+    {
+        $workflow = $this->registry->get(
+            $entity->getTask(),
+            (isset($entity->getData()['workflow'])) ? $entity->getData()['workflow'] : null
+        );
+        // sf4 check: prevent error message:
+        // `Notice: Undefined property: Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent::$getData`
+        // * fix syntax error on $entity->getData['workflow']
+        // * return null if not set
+
+        $transition = $this->getTransitionByName($entity->getTransition(), $workflow);
+
+        return [
+            'template' => 'ChillTaskBundle:Timeline:single_task_transition.html.twig',
+            'template_data' => [
+                'context' => $context,
+                'event' => $entity,
+                'task' => $entity->getTask(),
+                'transition' => $transition,
+            ],
+        ];
+    }
+
+    public function supportsType($type): bool
+    {
+        return self::TYPE === $type;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return \Symfony\Component\Workflow\Transition
+     */
+    protected function getTransitionByName($name, Workflow $workflow)
+    {
+        foreach ($workflow->getDefinition()->getTransitions() as $transition) {
+            if ($transition->getName() === $name) {
+                return $transition;
+            }
+        }
+    }
+
+    private function getFromClause(string $context)
+    {
+        $taskEvent = $this->em->getClassMetadata(SingleTaskPlaceEvent::class);
+        $singleTask = $this->em->getClassMetadata(SingleTask::class);
+        $person = $this->em->getClassMetadata(Person::class);
+        $eventFkTask = $taskEvent->getAssociationMapping('task')['joinColumns'][0]['name'];
+        $taskFkPerson = $singleTask->getAssociationMapping('person')['joinColumns'][0]['name'];
+        $personPk = $singleTask->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
+
+        $from = '{single_task_event} ' .
+            'JOIN {single_task} ON {single_task}.{task_pk} = {single_task_event}.{event_fk_task} ' .
+            'JOIN {person} ON {single_task}.{task_person_fk} = {person}.{person_pk}';
+
+        return strtr(
+            $from,
+            [
+                '{single_task}' => sprintf('%s.%s', $singleTask->getSchemaName(), $singleTask->getTableName()),
+                '{single_task_event}' => sprintf('%s.%s', $taskEvent->getSchemaName(), $taskEvent->getTableName()),
+                '{task_pk}' => $singleTask->getColumnName('id'),
+                '{event_fk_task}' => $eventFkTask,
+                '{person}' => $person->getTableName(),
+                '{task_person_fk}' => $taskFkPerson,
+                '{person_pk}' => $personPk,
+            ]
+        );
+    }
+
     private function getWhereClauseForCenter(array $centers): array
     {
         $taskEvent = $this->em->getClassMetadata(SingleTaskPlaceEvent::class);
@@ -98,16 +183,17 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $parameters = [];
 
         // the clause that we will repeat for each center, joined by 'OR'
-        $clause = "{person}.{center_id} = ? AND {task}.{circle} IN ({circle_ids})";
+        $clause = '{person}.{center_id} = ? AND {task}.{circle} IN ({circle_ids})';
 
         // array to gather clauses
         $clauses = [];
 
         // loop over centers
         foreach ($this->authorizationHelper->getReachableCenters(
-            $this->security->getUser(), new Role(ActivityVoter::SEE_DETAILS)) as $center) {
-
-            if (FALSE === \in_array($center, $centers)) {
+            $this->security->getUser(),
+            new Role(ActivityVoter::SEE_DETAILS)
+        ) as $center) {
+            if (false === in_array($center, $centers, true)) {
                 continue;
             }
 
@@ -116,32 +202,35 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 
             // we loop over circles
             $circles = $this->authorizationHelper->getReachableCircles(
-                $this->security->getUser(), new Role(ActivityVoter::SEE_DETAILS), $center);
+                $this->security->getUser(),
+                new Role(ActivityVoter::SEE_DETAILS),
+                $center
+            );
             $circleIds = [];
 
             foreach ($circles as $circle) {
                 $parameters[] = $circleIds[] = $circle->getId();
             }
 
-            $clauses[] = \strtr(
+            $clauses[] = strtr(
                 $clause,
                 [
                     '{person}' => $person->getTableName(),
                     '{center_id}' => $personFkCenter,
-                    '{task}' => $singleTask->getSchemaName().".".$singleTask->getTableName(),
+                    '{task}' => $singleTask->getSchemaName() . '.' . $singleTask->getTableName(),
                     '{circle}' => $taskFkCircle,
-                    '{circle_ids}' => \implode(', ', \array_fill(0, count($circleIds), '?'))
+                    '{circle_ids}' => implode(', ', array_fill(0, count($circleIds), '?')),
                 ]
             );
         }
 
-        if (0 === \count($clauses)) {
-            return [ 'FALSE = TRUE' , [] ];
+        if (0 === count($clauses)) {
+            return ['FALSE = TRUE', []];
         }
 
         return [
-            \implode(' OR ', $clauses),
-            $parameters
+            implode(' OR ', $clauses),
+            $parameters,
         ];
     }
 
@@ -155,23 +244,25 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $personPk = $singleTask->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
         $taskFkCircle = $singleTask->getAssociationMapping('circle')['joinColumns'][0]['name'];
 
-
         // the parameters
-        $parameters = [];
+        $parameters = $circleIds = [];
 
         // the clause that we will fill
-        $clause = "{person}.{person_id} = ? AND {task}.{circle} IN ({circle_ids})";
+        $clause = '{person}.{person_id} = ? AND {task}.{circle} IN ({circle_ids})';
 
         // person is the first parameter
         $parameters[] = $personArg->getId();
 
         // we loop over circles
         $circles = $this->authorizationHelper->getReachableCircles(
-            $this->security->getUser(), new Role(ActivityVoter::SEE_DETAILS), $personArg->getCenter());
+            $this->security->getUser(),
+            new Role(ActivityVoter::SEE_DETAILS),
+            $personArg->getCenter()
+        );
 
         if (0 === count($circles)) {
             // go fast to block access to every tasks
-            return [ "FALSE = TRUE", [] ];
+            return ['FALSE = TRUE', []];
         }
 
         foreach ($circles as $circle) {
@@ -179,100 +270,17 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         }
 
         return [
-            \strtr(
+            strtr(
                 $clause,
                 [
                     '{person}' => $person->getTableName(),
                     '{person_id}' => $person->getColumnName('id'),
-                    '{task}' => $singleTask->getSchemaName().".".$singleTask->getTableName(),
+                    '{task}' => $singleTask->getSchemaName() . '.' . $singleTask->getTableName(),
                     '{circle}' => $taskFkCircle,
-                    '{circle_ids}' => \implode(', ', \array_fill(0, count($circleIds), '?'))
+                    '{circle_ids}' => implode(', ', array_fill(0, count($circleIds), '?')),
                 ]
             ),
-            $parameters
+            $parameters,
         ];
     }
-
-    private function getFromClause(string $context)
-    {
-        $taskEvent = $this->em->getClassMetadata(SingleTaskPlaceEvent::class);
-        $singleTask = $this->em->getClassMetadata(SingleTask::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $eventFkTask = $taskEvent->getAssociationMapping('task')['joinColumns'][0]['name'];
-        $taskFkPerson = $singleTask->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $personPk = $singleTask->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
-
-        $from = "{single_task_event} ".
-            "JOIN {single_task} ON {single_task}.{task_pk} = {single_task_event}.{event_fk_task} ".
-            "JOIN {person} ON {single_task}.{task_person_fk} = {person}.{person_pk}";
-
-        return \strtr(
-            $from,
-            [
-                '{single_task}' => sprintf('%s.%s', $singleTask->getSchemaName(), $singleTask->getTableName()),
-                '{single_task_event}' => sprintf('%s.%s', $taskEvent->getSchemaName(), $taskEvent->getTableName()),
-                '{task_pk}' => $singleTask->getColumnName('id'),
-                '{event_fk_task}' => $eventFkTask, 
-                '{person}' => $person->getTableName(),
-                '{task_person_fk}' => $taskFkPerson,
-                '{person_pk}' => $personPk 
-            ]
-        );
-    } 
-    
-    public function getEntities(array $ids) 
-    {
-        $events = $this->em
-            ->getRepository(SingleTaskPlaceEvent::class)
-            ->findBy([ 'id' => $ids ])
-            ;
-        
-        return \array_combine(
-            \array_map(function($e) { return $e->getId(); }, $events ),
-            $events
-            );
-    } 
-    
-    public function getEntityTemplate($entity, $context, array $args)
-    {
-        $workflow = $this->registry->get($entity->getTask(),
-            (isset($entity->getData()['workflow'])) ? $entity->getData()['workflow'] : null
-        );
-        // sf4 check: prevent error message:
-        // `Notice: Undefined property: Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent::$getData`
-        // * fix syntax error on $entity->getData['workflow']
-        // * return null if not set
-        
-        $transition = $this->getTransitionByName($entity->getTransition(), $workflow);
-        
-        return [
-            'template' => 'ChillTaskBundle:Timeline:single_task_transition.html.twig',
-            'template_data' => [ 
-                'context' => $context,
-                'event' => $entity,
-                'task' => $entity->getTask(),
-                'transition' => $transition
-            ]
-        ];
-    } 
-    
-    /**
-     * 
-     * @param string $name
-     * @param Workflow $workflow
-     * @return \Symfony\Component\Workflow\Transition
-     */
-    protected function getTransitionByName($name, Workflow $workflow)
-    {
-        foreach ($workflow->getDefinition()->getTransitions() as $transition) {
-            if ($transition->getName() === $name) {
-                return $transition;
-            }
-        }
-    }
-    
-    public function supportsType($type): bool
-    {
-        return $type === self::TYPE;
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
index 64f5c7acc..6f0577ce2 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Definition/DefaultTaskDefinition.php
@@ -1,67 +1,54 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Workflow\Definition;
 
 use Chill\TaskBundle\Entity\AbstractTask;
 use Chill\TaskBundle\Entity\SingleTask;
+use LogicException;
 use Symfony\Component\Workflow\Transition;
+use function array_key_exists;
+use function array_slice;
+use function explode;
+use function implode;
 
-/**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDefinition
 {
-    const TRANSITION_METADATA = [
+    public const DEFINITION_METADATA = [
+        'name' => 'Default task',
+    ];
+
+    public const TRANSITION_METADATA = [
         'close' => [
             'verb' => 'close',
             'class' => 'btn btn-task-label btn-task-close',
             'sentence' => '%user% has closed the task',
             'sentence_confirmation' => 'Are you sure you want to close this task ?',
-            'apply_transition_submit_label' => 'Close_verb'
+            'apply_transition_submit_label' => 'Close_verb',
         ],
         'cancel' => [
             'verb' => 'cancel',
             'class' => 'btn btn-task-label btn-task-cancel',
             'sentence' => '%user% has canceled the task',
             'sentence_confirmation' => 'Are you sure you want to cancel this task ?',
-            'apply_transition_submit_label' => 'Set this task to cancel state'
+            'apply_transition_submit_label' => 'Set this task to cancel state',
         ],
         'start' => [
             'verb' => 'start',
             'class' => 'btn btn-task-label btn-task-start',
             'sentence' => '%user% has started the task',
             'sentence_confirmation' => 'Are you sure you want to start this task ?',
-            'apply_transition_submit_label' => 'Start_verb'
-        ]
+            'apply_transition_submit_label' => 'Start_verb',
+        ],
     ];
-    
-    const DEFINITION_METADATA = [
-        'name' => 'Default task'
-    ];
-
-    public function supports(AbstractTask $task)
-    {
-
-        return $task instanceof SingleTask
-            && $task->getType() === 'task_default';
-    }
 
     public static function getAssociatedWorkflowName()
     {
@@ -73,38 +60,46 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
         string $key,
         $metadataSubject = null
     ) {
-        $keys = \explode('.', $key);
+        $keys = explode('.', $key);
 
-        switch($keys[0]) {
+        switch ($keys[0]) {
             case 'transition':
                 if (!$metadataSubject instanceof Transition) {
-                    throw new \LogicException("You must give a transition as metadatasubject");
+                    throw new LogicException('You must give a transition as metadatasubject');
                 }
 
-                return $this->getTransitionMetadata(\implode('.', \array_slice($keys, 1)), $metadataSubject);
+                return $this->getTransitionMetadata(implode('.', array_slice($keys, 1)), $metadataSubject);
+
             case 'definition':
                 return self::DEFINITION_METADATA[$keys[1]] ?? $key;
+
             default:
                 return $key;
         }
     }
 
+    public function isClosed(AbstractTask $task)
+    {
+        return array_key_exists('closed', $task->getCurrentStates())
+            || array_key_exists('canceled', $task->getCurrentStates());
+    }
+
+    public function supports(AbstractTask $task)
+    {
+        return $task instanceof SingleTask
+            && $task->getType() === 'task_default';
+    }
+
     protected function getTransitionMetadata($key, Transition $transition)
     {
-        if (!\array_key_exists($transition->getName(), self::TRANSITION_METADATA)) {
+        if (!array_key_exists($transition->getName(), self::TRANSITION_METADATA)) {
             return $key;
         }
 
-        if (!\array_key_exists($key, self::TRANSITION_METADATA[$transition->getName()])) {
+        if (!array_key_exists($key, self::TRANSITION_METADATA[$transition->getName()])) {
             return $key;
         }
 
         return self::TRANSITION_METADATA[$transition->getName()][$key];
     }
-
-    public function isClosed(AbstractTask $task)
-    {
-        return \array_key_exists('closed', $task->getCurrentStates())
-            || \array_key_exists('canceled', $task->getCurrentStates());
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php b/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php
index e4ceff327..ca182afb8 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/Event/DefaultTaskGuardEvent.php
@@ -1,59 +1,49 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Workflow\Event;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Workflow\Event\GuardEvent;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
 
 /**
- * 
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Workflow\Event;
+
+use Chill\TaskBundle\Security\Authorization\TaskVoter;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Workflow\Event\GuardEvent;
+
 class DefaultTaskGuardEvent implements EventSubscriberInterface
 {
-    public static function getSubscribedEvents(): array
-    {
-        return [
-            'workflow.task_default.guard' => [
-                'checkACL'
-            ]
-        ];
-    }
-    
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
-    
+
     public function __construct(AuthorizationCheckerInterface $authorizationChecker)
     {
         $this->authorizationChecker = $authorizationChecker;
     }
-    
+
     public function checkACL(GuardEvent $event)
     {
-        if (FALSE === $this->authorizationChecker->isGranted(TaskVoter::UPDATE, 
-            $event->getSubject())) {
+        if (false === $this->authorizationChecker->isGranted(
+            TaskVoter::UPDATE,
+            $event->getSubject()
+        )) {
             $event->setBlocked(true);
         }
     }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'workflow.task_default.guard' => [
+                'checkACL',
+            ],
+        ];
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
index d49591a64..4b1b13eb8 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowDefinition.php
@@ -1,27 +1,16 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <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\TaskBundle\Workflow;
 
 /**
+ * Chill is a software for social workers
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\TaskBundle\Workflow;
+
 interface TaskWorkflowDefinition
 {
-    
 }
diff --git a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
index 13be91bd3..2bec260d4 100644
--- a/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+++ b/src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
@@ -1,93 +1,87 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
  *
- * 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\TaskBundle\Workflow;
 
 use Chill\TaskBundle\Entity\AbstractTask;
+use LogicException;
+use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\SupportStrategy\WorkflowSupportStrategyInterface;
 use Symfony\Component\Workflow\WorkflowInterface;
-use Symfony\Component\Workflow\Event\Event;
+use function count;
+use function sprintf;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class TaskWorkflowManager implements WorkflowSupportStrategyInterface
 {
     /**
-     *
      * @var TaskWorkflowDefinition[]
      */
-    protected $definitions = array();
-    
-    public function addDefinition(TaskWorkflowDefinition $definition) {
+    protected $definitions = [];
+
+    public function addDefinition(TaskWorkflowDefinition $definition)
+    {
         $this->definitions[] = $definition;
     }
-    
+
     /**
-     * 
-     * @param AbstractTask $task
+     * @throws LogicException
+     *
      * @return TaskWorkflowDefinition
-     * @throws \LogicException
      */
     public function getTaskWorkflowDefinition(AbstractTask $task)
     {
-        $definitions = array();
-        
-        foreach($this->definitions as $tested) {
+        $definitions = [];
+
+        foreach ($this->definitions as $tested) {
             if ($tested->supports($task)) {
                 $definitions[] = $tested;
             }
         }
-        
+
         $count = count($definitions);
-        if ($count > 1) {
-            throw new \LogicException("More than one TaskWorkflowDefinition supports "
-                . "this task. This should not happens.");
-        } elseif ($count === 0) {
-            throw new \LogicException(\sprintf("No taskWorkflowDefinition supports this task type: %s (task id: %s).", $task->getType(), $task->getId()));
+
+        if (1 < $count) {
+            throw new LogicException('More than one TaskWorkflowDefinition supports '
+                . 'this task. This should not happens.');
         }
-        
+
+        if (0 === $count) {
+            throw new LogicException(sprintf('No taskWorkflowDefinition supports this task type: %s (task id: %s).', $task->getType(), $task->getId()));
+        }
+
         return $definitions[0];
     }
-    
+
+    public function getWorkflowMetadata(AbstractTask $task, string $key, $metadataSubject = null, ?string $name = null)
+    {
+        return $this->getTaskWorkflowDefinition($task)
+            ->getWorkflowMetadata($task, $key, $metadataSubject);
+    }
+
+    public function onTaskStateEntered(Event $e)
+    {
+        $task = $e->getSubject();
+
+        $definition = $this->getTaskWorkflowDefinition($task);
+
+        $task->setClosed($definition->isClosed($task));
+    }
+
     public function supports(WorkflowInterface $workflow, $subject): bool
     {
         if (!$subject instanceof AbstractTask) {
             return false;
         }
-        
+
         return $workflow->getName() === $this
             ->getTaskWorkflowDefinition($subject)->getAssociatedWorkflowName();
     }
-    
-    public function getWorkflowMetadata(AbstractTask $task, string $key, $metadataSubject = null, string $name = null)
-    {
-        return $this->getTaskWorkflowDefinition($task)
-            ->getWorkflowMetadata($task, $key, $metadataSubject);
-    }
-    
-    public function onTaskStateEntered(Event $e) 
-    {
-        $task = $e->getSubject();
-        
-        $definition = $this->getTaskWorkflowDefinition($task);
-        
-        $task->setClosed($definition->isClosed($task));
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/chill.webpack.config.js b/src/Bundle/ChillTaskBundle/chill.webpack.config.js
index 83c08a6ce..e96855d80 100644
--- a/src/Bundle/ChillTaskBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillTaskBundle/chill.webpack.config.js
@@ -1,4 +1,6 @@
 module.exports = function(encore, entries)
 {
     entries.push(__dirname + '/Resources/public/chill/index.js');
+
+    encore.addEntry('page_task_list', __dirname + '/Resources/public/page/tile_list/index.js');
 };
diff --git a/src/Bundle/ChillTaskBundle/config/services/controller.yaml b/src/Bundle/ChillTaskBundle/config/services/controller.yaml
index 533c57f47..76799c72d 100644
--- a/src/Bundle/ChillTaskBundle/config/services/controller.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/controller.yaml
@@ -1,11 +1,6 @@
 services:
-    Chill\TaskBundle\Controller\:
-        resource: '../../Controller'
-        tags: ['controller.service_arguments']
-
-    Chill\TaskBundle\Controller\SingleTaskController:
-        arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
-            $timelineBuilder: '@chill_main.timeline_builder'
-            $logger: '@chill.main.logger'
-        tags: ['controller.service_arguments']
+  Chill\TaskBundle\Controller\:
+    resource: "../../Controller"
+    autowire: true
+    autoconfigure: ture
+    tags: ["controller.service_arguments"]
diff --git a/src/Bundle/ChillTaskBundle/config/services/form.yaml b/src/Bundle/ChillTaskBundle/config/services/form.yaml
index f82e4a562..728b8d7da 100644
--- a/src/Bundle/ChillTaskBundle/config/services/form.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/form.yaml
@@ -1,4 +1,9 @@
 services:
+    Chill\TaskBundle\Form\:
+        resource: '../../Form/'
+        autowire: true
+        autoconfigure: true
+
     Chill\TaskBundle\Form\SingleTaskListType:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'
diff --git a/src/Bundle/ChillTaskBundle/config/services/menu.yaml b/src/Bundle/ChillTaskBundle/config/services/menu.yaml
index b4ff7a421..a9e1948d6 100644
--- a/src/Bundle/ChillTaskBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/menu.yaml
@@ -1,23 +1,22 @@
 services:
-    Chill\TaskBundle\Menu\UserMenuBuilder:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $counter: '@Chill\TaskBundle\Templating\UI\CountNotificationTask'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
-            
-    Chill\TaskBundle\Menu\PersonMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
-            
-    Chill\TaskBundle\Menu\SectionMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-            $translator: '@Symfony\Component\Translation\TranslatorInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
+  Chill\TaskBundle\Menu\UserMenuBuilder:
+    arguments:
+      $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
+      $counter: '@Chill\TaskBundle\Templating\UI\CountNotificationTask'
+      $translator: '@Symfony\Component\Translation\TranslatorInterface'
+      $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
+    tags:
+      - { name: "chill.menu_builder" }
+
+  Chill\TaskBundle\Menu\MenuBuilder:
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: "chill.menu_builder" }
+
+  Chill\TaskBundle\Menu\SectionMenuBuilder:
+    arguments:
+      $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
+      $translator: '@Symfony\Component\Translation\TranslatorInterface'
+    tags:
+      - { name: "chill.menu_builder" }
diff --git a/src/Bundle/ChillTaskBundle/config/services/repositories.yaml b/src/Bundle/ChillTaskBundle/config/services/repositories.yaml
index 3cc867d96..7bee5abd0 100644
--- a/src/Bundle/ChillTaskBundle/config/services/repositories.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/repositories.yaml
@@ -9,3 +9,9 @@ services:
               arguments:
                   - "@chill.main.security.authorization.helper"
     Chill\TaskBundle\Repository\SingleTaskRepository: '@chill_task.single_task_repository'
+
+    Chill\TaskBundle\Repository\SingleTaskAclAwareRepository:
+        autowire: true
+        autoconfigure: true
+
+    Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface: '@Chill\TaskBundle\Repository\SingleTaskAclAwareRepository'
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
index 4be2ada22..233a860cd 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413135614.php
@@ -1,18 +1,31 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Task;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Create a table for Single task.
  */
 class Version20180413135614 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP SCHEMA chill_task CASCADE');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -27,17 +40,5 @@ class Version20180413135614 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_task.single_task ADD CONSTRAINT FK_194CB3D859EC7D60 FOREIGN KEY (assignee_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_task.single_task ADD CONSTRAINT FK_194CB3D8217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_task.single_task ADD CONSTRAINT FK_194CB3D870EE2FF6 FOREIGN KEY (circle_id) REFERENCES scopes (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        
-    }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP SCHEMA chill_task CASCADE');
-        
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
index e04d9ba04..6f7bd3cd5 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180413201023.php
@@ -1,18 +1,35 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\Migrations\Task;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create recurring task
+ * Create recurring task.
  */
 class Version20180413201023 extends AbstractMigration
 {
-    /**
-     * @param Schema $schema
-     */
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_task.single_task DROP CONSTRAINT FK_194CB3D840868C31');
+        $this->addSql('DROP SEQUENCE chill_task.recurring_task_id_seq CASCADE');
+
+        $this->addSql('DROP TABLE chill_task.recurring_task');
+        $this->addSql('ALTER TABLE chill_task.single_task DROP recurringTask_id');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -30,20 +47,5 @@ class Version20180413201023 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_task.single_task ADD recurringTask_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_task.single_task ADD CONSTRAINT FK_194CB3D840868C31 FOREIGN KEY (recurringTask_id) REFERENCES chill_task.recurring_task (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_194CB3D840868C31 ON chill_task.single_task (recurringTask_id)');
-
-    }
-
-    /**
-     * @param Schema $schema
-     */
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_task.single_task DROP CONSTRAINT FK_194CB3D840868C31');
-        $this->addSql('DROP SEQUENCE chill_task.recurring_task_id_seq CASCADE');
-        
-        $this->addSql('DROP TABLE chill_task.recurring_task');
-        $this->addSql('ALTER TABLE chill_task.single_task DROP recurringTask_id');
     }
 }
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
index b0030bd8a..3a38c78ba 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180426093011.php
@@ -1,23 +1,24 @@
-<?php declare(strict_types = 1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Task;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add a column 'closed' on tasks
+ * Add a column 'closed' on tasks.
  */
 class Version20180426093011 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE chill_task.single_task ADD closed BOOLEAN DEFAULT \'false\' NOT NULL');
-        $this->addSql('ALTER TABLE chill_task.recurring_task ADD closed BOOLEAN DEFAULT \'false\' NOT NULL');
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -25,4 +26,12 @@ class Version20180426093011 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_task.recurring_task DROP closed');
         $this->addSql('ALTER TABLE chill_task.single_task DROP closed');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_task.single_task ADD closed BOOLEAN DEFAULT \'false\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_task.recurring_task ADD closed BOOLEAN DEFAULT \'false\' NOT NULL');
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
index c62c81744..517896cd7 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20180502194119.php
@@ -1,15 +1,32 @@
-<?php declare(strict_types = 1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Task;
 
-use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
 
 /**
  * Create task place events table.
  */
 class Version20180502194119 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP SEQUENCE chill_task.single_task_place_event_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_task.single_task_place_event');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -22,13 +39,4 @@ class Version20180502194119 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_task.single_task_place_event ADD CONSTRAINT FK_D459EBEEF675F31B FOREIGN KEY (author_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_task.single_task_place_event ADD CONSTRAINT FK_D459EBEE8DB60186 FOREIGN KEY (task_id) REFERENCES chill_task.single_task (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP SEQUENCE chill_task.single_task_place_event_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_task.single_task_place_event');
-        
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
index 99a2bbb9f..8d934c0de 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113161925.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Task;
 
@@ -6,10 +15,18 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add index on single_task_place_events
+ * Add index on single_task_place_events.
  */
 final class Version20181113161925 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP INDEX transition_task_date');
+        $this->addSql('DROP INDEX transition_task');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -17,13 +34,4 @@ final class Version20181113161925 extends AbstractMigration
         $this->addSql('CREATE INDEX transition_task_date ON chill_task.single_task_place_event (task_id, transition, datetime)');
         $this->addSql('CREATE INDEX transition_task ON chill_task.single_task_place_event (task_id, transition)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP INDEX transition_task_date');
-        $this->addSql('DROP INDEX transition_task');
-        
-    }
 }
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
index 68de67114..9d5a9bdcb 100644
--- a/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20181113164108.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\Task;
 
@@ -6,18 +15,10 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add index on single task
+ * Add index on single task.
  */
 final class Version20181113164108 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE INDEX by_type ON chill_task.single_task (type)');
-        $this->addSql('CREATE INDEX by_current_state ON chill_task.single_task USING GIN (current_states)');
-    }
-
     public function down(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -25,4 +26,12 @@ final class Version20181113164108 extends AbstractMigration
         $this->addSql('DROP INDEX by_type');
         $this->addSql('DROP INDEX by_current_state');
     }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('CREATE INDEX by_type ON chill_task.single_task (type)');
+        $this->addSql('CREATE INDEX by_current_state ON chill_task.single_task USING GIN (current_states)');
+    }
 }
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php b/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php
new file mode 100644
index 000000000..edffd12f9
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20210909153533.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Task;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210909153533 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_task.recurring_task DROP CONSTRAINT FK_9F663B90591CC992');
+        $this->addSql('ALTER TABLE chill_task.recurring_task DROP course_id');
+        $this->addSql('ALTER TABLE chill_task.single_task DROP CONSTRAINT FK_194CB3D8591CC992');
+        $this->addSql('ALTER TABLE chill_task.single_task DROP course_id');
+    }
+
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_task.recurring_task ADD course_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_task.recurring_task ADD CONSTRAINT FK_9F663B90591CC992 FOREIGN KEY (course_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_9F663B90591CC992 ON chill_task.recurring_task (course_id)');
+        $this->addSql('ALTER TABLE chill_task.single_task ADD course_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_task.single_task ADD CONSTRAINT FK_194CB3D8591CC992 FOREIGN KEY (course_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_194CB3D8591CC992 ON chill_task.single_task (course_id)');
+    }
+}
diff --git a/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php b/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php
new file mode 100644
index 000000000..93ec4207d
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/migrations/Version20211029213909.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Task;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211029213909 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_task.by_end_date');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add index for task state and end date';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE INDEX by_end_date ON chill_task.single_task (end_date DESC NULLS FIRST)');
+    }
+}
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
index 71bc22612..5633c0219 100644
--- a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
@@ -1,53 +1,55 @@
-Tasks: 'Tâches'
-'New task': 'Nouvelle tâche'
-'Add a new task': 'Ajouter une nouvelle tâche'
+Tasks: "Tâches"
+"New task": "Nouvelle tâche"
+"Add a new task": "Ajouter une nouvelle tâche"
 Title: Titre
 Description: Description
-Assignee: 'Personne assignée'
+Assignee: "Personne assignée"
 Scope: Cercle
-'Start date': 'Date de début'
-'End date': "Date d'échéance"
-'Warning date': "Date d'avertissement"
-'Warning interval': "Délai d'avertissement avant la date d'échéance"
-'Unknown dates': 'Dates non spécifiées'
-'N': ''
-'Unit': ''
+"Start date": "Date de début"
+"End date": "Date d'échéance"
+"Warning date": "Date d'avertissement"
+"Warning interval": "Délai d'avertissement avant la date d'échéance"
+"Unknown dates": "Dates non spécifiées"
+"N": ""
+"Unit": ""
 Task: Tâche
 Details: Détails
 Person: Personne
 Date: Date
 Dates: Dates
 User: Utilisateur
-'Task list': 'Liste des tâches'
-'Tasks with expired deadline': "Tâches avec une date d'échéance dépassée"
-'Tasks with warning deadline reached': "Tâches avec une date d'avertissement atteinte"
-'Current tasks': 'Tâches en cours'
-'Closed tasks': Tâches terminées
-'Tasks not started': 'Tâches non commencées'
-'Task start date': 'Date de début'
-'Task warning date': "Date d'avertissement"
-'Task end date': "Date d'échéance"
-'Start': 'Début'
-'Warning': 'Avertissement'
-'End': 'Échéance'
-'Task type': 'Type'
-'Task status': 'Statut'
-'Edit the task': 'Modifier la tâche'
-'Edit task': 'Modifier la tâche'
-'Save task': 'Enregistrer la tâche'
-'View the task': 'Voir la tâche'
-'Update the task': 'Mettre à jour la tâche'
-'Remove task': 'Supprimer la tâche'
-'Delete': 'Supprimer'
-'Change task status': 'Changer le statut'
+"Task list": "Liste des tâches"
+"Tasks with expired deadline": "Tâches avec une date d'échéance dépassée"
+"Tasks with warning deadline reached": "Tâches avec une date d'avertissement atteinte"
+"Current tasks": "Tâches en cours"
+"Closed tasks": Tâches terminées
+"Tasks not started": "Tâches non commencées"
+"Task start date": "Date de début"
+"Task warning date": "Date d'avertissement"
+"Task end date": "Date d'échéance"
+"Start": "Début"
+"Warning": "Avertissement"
+"End": "Échéance"
+"Task type": "Type"
+"Task status": "Statut"
+"Edit the task": "Modifier la tâche"
+"Edit task": "Modifier la tâche"
+"Save task": "Enregistrer la tâche"
+"View the task": "Voir la tâche"
+"Update the task": "Mettre à jour la tâche"
+"Remove task": "Supprimer la tâche"
+"Delete": "Supprimer"
+"Change task status": "Changer le statut"
 'Are you sure you want to remove the task about "%name%" ?': 'Êtes-vous sûr·e de vouloir supprimer la tâche de "%name%"?'
-'See more': 'Voir plus'
-'Associated tasks': 'Tâches associées'
-'My tasks': 'Mes tâches'
-'No description': 'Pas de description'
-'No dates specified': 'Dates non spécifiées'
-'No one assignee': 'Aucune personne assignée'
-'Task types': Types de tâches
+'Are you sure you want to remove the task "%title%" ?': 'Êtes-vous sûr·e de vouloir supprimer la tâche "%title%" ?'
+"See more": "Voir plus"
+"Associated tasks": "Tâches associées"
+"My tasks": "Mes tâches"
+"Tasks for this accompanying period": "Tâches pour ce parcours d'accompagnement"
+"No description": "Pas de description"
+"No dates specified": "Dates non spécifiées"
+"No one assignee": "Aucune personne assignée"
+"Task types": Types de tâches
 Days: Jour(s)
 Weeks: Semaine(s)
 Months: Mois
@@ -61,38 +63,43 @@ Default task: Tâche par défaut
 Not assigned: Aucun utilisateur assigné
 For person: Pour
 By: Par
+Any tasks: Aucune tâche
 
 # transitions - default task definition
-'new': 'nouvelle'
-'in_progress': 'en cours'
-'closed': 'fermée'
-'canceled': 'supprimée'
+"new": "nouvelle"
+"in_progress": "en cours"
+"closed": "fermée"
+"canceled": "supprimée"
 start: démarrer
 close: clotûrer
 cancel: annuler
 Start_verb: Démarrer
 Close_verb: Clotûrer
 Set this task to cancel state: Marquer cette tâche comme annulée
-'%user% has closed the task': '%user% a fermé la tâche'
-'%user% has canceled the task': '%user% a annulé la tâche'
-'%user% has started the task': '%user% a commencé la tâche'
-'%user% has created the task': '%user% a introduit la tâche'
+"%user% has closed the task": "%user% a fermé la tâche"
+"%user% has canceled the task": "%user% a annulé la tâche"
+"%user% has started the task": "%user% a commencé la tâche"
+"%user% has created the task": "%user% a introduit la tâche"
 Are you sure you want to close this task ?: Êtes-vous sûrs de vouloir clotûrer cette tâche ?
 Are you sure you want to cancel this task ?: Êtes-vous sûrs de vouloir annuler cette tâche ?
 Are you sure you want to start this task ?: Êtes-vous sûrs de vouloir démarrer cette tâche ?
 
 #Flash messages
-'The task is created': 'La tâche a été créée'
-'There is no tasks.': Aucune tâche.
-'The task has been successfully removed.': 'La tâche a bien été supprimée'
-'This form contains errors': 'Ce formulaire contient des erreurs'
-'The task has been updated': 'La tâche a été mise à jour'
-'The transition is successfully applied': 'La transition a bien été effectuée'
-'The transition could not be applied': "La transition n'a pas pu être appliquée"
+"The task is created": "La tâche a été créée"
+"There is no tasks.": Aucune tâche.
+"The task has been successfully removed.": "La tâche a bien été supprimée"
+"This form contains errors": "Ce formulaire contient des erreurs"
+"The task has been updated": "La tâche a été mise à jour"
+"The transition is successfully applied": "La transition a bien été effectuée"
+"The transition could not be applied": "La transition n'a pas pu être appliquée"
 
 #widget
-'%number% tasks over deadline': '{0} Aucune tâche dépassée|{1} Une tâche dépassée | ]1,Inf[ %count% tâches dépassées'
-'%number% tasks near deadline': '{0} Aucune tâche en rappel|{1} Une tâche en rappel | ]1,Inf[ %count% tâches en rappel'
+"%number% tasks over deadline": "{0} Aucune tâche dépassée|{1} Une tâche dépassée | ]1,Inf[ %count% tâches dépassées"
+"%number% tasks near deadline": "{0} Aucune tâche en rappel|{1} Une tâche en rappel | ]1,Inf[ %count% tâches en rappel"
+
+Tasks near deadline: Tâches à échéance proche
+Tasks over deadline: Tâches à échéance dépassée
+Tasks without alert: Tâches à échéance future ou sans échéance
 
 #title
 My tasks near deadline: Mes tâches à échéance proche
@@ -107,4 +114,4 @@ All centers: Tous les centres
 CHILL_TASK_TASK_CREATE: Ajouter une tâche
 CHILL_TASK_TASK_DELETE: Supprimer une tâche
 CHILL_TASK_TASK_SHOW: Voir une tâche
-CHILL_TASK_TASK_UPDATE: Modifier une tâche
\ No newline at end of file
+CHILL_TASK_TASK_UPDATE: Modifier une tâche
diff --git a/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php b/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
index 6c6ff08c9..671db11e6 100644
--- a/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
+++ b/src/Bundle/ChillThirdPartyBundle/ChillThirdPartyBundle.php
@@ -1,10 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle;
 
+use Chill\ThirdPartyBundle\DependencyInjection\CompilerPass\ThirdPartyTypeCompilerPass;
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Chill\ThirdPartyBundle\DependencyInjection\CompilerPass\ThirdPartyTypeCompilerPass;
 
 class ChillThirdPartyBundle extends Bundle
 {
@@ -15,5 +24,4 @@ class ChillThirdPartyBundle extends Bundle
             ->addTag('chill_3party.provider');
         $container->addCompilerPass(new ThirdPartyTypeCompilerPass());
     }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
index f7d47a32d..5a1923328 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@@ -1,55 +1,53 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Controller;
 
-use Chill\MainBundle\CRUD\Controller\AbstractCRUDController;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyACLAwareRepositoryInterface;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use http\Exception\RuntimeException;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use LogicException;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Routing\Annotation\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
-use Doctrine\Common\Collections\ArrayCollection;
-use Chill\ThirdPartyBundle\Form\ThirdPartyType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Pagination\PaginatorFactory;
+use function array_merge;
 
 final class ThirdPartyController extends CRUDController
 {
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
     /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    /**
-     *
      * @var PaginatorFactory
      */
     protected $paginatorFactory;
 
+    protected RequestStack $requestStack;
+
     protected ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository;
 
-    protected RequestStack $requestStack;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
@@ -65,21 +63,57 @@ final class ThirdPartyController extends CRUDController
         $this->thirdPartyACLAwareRepository = $thirdPartyACLAwareRepository;
     }
 
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['name', 'company_name', 'acronym'])
+            //->addToggle('only-active', [])
+            //    ->addOrderBy()
+            ->build();
+    }
+
     protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
     {
-        if (NULL === $filterOrder){
-            throw new \LogicException('filterOrder should not be null');
+        if (null === $filterOrder) {
+            throw new LogicException('filterOrder should not be null');
         }
 
-        return $this->thirdPartyACLAwareRepository->countThirdParties(ThirdPartyVoter::SHOW,
-            $filterOrder->getQueryString());
+        return $this->thirdPartyACLAwareRepository->countThirdParties(
+            ThirdPartyVoter::SHOW,
+            $filterOrder->getQueryString()
+        );
+    }
+
+    protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    {
+        if ('new' === $action) {
+            return parent::createFormFor($action, $entity, $formClass, array_merge(
+                $formOptions,
+                ['kind' => $this->requestStack->getCurrentRequest()->query->getAlpha('kind')]
+            ));
+        }
+
+        if ('edit' === $action) {
+            return parent::createFormFor($action, $entity, $formClass, array_merge(
+                $formOptions,
+                ['kind' => $entity->getKind()]
+            ));
+        }
+
+        return parent::createFormFor($action, $entity, $formClass, $formOptions);
     }
 
     protected function getQueryResult(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
     {
         return $this->thirdPartyACLAwareRepository
-            ->listThirdParties(ThirdPartyVoter::SHOW, $filterOrder->getQueryString(), ['name' => 'ASC'], $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber());
+            ->listThirdParties(
+                ThirdPartyVoter::SHOW,
+                $filterOrder->getQueryString(),
+                ['name' => 'ASC'],
+                $paginator->getItemsPerPage(),
+                $paginator->getCurrentPageFirstItemNumber()
+            );
     }
 
     protected function onPostCheckACL($action, Request $request, $entity): ?Response
@@ -93,42 +127,16 @@ final class ThirdPartyController extends CRUDController
         if ('new' === $action) {
             if (!$request->query->has('kind')) {
                 return $this->render('@ChillThirdParty/ThirdParty/new_pick_kind.html.twig');
-            } else {
-                $kind = $request->query->getAlpha('kind', '');
-
-                if (!(ThirdParty::KIND_COMPANY === $kind || ThirdParty::KIND_CONTACT === $kind)) {
-                    throw new BadRequestHttpException('This kind is not supported: '.$kind);
-                }
-
-                $entity->setKind($kind);
             }
+            $kind = $request->query->getAlpha('kind', '');
+
+            if (!(ThirdParty::KIND_COMPANY === $kind || ThirdParty::KIND_CONTACT === $kind)) {
+                throw new BadRequestHttpException('This kind is not supported: ' . $kind);
+            }
+
+            $entity->setKind($kind);
         }
 
         return null;
     }
-
-    protected function createFormFor(string $action, $entity, string $formClass = null, array $formOptions = []): FormInterface
-    {
-        if ('new' === $action) {
-            return parent::createFormFor($action, $entity, $formClass, \array_merge(
-                $formOptions, [ 'kind' => $this->requestStack->getCurrentRequest()->query->getAlpha('kind')]
-            ));
-        } elseif ('edit' === $action) {
-            return parent::createFormFor($action, $entity, $formClass, \array_merge(
-                $formOptions, [ 'kind' => $entity->getKind()]
-            ));
-        }
-
-        return parent::createFormFor($action, $entity, $formClass, $formOptions);
-    }
-
-    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
-    {
-        return $this->getFilterOrderHelperFactory()
-            ->create(self::class)
-            ->addSearchBox(['name', 'company_name', 'acronym'])
-            //->addToggle('only-active', [])
-            //    ->addOrderBy()
-            ->build();
-    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
index 1d343f1fd..9f163c815 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdParty.php
@@ -1,21 +1,41 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\DataFixtures\ORM;
 
 use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeImmutable;
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Iterator;
 use Nelmio\Alice\Loader\NativeLoader;
 use Nelmio\Alice\ObjectSet;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Entity\Address;
-use Doctrine\ORM\EntityManagerInterface;
+use function array_map;
+use function count;
 
-class LoadThirdParty extends Fixture Implements DependentFixtureInterface
+class LoadThirdParty extends Fixture implements DependentFixtureInterface
 {
+    public function getDependencies()
+    {
+        return [
+            LoadCenters::class,
+            LoadPostalCodes::class,
+        ];
+    }
+
     public function load(ObjectManager $manager)
     {
         $thirdParties = $this->getThirdParties()->getObjects();
@@ -25,10 +45,10 @@ class LoadThirdParty extends Fixture Implements DependentFixtureInterface
                 // this is an address
                 continue;
             }
-            $thirdParty->setCreatedAt(new \DateTimeImmutable('today'));
+            $thirdParty->setCreatedAt(new DateTimeImmutable('today'));
 
             foreach ($this->getCenters() as $center) {
-               $thirdParty->addCenter($center);
+                $thirdParty->addCenter($center);
             }
 
             $manager->persist($thirdParty);
@@ -37,14 +57,32 @@ class LoadThirdParty extends Fixture Implements DependentFixtureInterface
         $manager->flush();
     }
 
-    private function getCenters(): \Iterator
+    private function createAddress(): ObjectSet
     {
-        $references = \array_map(function($a) { return $a['ref']; },
-            LoadCenters::$centers);
+        $loader = new NativeLoader();
+
+        return $loader->loadData([
+            Address::class => [
+                'address1' => [
+                    'name' => '<fr_FR:company()>',
+                    'telephone' => '<fr_FR:phonenumber()>',
+                    'email' => '<email()>',
+                    'comment' => '<fr_FR:realTextBetween(10, 500)>',
+                ],
+            ],
+        ]);
+    }
+
+    private function getCenters(): Iterator
+    {
+        $references = array_map(
+            static function ($a) { return $a['ref']; },
+            LoadCenters::$centers
+        );
         $number = random_int(1, count($references));
 
-        if ($number === 1) {
-            yield $this->getReference($references[\array_rand($references)]);
+        if (1 === $number) {
+            yield $this->getReference($references[array_rand($references)]);
         } else {
             foreach (array_rand($references, $number) as $index) {
                 yield $this->getReference($references[$index]);
@@ -52,24 +90,24 @@ class LoadThirdParty extends Fixture Implements DependentFixtureInterface
         }
     }
 
-    public function getDependencies()
+    private function getPostalCode(): PostalCode
     {
-        return [
-            LoadCenters::class,
-            LoadPostalCodes::class
-        ];
+        $ref = LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)];
+
+        return $this->getReference($ref);
     }
 
     private function getThirdParties(): ObjectSet
     {
         $loader = new NativeLoader();
-        $objectSet = $loader->loadData([
+
+        return $loader->loadData([
             Address::class => [
                 'address{1..75}' => [
                     'street' => '<fr_FR:streetName()>',
                     'streetNumber' => '<fr_FR:buildingNumber()>',
                     'validFrom' => '<dateTimeBetween(\'-1 year\', \'now\')>',
-                    'postCode' => $this->getPostalCode()
+                    'postCode' => $this->getPostalCode(),
                 ],
             ],
             ThirdParty::class => [
@@ -78,37 +116,9 @@ class LoadThirdParty extends Fixture Implements DependentFixtureInterface
                     'telephone' => '<fr_FR:phonenumber()>',
                     'email' => '<email()>',
                     'comment' => '<fr_FR:realTextBetween(10, 500)>',
-                    'address' => '@address<current()>'
-                ]
-            ]
+                    'address' => '@address<current()>',
+                ],
+            ],
         ]);
-
-        return $objectSet;
     }
-
-    private function getPostalCode(): PostalCode
-    {
-        $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)];
-
-        return $this->getReference($ref);
-    }
-
-    private function createAddress(): ObjectSet
-    {
-        $loader = new NativeLoader();
-        $objectSet = $loader->loadData([
-            Address::class => [
-                'address1' => [
-                    'name' => '<fr_FR:company()>',
-                    'telephone' => '<fr_FR:phonenumber()>',
-                    'email' => '<email()>',
-                    'comment' => '<fr_FR:realTextBetween(10, 500)>'
-                ]
-            ]
-        ]);
-
-        return $objectSet;
-
-    }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
index bb86e20f1..1bacbfc32 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyCategory.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\DataFixtures\ORM;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
@@ -8,9 +17,7 @@ use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 
 /**
- * Class LoadThirdPartyCategory
- * @package Chill\ThirdPartyBundle\DataFixtures\ORM
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Class LoadThirdPartyCategory.
  */
 class LoadThirdPartyCategory extends Fixture implements FixtureGroupInterface
 {
@@ -22,19 +29,19 @@ class LoadThirdPartyCategory extends Fixture implements FixtureGroupInterface
     public function load(ObjectManager $manager)
     {
         $categories = [
-            ['name' => ['fr' => "maison médicale" ]],
-            ['name' => ['fr' => "hôpital" ]],
-            ['name' => ['fr' => "médecin généraliste" ]],
-            ['name' => ['fr' => "pharmacien" ]],
-            ['name' => ['fr' => "assistance aux personnes âgées" ]],
-            ['name' => ['fr' => "assistante maternelle" ]],
-            ['name' => ['fr' => "assistant social" ]],
-            ['name' => ['fr' => "éducateur spécialisé" ]],
-            ['name' => ['fr' => "infirmier.ère" ]],
+            ['name' => ['fr' => 'maison médicale']],
+            ['name' => ['fr' => 'hôpital']],
+            ['name' => ['fr' => 'médecin généraliste']],
+            ['name' => ['fr' => 'pharmacien']],
+            ['name' => ['fr' => 'assistance aux personnes âgées']],
+            ['name' => ['fr' => 'assistante maternelle']],
+            ['name' => ['fr' => 'assistant social']],
+            ['name' => ['fr' => 'éducateur spécialisé']],
+            ['name' => ['fr' => 'infirmier.ère']],
         ];
 
-        foreach ( $categories as $val) {
-            print "Creating thirdparty category : " . $val['name']['fr'] . "\n";
+        foreach ($categories as $val) {
+            echo 'Creating thirdparty category : ' . $val['name']['fr'] . "\n";
             $category = (new ThirdPartyCategory())
                 ->setName($val['name'])
                 ->setActive(true);
diff --git a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
index ff38bd9ac..1b55ef8ef 100644
--- a/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/DataFixtures/ORM/LoadThirdPartyProfession.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\DataFixtures\ORM;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
@@ -8,9 +17,7 @@ use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
 use Doctrine\Persistence\ObjectManager;
 
 /**
- * Class LoadThirdPartyProfession
- * @package Chill\ThirdPartyBundle\DataFixtures\ORM
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Class LoadThirdPartyProfession.
  */
 class LoadThirdPartyProfession extends Fixture implements FixtureGroupInterface
 {
@@ -22,17 +29,17 @@ class LoadThirdPartyProfession extends Fixture implements FixtureGroupInterface
     public function load(ObjectManager $manager)
     {
         $professions = [
-            ['name' => ['fr' => "Directeur" ]],
-            ['name' => ['fr' => "Docteur" ]],
-            ['name' => ['fr' => "Médecin" ]],
-            ['name' => ['fr' => "Opérateur" ]],
-            ['name' => ['fr' => "Personnel administratif" ]],
-            ['name' => ['fr' => "Président" ]],
-            ['name' => ['fr' => "Responsable infirmier.ère" ]],
+            ['name' => ['fr' => 'Directeur']],
+            ['name' => ['fr' => 'Docteur']],
+            ['name' => ['fr' => 'Médecin']],
+            ['name' => ['fr' => 'Opérateur']],
+            ['name' => ['fr' => 'Personnel administratif']],
+            ['name' => ['fr' => 'Président']],
+            ['name' => ['fr' => 'Responsable infirmier.ère']],
         ];
 
-        foreach ( $professions as $val) {
-            print "Creating thirdparty professions : " . $val['name']['fr'] . "\n";
+        foreach ($professions as $val) {
+            echo 'Creating thirdparty professions : ' . $val['name']['fr'] . "\n";
             $profession = (new ThirdPartyProfession())
                 ->setName($val['name'])
                 ->setActive(true);
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index bdf21c05a..1981d6daf 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -1,35 +1,40 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\DependencyInjection;
 
 use Chill\ThirdPartyBundle\Controller\ThirdPartyController;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\ThirdPartyType;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpFoundation\Request;
-
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration.
  *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
+ * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
  */
 class ChillThirdPartyExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
@@ -49,15 +54,25 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
         $this->prependRoleHierarchy($container);
     }
 
+    protected function prependRoleHierarchy(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                ThirdPartyVoter::CREATE => [ThirdPartyVoter::SHOW],
+                ThirdPartyVoter::UPDATE => [ThirdPartyVoter::SHOW],
+            ],
+        ]);
+    }
+
     protected function preprendRoutes(ContainerBuilder $container)
     {
         //declare routes for 3party bundle
-        $container->prependExtensionConfig('chill_main', array(
-           'routing' => [
-              'resources' => array(
-                 '@ChillThirdPartyBundle/config/routes.yaml'
-              )
-              ],
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillThirdPartyBundle/config/routes.yaml',
+                ],
+            ],
             'cruds' => [
                 [
                     'class' => ThirdParty::class,
@@ -81,10 +96,9 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                         'view' => [
                             'template' => '@ChillThirdParty/ThirdParty/view.html.twig',
                             'role' => ThirdPartyVoter::SHOW,
-                        ]
-                    ]
-
-                ]
+                        ],
+                    ],
+                ],
             ],
             'apis' => [
                 [
@@ -100,29 +114,19 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                                 Request::METHOD_HEAD => true,
                                 Request::METHOD_POST => true,
                                 Request::METHOD_PUT => true,
-                                Request::METHOD_PATCH => true
+                                Request::METHOD_PATCH => true,
                             ],
                             'roles' => [
                                 Request::METHOD_GET => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
                                 Request::METHOD_HEAD => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::SHOW,
                                 Request::METHOD_POST => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
                                 Request::METHOD_PUT => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
-                                Request::METHOD_PATCH => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE
+                                Request::METHOD_PATCH => \Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter::CREATE,
                             ],
-                        ]
-                    ]
-                ]
+                        ],
+                    ],
+                ],
             ],
-        ));
-    }
-
-    protected function prependRoleHierarchy(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-            'role_hierarchy' => array(
-                ThirdPartyVoter::CREATE => [ThirdPartyVoter::SHOW],
-                ThirdPartyVoter::UPDATE => [ThirdPartyVoter::SHOW],
-            )
-        ));
+        ]);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
index e15510a5b..086492e88 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
@@ -1,38 +1,50 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\DependencyInjection\CompilerPass;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use LogicException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use function in_array;
 
 /**
- * Load services tagged chill_3party.provider and add them to the service 
- * definition of manager
- *
+ * Load services tagged chill_3party.provider and add them to the service
+ * definition of manager.
  */
 class ThirdPartyTypeCompilerPass implements CompilerPassInterface
 {
-    const TAG = 'chill_3party.provider';
-    
+    public const TAG = 'chill_3party.provider';
+
     public function process(ContainerBuilder $container)
     {
         $definition = $container->getDefinition(ThirdPartyTypeManager::class);
         $usedKeys = [];
-        
+
         foreach ($container->findTaggedServiceIds(self::TAG) as $id => $tags) {
             $taggedService = $container->getDefinition($id);
             // check forr keys already in use :
             $key = $taggedService->getClass()::getKey();
-            if (\in_array($key, $usedKeys)) {
-                throw new \LogicException(sprintf("Tag with key \"%s\" is already in used", 
-                    $key));
+
+            if (in_array($key, $usedKeys, true)) {
+                throw new LogicException(sprintf(
+                    'Tag with key "%s" is already in used',
+                    $key
+                ));
             }
             $usedKeys[] = $key;
             // alter the service definition of manager
-            $definition->addMethodCall('addProvider', [ new Reference($id) ]);
+            $definition->addMethodCall('addProvider', [new Reference($id)]);
         }
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
index ad5aac291..f5afe3bb2 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -12,9 +21,6 @@ use Symfony\Component\Config\Definition\ConfigurationInterface;
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_third_party');
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 2ce2c2185..069dba9d8 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -1,40 +1,40 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
-use Chill\MainBundle\Entity\Center;
-use Symfony\Component\Validator\Constraints as Assert;
-use Chill\MainBundle\Entity\Address;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use Symfony\Component\Validator\Constraints as Assert;
+use UnexpectedValueException;
+use function array_filter;
+use function array_map;
+use function array_merge;
+use function array_values;
+use function in_array;
+use function is_string;
+use function spl_object_hash;
 
 /**
  * ThirdParty is a party recorded in the database.
@@ -46,178 +46,102 @@ use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
  * @ORM\Entity
  * @ORM\Table(name="chill_3party.third_party")
  * @DiscriminatorMap(typeProperty="type", mapping={
- *  "thirdparty"=ThirdParty::class
+ *     "thirdparty": ThirdParty::class
  * })
  */
 class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 {
-    /**
-     * @var int
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private ?int $id = null;
+    public const KIND_CHILD = 'child';
 
-    const KIND_CONTACT = 'contact';
-    const KIND_COMPANY = 'company';
-    const KIND_CHILD = 'child';
-
-    /**
-     * @ORM\Column(name="kind", type="string", length="20", options={"default":""})
-     * @Groups({"write"})
-     */
-    private ?string $kind = "";
+    public const KIND_COMPANY = 'company';
+
+    public const KIND_CONTACT = 'contact';
 
     /**
+     * [fr] Sigle.
+     *
      * @var string
-     * @ORM\Column(name="name", type="string", length=255)
+     * @ORM\Column(name="acronym", type="string", length=64, nullable=true)
      * @Assert\Length(min="2")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
      */
-    private ?string $name = "";
+    private ?string $acronym = '';
 
     /**
-     * [fr] Raison sociale
-     * @var string
-     * @ORM\Column(name="name_company", type="string", length=255, nullable=true)
-     * @Assert\Length(min="3")
-     * @Groups({"read", "write"})
-    */
-    private ?string $nameCompany = "";
+     * Soft-delete flag.
+     *
+     * @ORM\Column(name="active", type="boolean", options={"defaut": true})
+     */
+    private bool $active = true;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
+     * cascade={"persist", "remove"})
+     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private ?Address $address = null;
 
     /**
      * Canonicalized form composed of name, company name and acronym.
      *
      * This field is read-only, and is generated on database side.
      *
-     * @ORM\Column(name="canonicalized", type="text", options={"default":""})
+     * @ORM\Column(name="canonicalized", type="text", options={"default": ""})
      */
-    private ?string $canonicalized = "";
-
-    /**
-     * [fr] Sigle
-     * @var string
-     * @ORM\Column(name="acronym", type="string", length=64, nullable=true)
-     * @Assert\Length(min="2")
-     * @Groups({"read", "write"})
-    */
-    private ?string $acronym = "";
+    private ?string $canonicalized = '';
 
     /**
      * @var ThirdPartyCategory
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyCategory")
      * @ORM\JoinTable(name="chill_3party.thirdparty_category",
      *     joinColumns={@ORM\JoinColumn(name="thirdparty_id", referencedColumnName="id")},
-     *     inverseJoinColumns={@ORM\JoinColumn(name="category_id", referencedColumnName="id")})
-    */
+     * inverseJoinColumns={@ORM\JoinColumn(name="category_id", referencedColumnName="id")})
+     * @Groups({"docgen:read"})
+     */
     private Collection $categories;
 
-    /**
-     * @var array|null
-     * @ORM\Column(name="types", type="json", nullable=true)
-     */
-    private $types;
-
-    /**
-     * Contact Persons: One Institutional ThirdParty has Many Contact Persons
-     * @ORM\OneToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", mappedBy="parent",
-     *     cascade={"persist"}, orphanRemoval=true)
-     * @var ThirdParty[]|Collection
-     * @Assert\Valid(traverse=true)
-     */
-    private Collection $children;
-
-    /**
-     * Institutional ThirdParty: Many Contact Persons have One Institutional ThirdParty
-     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", inversedBy="children")
-     * @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
-     * @Groups({"read"})
-     */
-    private ?ThirdParty $parent = null;
-
-    /**
-     * @var Civility
-     * @ORM\ManyToOne(targetEntity=Civility::class)
-     * ORM\JoinColumn(name="civility", referencedColumnName="id", nullable=true)
-     */
-    private ?Civility $civility = null;
-
-    /**
-     * [fr] Qualité
-     * @var ThirdPartyProfession
-     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyProfession")
-     * ORM\JoinColumn(name="profession", referencedColumnName="id", nullable=true)
-     */
-    private ?ThirdPartyProfession $profession = null;
-
-    /**
-     * @var string|null
-     * @ORM\Column(name="telephone", type="string", length=64, nullable=true)
-     * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/",
-     *   message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
-     * )
-     * @PhonenumberConstraint(type="any")
-     * @Groups({"read", "write"})
-     */
-    private ?string $telephone = null;
-
-    /**
-     * @var string|null
-     * @ORM\Column(name="email", type="string", length=255, nullable=true)
-     * @Assert\Email(checkMX=false)
-     * @Groups({"read", "write"})
-     */
-    private ?string $email = null;
-
-    /**
-     * @var bool
-     * @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default":false})
-     * @Groups({"read"})
-     */
-    private bool $contactDataAnonymous = false;
-
-    /**
-     * @var Address|null
-     * @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
-     *   cascade={"persist", "remove"})
-     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     * @Groups({"read", "write"})
-     */
-    private ?Address $address = null;
-
-    /**
-     * Soft-delete flag
-     * @ORM\Column(name="active", type="boolean", options={"defaut": true})
-     */
-    private bool $active = true;
-
-    /**
-     * @ORM\Column(name="comment", type="text", nullable=true)
-     */
-    private ?string $comment = null;
-
     /**
      * @ORM\ManyToMany(targetEntity="\Chill\MainBundle\Entity\Center")
      * @ORM\JoinTable(name="chill_3party.party_center")
      */
     private Collection $centers;
 
+    /**
+     * Contact Persons: One Institutional ThirdParty has Many Contact Persons.
+     *
+     * @ORM\OneToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", mappedBy="parent",
+     * cascade={"persist"}, orphanRemoval=true)
+     *
+     * @var Collection|ThirdParty[]
+     * @Assert\Valid(traverse=true)
+     */
+    private Collection $children;
+
+    /**
+     * @var Civility
+     * @ORM\ManyToOne(targetEntity=Civility::class)
+     * ORM\JoinColumn(name="civility", referencedColumnName="id", nullable=true)
+     * @Groups({"docgen:read", "read"})
+     */
+    private ?Civility $civility = null;
+
+    /**
+     * @ORM\Column(name="comment", type="text", nullable=true)
+     * @Groups({"read"})
+     */
+    private ?string $comment = null;
+
+    /**
+     * @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default": false})
+     * @Groups({"read", "docgen:read"})
+     */
+    private bool $contactDataAnonymous = false;
+
     /**
      * @ORM\Column(name="created_at", type="datetime_immutable", nullable=false)
      */
-    private \DateTimeImmutable $createdAt;
-
-    /**
-     * @ORM\Column(name="updated_at", type="datetime_immutable", nullable=true)
-     */
-    private ?\DateTimeImmutable $updatedAt;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @ORM\JoinColumn(name="updated_by", referencedColumnName="id")
-     */
-    private ?User $updatedBy;
+    private DateTimeImmutable $createdAt;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
@@ -225,6 +149,91 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      */
     private ?User $createdBy;
 
+    /**
+     * @ORM\Column(name="email", type="string", length=255, nullable=true)
+     * @Assert\Email(checkMX=false)
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private ?string $email = null;
+
+    /**
+     * @var int
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(name="kind", type="string", length="20", options={"default": ""})
+     * @Groups({"write"})
+     */
+    private ?string $kind = '';
+
+    /**
+     * @var string
+     * @ORM\Column(name="name", type="string", length=255)
+     * @Assert\Length(min="2")
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private ?string $name = '';
+
+    /**
+     * [fr] Raison sociale.
+     *
+     * @var string
+     * @ORM\Column(name="name_company", type="string", length=255, nullable=true)
+     * @Assert\Length(min="3")
+     * @Groups({"read", "write", "docgen:read"})
+     */
+    private ?string $nameCompany = '';
+
+    /**
+     * Institutional ThirdParty: Many Contact Persons have One Institutional ThirdParty.
+     *
+     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", inversedBy="children")
+     * @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
+     * @Groups({"read"})
+     */
+    private ?ThirdParty $parent = null;
+
+    /**
+     * [fr] Qualité.
+     *
+     * @var ThirdPartyProfession
+     * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyProfession")
+     * ORM\JoinColumn(name="profession", referencedColumnName="id", nullable=true)
+     * @Groups({"docgen:read"})
+     */
+    private ?ThirdPartyProfession $profession = null;
+
+    /**
+     * @ORM\Column(name="telephone", type="string", length=64, nullable=true)
+     * @Assert\Regex("/^([\+{1}])([0-9\s*]{4,20})$/",
+     *     message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
+     * )
+     * @PhonenumberConstraint(type="any")
+     * @Groups({"read", "write", "dogen:read"})
+     */
+    private ?string $telephone = null;
+
+    /**
+     * @var array|null
+     * @ORM\Column(name="types", type="json", nullable=true)
+     */
+    private $types;
+
+    /**
+     * @ORM\Column(name="updated_at", type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @ORM\JoinColumn(name="updated_by", referencedColumnName="id")
+     */
+    private ?User $updatedBy;
 
     /**
      * ThirdParty constructor.
@@ -236,6 +245,176 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         $this->children = new ArrayCollection();
     }
 
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getName();
+    }
+
+    /**
+     * Add a child and set the child as active.
+     *
+     * Method used in conjonction with getActiveChildren in form.
+     *
+     * @internal use the method addChild
+     *
+     * @return $this
+     */
+    public function addActiveChild(ThirdParty $child): self
+    {
+        $child->setActive(true);
+
+        return $this->addChild($child);
+    }
+
+    /**
+     * @return $this
+     */
+    public function addCategory(ThirdPartyCategory $category): self
+    {
+        if (!$this->categories->contains($category)) {
+            $this->categories[] = $category;
+        }
+
+        foreach ($this->children as $child) {
+            $child->addCategory($category);
+        }
+
+        return $this;
+    }
+
+    public function addCenter(Center $center)
+    {
+        if (false === $this->centers->contains($center)) {
+            $this->centers->add($center);
+        }
+    }
+
+    /**
+     * @return $this
+     */
+    public function addChild(ThirdParty $child): self
+    {
+        $this->children[] = $child;
+        $child->setParent($this)->setKind(ThirdParty::KIND_CHILD);
+
+        return $this;
+    }
+
+    public function addType(?string $type): self
+    {
+        if (null === $type) {
+            return $this;
+        }
+
+        if (!in_array($type, $this->types ?? [], true)) {
+            $this->types[] = $type;
+        }
+
+        foreach ($this->children as $child) {
+            $child->addType($type);
+        }
+
+        return $this;
+    }
+
+    public function addTypesAndCategories($typeAndCategory): self
+    {
+        if ($typeAndCategory instanceof ThirdPartyCategory) {
+            $this->addCategory($typeAndCategory);
+
+            return $this;
+        }
+
+        if (is_string($typeAndCategory)) {
+            $this->addType($typeAndCategory);
+
+            return $this;
+        }
+
+        throw new UnexpectedValueException(sprintf(
+            'typeAndCategory should be a string or a %s',
+            ThirdPartyCategory::class
+        ));
+    }
+
+    /**
+     * @return string
+     */
+    public function getAcronym(): ?string
+    {
+        return $this->acronym;
+    }
+
+    public function getActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * Get the children where active = true.
+     */
+    public function getActiveChildren(): Collection
+    {
+        return $this->children->filter(static fn (ThirdParty $tp) => $tp->getActive());
+    }
+
+    public function getAddress(): ?Address
+    {
+        if ($this->isChild()) {
+            return $this->getParent()->getAddress();
+        }
+
+        return $this->address;
+    }
+
+    public function getCategories(): Collection
+    {
+        return $this->categories;
+    }
+
+    public function getCenters(): Collection
+    {
+        return $this->centers;
+    }
+
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
+    public function getCivility(): ?Civility
+    {
+        return $this->civility;
+    }
+
+    /**
+     * Get comment.
+     *
+     * @return string|null
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    public function getCreatedAt(): DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * Get email.
+     *
+     * @return string|null
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
     /**
      * Get id.
      *
@@ -251,25 +430,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->kind;
     }
 
-    public function setKind(?string $kind): ThirdParty
-    {
-        $this->kind = $kind;
-        return $this;
-    }
-
-    /**
-     * Set name.
-     *
-     * @param string $name
-     * @return ThirdParty
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
     /**
      * Get name.
      *
@@ -280,17 +440,22 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->name;
     }
 
-    /**
-     * Set telephone.
-     *
-     * @param string|null $telephone
-     * @return ThirdParty
-     */
-    public function setTelephone($telephone = null)
+    public function getNameCompany(): ?string
     {
-        $this->telephone = $telephone;
+        return $this->nameCompany;
+    }
 
-        return $this;
+    public function getParent(): ?ThirdParty
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @return ThirdPartyProfession
+     */
+    public function getProfession(): ?ThirdPartyProfession
+    {
+        return $this->profession;
     }
 
     /**
@@ -303,81 +468,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->telephone;
     }
 
-    /**
-     * Set email.
-     *
-     * @param string|null $email
-     * @return ThirdParty
-     */
-    public function setEmail($email = null)
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    /**
-     * Get email.
-     *
-     * @return string|null
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    public function isContactDataAnonymous(): bool
-    {
-        return $this->contactDataAnonymous;
-    }
-
-    public function setContactDataAnonymous(bool $contactDataAnonymous): ThirdParty
-    {
-        $this->contactDataAnonymous = $contactDataAnonymous;
-        return $this;
-    }
-
-    /**
-     * Set comment.
-     *
-     * @param string|null $comment
-     * @return ThirdParty
-     */
-    public function setComment($comment = null)
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    /**
-     * Get comment.
-     *
-     * @return string|null
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Set type.
-     *
-     * @param array|null $type
-     * @return ThirdParty
-     */
-    public function setTypes(array $type = null)
-    {
-        // remove all keys from the input data
-        $this->types = \array_values($type);
-
-        foreach ($this->children as $child) {
-            $child->setTypes($type);
-        }
-
-        return $this;
-    }
-
     /**
      * Get type.
      *
@@ -388,202 +478,67 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this->types;
     }
 
-    public function addType(?string $type): self
+    public function getTypesAndCategories(): array
     {
-        if (NULL === $type) {
-            return $this;
-        }
-
-        if (!\in_array($type, $this->types ?? [])) {
-            $this->types[] = $type;
-        }
-
-        foreach ($this->children as $child) {
-            $child->addType($type);
-        }
-
-        return $this;
-    }
-
-    public function removeType(?string $type): self
-    {
-        if (NULL === $type) {
-            return $this;
-        }
-
-        if (\in_array($type, $this->types ?? [])) {
-            $this->types = \array_filter($this->types, fn($e) => !\in_array($e, $this->types));
-        }
-
-        foreach ($this->children as $child) {
-            $child->removeType($type);
-        }
-
-        return $this;
+        return array_merge(
+            $this->getCategories()->toArray(),
+            $this->getTypes() ?? []
+        );
     }
 
     /**
-     * @return bool
+     * @return DateTime|null
      */
-    public function getActive(): bool
+    public function getUpdatedAt(): ?DateTimeImmutable
     {
-        return $this->active;
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
     }
 
     /**
-     * @return Collection
+     * @Groups({"read", "docgen:read"})
      */
-    public function getCenters(): Collection
+    public function isChild(): bool
     {
-        return $this->centers;
+        return null !== $this->parent;
+    }
+
+    public function isContactDataAnonymous(): bool
+    {
+        return $this->contactDataAnonymous;
     }
 
     /**
-     * @param bool $active
+     * Mechanism to differentiate children and parents.
+     */
+    public function isLeaf(): bool
+    {
+        return $this->children->count() !== 0;
+    }
+
+    public function isParent(): bool
+    {
+        return !$this->isChild();
+    }
+
+    /**
+     * mark the child as unactive, but keep the child existing in the
+     * database. To effectively remove the child, use removeChild instead.
+     *
      * @return $this
      */
-    public function setActive(bool $active)
+    public function removeActiveChild(ThirdParty $child): self
     {
-        $this->active = $active;
-        foreach ($this->children as $child) {
-            $child->setActive($active);
-        }
-        return $this;
-    }
-
-    /**
-     * @param Center $center
-     */
-    public function addCenter(Center $center)
-    {
-        if (FALSE === $this->centers->contains($center)) {
-            $this->centers->add($center);
-        }
-    }
-
-    /**
-     * @param Center $center
-     */
-    public function removeCenter(Center $center)
-    {
-        if ($this->centers->contains($center)) {
-            $this->centers->removeElement($center);
-        }
-    }
-
-    /**
-     * @param Collection $centers
-     * @return $this
-     */
-    public function setCenters(Collection $centers)
-    {
-        foreach ($centers as $center) {
-            $this->addCenter($center);
-        }
-
-        foreach ($this->centers as $center) {
-            if (FALSE === $centers->contains($center)) {
-                $this->removeCenter($center);
-            }
-        }
+        $child->setActive(false);
 
         return $this;
     }
 
     /**
-     * @return Address|null
-     */
-    public function getAddress(): ?Address
-    {
-        if ($this->isChild()) {
-            return $this->getParent()->getAddress();
-        }
-
-        return $this->address;
-    }
-
-    /**
-     * @param Address|null $address
-     * @return $this
-     */
-    public function setAddress(?Address $address = null)
-    {
-        $this->address = $address;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getNameCompany(): ?string
-    {
-        return $this->nameCompany;
-    }
-
-    /**
-     * @param string $nameCompany
-     * @return ThirdParty
-     */
-    public function setNameCompany(?string $nameCompany): ThirdParty
-    {
-        $this->nameCompany = (string) $nameCompany;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAcronym(): ?string
-    {
-        return $this->acronym;
-    }
-
-    /**
-     * @param string $acronym
-     * @return $this
-     */
-    public function setAcronym(?string $acronym = null): ThirdParty
-    {
-        $this->acronym = (string) $acronym;
-        return $this;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getCategories(): Collection
-    {
-        return $this->categories;
-    }
-
-    /**
-     * @param ThirdPartyCategory $category
-     * @return $this
-     */
-    public function addCategory(ThirdPartyCategory $category): self
-    {
-        if (!$this->categories->contains($category)) {
-            $this->categories[] = $category;
-        }
-
-        foreach ($this->children as $child) {
-        $child->addCategory($category);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param ThirdPartyCategory $category
      * @return $this
      */
     public function removeCategory(ThirdPartyCategory $category): self
@@ -597,152 +552,11 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * Mechanism to differentiate children and parents
-     */
-    public function isLeaf(): bool
+    public function removeCenter(Center $center)
     {
-        return $this->children->count() !== 0;
-    }
-
-    /**
-     * @Groups({"read"})
-     */
-    public function isChild():bool
-    {
-        return $this->parent !== null;
-    }
-
-    public function isParent():bool
-    {
-        return !$this->isChild();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children;
-    }
-
-    /**
-     * Get the children where active = true
-     *
-     * @return Collection
-     */
-    public function getActiveChildren(): Collection
-    {
-        return $this->children->filter(fn (ThirdParty $tp) => $tp->getActive());
-    }
-
-    /**
-     * Add a child and set the child as active
-     *
-     * Method used in conjonction with getActiveChildren in form.
-     *
-     * @internal use the method addChild
-     * @param ThirdParty $child
-     * @return $this
-     */
-    public function addActiveChild(ThirdParty $child): self
-    {
-        $child->setActive(true);
-
-        return $this->addChild($child);
-    }
-
-    /**
-     * mark the child as unactive, but keep the child existing in the
-     * database. To effectively remove the child, use removeChild instead.
-     *
-     * @param ThirdParty $child
-     * @return $this
-     */
-    public function removeActiveChild(ThirdParty $child): self
-    {
-        $child->setActive(false);
-
-        return $this;
-    }
-
-    public function addTypesAndCategories($typeAndCategory): self
-    {
-        if ($typeAndCategory instanceof ThirdPartyCategory) {
-            $this->addCategory($typeAndCategory);
-            return $this;
+        if ($this->centers->contains($center)) {
+            $this->centers->removeElement($center);
         }
-
-        if (is_string($typeAndCategory)) {
-            $this->addType($typeAndCategory);
-            return $this;
-        }
-
-        throw new \UnexpectedValueException(sprintf(
-            "typeAndCategory should be a string or a %s", ThirdPartyCategory::class));
-    }
-
-    public function removeTypesAndCategories($typeAndCategory): self
-    {
-        if ($typeAndCategory instanceof ThirdPartyCategory) {
-            $this->removeCategory($typeAndCategory);
-            return $this;
-        }
-
-        if (is_string($typeAndCategory)) {
-            $this->removeType($typeAndCategory);
-            return $this;
-        }
-
-        throw new \UnexpectedValueException(sprintf(
-            "typeAndCategory should be a string or a %s", ThirdPartyCategory::class));
-    }
-
-    public function getTypesAndCategories(): array
-    {
-        return \array_merge(
-            $this->getCategories()->toArray(),
-            $this->getTypes() ?? []
-        );
-    }
-
-    public function setTypesAndCategories(array $typesAndCategories): self
-    {
-        $types = \array_filter($typesAndCategories, fn($item) => !$item instanceof ThirdPartyCategory);
-        $this->setTypes($types);
-
-        // handle categories
-        foreach ($typesAndCategories as $t) {
-            $this->addTypesAndCategories($t);
-        }
-
-        $categories = \array_filter($typesAndCategories, fn($item) => $item instanceof ThirdPartyCategory);
-        $categoriesHashes = \array_map(fn(ThirdPartyCategory $c) => \spl_object_hash($c), $categories);
-
-        foreach ($categories as $c) {
-            $this->addCategory($c);
-        }
-
-        foreach ($this->getCategories() as $t) {
-            if (!\in_array(\spl_object_hash($t), $categoriesHashes)) {
-                $this->removeCategory($t);
-            }
-        }
-
-        return $this;
-    }
-
-
-    /**
-     * @param ThirdParty $child
-     * @return $this
-     */
-    public function addChild(ThirdParty $child): self
-    {
-        $this->children[] = $child;
-        $child->setParent($this)->setKind(ThirdParty::KIND_CHILD);;
-
-        return $this;
     }
 
     /**
@@ -751,7 +565,6 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
      * If you want to keep the child into the database
      * but desactivate it, use removeActiveChildren instead.
      *
-     * @param ThirdParty $child
      * @return $this
      */
     public function removeChild(ThirdParty $child): self
@@ -761,111 +574,137 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    /**
-     * @return ThirdParty|null
-     */
-    public function getParent(): ?ThirdParty
+    public function removeType(?string $type): self
     {
-        return $this->parent;
+        if (null === $type) {
+            return $this;
+        }
+
+        if (in_array($type, $this->types ?? [], true)) {
+            $this->types = array_filter($this->types, fn ($e) => !in_array($e, $this->types, true));
+        }
+
+        foreach ($this->children as $child) {
+            $child->removeType($type);
+        }
+
+        return $this;
+    }
+
+    public function removeTypesAndCategories($typeAndCategory): self
+    {
+        if ($typeAndCategory instanceof ThirdPartyCategory) {
+            $this->removeCategory($typeAndCategory);
+
+            return $this;
+        }
+
+        if (is_string($typeAndCategory)) {
+            $this->removeType($typeAndCategory);
+
+            return $this;
+        }
+
+        throw new UnexpectedValueException(sprintf(
+            'typeAndCategory should be a string or a %s',
+            ThirdPartyCategory::class
+        ));
     }
 
     /**
-     * @param ThirdParty|null $parent
+     * @param string $acronym
+     *
      * @return $this
      */
-    public function setParent(?ThirdParty $parent): ThirdParty
+    public function setAcronym(?string $acronym = null): ThirdParty
     {
-        $this->parent = $parent;
+        $this->acronym = (string) $acronym;
+
         return $this;
     }
 
     /**
-     * @return Civility|null
+     * @return $this
      */
-    public function getCivility(): ?Civility
+    public function setActive(bool $active)
     {
-        return $this->civility;
+        $this->active = $active;
+
+        foreach ($this->children as $child) {
+            $child->setActive($active);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setAddress(?Address $address = null)
+    {
+        $this->address = $address;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setCenters(Collection $centers)
+    {
+        foreach ($centers as $center) {
+            $this->addCenter($center);
+        }
+
+        foreach ($this->centers as $center) {
+            if (false === $centers->contains($center)) {
+                $this->removeCenter($center);
+            }
+        }
+
+        return $this;
     }
 
     /**
-     * @param Civility $civility
      * @return $this
      */
     public function setCivility(Civility $civility): ThirdParty
     {
         $this->civility = $civility;
+
         return $this;
     }
 
     /**
-     * @return ThirdPartyProfession
+     * Set comment.
+     *
+     * @param string|null $comment
+     *
+     * @return ThirdParty
      */
-    public function getProfession(): ?ThirdPartyProfession
+    public function setComment($comment = null)
     {
-        return $this->profession;
+        $this->comment = $comment;
+
+        return $this;
     }
 
-    /**
-     * @param ThirdPartyProfession $profession
-     * @return $this
-     */
-    public function setProfession(ThirdPartyProfession $profession): ThirdParty
+    public function setContactDataAnonymous(bool $contactDataAnonymous): ThirdParty
     {
-        $this->profession = $profession;
+        $this->contactDataAnonymous = $contactDataAnonymous;
+
         return $this;
     }
 
     /**
-     * @return \DateTimeImmutable
-     */
-    public function getCreatedAt(): \DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
-    /**
-     * @param \DateTimeImmutable $createdAt
+     * @param DateTimeImmutable $createdAt
+     *
      * @return $this
      */
-    public function setCreatedAt(\DateTimeInterface $createdAt): ThirdParty
+    public function setCreatedAt(DateTimeInterface $createdAt): ThirdParty
     {
         $this->createdAt = $createdAt;
-        return $this;
-    }
 
-    /**
-     * @return \DateTime|null
-     */
-    public function getUpdatedAt(): ?\DateTimeImmutable
-    {
-        return $this->updatedAt;
-    }
-
-    /**
-     * @param \DateTimeImmutable $updatedAt
-     * @return $this
-     */
-    public function setUpdatedAt(\DateTimeInterface $updatedAt): ThirdParty
-    {
-        $this->updatedAt = $updatedAt;
-        return $this;
-    }
-
-    /**
-     * @return User|null
-     */
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
-    /**
-     * @param User $updatedBy
-     * @return $this
-     */
-    public function setUpdatedBy(User $updatedBy): ThirdParty
-    {
-        $this->updatedBy = $updatedBy;
         return $this;
     }
 
@@ -876,5 +715,147 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    /**
+     * Set email.
+     *
+     * @param string|null $email
+     *
+     * @return ThirdParty
+     */
+    public function setEmail($email = null)
+    {
+        $this->email = $email;
 
+        return $this;
+    }
+
+    public function setKind(?string $kind): ThirdParty
+    {
+        $this->kind = $kind;
+
+        return $this;
+    }
+
+    /**
+     * Set name.
+     *
+     * @param string $name
+     *
+     * @return ThirdParty
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @param string $nameCompany
+     */
+    public function setNameCompany(?string $nameCompany): ThirdParty
+    {
+        $this->nameCompany = (string) $nameCompany;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setParent(?ThirdParty $parent): ThirdParty
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setProfession(ThirdPartyProfession $profession): ThirdParty
+    {
+        $this->profession = $profession;
+
+        return $this;
+    }
+
+    /**
+     * Set telephone.
+     *
+     * @param string|null $telephone
+     *
+     * @return ThirdParty
+     */
+    public function setTelephone($telephone = null)
+    {
+        $this->telephone = $telephone;
+
+        return $this;
+    }
+
+    /**
+     * Set type.
+     *
+     * @return ThirdParty
+     */
+    public function setTypes(?array $type = null)
+    {
+        // remove all keys from the input data
+        $this->types = array_values($type);
+
+        foreach ($this->children as $child) {
+            $child->setTypes($type);
+        }
+
+        return $this;
+    }
+
+    public function setTypesAndCategories(array $typesAndCategories): self
+    {
+        $types = array_filter($typesAndCategories, static fn ($item) => !$item instanceof ThirdPartyCategory);
+        $this->setTypes($types);
+
+        // handle categories
+        foreach ($typesAndCategories as $t) {
+            $this->addTypesAndCategories($t);
+        }
+
+        $categories = array_filter($typesAndCategories, static fn ($item) => $item instanceof ThirdPartyCategory);
+        $categoriesHashes = array_map(static fn (ThirdPartyCategory $c) => spl_object_hash($c), $categories);
+
+        foreach ($categories as $c) {
+            $this->addCategory($c);
+        }
+
+        foreach ($this->getCategories() as $t) {
+            if (!in_array(spl_object_hash($t), $categoriesHashes, true)) {
+                $this->removeCategory($t);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param DateTimeImmutable $updatedAt
+     *
+     * @return $this
+     */
+    public function setUpdatedAt(DateTimeInterface $updatedAt): ThirdParty
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setUpdatedBy(User $updatedBy): ThirdParty
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
index ee0a633e6..7ce362360 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php
@@ -1,29 +1,19 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Entity;
 
 use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_3party.party_category")
@@ -31,22 +21,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class ThirdPartyCategory
 {
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $name = [];
+    private array $name = [];
 
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
 
     public function getId(): ?int
     {
@@ -58,22 +55,17 @@ class ThirdPartyCategory
         return $this->name;
     }
 
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getActive(): ?bool
-    {
-        return $this->active;
-    }
-
     public function setActive(bool $active): self
     {
         $this->active = $active;
 
         return $this;
     }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
index 0a9048e25..1963b34a7 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php
@@ -1,29 +1,19 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Entity;
 
 use Chill\ThirdPartyBundle\Repository\ThirdPartyProfessionRepository;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Table(name="chill_3party.party_profession")
@@ -31,22 +21,29 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class ThirdPartyProfession
 {
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $name = [];
+    private array $name = [];
 
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
 
     public function getId(): ?int
     {
@@ -58,22 +55,17 @@ class ThirdPartyProfession
         return $this->name;
     }
 
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getActive(): ?bool
-    {
-        return $this->active;
-    }
-
     public function setActive(bool $active): self
     {
         $this->active = $active;
 
         return $this;
     }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
index a3c7e154b..fb19771fd 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
@@ -1,45 +1,51 @@
 <?php
-/*
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Form\ChoiceLoader;
 
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
-use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
-use Doctrine\ORM\EntityRepository;
 use Chill\MainBundle\Entity\Center;
+use Doctrine\ORM\EntityRepository;
+use RuntimeException;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use function call_user_func;
+use function in_array;
 
 /**
  * Lazy load third parties.
- *
  */
 class ThirdPartyChoiceLoader implements ChoiceLoaderInterface
 {
     /**
-     *
-     * @var \Chill\ThirdPartyBundle\Entity\ThirdParty[]
-     */
-    protected $lazyLoadedParties = [];
-    
-    /**
-     *
      * @var Center
      */
     protected $center;
-    
+
+    /**
+     * @var \Chill\ThirdPartyBundle\Entity\ThirdParty[]
+     */
+    protected $lazyLoadedParties = [];
+
     /**
-     *
      * @var EntityRepository
      */
     protected $partyRepository;
-    
+
     public function __construct(Center $center, EntityRepository $partyRepository)
     {
         $this->center = $center;
         $this->partyRepository = $partyRepository;
     }
 
-    
     public function loadChoiceList($value = null): ChoiceListInterface
     {
         return new ArrayChoiceList($this->lazyLoadedParties, $value);
@@ -48,39 +54,40 @@ class ThirdPartyChoiceLoader implements ChoiceLoaderInterface
     public function loadChoicesForValues($values, $value = null)
     {
         $choices = [];
-        
-        foreach($values as $value) {
+
+        foreach ($values as $value) {
             if (empty($value)) {
                 continue;
             }
-            
+
             $party = $this->partyRepository->find($value);
-            
-            if (FALSE === \in_array($this->center, $party->getCenters()->toArray())) {
-                throw new \RuntimeException("the party's center is not authorized");
+
+            if (false === in_array($this->center, $party->getCenters()->toArray(), true)) {
+                throw new RuntimeException("the party's center is not authorized");
             }
-            
+
             $choices[] = $party;
         }
 
         return $choices;
     }
-    
+
     public function loadValuesForChoices(array $choices, $value = null)
     {
         $values = [];
-        
+
         foreach ($choices as $choice) {
-            if (NULL === $choice) {
+            if (null === $choice) {
                 $values[] = null;
+
                 continue;
             }
-            
-            $id = \call_user_func($value, $choice);
+
+            $id = call_user_func($value, $choice);
             $values[] = $id;
             $this->lazyLoadedParties[$id] = $choice;
         }
-        
+
         return $values;
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
index 2c7380116..a32c0ade2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
@@ -1,93 +1,101 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Form;
 
-use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\MainBundle\Form\Type\PickCenterType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
-use Chill\ThirdPartyBundle\Form\Type\PickThirdPartyType;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdPartyTypeCategoryType;
-use Doctrine\ORM\EntityManager;
+use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-
+use function array_key_exists;
 
 class ThirdPartyType extends AbstractType
 {
     protected AuthorizationHelper $authorizationHelper;
 
-    protected TokenStorageInterface $tokenStorage;
+    protected EntityManagerInterface $om;
 
-    protected ThirdPartyTypeManager $typesManager;
+    protected TokenStorageInterface $tokenStorage;
 
     protected TranslatableStringHelper $translatableStringHelper;
 
-    protected EntityManagerInterface $om;
+    protected ThirdPartyTypeManager $typesManager;
+
+    private bool $askCenter;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
         ThirdPartyTypeManager $typesManager,
         TranslatableStringHelper $translatableStringHelper,
-        EntityManagerInterface $om
+        EntityManagerInterface $om,
+        ParameterBagInterface $parameterBag
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
         $this->typesManager = $typesManager;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->om = $om;
+        $this->askCenter = $parameterBag->get('chill_main')['acl']['form_show_centers'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TextType::class, [
-                'required' => true
+                'required' => true,
             ])
             ->add('telephone', TextType::class, [
                 'label' => 'Phonenumber',
-                'required' => false
+                'required' => false,
             ])
             ->add('email', EmailType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('comment', ChillTextareaType::class, [
-                'required' => false
-            ])
-            ->add('centers', PickCenterType::class, [
-                'role' => (\array_key_exists('data', $options) && $this->om->contains($options['data'])) ?
-                    ThirdPartyVoter::UPDATE : ThirdPartyVoter::CREATE,
-                'choice_options' => [
-                    'multiple' => true,
-                    'attr' => ['class' => 'select2']
-                ]
-            ])
-        ;
+                'required' => false,
+            ]);
+
+        if ($this->askCenter) {
+            $builder
+                ->add('centers', PickCenterType::class, [
+                    'role' => (array_key_exists('data', $options) && $this->om->contains($options['data'])) ?
+                        ThirdPartyVoter::UPDATE : ThirdPartyVoter::CREATE,
+                    'choice_options' => [
+                        'multiple' => true,
+                        'attr' => ['class' => 'select2'],
+                    ],
+                ]);
+        }
 
         // Contact Person ThirdParty (child)
         if (ThirdParty::KIND_CONTACT === $options['kind'] || ThirdParty::KIND_CHILD === $options['kind']) {
@@ -98,12 +106,12 @@ class ThirdPartyType extends AbstractType
                     'choice_label' => function (Civility $civility): string {
                         return $this->translatableStringHelper->localize($civility->getName());
                     },
-                    'query_builder' => function (EntityRepository $er): QueryBuilder {
+                    'query_builder' => static function (EntityRepository $er): QueryBuilder {
                         return $er->createQueryBuilder('c')
                             ->where('c.active = true');
                     },
                     'placeholder' => 'thirdparty.choose civility',
-                    'required' => false
+                    'required' => false,
                 ])
                 ->add('profession', EntityType::class, [
                     'label' => 'thirdparty.Profession',
@@ -111,24 +119,23 @@ class ThirdPartyType extends AbstractType
                     'choice_label' => function (ThirdPartyProfession $profession): string {
                         return $this->translatableStringHelper->localize($profession->getName());
                     },
-                    'query_builder' => function (EntityRepository $er): QueryBuilder {
+                    'query_builder' => static function (EntityRepository $er): QueryBuilder {
                         return $er->createQueryBuilder('p')
                             ->where('p.active = true');
                     },
                     'placeholder' => 'thirdparty.choose profession',
-                    'required' => false
+                    'required' => false,
                 ])
                 ->add('contactDataAnonymous', CheckboxType::class, [
                     'required' => false,
-                    'label' => 'thirdparty.Contact data are confidential'
-                ])
-            ;
+                    'label' => 'thirdparty.Contact data are confidential',
+                ]);
 
         // Institutional ThirdParty (parent)
         } else {
             $builder
                 ->add('address', PickAddressType::class, [
-                    'label' => 'Address'
+                    'label' => 'Address',
                 ])
                 ->add('address2', PickAddressType::class, [
                     'label' => 'Address',
@@ -138,11 +145,11 @@ class ThirdPartyType extends AbstractType
                 ])
                 ->add('nameCompany', TextType::class, [
                     'label' => 'thirdparty.NameCompany',
-                    'required' => false
+                    'required' => false,
                 ])
                 ->add('acronym', TextType::class, [
                     'label' => 'thirdparty.Acronym',
-                    'required' => false
+                    'required' => false,
                 ])
                 ->add('activeChildren', ChillCollectionType::class, [
                     'entry_type' => ThirdPartyType::class,
@@ -155,40 +162,35 @@ class ThirdPartyType extends AbstractType
                     'allow_add' => true,
                     'allow_delete' => true,
                     'by_reference' => false,
-                    'button_add_label' => "Add a contact",
-                    'button_remove_label' => "Remove a contact",
-                    'empty_collection_explain' => "Any contact"
-                ])
-            ;
+                    'button_add_label' => 'Add a contact',
+                    'button_remove_label' => 'Remove a contact',
+                    'empty_collection_explain' => 'Any contact',
+                ]);
         }
 
         if (ThirdParty::KIND_CHILD !== $options['kind']) {
             $builder
                 ->add('typesAndCategories', PickThirdPartyTypeCategoryType::class, [
-                    'label' => 'thirdparty.Categories'
+                    'label' => 'thirdparty.Categories',
                 ])
                 ->add('active', ChoiceType::class, [
                     'label' => 'thirdparty.Status',
                     'choices' => [
                         'Active, shown to users' => true,
-                        'Inactive, not shown to users' => false
+                        'Inactive, not shown to users' => false,
                     ],
                     'expanded' => true,
-                    'multiple' => false
+                    'multiple' => false,
                 ]);
         }
     }
 
-
-    /**
-     * {@inheritdoc}
-     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => ThirdParty::class,
             'is_child' => false,
-            'kind' => null
-        ));
+            'kind' => null,
+        ]);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
index 98d3e585b..c7d8d94c0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
@@ -1,55 +1,58 @@
 <?php
-/*
- * 
- */
-namespace Chill\ThirdPartyBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\OptionsResolver\Options;
-use Chill\ThirdPartyBundle\Form\ChoiceLoader\ThirdPartyChoiceLoader;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Chill\ThirdPartyBundle\Search\ThirdPartySearch;
-use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
-use Chill\MainBundle\Search\SearchInterface;
 
 /**
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Form\Type;
+
+use Chill\MainBundle\Search\SearchInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Form\ChoiceLoader\ThirdPartyChoiceLoader;
+use Chill\ThirdPartyBundle\Search\ThirdPartySearch;
+use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use function array_diff;
+use function array_merge;
+use function count;
+use function is_array;
+
 class PickThirdPartyType extends AbstractType
 {
     /**
-     *
      * @var EntityManagerInterface
      */
     protected $em;
-    
+
     /**
-     *
-     * @var UrlGeneratorInterface
-     */
-    protected $urlGenerator;
-    
-    /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     /**
-     *
      * @var ThirdPartyTypeManager
      */
     protected $typesManager;
-    
+
+    /**
+     * @var UrlGeneratorInterface
+     */
+    protected $urlGenerator;
+
     public function __construct(
-        EntityManagerInterface $em, 
-        UrlGeneratorInterface $urlGenerator, 
+        EntityManagerInterface $em,
+        UrlGeneratorInterface $urlGenerator,
         TranslatorInterface $translator,
         ThirdPartyTypeManager $typesManager
     ) {
@@ -59,54 +62,55 @@ class PickThirdPartyType extends AbstractType
         $this->typesManager = $typesManager;
     }
 
-    
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver
-            ->setRequired('center')
-            ->setAllowedTypes('center', [ \Chill\MainBundle\Entity\Center::class ])
-            ->setDefined('types')
-            ->setRequired('types')
-            ->setAllowedValues('types', function($types) {
-                if (FALSE === \is_array($types)) {
-                    return false;
-                }
-                // return false if one element is not contained in allowed types
-                return count(\array_diff($types, $this->typesManager->getTypes())) === 0;
-            })
-            ;
-        
-        $resolver
-            ->setDefault('class', ThirdParty::class)
-            ->setDefault('choice_label', function(ThirdParty $tp) {
-                return $tp->getName();
-            })
-            ->setDefault('choice_loader', function(Options $options) {
-                return new ThirdPartyChoiceLoader($options['center'], 
-                    $this->em->getRepository(ThirdParty::class));
-            })
-            ;
-    }
-    
-    public function getParent(): string
-    {
-        return EntityType::class;
-    }
-    
     public function buildView(\Symfony\Component\Form\FormView $view, \Symfony\Component\Form\FormInterface $form, array $options)
     {
-        $view->vars['attr']['class'] = \array_merge(['select2 '], $view->vars['attr']['class'] ?? []);
+        $view->vars['attr']['class'] = array_merge(['select2 '], $view->vars['attr']['class'] ?? []);
         $view->vars['attr']['data-3party-picker'] = true;
         $view->vars['attr']['data-select-interactive-loading'] = true;
         $view->vars['attr']['data-search-url'] = $this->urlGenerator
-            ->generate('chill_main_search', [
-                'name' => ThirdPartySearch::NAME,
-                SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS => ['t' => $options['types']],
-                '_format' => 'json' ]
-                );
+            ->generate(
+                'chill_main_search',
+                [
+                    'name' => ThirdPartySearch::NAME,
+                    SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS => ['t' => $options['types']],
+                    '_format' => 'json', ]
+            );
         $view->vars['attr']['data-placeholder'] = $this->translator->trans($options['placeholder']);
         $view->vars['attr']['data-no-results-label'] = $this->translator->trans('select2.no_results');
         $view->vars['attr']['data-error-load-label'] = $this->translator->trans('select2.error_loading');
         $view->vars['attr']['data-searching-label'] = $this->translator->trans('select2.searching');
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setRequired('center')
+            ->setAllowedTypes('center', [\Chill\MainBundle\Entity\Center::class])
+            ->setDefined('types')
+            ->setRequired('types')
+            ->setAllowedValues('types', function ($types) {
+                if (false === is_array($types)) {
+                    return false;
+                }
+                // return false if one element is not contained in allowed types
+                return count(array_diff($types, $this->typesManager->getTypes())) === 0;
+            });
+
+        $resolver
+            ->setDefault('class', ThirdParty::class)
+            ->setDefault('choice_label', static function (ThirdParty $tp) {
+                return $tp->getName();
+            })
+            ->setDefault('choice_loader', function (Options $options) {
+                return new ThirdPartyChoiceLoader(
+                    $options['center'],
+                    $this->em->getRepository(ThirdParty::class)
+                );
+            });
+    }
+
+    public function getParent(): string
+    {
+        return EntityType::class;
+    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
index 2af962895..25980f673 100644
--- a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyTypeCategoryType.php
@@ -1,27 +1,42 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Form\Type;
 
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository;
 use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeManager;
-use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_merge;
+use function implode;
+use function is_array;
+use function is_string;
+use function uasort;
 
 class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractType
 {
-    private ThirdPartyCategoryRepository $thirdPartyCategoryRepository;
-    private ThirdPartyTypeManager $thirdPartyTypeManager;
-    private TranslatableStringHelper $translatableStringHelper;
-    private TranslatorInterface $translator;
-
     private const PREFIX_TYPE = 'chill_3party.key_label.';
 
+    private ThirdPartyCategoryRepository $thirdPartyCategoryRepository;
+
+    private ThirdPartyTypeManager $thirdPartyTypeManager;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
     public function __construct(
         ThirdPartyCategoryRepository $thirdPartyCategoryRepository,
         ThirdPartyTypeManager $thirdPartyTypeManager,
@@ -34,67 +49,68 @@ class PickThirdPartyTypeCategoryType extends \Symfony\Component\Form\AbstractTyp
         $this->translator = $translator;
     }
 
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $choices = array_merge(
+            $this->thirdPartyCategoryRepository->findBy(['active' => true]),
+            $this->thirdPartyTypeManager->getTypes()
+        );
+
+        uasort($choices, function ($itemA, $itemB) {
+            $strA = $itemA instanceof ThirdPartyCategory ? $this->translatableStringHelper
+                ->localize($itemA->getName()) : $this->translator->trans(self::PREFIX_TYPE . $itemA);
+            $strB = $itemB instanceof ThirdPartyCategory ? $this->translatableStringHelper
+                ->localize($itemB->getName()) : $this->translator->trans(self::PREFIX_TYPE . $itemB);
+
+            return $strA <=> $strB;
+        });
+
+        $resolver->setDefaults([
+            'choices' => $choices,
+            'attr' => ['class' => 'select2'],
+            'multiple' => true,
+            'choice_label' => function ($item) {
+                if ($item instanceof ThirdPartyCategory) {
+                    return $this->translatableStringHelper->localize($item->getName());
+                }
+
+                return self::PREFIX_TYPE . $item;
+            },
+            'choice_value' => function ($item) {
+                return $this->reverseTransform($item);
+            },
+        ]);
+    }
+
     public function getParent()
     {
         return ChoiceType::class;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $choices = \array_merge(
-            $this->thirdPartyCategoryRepository->findBy(['active' => true]),
-            $this->thirdPartyTypeManager->getTypes()
-        );
-
-        \uasort($choices, function ($itemA, $itemB) {
-            $strA = $itemA instanceof ThirdPartyCategory ? $this->translatableStringHelper
-                ->localize($itemA->getName()) : $this->translator->trans(self::PREFIX_TYPE.$itemA);
-            $strB = $itemB instanceof ThirdPartyCategory ? $this->translatableStringHelper
-                ->localize($itemB->getName()) : $this->translator->trans(self::PREFIX_TYPE.$itemB);
-
-            return $strA <=> $strB;
-        });
-
-
-        $resolver->setDefaults([
-            'choices' => $choices,
-            'attr' => [ 'class' => 'select2' ],
-            'multiple' => true,
-            'choice_label' => function($item) {
-                if ($item instanceof ThirdPartyCategory) {
-                    return $this->translatableStringHelper->localize($item->getName());
-                }
-                return self::PREFIX_TYPE.$item;
-            },
-            'choice_value' => function($item) {
-                return $this->reverseTransform($item);
-            }
-        ]);
-    }
-
     public function reverseTransform($value)
     {
-        if ($value === null) {
+        if (null === $value) {
             return null;
         }
-        if (is_array($value)){
+
+        if (is_array($value)) {
             $r = [];
 
             foreach ($value as $v) {
-               $r[] = $this->transform($v);
+                $r[] = $this->transform($v);
             }
 
             return $r;
         }
 
         if ($value instanceof ThirdPartyCategory) {
-            return 'category:'.$value->getId();
+            return 'category:' . $value->getId();
         }
 
         if (is_string($value)) {
-            return 'type:'.$value;
+            return 'type:' . $value;
         }
 
-        throw new UnexpectedTypeException($value, \implode(' or ', ['array', 'string', ThirdPartyCategory::class]));
+        throw new UnexpectedTypeException($value, implode(' or ', ['array', 'string', ThirdPartyCategory::class]));
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
index e52ba66e1..aec5ffb3f 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
@@ -1,45 +1,33 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2019, 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\ThirdPartyBundle\Menu;
-
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Knp\Menu\MenuItem;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 
 /**
- * Add an entry in section to go to third party index page
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+
+/**
+ * Add an entry in section to go to third party index page.
  */
 class MenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     *
      * @var AuthorizationCheckerInterface
      */
     protected $authorizationChecker;
 
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
@@ -52,7 +40,6 @@ class MenuBuilder implements LocalMenuBuilderInterface
         $this->translator = $translator;
     }
 
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->authorizationChecker->isGranted(ThirdPartyVoter::SHOW)) {
@@ -61,11 +48,11 @@ class MenuBuilder implements LocalMenuBuilderInterface
                     $this->translator->trans('Third parties'),
                     [
                         'route' => 'chill_crud_3party_3party_index',
-                    ])
+                    ]
+                )
                 ->setExtras([
-                    'order' => 112
-                ])
-                ;
+                    'order' => 112,
+                ]);
         }
     }
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
index ab535e60e..2a57a2f55 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
@@ -1,16 +1,26 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Repository;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Security\Core\Security;
 
 final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepositoryInterface
 {
-    private Security $security;
     private AuthorizationHelper $authorizationHelper;
+
+    private Security $security;
+
     private ThirdPartyRepository $thirdPartyRepository;
 
     public function __construct(Security $security, AuthorizationHelper $authorizationHelper, ThirdPartyRepository $thirdPartyRepository)
@@ -20,23 +30,16 @@ final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepository
         $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
-    public function listThirdParties(
-       string $role,
-       ?string $filterString,
-       ?array $orderBy = [],
-       ?int $limit = null,
-       ?int $offset = null
-    ): array {
-        $qb = $this->buildQuery($filterString);
+    public function buildQuery(?string $filterString = null): QueryBuilder
+    {
+        $qb = $this->thirdPartyRepository->createQueryBuilder('tp');
 
-        foreach ($orderBy as $sort => $direction) {
-            $qb->addOrderBy('tp.'.$sort, $direction);
+        if (null !== $filterString) {
+            $qb->andWhere($qb->expr()->like('tp.canonicalized', 'LOWER(UNACCENT(:filterString))'))
+                ->setParameter('filterString', '%' . $filterString . '%');
         }
 
-        $qb->setFirstResult($offset)
-            ->setMaxResults($limit);
-
-        return $qb->getQuery()->getResult();
+        return $qb;
     }
 
     public function countThirdParties(
@@ -49,15 +52,22 @@ final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function buildQuery(?string $filterString = null): QueryBuilder
-    {
-        $qb = $this->thirdPartyRepository->createQueryBuilder('tp');
+    public function listThirdParties(
+        string $role,
+        ?string $filterString,
+        ?array $orderBy = [],
+        ?int $limit = null,
+        ?int $offset = null
+    ): array {
+        $qb = $this->buildQuery($filterString);
 
-        if (NULL !== $filterString) {
-            $qb->andWhere($qb->expr()->like('tp.canonicalized', 'LOWER(UNACCENT(:filterString))'))
-                ->setParameter('filterString', '%'.$filterString.'%');
+        foreach ($orderBy as $sort => $direction) {
+            $qb->addOrderBy('tp.' . $sort, $direction);
         }
 
-        return $qb;
+        $qb->setFirstResult($offset)
+            ->setMaxResults($limit);
+
+        return $qb->getQuery()->getResult();
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php
index 459ac896a..0bda192e2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -9,10 +18,6 @@ interface ThirdPartyACLAwareRepositoryInterface
     public function countThirdParties(string $role, ?string $filterString): int;
 
     /**
-     * @param string $role
-     * @param array|null $orderBy
-     * @param int|null $limit
-     * @param int|null $offset
      * @return array|ThirdParty[]
      */
     public function listThirdParties(
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php
index ee5e92eda..8d3ac35df 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyCategoryRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
@@ -38,5 +27,4 @@ class ThirdPartyCategoryRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, ThirdPartyCategory::class);
     }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php
index 1216ee018..1a336de2d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyProfessionRepository.php
@@ -1,25 +1,14 @@
 <?php
 
-/*
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2021, 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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Repository;
 
 use Chill\ThirdPartyBundle\Entity\ThirdPartyProfession;
@@ -38,5 +27,4 @@ class ThirdPartyProfessionRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, ThirdPartyProfession::class);
     }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index f91501c59..ef9af3940 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -1,14 +1,24 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Repository;
 
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\Query;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
-
+use DomainException;
+use function array_key_exists;
 
 final class ThirdPartyRepository implements ObjectRepository
 {
@@ -20,11 +30,9 @@ final class ThirdPartyRepository implements ObjectRepository
     }
 
     /**
-     * count amongst parties associated to $centers, with $terms parameters
+     * count amongst parties associated to $centers, with $terms parameters.
      *
-     * @param array $centers
      * @param type $terms
-     * @return int
      */
     public function countByMemberOfCenters(array $centers, $terms = []): int
     {
@@ -34,121 +42,9 @@ final class ThirdPartyRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
-    /**
-     * Search amongst parties associated to $centers, with $terms parameters
-     *
-     * Different format for return:
-     * - ['entity']: return the entity hydrated as objects
-     * - ['array', [ DQL ]: return objects hydrated as entity, with
-     *   an array describing the fields as DQL.
-     *
-     * supported terms:
-     *
-     * - name or _default: containing the name (name LIKE %string%)
-     * - is_active: is active = true / false
-     * - types: an array of types
-     *
-     * @param array $centers
-     * @param int $firstResult
-     * @param int $maxResults
-     * @param array $terms
-     * @param string[] $returnFormat a format for returning
-     * @return array
-     */
-    public function findByMemberOfCenters(array $centers, $firstResult = 0, $maxResults = 20, $terms = [], $returnFormat = ['entity']): array
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
     {
-        $qb = $this->buildQuery($centers, $terms);
-        switch($returnFormat[0]) {
-            case 'entity':
-                $qb->select('tp');
-                $hydrate = Query::HYDRATE_OBJECT;
-                break;
-            case 'array':
-                $hydrate = Query::HYDRATE_ARRAY;
-                $first = true;
-                foreach ($returnFormat[1] as $dql) {
-                    if ($first) {
-                        $qb->select($dql);
-                        $first = false;
-                    } else {
-                        $qb->addSelect($dql);
-                    }
-                }
-                break;
-            default:
-                throw new \DomainException("This return format is invalid");
-        }
-        $qb->setFirstResult($firstResult)
-            ->setMaxResults($maxResults);
-
-        return $qb->getQuery()->getResult();
-    }
-
-    protected function createMemberOfCentersQuery($centers): QueryBuilder
-    {
-        $qb = $this->createQueryBuilder('tp');
-
-        $or = $qb->expr()->orX();
-
-        foreach ($centers as $center) {
-            $or->add($qb->expr()->isMemberOf(':center_'.$center->getId(), 'tp.centers'));
-            $qb->setParameter('center_'.$center->getId(), $center);
-        }
-
-        $qb->where($or);
-
-        return $qb;
-    }
-
-    protected function buildQuery($centers, $terms): QueryBuilder
-    {
-        $qb = $this->createMemberOfCentersQuery($centers);
-        $this->setNameCondition($qb, $terms);
-        $this->setTypesCondition($qb, $terms);
-        $this->setIsActiveCondition($qb, $terms);
-
-        return $qb;
-    }
-
-    /**
-     * Add parameters to filter by containing $terms["name"] or
-     * $terms["_default"]
-     *
-     * @param QueryBuilder $qb
-     * @param array $terms
-     */
-    protected function setNameCondition(QueryBuilder $qb, array $terms)
-    {
-        if (\array_key_exists('name', $terms) || \array_key_exists('_default', $terms)) {
-            $term = $terms['name'] ?? $terms['_default'];
-            if (empty($term)) {
-                return;
-            }
-            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(tp.name))', 'UNACCENT(LOWER(:name))'));
-            $qb->setParameter('name', '%'.$term.'%');
-        }
-    }
-
-    protected function setTypesCondition(QueryBuilder $qb, array $terms)
-    {
-        if (\array_key_exists('types', $terms)) {
-            $orx = $qb->expr()->orX();
-            foreach ($terms['types'] as $type) {
-                $orx->add('JSONB_EXISTS_IN_ARRAY(tp.type, :type_'.$type.') = \'TRUE\'');
-                $qb->setParameter('type_'.$type, $type);
-            }
-            $qb->andWhere($orx);
-        }
-    }
-
-    protected function setIsActiveCondition(QueryBuilder $qb, array $terms)
-    {
-        if (\array_key_exists('is_active', $terms)) {
-            $qb->andWhere(
-                $terms['is_active'] ? $qb->expr()->eq('tp.active', "'TRUE'") :
-                $qb->expr()->eq('tp.active', "'FALSE'")
-                );
-        }
+        return $this->repository->createQueryBuilder($alias, $indexBy);
     }
 
     public function find($id): ?ThirdParty
@@ -165,10 +61,9 @@ final class ThirdPartyRepository implements ObjectRepository
     }
 
     /**
-     * @param array $criteria
-     * @param array|null $orderBy
      * @param null $limit
      * @param null $offset
+     *
      * @return array|ThirdParty[]
      */
     public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
@@ -176,6 +71,60 @@ final class ThirdPartyRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
+    /**
+     * Search amongst parties associated to $centers, with $terms parameters.
+     *
+     * Different format for return:
+     * - ['entity']: return the entity hydrated as objects
+     * - ['array', [ DQL ]: return objects hydrated as entity, with
+     *   an array describing the fields as DQL.
+     *
+     * supported terms:
+     *
+     * - name or _default: containing the name (name LIKE %string%)
+     * - is_active: is active = true / false
+     * - types: an array of types
+     *
+     * @param int $firstResult
+     * @param int $maxResults
+     * @param array $terms
+     * @param string[] $returnFormat a format for returning
+     */
+    public function findByMemberOfCenters(array $centers, $firstResult = 0, $maxResults = 20, $terms = [], $returnFormat = ['entity']): array
+    {
+        $qb = $this->buildQuery($centers, $terms);
+
+        switch ($returnFormat[0]) {
+            case 'entity':
+                $qb->select('tp');
+                $hydrate = Query::HYDRATE_OBJECT;
+
+                break;
+
+            case 'array':
+                $hydrate = Query::HYDRATE_ARRAY;
+                $first = true;
+
+                foreach ($returnFormat[1] as $dql) {
+                    if ($first) {
+                        $qb->select($dql);
+                        $first = false;
+                    } else {
+                        $qb->addSelect($dql);
+                    }
+                }
+
+                break;
+
+            default:
+                throw new DomainException('This return format is invalid');
+        }
+        $qb->setFirstResult($firstResult)
+            ->setMaxResults($maxResults);
+
+        return $qb->getQuery()->getResult();
+    }
+
     public function findOneBy(array $criteria): ?ThirdParty
     {
         return $this->repository->findOneBy($criteria);
@@ -186,9 +135,69 @@ final class ThirdPartyRepository implements ObjectRepository
         return ThirdParty::class;
     }
 
-    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    private function buildQuery($centers, $terms): QueryBuilder
     {
-        return $this->repository->createQueryBuilder($alias, $indexBy);
+        $qb = $this->createMemberOfCentersQuery($centers);
+        $this->setNameCondition($qb, $terms);
+        $this->setTypesCondition($qb, $terms);
+        $this->setIsActiveCondition($qb, $terms);
+
+        return $qb;
     }
 
+    private function createMemberOfCentersQuery($centers): QueryBuilder
+    {
+        $qb = $this->createQueryBuilder('tp');
+
+        $or = $qb->expr()->orX();
+
+        foreach ($centers as $center) {
+            $or->add($qb->expr()->isMemberOf(':center_' . $center->getId(), 'tp.centers'));
+            $qb->setParameter('center_' . $center->getId(), $center);
+        }
+
+        $qb->where($or);
+
+        return $qb;
+    }
+
+    private function setIsActiveCondition(QueryBuilder $qb, array $terms)
+    {
+        if (array_key_exists('is_active', $terms)) {
+            $qb->andWhere(
+                $terms['is_active'] ? $qb->expr()->eq('tp.active', "'TRUE'") :
+                $qb->expr()->eq('tp.active', "'FALSE'")
+            );
+        }
+    }
+
+    /**
+     * Add parameters to filter by containing $terms["name"] or
+     * $terms["_default"].
+     */
+    private function setNameCondition(QueryBuilder $qb, array $terms)
+    {
+        if (array_key_exists('name', $terms) || array_key_exists('_default', $terms)) {
+            $term = $terms['name'] ?? $terms['_default'];
+
+            if (empty($term)) {
+                return;
+            }
+            $qb->andWhere($qb->expr()->like('UNACCENT(LOWER(tp.name))', 'UNACCENT(LOWER(:name))'));
+            $qb->setParameter('name', '%' . $term . '%');
+        }
+    }
+
+    private function setTypesCondition(QueryBuilder $qb, array $terms)
+    {
+        if (array_key_exists('types', $terms)) {
+            $orx = $qb->expr()->orX();
+
+            foreach ($terms['types'] as $type) {
+                $orx->add('JSONB_EXISTS_IN_ARRAY(tp.type, :type_' . $type . ') = \'TRUE\'');
+                $qb->setParameter('type_' . $type, $type);
+            }
+            $qb->andWhere($orx);
+        }
+    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
index 9762a898a..b5b1b7a9e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/chillthirdparty.scss
@@ -1,16 +1,35 @@
 @import 'ChillMainAssets/module/bootstrap/shared';
 
-.badge {
-    &.bg-thirdparty-company {
-        //@extend .bg-info;
-        background-color: $yellow;
-    }
-    &.bg-thirdparty-child {
-        //@extend .bg-chill-blue;
-        background-color: $chill-blue;
-    }
-    &.bg-thirdparty-contact {
-        //@extedn .bg-secondary;
-        background-color: $secondary;
+/// Pill badge by entity
+.badge.rounded-pill {
+    &.bg-thirdparty {
+        //@extend .$chill-ll-gray;
+        background-color: $chill-ll-gray;
+        color: $chill-pink;
+    }
+}
+
+/// force first column width in list
+div.thirdparty-list {
+    label.counter {
+        span {
+            font-weight: bold;
+        }
+    }
+    div.flex-table {
+        div.item-bloc {
+            div.item-row {
+                div.item-col:first-child {
+                    flex-basis: 25%;
+                }
+            }
+        }
+    }
+}
+
+/// render_box
+section.chill-entity {
+    .entity-thirdparty {
+        span.name {}
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/page/index/index.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/page/index/index.js
deleted file mode 100644
index 10b9e8383..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/page/index/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('./index_3party.scss');
-
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/page/index/index_3party.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/page/index/index_3party.scss
deleted file mode 100644
index c14be5194..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/page/index/index_3party.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-///
-div.thirdparty-list {
-    label.counter {
-        float: right;
-        span {
-            font-weight: bold;
-        }
-    }
-}
-
-/// render_box
-section.chill-entity {
-    .entity-thirdparty {
-        span.name {}
-    }
-}
-
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 1504bdfb9..47565a427 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -7,30 +7,19 @@
             <div class="entity-label">
                 <div :class="'denomination h' + options.hLevel">
 
-                    <a v-if="this.options.addLink ===  true" href="#">
+                    <a v-if="this.options.addLink === true" href="#">
                         <span class="name">{{ thirdparty.text }}</span>
                     </a>
-                    <span class="name">{{ thirdparty.text }}</span>
+                    <span class="name" v-else>{{ thirdparty.text }}</span>
 
-                    <span class="badge bg-thirdparty-child" v-if="thirdparty.kind == 'child'">
-                        {{ $t('thirdparty.child')}}
-                    </span>
-                    <span class="badge bg-thirdparty-company" v-else-if="thirdparty.kind == 'company'">
-                       {{ $t('thirdparty.company')}}
-                    </span>
-                    <span class="badge bg-thirdparty-contact" v-else>
-                        {{ $t('thirdparty.contact')}}
+                    <span v-if="options.addId === true" class="id-number" :title="'n° ' + thirdparty.id">
+                        {{ thirdparty.id }}
                     </span>
 
-                    <span v-if="options.addId ==  true" class="id-number" :title="'n° ' + thirdparty.id">{{ thirdparty.id }}</span>
-                    <span v-if="options.addEntity ==  true && thirdparty.type === 'thirdparty'" class="badge rounded-pill bg-secondary">{{ $t('renderbox.type.thirdparty') }}</span>
-
-                </div>
-
-                <div v-if="hasParent">
-                    <span class="name tparty-parent">
-                        > {{ thirdparty.parent.text }}
-                    </span>
+                    <badge-entity v-if="options.addEntity === true"
+                        :entity="thirdparty"
+                        :options="{ displayLong: options.entityDisplayLong }">
+                    </badge-entity>
                 </div>
 
                 <p v-if="this.options.addInfo === true" class="moreinfo">
@@ -38,13 +27,38 @@
             </div>
         </div>
 
-
         <div class="item-col">
            <div class="float-button bottom">
               <div class="box">
                  <div class="action">
                     <slot name="record-actions"></slot>
                  </div>
+                 <ul class="list-content fa-ul">
+                     <li v-if="hasParent">
+                         <i class="fa fa-li fa-hand-o-right"></i>
+                         <b class="me-2">{{ $t('child_of') }}</b>
+                         <span class="chill-entity badge-thirdparty">{{ thirdparty.parent.text }}</span>
+                         <!-- console: [Vue warn]: Failed to resolve component: on-the-fly ...
+                             <on-the-fly type="thirdparty" action="show" :id="thirdparty.parent.id"
+                                 :buttonText="thirdparty.parent.text" :displayBadge="'true' === 'true'"
+                             ></on-the-fly>
+                         -->
+                     </li>
+                     <!-- TODO hasChildren
+                     <li v-if="hasChildren">
+                         <i class="fa fa-li fa-hand-o-right"></i>
+                         <b class="me-2">{{ $t('children') }}</b>
+                         <span v-for="child in thirdparty.activeChildren">
+                             <on-the-fly type="thirdparty"
+                                 action="show"
+                                 :id="child.id"
+                                 :buttonText="child.text"
+                                 displayBadge="'true' === 'true'">
+                             </on-the-fly>
+                         </span>
+                     </li>
+                     -->
+                 </ul>
                  <confidential v-if="thirdparty.contactDataAnonymous">
                     <template v-slot:confidential-content>
                         <ul class="list-content fa-ul">
@@ -62,21 +76,24 @@
                             </li>
                         </ul>
                     </template>
-                </confidential>
-                <ul v-else class="list-content fa-ul">
-                    <li v-if="thirdparty.address">
-                        <i class="fa fa-li fa-map-marker"></i>
-                        <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
-                    </li>
-                    <li v-if="thirdparty.phonenumber">
-                        <i class="fa fa-li fa-mobile"></i>
-                        <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
-                    </li>
-                    <li v-if="thirdparty.email">
-                        <i class="fa fa-li fa-envelope-o"></i>
-                        <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
-                    </li>
-                </ul>
+                 </confidential>
+                 <ul v-else class="list-content fa-ul">
+                     <li v-if="thirdparty.address">
+                         <i class="fa fa-li fa-map-marker"></i>
+                         <address-render-box :address="thirdparty.address" :isMultiline="isMultiline"></address-render-box>
+                     </li>
+                     <li v-if="thirdparty.phonenumber">
+                         <i class="fa fa-li fa-mobile"></i>
+                         <a :href="'tel: ' + thirdparty.phonenumber">{{ thirdparty.phonenumber }}</a>
+                     </li>
+                     <li v-if="thirdparty.email">
+                         <i class="fa fa-li fa-envelope-o"></i>
+                         <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
+                     </li>
+                 </ul>
+                  <div v-if="options.addComment && !thirdparty.contactDataAnonymous && thirdparty.comment">
+                      <blockquote class="chill-user-quote">{{ thirdparty.comment }}</blockquote>
+                  </div>
               </div>
            </div>
         </div>
@@ -91,25 +108,24 @@
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import {dateToISO} from 'ChillMainAssets/chill/js/date.js';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
-
-const i18n = {
-    messages: {
-        fr: {
-            tparty: {
-                contact: "Personne physique",
-                company: "Personne morale"
-            }
-        }
-    }
-};
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+//import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 
 export default {
     name: "ThirdPartyRenderBox",
     components: {
         AddressRenderBox,
-        Confidential
+        Confidential,
+        BadgeEntity,
+        //OnTheFly
+    },
+    i18n: {
+        messages: {
+            fr: {
+                children: "Personnes de contact: ",
+                child_of: "Contact de: ",
+        }}
     },
-    i18n,
     props: ['thirdparty', 'options'],
     computed: {
         isMultiline: function() {
@@ -120,8 +136,13 @@ export default {
             }
         },
         hasParent() {
-            return !(this.$props.thirdparty.parent === null || this.$props.thirdparty.parent === undefined);
-        }
+            return !(this.thirdparty.parent === null || this.thirdparty.parent === undefined);
+        },
+        /* TODO need backend normalizer to serve children without circular reference
+        hasChildren() {
+            //console.log(this.thirdparty.activeChildren.length > 0)
+            return false
+        } */
     }
 }
 </script>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 5b605c748..2d540530d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -5,7 +5,8 @@
             :thirdparty="thirdparty"
             :options="{
                addInfo: true,
-               addEntity: false,
+               addEntity: true,
+               entityDisplayLong: true,
                addAltNames: true,
                addId: true,
                addLink: false,
@@ -13,6 +14,7 @@
                hLevel: 3,
                addCenter: true,
                addNoData: true,
+               addComment: true,
                isMultiline: true
             }"
          ></third-party-render-box>
@@ -24,7 +26,7 @@
            <div class="form-check">
                <input class="form-check-input mt-0" type="radio" v-model="kind" value="company" id="tpartyKindInstitution">
                <label for="tpartyKindInstitution" class="required">
-                   <span class="badge bg-thirdparty-company" style="padding-top: 0;">
+                   <span class="badge rounded-pill bg-thirdparty-company" style="padding-top: 0;">
                        {{ $t('tparty.company')}}
                    </span>
                </label>
@@ -32,7 +34,7 @@
            <div class="form-check">
                <input class="form-check-input mt-0" type="radio" v-model="kind" value="contact" id="tpartyKindContact">
                <label for="tpartyKindContact" class="required">
-                   <span class="badge bg-thirdparty-contact" style="padding-top: 0;">
+                   <span class="badge rounded-pill bg-thirdparty-contact" style="padding-top: 0;">
                        {{ $t('tparty.contact')}}
                    </span>
                </label>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
index 755d4f2eb..4f1e739a8 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
@@ -82,7 +82,19 @@
     <div class="item-row entity-bloc">
         <div class="item-col">
             {{ _self.label(thirdparty, options) }}
-             <span class="badge bg-thirdparty-{{ thirdparty.kind }}">{{ ('thirdparty.' ~ thirdparty.kind)|trans }}</span>
+            {% if thirdparty.kind == 'child' %}
+                <span class="badge rounded-pill bg-thirdparty">
+                    <i class="fa fa-fw fa-user"></i>{{ 'thirdparty.child'|trans }}
+                </span>
+            {% elseif thirdparty.kind == 'company' %}
+                <span class="badge rounded-pill bg-thirdparty">
+                    <i class="fa fa-fw fa-hospital-o"></i>{{ 'thirdparty.company'|trans }}
+                </span>
+            {% else %}
+                <span class="badge rounded-pill bg-thirdparty">
+                    <i class="fa fa-fw fa-user-md"></i>{{ 'thirdparty.contact'|trans }}
+                </span>
+            {% endif %}
         </div>
         <div class="item-col">
         {% if options['isConfidential'] %}
@@ -160,26 +172,33 @@
     </div>
     {% if options['showContacts'] and thirdparty.activeChildren|length > 0 %}
     <div class="item-row">
-        {{ 'thirdparty.Children'|trans }}&nbsp;:
-        {% for c in thirdparty.activeChildren %}
-            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                targetEntity: { name: 'thirdparty', id: c.id },
-                action: 'show',
-                displayBadge: true,
-                buttonText: c|chill_entity_render_string
-            } %}
-        {% endfor %}
+        <div class="item-col"></div>
+        <div class="item-col">
+            <h5 class="me-2">{{ 'thirdparty.Children'|trans ~ ': ' }}</h5>
+            {% for c in thirdparty.activeChildren %}
+                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                    targetEntity: { name: 'thirdparty', id: c.id },
+                    action: 'show',
+                    displayBadge: true,
+                    buttonText: c|chill_entity_render_string
+                } %}
+            {% endfor %}
+        </div>
     </div>
     {% endif %}
+
     {% if options['showParent'] and thirdparty.isChild %}
         <div class="item-row">
-            {{ 'thirdparty.Contact of'|trans }}&nbsp;:
-            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                targetEntity: { name: 'thirdparty', id: thirdparty.parent.id },
-                action: 'show',
-                displayBadge: true,
-                buttonText: thirdparty.parent|chill_entity_render_string
-            } %}
+            <div class="item-col"></div>
+            <div class="item-col">
+                <h5 class="me-2">{{ 'thirdparty.Contact of'|trans ~ ': ' }}</h5>
+                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                    targetEntity: { name: 'thirdparty', id: thirdparty.parent.id },
+                    action: 'show',
+                    displayBadge: true,
+                    buttonText: thirdparty.parent|chill_entity_render_string
+                } %}
+            </div>
         </div>
     {% endif %}
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig
index 6bc4e3da7..c53764871 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig
@@ -30,38 +30,10 @@
 
 {{ form_row(form.address) }}
 
-{#
-<div class="mb-3 row">
-    {{ form_label(form.address) }}
-    {{ form_widget(form.address) }}
-
-    <div class="col-sm-8">
-        {% if thirdParty.address %}
-            {# include vue_address component #
-            {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-                targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                mode: 'edit',
-                addressId: thirdParty.address.id,
-                buttonSize: 'btn-sm',
-            } %}
-            {#
-            backUrl: path('chill_3party_3party_new'),
-            #
-        {% else %}
-            {# include vue_address component #
-            {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-                targetEntity: { name: 'thirdparty', id: thirdParty.id },
-                mode: 'new',
-                buttonSize: 'btn-sm',
-                buttonText: 'Create a new address',
-                modalTitle: 'Create a new address',
-            } %}
-        {% endif %}
-    </div>
-</div>
-#}
-
 {{ form_row(form.comment) }}
+
+{% if form.centers is defined %}
 {{ form_row(form.centers) }}
+{% endif %}
 
 {{ form_row(form.active) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index 72e20fa87..cb9c4bcf5 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -6,6 +6,26 @@
 
 {% block content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+
+        {% macro rowCustomButtons(tp) %}
+            {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_edit',
+                        { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}"
+                       title="{{ 'Edit'|trans }}"
+                       class="btn btn-sm btn-update"></a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_view',
+                        { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}"
+                       title="{{ 'Show'|trans }}"
+                       class="btn btn-sm btn-show"></a>
+                </li>
+            {% endif %}
+        {% endmacro %}
+
         {% block index_header %}
             <h1>{{ 'List of third parties'|trans  }}</h1>
         {% endblock %}
@@ -13,37 +33,25 @@
         {% block table_entities %}
             <div class="thirdparty-list my-5">
                 <div class="row justify-content-center">
-                    <div>
 
-                        <label class="counter">
-                            <span>{{ paginator.totalItems }}</span> {{ 'third parties'|trans }}
-                        </label>
+                    <label class="counter text-end">
+                        <span>{{ paginator.totalItems }}</span> {{ 'third parties'|trans }}
+                    </label>
 
-                        <div class="flex-table">
-                            {% for tp in third_parties %}
-                                <div class="item-bloc">
-                                    {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'showContacts': true, 'isConfidential': (tp.contactDataAnonymous ? true : false) }) }}
-                                    <div class="item-row separator">
-                                        <ul class="record_actions">
-                                            {% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_edit',
-                                                        { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}" class="btn btn-sm btn-update"></a>
-                                                </li>
-                                            {% endif %}
-                                            {% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_crud_3party_3party_view',
-                                                        { 'id': (tp.isParent ? tp.id : tp.parent.id) }) }}" class="btn btn-sm btn-show"></a>
-                                                </li>
-                                            {% endif %}
-                                        </ul>
-
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>
+                    <div class="flex-table">
+                        {% for tp in third_parties %}
+                            <div class="item-bloc">
+                                {{ tp|chill_entity_render_box({
+                                    'render': 'bloc',
+                                    'showContacts': true,
+                                    'addLink': true,
+                                    'customButtons': { 'replace': _self.rowCustomButtons(tp) },
+                                    'isConfidential': (tp.contactDataAnonymous ? true : false)
+                                }) }}
+                            </div>
+                        {% endfor %}
                     </div>
+
                 </div>
             </div>
         {% endblock %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index 6b6395b19..06c5e1391 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -12,10 +12,10 @@
             {% block crud_content_header %}
                 <h1>
                     {{ title_ }}
-                    <span class="badge bg-{{ thirdParty.active ? 'success' : 'danger' }}"
+                    <span class="badge bg-{{ thirdParty.active ? 'success' : 'danger' }} float-end"
                           title="{{ (thirdParty.active ? 'shown to users' : 'not shown to users')|trans }}">
-                    {{ (thirdParty.active ? 'Active' : 'Inactive')|trans }}
-                </span>
+                        {{ (thirdParty.active ? 'Active' : 'Inactive')|trans }}
+                    </span>
                 </h1>
             {% endblock %}
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index d25b6ac8f..85f798424 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -1,12 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Search;
 
 use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use function array_merge;
 use function explode;
-
+use function implode;
+use function in_array;
 
 /*
  * Internal note: test query for parametrizing / testing:
@@ -33,7 +44,7 @@ FROM rows, searches
  */
 
 /**
- * Generate query for searching amongst third parties
+ * Generate query for searching amongst third parties.
  */
 class ThirdPartyApiSearch implements SearchApiInterface
 {
@@ -44,9 +55,18 @@ class ThirdPartyApiSearch implements SearchApiInterface
         $this->thirdPartyRepository = $thirdPartyRepository;
     }
 
+    public function getResult(string $key, array $metadata, float $pertinence)
+    {
+        return $this->thirdPartyRepository->find($metadata['id']);
+    }
+
+    public function prepare(array $metadatas): void
+    {
+    }
+
     public function provideQuery(string $pattern, array $parameters): SearchApiQuery
     {
-        $query = (new SearchApiQuery)
+        $query = (new SearchApiQuery())
             ->setSelectKey('tparty')
             ->setSelectJsonbMetadata("jsonb_build_object('id', tparty.id)")
             ->setFromClause('chill_3party.third_party AS tparty
@@ -55,8 +75,7 @@ class ThirdPartyApiSearch implements SearchApiInterface
                 LEFT JOIN chill_3party.third_party AS parent ON tparty.parent_id = parent.id
                 LEFT JOIN chill_main_address cma_p ON parent.address_id = cma_p.id
                 LEFT JOIN chill_main_postal_code cmpc_p ON cma_p.postcode_id = cmpc.id')
-            ->andWhereClause("tparty.active IS TRUE")
-        ;
+            ->andWhereClause('tparty.active IS TRUE');
 
         $strs = explode(' ', $pattern);
         $wheres = [];
@@ -65,45 +84,39 @@ class ThirdPartyApiSearch implements SearchApiInterface
         $pertinenceArgs = [];
 
         foreach ($strs as $str) {
-           if (!empty($str)) {
-               $wheres[] = "(LOWER(UNACCENT(?)) <<% tparty.canonicalized OR
+            if (!empty($str)) {
+                $wheres[] = "(LOWER(UNACCENT(?)) <<% tparty.canonicalized OR
                     tparty.canonicalized LIKE '%' || LOWER(UNACCENT(?)) || '%')";
-               $whereArgs[] = [$str, $str];
-               $pertinence[] = "STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized) + ".
-                   "(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int + ".
+                $whereArgs[] = [$str, $str];
+                $pertinence[] = 'STRICT_WORD_SIMILARITY(LOWER(UNACCENT(?)), tparty.canonicalized) + ' .
+                   "(tparty.canonicalized LIKE '%s' || LOWER(UNACCENT(?)) || '%')::int + " .
                    // take postcode label into account, but lower than the canonicalized field
-                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0) + ".
+                   "COALESCE((LOWER(UNACCENT(cmpc.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0) + " .
                    "COALESCE((LOWER(UNACCENT(cmpc_p.label)) LIKE '%' || LOWER(UNACCENT(?)) || '%')::int * 0.3, 0)";
-               $pertinenceArgs[] = [$str, $str, $str, $str];
-           }
+                $pertinenceArgs[] = [$str, $str, $str, $str];
+            }
         }
 
         $query
-            ->setSelectPertinence(\implode(' + ', $pertinence), \array_merge([],
-                ...$pertinenceArgs))
-            ->andWhereClause(\implode(' OR ', $wheres), \array_merge([],
-                ...$whereArgs));
+            ->setSelectPertinence(implode(' + ', $pertinence), array_merge(
+                [],
+                ...$pertinenceArgs
+            ))
+            ->andWhereClause(implode(' OR ', $wheres), array_merge(
+                [],
+                ...$whereArgs
+            ));
 
         return $query;
     }
 
-    public function supportsTypes(string $pattern, array $types, array $parameters): bool
-    {
-        return \in_array('thirdparty', $types);
-    }
-
-    public function prepare(array $metadatas): void
-    {
-
-    }
-
     public function supportsResult(string $key, array $metadatas): bool
     {
-        return $key === 'tparty';
+        return 'tparty' === $key;
     }
 
-    public function getResult(string $key, array $metadata, float $pertinence)
+    public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return $this->thirdPartyRepository->find($metadata['id']);
+        return in_array('thirdparty', $types, true);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
index 16984ea68..a2a371f3b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
@@ -1,53 +1,56 @@
 <?php
-/*
-
- */
-namespace Chill\ThirdPartyBundle\Search;
-
-use Chill\MainBundle\Search\SearchInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 
 /**
- * Allow to search amongst parties
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Search;
+
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Search\SearchInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Role\Role;
+
+/**
+ * Allow to search amongst parties.
  */
 class ThirdPartySearch implements SearchInterface
 {
+    public const NAME = '3party';
+
     /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var TokenStorageInterface
-     */
-    protected $tokenStorage;
-    
-    /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
-    
+
     /**
-     *
-     * @var PaginatorFactory 
+     * @var EntityManagerInterface
+     */
+    protected $em;
+
+    /**
+     * @var PaginatorFactory
      */
     protected $paginatorFactory;
-    
-    const NAME = '3party';
-    
+
+    /**
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+
     public function __construct(
-        EntityManagerInterface $em, 
-        TokenStorageInterface $tokenStorage, 
-        AuthorizationHelper $authorizationHelper, 
+        EntityManagerInterface $em,
+        TokenStorageInterface $tokenStorage,
+        AuthorizationHelper $authorizationHelper,
         PaginatorFactory $paginatorFactory
     ) {
         $this->em = $em;
@@ -56,7 +59,6 @@ class ThirdPartySearch implements SearchInterface
         $this->paginatorFactory = $paginatorFactory;
     }
 
-    
     public function getOrder(): int
     {
         return 59866;
@@ -67,34 +69,39 @@ class ThirdPartySearch implements SearchInterface
         return false;
     }
 
-    public function renderResult(array $terms, $start = 0, $limit = 50, $options = array(), $format = 'html')
+    public function renderResult(array $terms, $start = 0, $limit = 50, $options = [], $format = 'html')
     {
         $centers = $this->authorizationHelper
             ->getReachableCenters(
-                $this->tokenStorage->getToken()->getUser(), 
+                $this->tokenStorage->getToken()->getUser(),
                 new Role(ThirdPartyVoter::SHOW)
-                );
+            );
         $total = $this->count($centers, $terms);
         $paginator = $this->paginatorFactory->create($total);
         // replace types in terms by types in query
         $terms['types'] = $options[SearchInterface::REQUEST_QUERY_PARAMETERS]['t'];
         $terms['is_active'] = true;
-        
-        if ($format === 'json') {
+
+        if ('json' === $format) {
             return [
                 'results' => $this->em->getRepository(ThirdParty::class)
-                    ->findByMemberOfCenters($centers, $start, $limit, $terms, 
-                        ['array', ['tp.id', 'tp.name AS text']]),
-                'more' => $paginator->hasNextPage()
+                    ->findByMemberOfCenters(
+                        $centers,
+                        $start,
+                        $limit,
+                        $terms,
+                        ['array', ['tp.id', 'tp.name AS text']]
+                    ),
+                'more' => $paginator->hasNextPage(),
             ];
         }
     }
 
     public function supports($domain, $format): bool
     {
-        return self::NAME === $domain and $format === 'json';
+        return self::NAME === $domain && 'json' === $format;
     }
-    
+
     protected function count($centers, $terms): int
     {
         return $this->em->getRepository(ThirdParty::class)
diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
index ab78c7701..93cdaff3a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
@@ -1,94 +1,59 @@
 <?php
-/*
-
- */
-namespace Chill\ThirdPartyBundle\Security\Voter;
-
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Chill\MainBundle\Entity\User; 
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
- * Voter for Third Party
- * 
- * 
+ * Chill is a software for social workers
  *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Security\Voter;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use function array_intersect;
+use function count;
+use function in_array;
+
+/**
+ * Voter for Third Party.
  */
 class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
+    public const CREATE = 'CHILL_3PARTY_3PARTY_CREATE';
+
+    public const SHOW = 'CHILL_3PARTY_3PARTY_SHOW';
+
+    public const UPDATE = 'CHILL_3PARTY_3PARTY_UPDATE';
+
     /**
-     *
      * @var AuthorizationHelper
      */
     protected $authorizationHelper;
 
-    public const CREATE = 'CHILL_3PARTY_3PARTY_CREATE';
-    public const UPDATE = 'CHILL_3PARTY_3PARTY_UPDATE';
-    public const SHOW   = 'CHILL_3PARTY_3PARTY_SHOW';
-    
     public function __construct(AuthorizationHelper $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
 
-    
-    protected function supports($attribute, $subject)
-    {
-        if ($subject instanceof ThirdParty) {
-            return \in_array($attribute, $this->getRoles());
-        } elseif ($subject === NULL) {
-            return $attribute === self::CREATE || $attribute === self::SHOW ;
-        }
-        
-        return false;
-    }
-    
-    /**
-     * 
-     * @param string $attribute
-     * @param ThirdParty|null $subject
-     * @param TokenInterface $token
-     * @return type
-     */
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
-    {
-        return true;
-
-        $user = $token->getUser();
-        
-        if (!$user instanceof User) {
-            return false;
-        }
-
-        return true;
-        
-        $centers = $this->authorizationHelper
-            ->getReachableCenters($user, new Role($attribute));
-        
-        if ($subject === NULL) {
-            return count($centers) > 0;
-        } elseif ($subject instanceof ThirdParty) {
-            return count(\array_intersect($centers, $subject->getCenters()->toArray())) > 0;
-        }
-        
-        return false;
-    }
-
-        public function getRoles(): array
+    public function getRoles(): array
     {
         return [
-            self::CREATE, self::UPDATE, self::SHOW
+            self::CREATE, self::UPDATE, self::SHOW,
         ];
     }
 
     public function getRolesWithHierarchy(): array
     {
         return [
-            'Third Party' => $this->getRoles()
+            'Third Party' => $this->getRoles(),
         ];
     }
 
@@ -96,4 +61,45 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
     {
         return $this->getRoles();
     }
+
+    protected function supports($attribute, $subject)
+    {
+        if ($subject instanceof ThirdParty) {
+            return in_array($attribute, $this->getRoles(), true);
+        }
+
+        if (null === $subject) {
+            return self::CREATE === $attribute || self::SHOW === $attribute;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $attribute
+     * @param ThirdParty|null $subject
+     */
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
+    {
+        return true;
+        $user = $token->getUser();
+
+        if (!$user instanceof User) {
+            return false;
+        }
+
+        return true;
+        $centers = $this->authorizationHelper
+            ->getReachableCenters($user, new Role($attribute));
+
+        if (null === $subject) {
+            return count($centers) > 0;
+        }
+
+        if ($subject instanceof ThirdParty) {
+            return count(array_intersect($centers, $subject->getCenters()->toArray())) > 0;
+        }
+
+        return false;
+    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index c62fdb31b..91592ffde 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -8,8 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-
-class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterface
+class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
     use NormalizerAwareTrait;
 
@@ -20,28 +28,29 @@ class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterf
         $this->thirdPartyRender = $thirdPartyRender;
     }
 
-    public function normalize($thirdParty, string $format = null, array $context = [])
+    /**
+     * @param ThirdParty $thirdParty
+     */
+    public function normalize($thirdParty, ?string $format = null, array $context = [])
     {
-        /** @var $thirdParty ThirdParty */
-        $data['type'] = 'thirdparty';
-        $data['text'] = $this->thirdPartyRender->renderString($thirdParty, []);
-        $data['id'] = $thirdParty->getId();
-        $data['kind'] = $thirdParty->getKind();
-        $data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
-            [ 'address_rendering' => 'short' ]);
-        $data['phonenumber'] = $thirdParty->getTelephone();
-        $data['email'] = $thirdParty->getEmail();
-        $data['isChild'] = $thirdParty->isChild();
-        $data['parent'] = $this->normalizer->normalize($thirdParty->getParent(), $format, $context);
-        $data['civility'] = $this->normalizer->normalize($thirdParty->getCivility(), $format, $context);
-        $data['contactDataAnonymous'] = $thirdParty->isContactDataAnonymous();
-
-        return $data;
+        return [
+            'type' => 'thirdparty',
+            'text' => $this->thirdPartyRender->renderString($thirdParty, []),
+            'id' => $thirdParty->getId(),
+            'kind' => $thirdParty->getKind(),
+            'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, ['address_rendering' => 'short']),
+            'phonenumber' => $thirdParty->getTelephone(),
+            'email' => $thirdParty->getEmail(),
+            'isChild' => $thirdParty->isChild(),
+            'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
+            'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
+            'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
+            'comment' => $thirdParty->getComment(),
+        ];
     }
 
-    public function supportsNormalization($data, string $format = null)
+    public function supportsNormalization($data, ?string $format = null)
     {
-        return $data instanceof ThirdParty;
+        return $data instanceof ThirdParty && 'json' === $format;
     }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index 01ff02e0a..8cfa95f80 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -1,23 +1,14 @@
 <?php
-/*
+
+/**
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2020 , Champs Libres Cooperative SCRLFS,
- * <http://www.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/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Templating\Entity;
 
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
@@ -25,30 +16,22 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Component\Templating\EngineInterface;
 
-/**
- *
- *
- */
 class ThirdPartyRender extends AbstractChillEntityRender
 {
-
     protected EngineInterface $engine;
+
     protected TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(
         EngineInterface $engine,
         TranslatableStringHelper $translatableStringHelper
-    )
-    {
+    ) {
         $this->engine = $engine;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
     /**
-     *
      * @param ThirdParty $entity
-     * @param array $options
-     * @return string
      */
     public function renderBox($entity, array $options): string
     {
@@ -63,7 +46,7 @@ class ThirdPartyRender extends AbstractChillEntityRender
             'customArea' => $options['customArea'] ?? [],
             'showContacts' => $options['showContacts'] ?? false,
             'showParent' => $options['showParent'] ?? true,
-            'isConfidential' => $options['isConfidential'] ?? false
+            'isConfidential' => $options['isConfidential'] ?? false,
         ];
 
         return
@@ -71,31 +54,30 @@ class ThirdPartyRender extends AbstractChillEntityRender
             $this->engine->render('@ChillThirdParty/Entity/thirdparty.html.twig', [
                 'thirdparty' => $entity,
                 'render' => $options['render'] ?? 'raw',
-                'options' => $params
+                'options' => $params,
             ]) .
             $this->getDefaultClosingBox();
     }
 
     /**
-     *
      * @param ThirdParty $entity
-     * @param array $options
-     * @return string
      */
     public function renderString($entity, array $options): string
     {
-        if ($entity->getCivility() !== NULL) {
+        if ($entity->getCivility() !== null) {
             $civility = $this->translatableStringHelper
-                ->localize($entity->getCivility()->getAbbreviation()).' ';
+                ->localize($entity->getCivility()->getAbbreviation()) . ' ';
         } else {
             $civility = '';
         }
+
         if (!empty($entity->getAcronym())) {
-            $acronym = ' ('.$entity->getAcronym().')';
+            $acronym = ' (' . $entity->getAcronym() . ')';
         } else {
             $acronym = '';
         }
-        return $civility.$entity->getName().$acronym;
+
+        return $civility . $entity->getName() . $acronym;
     }
 
     public function supports($entity, array $options): bool
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
index 9c3e187fc..86bce1901 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Controller/ThirdPartyControllerTest.php
@@ -1,30 +1,42 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-class ThirdPartyControllerTest extends WebTestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ThirdPartyControllerTest extends WebTestCase
 {
     public function testIndex()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         $crawler = $client->request('GET', '/index');
     }
 
     public function testNew()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         $crawler = $client->request('GET', '/new');
     }
 
     public function testUpdate()
     {
-        $client = static::createClient();
+        $client = self::createClient();
 
         $crawler = $client->request('GET', '/update');
     }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
index ac1758030..0ec7d065e 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Entity/ThirdPartyTest.php
@@ -1,12 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdParty\Tests\Entity;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use PHPUnit\Framework\TestCase;
 
-class ThirdPartyTest extends TestCase
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ThirdPartyTest extends TestCase
 {
     public function testAddingRemovingActivityTypes()
     {
@@ -34,8 +47,10 @@ class ThirdPartyTest extends TestCase
         $tp->removeTypesAndCategories('type');
         $tp->removeTypesAndCategories($cat2);
 
-        $this->assertTrue($tp->getCategories()->contains($cat1),
-            "test that cat1 is still present");
+        $this->assertTrue(
+            $tp->getCategories()->contains($cat1),
+            'test that cat1 is still present'
+        );
         $this->assertFalse($tp->getCategories()->contains($cat2));
         $this->assertCount(1, $tp->getCategories());
 
@@ -55,7 +70,7 @@ class ThirdPartyTest extends TestCase
             'type1',
             'type2',
             $cat1 = new ThirdPartyCategory(),
-            $cat2 = new ThirdPartyCategory()
+            $cat2 = new ThirdPartyCategory(),
         ]);
 
         $this->assertTrue($tp->getCategories()->contains($cat1));
@@ -88,5 +103,4 @@ class ThirdPartyTest extends TestCase
         $this->assertContains('type1', $tp->getTypesAndCategories());
         $this->assertNotContains('type2', $tp->getTypesAndCategories());
     }
-
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php
new file mode 100644
index 000000000..0b8169d69
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdpartyDocGenNormalizerTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Civility;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ThirdpartyDocGenNormalizerTest extends KernelTestCase
+{
+    private NormalizerInterface $normalizer;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->normalizer = self::$container->get(NormalizerInterface::class);
+    }
+
+    public function testNormalize()
+    {
+        $thirdparty = new ThirdParty();
+        $thirdparty
+            ->setAcronym('ABCD')
+            ->setName('test')
+            ->setCivility((new Civility())->setName(['fr' => 'Monsieur'])->setAbbreviation(['fr' => 'M.']))
+            ->setEmail('info@cl.coop')
+            ->addTypesAndCategories('kind')
+            ->addTypesAndCategories((new ThirdPartyCategory())->setName(['fr' => 'category']));
+
+        $actual = $this->normalizer->normalize($thirdparty, 'docgen', ['groups' => ['docgen:read']]);
+
+        var_dump($actual);
+
+        $this->assertIsArray($actual);
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
index 87208bdcf..36eafb288 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
@@ -1,56 +1,62 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\ThirdPartyType;
 
+use function array_keys;
+
 /**
- * Manages types of third parties
- *
+ * Manages types of third parties.
  */
 class ThirdPartyTypeManager
 {
     /**
-     *
+     * The prefix used to translate the key of provider.
+     */
+    public const THIRD_PARTY_TRANSLATOR_KEY = 'chill_3party.key_label.';
+
+    /**
      * @var ThirdPartyTypeProviderInterface[]
      */
     protected $providers = [];
-    
+
     /**
-     * The prefix used to translate the key of provider
-     */
-    const THIRD_PARTY_TRANSLATOR_KEY = 'chill_3party.key_label.';
-    
-    /**
-     * Add a provider to the manager
-     * 
+     * Add a provider to the manager.
+     *
      * Method used during the load of the manager by Dependency Injection
-     * 
+     *
      * @param \Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface $provider
-     * @return \self
      */
     public function addProvider(ThirdPartyTypeProviderInterface $provider): self
     {
         $this->providers[$provider->getKey()] = $provider;
-        
+
         return $this;
     }
-    
+
     /**
-     * Get all providers
-     * 
-     * @return array
+     * Get all providers.
      */
     public function getProviders(): array
     {
         return $this->providers;
     }
-    
+
     /**
-     * Get a list of types
-     * 
+     * Get a list of types.
+     *
      * @return string[]
      */
     public function getTypes(): array
     {
-        return \array_keys($this->providers);
+        return array_keys($this->providers);
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php
index d544255e9..3289a7cb1 100644
--- a/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php
+++ b/src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeProviderInterface.php
@@ -1,17 +1,23 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ThirdPartyBundle\ThirdPartyType;
 
 /**
- * Provide third party type
+ * Provide third party type.
  */
 interface ThirdPartyTypeProviderInterface
 {
     /**
      * Return an unique key for this type.
-     * 
-     * @return string
      */
     public static function getKey(): string;
-    
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js b/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js
index 8fbeb35a2..ea523d82f 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js
@@ -6,9 +6,4 @@ module.exports = function(encore, entries)
     });
 
     entries.push(__dirname + '/Resources/public/chill/index.js');
-
-    encore.addEntry(
-        'page_3party_3party_index',
-        __dirname + '/Resources/public/page/index/index.js'
-    );
 };
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
index 0b7ab562f..e842bd11d 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
@@ -6,23 +15,12 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * add ThirdParty Entity
+ * add ThirdParty Entity.
  *
  * @Author Mathieu Jaumotte jaum_mathieu@collectifs.net
  */
 final class Version20190307111314 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('CREATE SEQUENCE chill_third_party_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_third_party (id INT NOT NULL, name VARCHAR(255) NOT NULL, telephone VARCHAR(64) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, comment TEXT DEFAULT NULL, type JSON DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_third_party.type IS \'(DC2Type:json_array)\'');
-        
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
@@ -30,6 +28,14 @@ final class Version20190307111314 extends AbstractMigration
 
         $this->addSql('DROP SEQUENCE chill_third_party_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_third_party');
+    }
 
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('CREATE SEQUENCE chill_third_party_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_third_party (id INT NOT NULL, name VARCHAR(255) NOT NULL, telephone VARCHAR(64) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, comment TEXT DEFAULT NULL, type JSON DEFAULT NULL, PRIMARY KEY(id))');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
index 0d20c53b2..650e7e824 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190307131650.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
@@ -6,24 +15,24 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Move table third-party to another schema
+ * Move table third-party to another schema.
  */
 final class Version20190307131650 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql("CREATE SCHEMA chill_3party");
-        $this->addSql("ALTER TABLE chill_third_party SET SCHEMA chill_3party");
-        $this->addSql("ALTER TABLE chill_3party.chill_third_party RENAME TO third_party");
-        $this->addSql("ALTER SEQUENCE chill_third_party_id_seq SET SCHEMA chill_3party");
-        $this->addSql("ALTER SEQUENCE chill_3party.chill_third_party_id_seq RENAME TO third_party_id_seq");
-    }
-
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->throwIrreversibleMigrationException("The down version of this migration is "
-            . "not written");
+        $this->throwIrreversibleMigrationException('The down version of this migration is '
+            . 'not written');
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA chill_3party');
+        $this->addSql('ALTER TABLE chill_third_party SET SCHEMA chill_3party');
+        $this->addSql('ALTER TABLE chill_3party.chill_third_party RENAME TO third_party');
+        $this->addSql('ALTER SEQUENCE chill_third_party_id_seq SET SCHEMA chill_3party');
+        $this->addSql('ALTER SEQUENCE chill_3party.chill_third_party_id_seq RENAME TO third_party_id_seq');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
index bb4900355..754263653 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190418090842.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
@@ -6,10 +15,18 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add "centers" and "active" to 3rd party
+ * Add "centers" and "active" to 3rd party.
  */
 final class Version20190418090842 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('DROP TABLE chill_3party.party_center');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP active');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -21,12 +38,4 @@ final class Version20190418090842 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_3party.party_center ADD CONSTRAINT FK_C65D43975932F377 FOREIGN KEY (center_id) REFERENCES centers (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_3party.third_party ADD active BOOLEAN NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-
-        $this->addSql('DROP TABLE chill_3party.party_center');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP active');
-    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
index 99e9806d7..ec62b7cd2 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190429171109.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
@@ -6,21 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Alter third_party.type to jsonb and rename to types
+ * Alter third_party.type to jsonb and rename to types.
  */
 final class Version20190429171109 extends AbstractMigration
 {
-    public function up(Schema $schema): void
-    {
-        $this->addSql("ALTER TABLE chill_3party.third_party RENAME COLUMN type "
-            . "TO types");
-        $this->addSql("ALTER TABLE chill_3party.third_party ALTER COLUMN types "
-            . "SET DATA TYPE jsonb");
-
-    }
-
     public function down(Schema $schema): void
     {
-        $this->throwIrreversibleMigrationException("not implemented");
+        $this->throwIrreversibleMigrationException('not implemented');
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.third_party RENAME COLUMN type '
+            . 'TO types');
+        $this->addSql('ALTER TABLE chill_3party.third_party ALTER COLUMN types '
+            . 'SET DATA TYPE jsonb');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
index b19c1b833..b17fe5a49 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20190502144206.php
@@ -1,4 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
 
@@ -6,10 +15,18 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add an address to parties
+ * Add an address to parties.
  */
 final class Version20190502144206 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
+
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BF5B7AF75');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP address_id');
+    }
+
     public function up(Schema $schema): void
     {
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
@@ -18,14 +35,5 @@ final class Version20190502144206 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.types IS NULL');
         $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT FK_D952467BF5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_D952467BF5B7AF75 ON chill_3party.third_party (address_id)');
-        
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
-        
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BF5B7AF75');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP address_id');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php
index ae270a1d1..507c0316e 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210525211216.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
@@ -8,10 +15,16 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Specify ON DELETE behaviour to handle deletion of parents in associated tables
+ * Specify ON DELETE behaviour to handle deletion of parents in associated tables.
  */
 final class Version20210525211216 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT fk_d952467bf5b7af75');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467bf5b7af75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
     public function getDescription(): string
     {
         return 'Specify ON DELETE behaviour to handle deletion of parents in associated tables';
@@ -22,10 +35,4 @@ final class Version20210525211216 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BF5B7AF75');
         $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT FK_D952467BF5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) ON DELETE SET NULL NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT fk_d952467bf5b7af75');
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467bf5b7af75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php
index cb7ba9835..3242e677b 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20210719105918.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
@@ -8,11 +15,36 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add new fields to ThirdParty Entity
- * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ * Add new fields to ThirdParty Entity.
  */
 final class Version20210719105918 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.thirdparty_category DROP CONSTRAINT FK_7049563712469DE2');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B384D4799');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BBA930D69');
+        $this->addSql('DROP SEQUENCE chill_3party.party_category_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_3party.party_civility_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_3party.party_profession_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_3party.party_category');
+        $this->addSql('DROP TABLE chill_3party.party_civility');
+        $this->addSql('DROP TABLE chill_3party.party_profession');
+        $this->addSql('DROP TABLE chill_3party.thirdparty_category');
+        $this->addSql('ALTER INDEX chill_3party.idx_14dc44755932f377 RENAME TO idx_c65d43975932f377');
+        $this->addSql('ALTER INDEX chill_3party.idx_14dc4475c7d3a8e6 RENAME TO idx_c65d4397c7d3a8e6');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B727ACA70');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B16FE72E1');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP parent_id');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP civility');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP updated_by');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP name_company');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP acronym');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP created_at');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP updated_at');
+    }
+
     public function getDescription(): string
     {
         return 'Add new fields to ThirdParty Entity + new join tables';
@@ -50,30 +82,4 @@ final class Version20210719105918 extends AbstractMigration
         $this->addSql('ALTER INDEX chill_3party.idx_c65d4397c7d3a8e6 RENAME TO IDX_14DC4475C7D3A8E6');
         $this->addSql('ALTER INDEX chill_3party.idx_c65d43975932f377 RENAME TO IDX_14DC44755932F377');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_3party.thirdparty_category DROP CONSTRAINT FK_7049563712469DE2');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B384D4799');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BBA930D69');
-        $this->addSql('DROP SEQUENCE chill_3party.party_category_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_3party.party_civility_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_3party.party_profession_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_3party.party_category');
-        $this->addSql('DROP TABLE chill_3party.party_civility');
-        $this->addSql('DROP TABLE chill_3party.party_profession');
-        $this->addSql('DROP TABLE chill_3party.thirdparty_category');
-        $this->addSql('ALTER INDEX chill_3party.idx_14dc44755932f377 RENAME TO idx_c65d43975932f377');
-        $this->addSql('ALTER INDEX chill_3party.idx_14dc4475c7d3a8e6 RENAME TO idx_c65d4397c7d3a8e6');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B727ACA70');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B16FE72E1');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP parent_id');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP civility');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP updated_by');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP name_company');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP acronym');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP created_at');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP updated_at');
-    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php
index d35552604..60ab49cd8 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211006200924.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add created_by to third party
+ * Add created_by to third party.
  */
 final class Version20211006200924 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP created_by');
+    }
+
     public function getDescription(): string
     {
         return 'Add link to creator (created_by) to thirdParty';
@@ -19,19 +31,14 @@ final class Version20211006200924 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-         $this->addSql('ALTER TABLE chill_3party.third_party ADD created_by INT DEFAULT NULL');
-         $this->addSql('ALTER TABLE chill_3party.third_party ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-         $this->addSql('ALTER TABLE chill_3party.third_party ALTER created_at DROP DEFAULT');
-         $this->addSql('ALTER TABLE chill_3party.third_party ALTER updated_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-         $this->addSql('ALTER TABLE chill_3party.third_party ALTER updated_at DROP DEFAULT');
-         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.created_at IS \'(DC2Type:datetime_immutable)\'');
-         $this->addSql('COMMENT ON COLUMN chill_3party.third_party.updated_at IS \'(DC2Type:datetime_immutable)\'');
-         $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT FK_D952467BDE12AB56 FOREIGN KEY (created_by) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-         $this->addSql('CREATE INDEX IDX_D952467BDE12AB56 ON chill_3party.third_party (created_by)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP created_by');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD created_by INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_3party.third_party ALTER created_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_3party.third_party ALTER created_at DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_3party.third_party ALTER updated_at TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
+        $this->addSql('ALTER TABLE chill_3party.third_party ALTER updated_at DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_3party.third_party.created_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_3party.third_party.updated_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT FK_D952467BDE12AB56 FOREIGN KEY (created_by) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_D952467BDE12AB56 ON chill_3party.third_party (created_by)');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php
index fb4f9bed1..29ecc702e 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007150459.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
@@ -8,10 +15,31 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * migrate data from 3party.civility to chill_main_civility table
+ * migrate data from 3party.civility to chill_main_civility table.
  */
 final class Version20211007150459 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException('Reversible migration not implemented');
+
+        // for reference:
+        $this->addSql('CREATE SEQUENCE chill_3party.party_civility_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_3party.party_civility (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B23D6A298');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BFDEF8996');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD civility INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP civility_id');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP kind');
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP canonicalized');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467b384d4799 FOREIGN KEY (civility) REFERENCES chill_3party.party_civility (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467bba930d69 FOREIGN KEY (profession) REFERENCES chill_3party.party_profession (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE UNIQUE INDEX uniq_d952467b384d4799 ON chill_3party.third_party (civility)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_d952467bba930d69 ON chill_3party.third_party (profession)');
+    }
+
     public function getDescription(): string
     {
         return 'migrate data from 3party.civility to chill_main_civility table';
@@ -45,25 +73,4 @@ final class Version20211007150459 extends AbstractMigration
         $this->addSql('CREATE INDEX IDX_D952467B23D6A298 ON chill_3party.third_party (civility_id)');
         $this->addSql('CREATE INDEX IDX_D952467BFDEF8996 ON chill_3party.third_party (profession_id)');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->throwIrreversibleMigrationException('Reversible migration not implemented');
-
-        // for reference:
-        $this->addSql('CREATE SEQUENCE chill_3party.party_civility_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_3party.party_civility (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467B23D6A298');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP CONSTRAINT FK_D952467BFDEF8996');
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD civility INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD profession INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP civility_id');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP profession_id');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP kind');
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP canonicalized');
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467b384d4799 FOREIGN KEY (civility) REFERENCES chill_3party.party_civility (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_3party.third_party ADD CONSTRAINT fk_d952467bba930d69 FOREIGN KEY (profession) REFERENCES chill_3party.party_profession (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('CREATE UNIQUE INDEX uniq_d952467b384d4799 ON chill_3party.third_party (civility)');
-        $this->addSql('CREATE UNIQUE INDEX uniq_d952467bba930d69 ON chill_3party.third_party (profession)');
-    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
index f58fa1a79..2d33bbeb4 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007165001.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
@@ -8,10 +15,20 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Create trigger for canonicalisation on 3party + indexes
+ * Create trigger for canonicalisation on 3party + indexes.
  */
 final class Version20211007165001 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP TRIGGER canonicalize_fullname_on_update ON chill_3party.third_party');
+        $this->addSql('DROP TRIGGER canonicalize_fullname_on_insert ON chill_3party.third_party');
+        $this->addSql('DROP FUNCTION chill_3party.canonicalize()');
+        $this->addSql('
+            DROP INDEX chill_3party.chill_custom_canonicalized_trgm_idx_gist
+        ');
+    }
+
     public function getDescription(): string
     {
         return 'Create trigger for canonicalisation on 3party + indexes';
@@ -54,33 +71,23 @@ final class Version20211007165001 extends AbstractMigration
                 END
                 $$
         ");
-        $this->addSql("
+        $this->addSql('
             CREATE TRIGGER canonicalize_fullname_on_insert
                 BEFORE INSERT
                 ON chill_3party.third_party
                 FOR EACH ROW
                     EXECUTE procedure chill_3party.canonicalize();
-        ");
-        $this->addSql("
+        ');
+        $this->addSql('
             CREATE TRIGGER canonicalize_fullname_on_update
                 BEFORE UPDATE
                 ON chill_3party.third_party
                 FOR EACH ROW
                     EXECUTE procedure chill_3party.canonicalize();
-        ");
-        $this->addSql("
+        ');
+        $this->addSql('
             CREATE INDEX chill_custom_canonicalized_trgm_idx_gist
                 ON chill_3party.third_party USING GIST (canonicalized gist_trgm_ops) WHERE active IS TRUE
-        ");
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP TRIGGER canonicalize_fullname_on_update ON chill_3party.third_party');
-        $this->addSql('DROP TRIGGER canonicalize_fullname_on_insert ON chill_3party.third_party');
-        $this->addSql('DROP FUNCTION chill_3party.canonicalize()');
-        $this->addSql("
-            DROP INDEX chill_3party.chill_custom_canonicalized_trgm_idx_gist
-        ");
+        ');
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php
index 7a6f5fb76..ac1b04486 100644
--- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php
+++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20211007194942.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\ThirdParty;
@@ -8,10 +15,15 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Add anonymous flag for contacts
+ * Add anonymous flag for contacts.
  */
 final class Version20211007194942 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_3party.third_party DROP contact_data_anonymous');
+    }
+
     public function getDescription(): string
     {
         return 'Add anonymous flag for contacts';
@@ -21,9 +33,4 @@ final class Version20211007194942 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_3party.third_party ADD contact_data_anonymous BOOLEAN DEFAULT \'false\' NOT NULL;');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_3party.third_party DROP contact_data_anonymous');
-    }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 135ef9b47..20b45a398 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -85,3 +85,6 @@ crud:
     3party_3party:
         index:
             add_new: Créer
+
+Thirdparty handling: Tiers traitant
+Thirdparty workers: Tiers intervenants
diff --git a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
index 694503987..ac7ed05cb 100644
--- a/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
+++ b/src/Bundle/ChillWopiBundle/src/ChillWopiBundle.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Test.php b/src/Bundle/ChillWopiBundle/src/Controller/Test.php
index 283328f21..1687bce13 100644
--- a/src/Bundle/ChillWopiBundle/src/Controller/Test.php
+++ b/src/Bundle/ChillWopiBundle/src/Controller/Test.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
@@ -22,22 +24,26 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Security;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 final class Test
 {
-    private DiscoveryInterface $wopiDiscovery;
-
     private DocumentManagerInterface $documentManager;
 
-    private ConfigurationInterface $wopiConfiguration;
-
-    private ResponderInterface $responder;
-
-    private Security $security;
-
     private Psr17Interface $psr17;
 
+    private ResponderInterface $responder;
+
     private RouterInterface $router;
 
+    private Security $security;
+
+    private ConfigurationInterface $wopiConfiguration;
+
+    private DiscoveryInterface $wopiDiscovery;
+
     public function __construct(
         ConfigurationInterface $wopiConfiguration,
         DiscoveryInterface $wopiDiscovery,
@@ -88,7 +94,7 @@ final class Test
                                 ],
                                 UrlGeneratorInterface::ABSOLUTE_URL
                             ),
-                        'closebutton' => 1
+                        'closebutton' => 1,
                     ]
                 )
             );
@@ -99,6 +105,5 @@ final class Test
                 '@ChillWopi/Editor/page.html.twig',
                 $configuration
             );
-
     }
 }
diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
index d67a62d94..37a9e2fa6 100644
--- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
+++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php
index a30a203e4..fe33d68bf 100644
--- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php
index 60bd96bde..81ecb4e55 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/routes/routes.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
index 4925404b3..ff741d492 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
+++ b/src/Bundle/ChillWopiBundle/src/Resources/config/services.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
@@ -10,10 +12,10 @@ declare(strict_types=1);
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface;
-use Chill\WopiBundle\Service\Wopi\ChillWopi;
 use ChampsLibres\WopiBundle\Service\Wopi as CLWopi;
 use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface;
 use Chill\WopiBundle\Service\Wopi\ChillDocumentManager;
+use Chill\WopiBundle\Service\Wopi\ChillWopi;
 
 return static function (ContainerConfigurator $container) {
     $services = $container
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
index bc26be62d..064027be6 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/Responder.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
index 712b3cd59..876509469 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Controller/ResponderInterface.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
index ac3de1729..4f6727598 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
@@ -28,6 +30,7 @@ use Symfony\Component\Mime\MimeTypes;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Throwable;
+use function strlen;
 
 final class ChillDocumentManager implements DocumentManagerInterface
 {
@@ -86,14 +89,16 @@ final class ChillDocumentManager implements DocumentManagerInterface
         return $document;
     }
 
-    public function deleteLock(Document $document): void {
+    public function deleteLock(Document $document): void
+    {
         $this->documentLockManager->deleteLock($document, $this->request);
     }
 
     /**
      * @param string $documentFilename without extension !
      */
-    public function findByDocumentFilename(string $documentFilename): ?Document {
+    public function findByDocumentFilename(string $documentFilename): ?Document
+    {
         return $this->storedObjectRepository->findOneBy(
             [
                 'filename' => $documentFilename,
@@ -101,7 +106,8 @@ final class ChillDocumentManager implements DocumentManagerInterface
         );
     }
 
-    public function findByDocumentId(string $documentId): ?Document {
+    public function findByDocumentId(string $documentId): ?Document
+    {
         return $this->storedObjectRepository->findOneBy(
             [
                 'uuid' => Uuid::fromString($documentId),
@@ -109,6 +115,22 @@ final class ChillDocumentManager implements DocumentManagerInterface
         );
     }
 
+    /**
+     * @param StoredObject $document
+     *
+     * @return string The document filename with its extension.
+     */
+    public function getBasename(Document $document): string
+    {
+        $exts = (new MimeTypes())->getExtensions($document->getType());
+
+        if ([] === $exts) {
+            throw new Error('Unknown mimetype for stored document.');
+        }
+
+        return sprintf('%s.%s', $document->getFilename(), reset($exts));
+    }
+
     /**
      * @param StoredObject $document
      */
@@ -117,6 +139,14 @@ final class ChillDocumentManager implements DocumentManagerInterface
         return $document->getCreationDate();
     }
 
+    /**
+     * @param StoredObject $document
+     */
+    public function getDocumentId(Document $document): string
+    {
+        return (string) $document->getUuid();
+    }
+
     /**
      * @param StoredObject $document
      */
@@ -126,24 +156,46 @@ final class ChillDocumentManager implements DocumentManagerInterface
         return $document->getCreationDate();
     }
 
-    public function getLock(Document $document): string {
+    public function getLock(Document $document): string
+    {
         return $this->documentLockManager->getLock($document, $this->request);
     }
 
-    public function getVersion(Document $document): string {
+    public function getSha256(Document $document): string
+    {
+        return base64_encode(hash('sha256', $this->getContent($document)));
+    }
+
+    public function getSize(Document $document): int
+    {
+        return strlen($this->getContent($document));
+    }
+
+    public function getVersion(Document $document): string
+    {
         // TODO ?
         return '0';
     }
 
-    public function hasLock(Document $document): bool {
+    public function hasLock(Document $document): bool
+    {
         return $this->documentLockManager->hasLock($document, $this->request);
     }
 
-    public function lock(Document $document, string $lock): void {
+    public function lock(Document $document, string $lock): void
+    {
         $this->documentLockManager->setLock($document, $lock, $this->request);
     }
 
-    public function remove(Document $document): void {
+    public function read(Document $document): StreamInterface
+    {
+        return $this
+            ->psr17
+            ->createStream($this->getContent($document));
+    }
+
+    public function remove(Document $document): void
+    {
         $entityIsDeleted = false;
 
         try {
@@ -153,7 +205,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
             $entityIsDeleted = false;
         }
 
-        if ($entityIsDeleted === true) {
+        if (true === $entityIsDeleted) {
             $this->deleteContent($document);
         }
     }
@@ -163,42 +215,6 @@ final class ChillDocumentManager implements DocumentManagerInterface
         $this->setContent($document, $properties['content']);
     }
 
-    /**
-     * @param StoredObject $document
-     *
-     * @return string The document filename with its extension.
-     */
-    public function getBasename(Document $document): string {
-        $exts = (new MimeTypes())->getExtensions($document->getType());
-
-        if ([] === $exts) {
-            throw new Error('Unknown mimetype for stored document.');
-        }
-
-        return sprintf('%s.%s', $document->getFilename(), reset($exts));
-    }
-
-    /**
-     * @param StoredObject $document
-     */
-    public function getDocumentId(Document $document): string {
-        return (string) $document->getUuid();
-    }
-
-    public function getSha256(Document $document): string {
-        return base64_encode(hash('sha256', $this->getContent($document)));
-    }
-
-    public function getSize(Document $document): int {
-        return strlen($this->getContent($document));
-    }
-
-    public function read(Document $document): StreamInterface {
-        return $this
-            ->psr17
-            ->createStream($this->getContent($document));
-    }
-
     private function deleteContent(StoredObject $storedObject): void
     {
         /** @var StdClass $object */
@@ -206,8 +222,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
         $response = $this->httpClient->request('DELETE', $object->url);
 
-        if (200 !== $response->getStatusCode())
-        {
+        if (200 !== $response->getStatusCode()) {
             throw new Error('Unable to delete stored object.');
         }
     }
@@ -219,8 +234,7 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
         $response = $this->httpClient->request('GET', $object->url);
 
-        if (200 !== $response->getStatusCode())
-        {
+        if (200 !== $response->getStatusCode()) {
             throw new Error('Unable to retrieve stored object.');
         }
 
@@ -235,10 +249,8 @@ final class ChillDocumentManager implements DocumentManagerInterface
 
         $response = $this->httpClient->request('PUT', $object->url, ['body' => $content]);
 
-        if (201 !== $response->getStatusCode())
-        {
+        if (201 !== $response->getStatusCode()) {
             throw new Error('Unable to save stored object.');
         }
     }
-
 }
diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
index ba289630e..21725c3f1 100644
--- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
+++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
@@ -1,6 +1,8 @@
 <?php
 
 /**
+ * Chill is a software for social workers
+ *
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
diff --git a/tests/app b/tests/app
index bd95d3c96..5952eda44 160000
--- a/tests/app
+++ b/tests/app
@@ -1 +1 @@
-Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01
+Subproject commit 5952eda44831896991989c2e4881adc26329140e